Remove GPS Baudrate locking for Seeed Xiao S3 Kit

The Seeed Xiao S3 Kit's default GPS is an L76K which operates at 9600 baud, so when this variant was defined that baud rate was specified.

However, this is a development board and it is expected that users can attach their own devices. This includes GPS, which may operate at a different baud rate. The current fixed baud rate prevents this, so this patch removes that setting.

This will revert to the regular automatic probe method. This will successfully detect the L76K as before (the same speed as before since 9600 baud is the first baud rate checked), but also allow other GPSes at other baud rates to be detected.

Thanks to @ScarpMarc for the report

Fixes https://github.com/meshtastic/firmware/issues/9373#issuecomment-3774802763

src/mesh/NodeDB.cpp

@@ -1410,15 +1410,6 @@ void NodeDB::loadFromDisk()
     if (portduino_config.has_configDisplayMode) {
         config.display.displaymode = (_meshtastic_Config_DisplayConfig_DisplayMode)portduino_config.configDisplayMode;
     }
-    if (portduino_config.has_statusMessage) {
-        moduleConfig.has_statusmessage = true;
-        strncpy(moduleConfig.statusmessage.node_status, portduino_config.statusMessage.c_str(),
-                sizeof(moduleConfig.statusmessage.node_status));
-        moduleConfig.statusmessage.node_status[sizeof(moduleConfig.statusmessage.node_status) - 1] = '\0';
-    }
-    if (portduino_config.enable_UDP) {
-        config.network.enabled_protocols = true;
-    }
 
 #endif
 }
@@ -1519,7 +1510,6 @@ bool NodeDB::saveToDiskNoRetry(int saveWhat)
         moduleConfig.has_ambient_lighting = true;
         moduleConfig.has_audio = true;
         moduleConfig.has_paxcounter = true;
-        moduleConfig.has_statusmessage = true;
 
         success &=
             saveProto(moduleConfigFileName, meshtastic_LocalModuleConfig_size, &meshtastic_LocalModuleConfig_msg, &moduleConfig);

src/modules/AdminModule.cpp

@@ -905,11 +905,10 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
 
 bool AdminModule::handleSetModuleConfig(const meshtastic_ModuleConfig &c)
 {
-    bool shouldReboot = true;
     // If we are in an open transaction or configuring MQTT or Serial (which have validation), defer disabling Bluetooth
     // Otherwise, disable Bluetooth to prevent the phone from interfering with the config
-    if (!hasOpenEditTransaction && !IS_ONE_OF(c.which_payload_variant, meshtastic_ModuleConfig_mqtt_tag,
+    if (!hasOpenEditTransaction &&
-                                              meshtastic_ModuleConfig_serial_tag, meshtastic_ModuleConfig_statusmessage_tag)) {
+        !IS_ONE_OF(c.which_payload_variant, meshtastic_ModuleConfig_mqtt_tag, meshtastic_ModuleConfig_serial_tag)) {
         disableBluetooth();
     }
 
@@ -1001,14 +1000,8 @@ bool AdminModule::handleSetModuleConfig(const meshtastic_ModuleConfig &c)
         moduleConfig.has_paxcounter = true;
         moduleConfig.paxcounter = c.payload_variant.paxcounter;
         break;
-    case meshtastic_ModuleConfig_statusmessage_tag:
-        LOG_INFO("Set module config: StatusMessage");
-        moduleConfig.has_statusmessage = true;
-        moduleConfig.statusmessage = c.payload_variant.statusmessage;
-        shouldReboot = false;
-        break;
     }
-    saveChanges(SEGMENT_MODULECONFIG, shouldReboot);
+    saveChanges(SEGMENT_MODULECONFIG);
     return true;
 }
 
@@ -1187,11 +1180,6 @@ void AdminModule::handleGetModuleConfig(const meshtastic_MeshPacket &req, const
             res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_paxcounter_tag;
             res.get_module_config_response.payload_variant.paxcounter = moduleConfig.paxcounter;
             break;
-        case meshtastic_AdminMessage_ModuleConfigType_STATUSMESSAGE_CONFIG:
-            LOG_INFO("Get module config: StatusMessage");
-            res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_statusmessage_tag;
-            res.get_module_config_response.payload_variant.statusmessage = moduleConfig.statusmessage;
-            break;
         }
 
         // NOTE: The phone app needs to know the ls_secsvalue so it can properly expect sleep behavior.

src/modules/Modules.cpp

@@ -108,9 +108,6 @@
 #if !MESHTASTIC_EXCLUDE_DROPZONE
 #include "modules/DropzoneModule.h"
 #endif
