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

Trunk it

Browse Source
This commit is contained in:
Ben Meadors 2023-02-03 09:50:49 -06:00
parent 51521462c4
commit 1fa2ca6a14
1 changed files with 37 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
src/modules/AdminModule.cpp
View File

@ -33,8 +33,7 @@ static const char *secretReserved = "sekrit";
/// If buf is the reserved secret word, replace the buffer with currentVal /// If buf is the reserved secret word, replace the buffer with currentVal
static void writeSecret(char *buf, size_t bufsz, const char *currentVal) static void writeSecret(char *buf, size_t bufsz, const char *currentVal)
{ {
if (strcmp(buf, secretReserved) == 0) if (strcmp(buf, secretReserved) == 0) {
{
strncpy(buf, currentVal, bufsz); strncpy(buf, currentVal, bufsz);
} }
} }
@ -52,8 +51,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
bool handled = false; bool handled = false;
assert(r); assert(r);
switch (r->which_payload_variant) switch (r->which_payload_variant) {
{
/** /**
* Getters * Getters
@ -73,8 +71,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
handleGetModuleConfig(mp, r->get_module_config_request); handleGetModuleConfig(mp, r->get_module_config_request);
break; break;
case meshtastic_AdminMessage_get_channel_request_tag: case meshtastic_AdminMessage_get_channel_request_tag: {
{
uint32_t i = r->get_channel_request - 1; uint32_t i = r->get_channel_request - 1;
LOG_INFO("Client is getting channel %u\n", i); LOG_INFO("Client is getting channel %u\n", i);
if (i >= MAX_NUM_CHANNELS) if (i >= MAX_NUM_CHANNELS)
@ -113,22 +110,17 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
/** /**
* Other * Other
*/ */
case meshtastic_AdminMessage_reboot_seconds_tag: case meshtastic_AdminMessage_reboot_seconds_tag: {
{
reboot(r->reboot_seconds); reboot(r->reboot_seconds);
break; break;
} }
case meshtastic_AdminMessage_reboot_ota_seconds_tag: case meshtastic_AdminMessage_reboot_ota_seconds_tag: {
{
int32_t s = r->reboot_ota_seconds; int32_t s = r->reboot_ota_seconds;
#ifdef ARCH_ESP32 #ifdef ARCH_ESP32
if (BleOta::getOtaAppVersion().isEmpty()) if (BleOta::getOtaAppVersion().isEmpty()) {
{
LOG_INFO("No OTA firmware available, scheduling regular reboot in %d seconds\n", s); LOG_INFO("No OTA firmware available, scheduling regular reboot in %d seconds\n", s);
screen->startRebootScreen(); screen->startRebootScreen();
} } else {
else
{
screen->startFirmwareUpdateScreen(); screen->startFirmwareUpdateScreen();
BleOta::switchToOtaApp(); BleOta::switchToOtaApp();
LOG_INFO("Rebooting to OTA in %d seconds\n", s); LOG_INFO("Rebooting to OTA in %d seconds\n", s);
@ -140,48 +132,41 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
rebootAtMsec = (s < 0) ? 0 : (millis() + s * 1000); rebootAtMsec = (s < 0) ? 0 : (millis() + s * 1000);
break; break;
} }
case meshtastic_AdminMessage_shutdown_seconds_tag: case meshtastic_AdminMessage_shutdown_seconds_tag: {
{
int32_t s = r->shutdown_seconds; int32_t s = r->shutdown_seconds;
LOG_INFO("Shutdown in %d seconds\n", s); LOG_INFO("Shutdown in %d seconds\n", s);
shutdownAtMsec = (s < 0) ? 0 : (millis() + s * 1000); shutdownAtMsec = (s < 0) ? 0 : (millis() + s * 1000);
break; break;
} }
case meshtastic_AdminMessage_get_device_metadata_request_tag: case meshtastic_AdminMessage_get_device_metadata_request_tag: {
{
LOG_INFO("Client is getting device metadata\n"); LOG_INFO("Client is getting device metadata\n");
handleGetDeviceMetadata(mp); handleGetDeviceMetadata(mp);
break; break;
} }
case meshtastic_AdminMessage_factory_reset_tag: case meshtastic_AdminMessage_factory_reset_tag: {
{
LOG_INFO("Initiating factory reset\n"); LOG_INFO("Initiating factory reset\n");
nodeDB.factoryReset(); nodeDB.factoryReset();
reboot(DEFAULT_REBOOT_SECONDS); reboot(DEFAULT_REBOOT_SECONDS);
break; break;
} }
case meshtastic_AdminMessage_nodedb_reset_tag: case meshtastic_AdminMessage_nodedb_reset_tag: {
{
LOG_INFO("Initiating node-db reset\n"); LOG_INFO("Initiating node-db reset\n");
nodeDB.resetNodes(); nodeDB.resetNodes();
reboot(DEFAULT_REBOOT_SECONDS); reboot(DEFAULT_REBOOT_SECONDS);
break; break;
} }
case meshtastic_AdminMessage_begin_edit_settings_tag: case meshtastic_AdminMessage_begin_edit_settings_tag: {
{
LOG_INFO("Beginning transaction for editing settings\n"); LOG_INFO("Beginning transaction for editing settings\n");
hasOpenEditTransaction = true; hasOpenEditTransaction = true;
break; break;
} }
case meshtastic_AdminMessage_commit_edit_settings_tag: case meshtastic_AdminMessage_commit_edit_settings_tag: {
{
LOG_INFO("Committing transaction for edited settings\n"); LOG_INFO("Committing transaction for edited settings\n");
hasOpenEditTransaction = false; hasOpenEditTransaction = false;
saveChanges(SEGMENT_CONFIG | SEGMENT_MODULECONFIG | SEGMENT_DEVICESTATE | SEGMENT_CHANNELS); saveChanges(SEGMENT_CONFIG | SEGMENT_MODULECONFIG | SEGMENT_DEVICESTATE | SEGMENT_CHANNELS);
break; break;
} }
case meshtastic_AdminMessage_get_device_connection_status_request_tag: case meshtastic_AdminMessage_get_device_connection_status_request_tag: {
{
LOG_INFO("Client is getting device connection status\n"); LOG_INFO("Client is getting device connection status\n");
handleGetDeviceConnectionStatus(mp); handleGetDeviceConnectionStatus(mp);
break; break;
@ -197,16 +182,11 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
meshtastic_AdminMessage res = meshtastic_AdminMessage_init_default; meshtastic_AdminMessage res = meshtastic_AdminMessage_init_default;
AdminMessageHandleResult handleResult = MeshModule::handleAdminMessageForAllPlugins(mp, r, &res); AdminMessageHandleResult handleResult = MeshModule::handleAdminMessageForAllPlugins(mp, r, &res);
if (handleResult == AdminMessageHandleResult::HANDLED_WITH_RESPONSE) if (handleResult == AdminMessageHandleResult::HANDLED_WITH_RESPONSE) {
{
myReply = allocDataProtobuf(res); myReply = allocDataProtobuf(res);
} } else if (mp.decoded.want_response) {
else if (mp.decoded.want_response)
{
LOG_DEBUG("We did not responded to a request that wanted a respond. req.variant=%d\n", r->which_payload_variant); LOG_DEBUG("We did not responded to a request that wanted a respond. req.variant=%d\n", r->which_payload_variant);
} } else if (handleResult != AdminMessageHandleResult::HANDLED) {
else if (handleResult != AdminMessageHandleResult::HANDLED)
{
// Probably a message sent by us or sent to our local node. FIXME, we should avoid scanning these messages // Probably a message sent by us or sent to our local node. FIXME, we should avoid scanning these messages
LOG_INFO("Ignoring nonrelevant admin %d\n", r->which_payload_variant); LOG_INFO("Ignoring nonrelevant admin %d\n", r->which_payload_variant);
} }
@ -214,8 +194,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
} }
// If asked for a response and it is not yet set, generate an 'ACK' response // If asked for a response and it is not yet set, generate an 'ACK' response
if (mp.decoded.want_response && !myReply) if (mp.decoded.want_response && !myReply) {
{
myReply = allocErrorResponse(meshtastic_Routing_Error_NONE, &mp); myReply = allocErrorResponse(meshtastic_Routing_Error_NONE, &mp);
} }
@ -231,31 +210,26 @@ void AdminModule::handleSetOwner(const meshtastic_User &o)
int changed = 0; int changed = 0;
bool licensed_changed = false; bool licensed_changed = false;
if (*o.long_name) if (*o.long_name) {
{
changed |= strcmp(owner.long_name, o.long_name); changed |= strcmp(owner.long_name, o.long_name);
strncpy(owner.long_name, o.long_name, sizeof(owner.long_name)); strncpy(owner.long_name, o.long_name, sizeof(owner.long_name));
} }
if (*o.short_name) if (*o.short_name) {
{
changed |= strcmp(owner.short_name, o.short_name); changed |= strcmp(owner.short_name, o.short_name);
strncpy(owner.short_name, o.short_name, sizeof(owner.short_name)); strncpy(owner.short_name, o.short_name, sizeof(owner.short_name));
} }
if (*o.id) if (*o.id) {
{
changed |= strcmp(owner.id, o.id); changed |= strcmp(owner.id, o.id);
strncpy(owner.id, o.id, sizeof(owner.id)); strncpy(owner.id, o.id, sizeof(owner.id));
} }
if (owner.is_licensed != o.is_licensed) if (owner.is_licensed != o.is_licensed) {
{
changed = 1; changed = 1;
licensed_changed = true; licensed_changed = true;
owner.is_licensed = o.is_licensed; owner.is_licensed = o.is_licensed;
config.lora.override_duty_cycle = owner.is_licensed; // override duty cycle for licensed operators config.lora.override_duty_cycle = owner.is_licensed; // override duty cycle for licensed operators
} }
if (changed) if (changed) { // If nothing really changed, don't broadcast on the network or write to flash
{ // If nothing really changed, don't broadcast on the network or write to flash
service.reloadOwner(!hasOpenEditTransaction); service.reloadOwner(!hasOpenEditTransaction);
licensed_changed ? saveChanges(SEGMENT_CONFIG | SEGMENT_DEVICESTATE) : saveChanges(SEGMENT_DEVICESTATE); licensed_changed ? saveChanges(SEGMENT_CONFIG | SEGMENT_DEVICESTATE) : saveChanges(SEGMENT_DEVICESTATE);
} }
@ -266,8 +240,7 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
auto existingRole = config.device.role; auto existingRole = config.device.role;
bool isRegionUnset = (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET); bool isRegionUnset = (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET);
switch (c.which_payload_variant) switch (c.which_payload_variant) {
{
case meshtastic_Config_device_tag: case meshtastic_Config_device_tag:
LOG_INFO("Setting config: Device\n"); LOG_INFO("Setting config: Device\n");
config.has_device = true; config.has_device = true;
@ -302,8 +275,7 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
LOG_INFO("Setting config: LoRa\n"); LOG_INFO("Setting config: LoRa\n");
config.has_lora = true; config.has_lora = true;
config.lora = c.payload_variant.lora; config.lora = c.payload_variant.lora;
if (isRegionUnset && config.lora.region > meshtastic_Config_LoRaConfig_RegionCode_UNSET) if (isRegionUnset && config.lora.region > meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
{
config.lora.tx_enabled = true; config.lora.tx_enabled = true;
} }
break; break;
@ -319,8 +291,7 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
void AdminModule::handleSetModuleConfig(const meshtastic_ModuleConfig &c) void AdminModule::handleSetModuleConfig(const meshtastic_ModuleConfig &c)
{ {
switch (c.which_payload_variant) switch (c.which_payload_variant) {
{
case meshtastic_ModuleConfig_mqtt_tag: case meshtastic_ModuleConfig_mqtt_tag:
LOG_INFO("Setting module config: MQTT\n"); LOG_INFO("Setting module config: MQTT\n");
moduleConfig.has_mqtt = true; moduleConfig.has_mqtt = true;
@ -384,8 +355,7 @@ void AdminModule::handleSetChannel(const meshtastic_Channel &cc)
void AdminModule::handleGetOwner(const meshtastic_MeshPacket &req) void AdminModule::handleGetOwner(const meshtastic_MeshPacket &req)
{ {
if (req.decoded.want_response) if (req.decoded.want_response) {
{
// We create the reply here // We create the reply here
meshtastic_AdminMessage res = meshtastic_AdminMessage_init_default; meshtastic_AdminMessage res = meshtastic_AdminMessage_init_default;
res.get_owner_response = owner; res.get_owner_response = owner;
@ -399,10 +369,8 @@ void AdminModule::handleGetConfig(const meshtastic_MeshPacket &req, const uint32
{ {
meshtastic_AdminMessage res = meshtastic_AdminMessage_init_default; meshtastic_AdminMessage res = meshtastic_AdminMessage_init_default;
if (req.decoded.want_response) if (req.decoded.want_response) {
{ switch (configType) {
switch (configType)
{
case meshtastic_AdminMessage_ConfigType_DEVICE_CONFIG: case meshtastic_AdminMessage_ConfigType_DEVICE_CONFIG:
LOG_INFO("Getting config: Device\n"); LOG_INFO("Getting config: Device\n");
res.get_config_response.which_payload_variant = meshtastic_Config_device_tag; res.get_config_response.which_payload_variant = meshtastic_Config_device_tag;
@ -457,10 +425,8 @@ void AdminModule::handleGetModuleConfig(const meshtastic_MeshPacket &req, const
{ {
meshtastic_AdminMessage res = meshtastic_AdminMessage_init_default; meshtastic_AdminMessage res = meshtastic_AdminMessage_init_default;
if (req.decoded.want_response) if (req.decoded.want_response) {
{ switch (configType) {
switch (configType)
{
case meshtastic_AdminMessage_ModuleConfigType_MQTT_CONFIG: case meshtastic_AdminMessage_ModuleConfigType_MQTT_CONFIG:
LOG_INFO("Getting module config: MQTT\n"); LOG_INFO("Getting module config: MQTT\n");
res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_mqtt_tag; res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_mqtt_tag;
@ -550,8 +516,7 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
conn.has_wifi = true; conn.has_wifi = true;
conn.wifi.status.status.is_connected = WiFi.status() != WL_CONNECTED; conn.wifi.status.status.is_connected = WiFi.status() != WL_CONNECTED;
strncpy(conn.wifi.ssid, config.network.wifi_ssid, 33); strncpy(conn.wifi.ssid, config.network.wifi_ssid, 33);
if (conn.wifi.status.status.is_connected) if (conn.wifi.status.status.is_connected) {
{
conn.wifi.rssi = WiFi.RSSI(); conn.wifi.rssi = WiFi.RSSI();
conn.wifi.status.status.ip_address = WiFi.localIP(); conn.wifi.status.status.ip_address = WiFi.localIP();
conn.wifi.status.status.is_mqtt_connected = mqtt && mqtt->connected(); conn.wifi.status.status.is_mqtt_connected = mqtt && mqtt->connected();
@ -561,8 +526,7 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
#if HAS_ETHERNET #if HAS_ETHERNET
conn.has_ethernet = true; conn.has_ethernet = true;
if (Ethernet.linkStatus() == LinkON) if (Ethernet.linkStatus() == LinkON) {
{
conn.ethernet.status.is_connected = true; conn.ethernet.status.is_connected = true;
conn.ethernet.status.ip_address = Ethernet.localIP(); conn.ethernet.status.ip_address = Ethernet.localIP();
conn.ethernet.status.is_mqtt_connected = mqtt && mqtt->connected(); conn.ethernet.status.is_mqtt_connected = mqtt && mqtt->connected();
@ -592,8 +556,7 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
void AdminModule::handleGetChannel(const meshtastic_MeshPacket &req, uint32_t channelIndex) void AdminModule::handleGetChannel(const meshtastic_MeshPacket &req, uint32_t channelIndex)
{ {
if (req.decoded.want_response) if (req.decoded.want_response) {
{
// We create the reply here // We create the reply here
meshtastic_AdminMessage r = meshtastic_AdminMessage_init_default; meshtastic_AdminMessage r = meshtastic_AdminMessage_init_default;
r.get_channel_response = channels.getByIndex(channelIndex); r.get_channel_response = channels.getByIndex(channelIndex);
@ -611,17 +574,13 @@ void AdminModule::reboot(int32_t seconds)
void AdminModule::saveChanges(int saveWhat, bool shouldReboot) void AdminModule::saveChanges(int saveWhat, bool shouldReboot)
{ {
if (!hasOpenEditTransaction) if (!hasOpenEditTransaction) {
{
LOG_INFO("Saving changes to disk\n"); LOG_INFO("Saving changes to disk\n");
service.reloadConfig(saveWhat); // Calls saveToDisk among other things service.reloadConfig(saveWhat); // Calls saveToDisk among other things
} } else {
else
{
LOG_INFO("Delaying save of changes to disk until the open transaction is committed\n"); LOG_INFO("Delaying save of changes to disk until the open transaction is committed\n");
} }
if (shouldReboot) if (shouldReboot) {
{
reboot(DEFAULT_REBOOT_SECONDS); reboot(DEFAULT_REBOOT_SECONDS);
} }
} }