pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-26 22:33:24 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

dummy for config transfer (#5154)

Browse Source
This commit is contained in:
Thomas Göttgens 2024-10-26 18:04:31 +02:00 committed by GitHub
parent a6b429a550
commit 42d22a911b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main.cpp
View File

@ -1324,4 +1324,3 @@ void tft_task_handler(void *param = nullptr)
} }
#endif #endif

6
src/mesh/PhoneAPI.cpp
View File

@ -165,6 +165,7 @@ bool PhoneAPI::handleToRadio(const uint8_t *buf, size_t bufLength)
* *
* Our sending states progress in the following sequence (the client apps ASSUME THIS SEQUENCE, DO NOT CHANGE IT): * Our sending states progress in the following sequence (the client apps ASSUME THIS SEQUENCE, DO NOT CHANGE IT):
STATE_SEND_MY_INFO, // send our my info record STATE_SEND_MY_INFO, // send our my info record
STATE_SEND_UIDATA,
STATE_SEND_OWN_NODEINFO, STATE_SEND_OWN_NODEINFO,
STATE_SEND_METADATA, STATE_SEND_METADATA,
STATE_SEND_CHANNELS STATE_SEND_CHANNELS
@ -280,9 +281,12 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
fromRadioScratch.config.which_payload_variant = meshtastic_Config_security_tag; fromRadioScratch.config.which_payload_variant = meshtastic_Config_security_tag;
fromRadioScratch.config.payload_variant.security = config.security; fromRadioScratch.config.payload_variant.security = config.security;
break; break;
case meshtastic_Config_sessionkey_tag: case meshtastic_Config_sessionkey_tag: // NOOP!
fromRadioScratch.config.which_payload_variant = meshtastic_Config_sessionkey_tag; fromRadioScratch.config.which_payload_variant = meshtastic_Config_sessionkey_tag;
break; break;
case meshtastic_Config_device_ui_tag: // NOOP!
fromRadioScratch.config.which_payload_variant = meshtastic_Config_device_ui_tag;
break;
default: default:
LOG_ERROR("Unknown config type %d", config_state); LOG_ERROR("Unknown config type %d", config_state);
} }

7
src/modules/AdminModule.cpp
View File

@ -606,6 +606,9 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
requiresReboot = false; requiresReboot = false;
break; break;
case meshtastic_Config_device_ui_tag:
// NOOP! This is handled by handleStoreDeviceUIConfig
break;
} }
if (requiresReboot && !hasOpenEditTransaction) { if (requiresReboot && !hasOpenEditTransaction) {
disableBluetooth(); disableBluetooth();
@ -768,6 +771,10 @@ void AdminModule::handleGetConfig(const meshtastic_MeshPacket &req, const uint32
LOG_INFO("Getting config: Sessionkey"); LOG_INFO("Getting config: Sessionkey");
res.get_config_response.which_payload_variant = meshtastic_Config_sessionkey_tag; res.get_config_response.which_payload_variant = meshtastic_Config_sessionkey_tag;
break; break;
case meshtastic_AdminMessage_ConfigType_DEVICEUI_CONFIG:
// NOOP! This is handled by handleGetDeviceUIConfig
res.get_config_response.which_payload_variant = meshtastic_Config_device_ui_tag;
break;
} }
// NOTE: The phone app needs to know the ls_secs value so it can properly expect sleep behavior. // NOTE: The phone app needs to know the ls_secs value so it can properly expect sleep behavior.
// So even if we internally use 0 to represent 'use default' we still need to send the value we are // So even if we internally use 0 to represent 'use default' we still need to send the value we are