-#if !MESHTASTIC_EXCLUDE_STATUS
-#include "modules/StatusMessageModule.h"
-#endif
 
 /**
  * Create module instances here.  If you are adding a new module, you must 'new' it here (or somewhere else)
@@ -168,9 +165,6 @@ void setupModules()
 #if !MESHTASTIC_EXCLUDE_DROPZONE
     dropzoneModule = new DropzoneModule();
 #endif
-#if !MESHTASTIC_EXCLUDE_STATUS
-    statusMessageModule = new StatusMessageModule();
-#endif
 #if !MESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE
     new GenericThreadModule();
 #endif

src/modules/StatusMessageModule.cpp

@@ -1,41 +0,0 @@
-#if !MESHTASTIC_EXCLUDE_STATUS
-
-#include "StatusMessageModule.h"
-#include "MeshService.h"
-#include "ProtobufModule.h"
-
-StatusMessageModule *statusMessageModule;
-
-int32_t StatusMessageModule::runOnce()
-{
-    if (moduleConfig.has_statusmessage && moduleConfig.statusmessage.node_status[0] != '\0') {
-        // create and send message with the status message set
-        meshtastic_StatusMessage ourStatus = meshtastic_StatusMessage_init_zero;
-        strncpy(ourStatus.status, moduleConfig.statusmessage.node_status, sizeof(ourStatus.status));
-        ourStatus.status[sizeof(ourStatus.status) - 1] = '\0'; // ensure null termination
-        meshtastic_MeshPacket *p = allocDataPacket();
-        p->decoded.payload.size = pb_encode_to_bytes(p->decoded.payload.bytes, sizeof(p->decoded.payload.bytes),
-                                                     meshtastic_StatusMessage_fields, &ourStatus);
-        p->to = NODENUM_BROADCAST;
-        p->decoded.want_response = false;
-        p->priority = meshtastic_MeshPacket_Priority_BACKGROUND;
-        p->channel = 0;
-        service->sendToMesh(p);
-    }
-
-    return 1000 * 12 * 60 * 60;
-}
-
-ProcessMessage StatusMessageModule::handleReceived(const meshtastic_MeshPacket &mp)
-{
-    if (mp.which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
-        meshtastic_StatusMessage incomingMessage;
-        if (pb_decode_from_bytes(mp.decoded.payload.bytes, mp.decoded.payload.size, meshtastic_StatusMessage_fields,
-                                 &incomingMessage)) {
-            LOG_INFO("Received a NodeStatus message %s", incomingMessage.status);
-        }
-    }
-    return ProcessMessage::CONTINUE;
-}
-
-#endif

src/modules/StatusMessageModule.h

@@ -1,35 +0,0 @@
-#pragma once
-#if !MESHTASTIC_EXCLUDE_STATUS
-#include "SinglePortModule.h"
-#include "configuration.h"
-
-class StatusMessageModule : public SinglePortModule, private concurrency::OSThread
-{
-
-  public:
-    /** Constructor
-     * name is for debugging output
-     */
-    StatusMessageModule()
-        : SinglePortModule("statusMessage", meshtastic_PortNum_NODE_STATUS_APP), concurrency::OSThread("StatusMessage")
-    {
-        if (moduleConfig.has_statusmessage && moduleConfig.statusmessage.node_status[0] != '\0') {
-            this->setInterval(2 * 60 * 1000);
-        } else {
-            this->setInterval(1000 * 12 * 60 * 60);
-        }
-        // TODO: If we have a string, set the initial delay (15 minutes maybe)
-    }
-
-    virtual int32_t runOnce() override;
-
-  protected:
-    /** Called to handle a particular incoming message
-     */
-    virtual ProcessMessage handleReceived(const meshtastic_MeshPacket &mp) override;
-
-  private:
-};
-
-extern StatusMessageModule *statusMessageModule;
-#endif

src/platform/portduino/PortduinoGlue.cpp

@@ -65,7 +65,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state)
             return ARGP_ERR_UNKNOWN;
         else
             checkConfigPort = false;
-        printf("Using config file %d\n", TCPPort);
+            printf("Using config file %d\n", TCPPort);
         break;
     case 'c':
         configPath = arg;
@@ -847,7 +847,6 @@ bool loadConfig(const char *configPath)
         }
 
         if (yamlConfig["Config"]) {
-            portduino_config.has_config_overrides = true;
             if (yamlConfig["Config"]["DisplayMode"]) {
                 portduino_config.has_configDisplayMode = true;
                 if ((yamlConfig["Config"]["DisplayMode"]).as<std::string>("") == "TWOCOLOR") {
@@ -860,13 +859,6 @@ bool loadConfig(const char *configPath)
                     portduino_config.configDisplayMode = meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT;
                 }
             }
-            if (yamlConfig["Config"]["StatusMessage"]) {
-                portduino_config.has_statusMessage = true;
-                portduino_config.statusMessage = (yamlConfig["Config"]["StatusMessage"]).as<std::string>("");
-            }
-            if ((yamlConfig["Config"]["EnableUDP"]).as<bool>(false)) {
-                portduino_config.enable_UDP = true;
-            }
         }
 
         if (yamlConfig["General"]) {
@@ -882,8 +874,10 @@ bool loadConfig(const char *configPath)
             }
             if (checkConfigPort) {
                 portduino_config.api_port = (yamlConfig["General"]["APIPort"]).as<int>(-1);
-                if (portduino_config.api_port != -1 && portduino_config.api_port > 1023 && portduino_config.api_port < 65536) {
+                if (portduino_config.api_port != -1 &&
-                    TCPPort = (portduino_config.api_port);
+                portduino_config.api_port > 1023 &&
+                portduino_config.api_port < 65536) {
+                TCPPort = (portduino_config.api_port);
                 }
             }
             portduino_config.mac_address = (yamlConfig["General"]["MACAddress"]).as<std::string>("");

src/platform/portduino/PortduinoGlue.h

@@ -168,12 +168,8 @@ extern struct portduino_config_struct {
     int hostMetrics_channel = 0;
 
     // config
-    bool has_config_overrides = false;
     int configDisplayMode = 0;
     bool has_configDisplayMode = false;
-    std::string statusMessage = "";
-    bool has_statusMessage = false;
-    bool enable_UDP = false;
 
     // General
     std::string mac_address = "";
@@ -489,30 +485,21 @@ extern struct portduino_config_struct {
         }
 
         // config
-        if (has_config_overrides) {
+        if (has_configDisplayMode) {
             out << YAML::Key << "Config" << YAML::Value << YAML::BeginMap;
-            if (has_configDisplayMode) {
+            switch (configDisplayMode) {
-
+            case meshtastic_Config_DisplayConfig_DisplayMode_TWOCOLOR:
-                switch (configDisplayMode) {
+                out << YAML::Key << "DisplayMode" << YAML::Value << "TWOCOLOR";
-                case meshtastic_Config_DisplayConfig_DisplayMode_TWOCOLOR:
+                break;
-                    out << YAML::Key << "DisplayMode" << YAML::Value << "TWOCOLOR";
+            case meshtastic_Config_DisplayConfig_DisplayMode_INVERTED:
-                    break;
+                out << YAML::Key << "DisplayMode" << YAML::Value << "INVERTED";
-                case meshtastic_Config_DisplayConfig_DisplayMode_INVERTED:
+                break;
-                    out << YAML::Key << "DisplayMode" << YAML::Value << "INVERTED";
+            case meshtastic_Config_DisplayConfig_DisplayMode_COLOR:
-                    break;
+                out << YAML::Key << "DisplayMode" << YAML::Value << "COLOR";
-                case meshtastic_Config_DisplayConfig_DisplayMode_COLOR:
+                break;
-                    out << YAML::Key << "DisplayMode" << YAML::Value << "COLOR";
+            case meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT:
-                    break;
+                out << YAML::Key << "DisplayMode" << YAML::Value << "DEFAULT";
-                case meshtastic_Config_DisplayConfig_DisplayMode_DEFAULT:
+                break;
-                    out << YAML::Key << "DisplayMode" << YAML::Value << "DEFAULT";
-                    break;
-                }
-            }
-            if (has_statusMessage) {
-                out << YAML::Key << "StatusMessage" << YAML::Value << statusMessage;
-            }
-            if (enable_UDP) {
-                out << YAML::Key << "EnableUDP" << YAML::Value << true;
             }
 
             out << YAML::EndMap; // Config

variants/esp32s3/seeed_xiao_s3/variant.h

@@ -50,7 +50,6 @@ L76K GPS Module Information : https://www.seeedstudio.com/L76K-GNSS-Module-for-S
 #define GPS_RX_PIN 44
 #define GPS_TX_PIN 43
 #define HAS_GPS 1
-#define GPS_BAUDRATE 9600
 #define GPS_THREAD_INTERVAL 50
 #define PIN_SERIAL1_RX PIN_GPS_TX
 #define PIN_SERIAL1_TX PIN_GPS_RX