Merge branch 'master' into esp32s2fix

src/AccelerometerThread.h

@@ -42,7 +42,7 @@ namespace concurrency
 class AccelerometerThread : public concurrency::OSThread
 {
   public:
-    AccelerometerThread(ScanI2C::DeviceType type = ScanI2C::DeviceType::NONE) : OSThread("AccelerometerThread")
+    explicit AccelerometerThread(ScanI2C::DeviceType type) : OSThread("AccelerometerThread")
     {
         if (accelerometer_found.port == ScanI2C::I2CPort::NO_I2C) {
             LOG_DEBUG("AccelerometerThread disabling due to no sensors found\n");

src/AmbientLightingThread.h

@@ -10,7 +10,7 @@ namespace concurrency
 class AmbientLightingThread : public concurrency::OSThread
 {
   public:
-    AmbientLightingThread(ScanI2C::DeviceType type) : OSThread("AmbientLightingThread")
+    explicit AmbientLightingThread(ScanI2C::DeviceType type) : OSThread("AmbientLightingThread")
     {
         // Uncomment to test module
         // moduleConfig.ambient_lighting.led_state = true;

src/Power.cpp

@@ -402,11 +402,8 @@ bool Power::analogInit()
  */
 bool Power::setup()
 {
-    bool found = axpChipInit();
+    bool found = axpChipInit() || analogInit();
 
-    if (!found) {
-        found = analogInit();
-    }
     enabled = found;
     low_voltage_counter = 0;
 

src/PowerFSMThread.h

@@ -21,7 +21,7 @@ class PowerFSMThread : public OSThread
 
         /// If we are in power state we force the CPU to wake every 10ms to check for serial characters (we don't yet wake
         /// cpu for serial rx - FIXME)
-        const auto state = powerFSM.getState();
+        const State *state = powerFSM.getState();
         canSleep = (state != &statePOWER) && (state != &stateSERIAL);
 
         if (powerStatus->getHasUSB()) {

src/mesh/Channels.cpp

@@ -184,7 +184,7 @@ void Channels::onConfigChanged()
 {
     // Make sure the phone hasn't mucked anything up
     for (int i = 0; i < channelFile.channels_count; i++) {
-        meshtastic_Channel &ch = fixupChannel(i);
+        const meshtastic_Channel &ch = fixupChannel(i);
 
         if (ch.role == meshtastic_Channel_Role_PRIMARY)
             primaryIndex = i;

src/meshUtils.cpp

@@ -39,10 +39,11 @@
  */
 char *strnstr(const char *s, const char *find, size_t slen)
 {
-    char c, sc;
+    char c;
+    if ((c = *find++) != '\0') {
+        char sc;
         size_t len;
 
-    if ((c = *find++) != '\0') {
         len = strlen(find);
         do {
             do {

src/modules/NeighborInfoModule.cpp

@@ -118,7 +118,7 @@ uint32_t NeighborInfoModule::collectNeighborInfo(meshtastic_NeighborInfo *neighb
     int num_neighbors = cleanUpNeighbors();
 
     for (int i = 0; i < num_neighbors; i++) {
-        meshtastic_Neighbor *dbEntry = getNeighborByIndex(i);
+        const meshtastic_Neighbor *dbEntry = getNeighborByIndex(i);
         if ((neighborInfo->neighbors_count < MAX_NUM_NEIGHBORS) && (dbEntry->node_id != my_node_id)) {
             neighborInfo->neighbors[neighborInfo->neighbors_count].node_id = dbEntry->node_id;
             neighborInfo->neighbors[neighborInfo->neighbors_count].snr = dbEntry->snr;
@@ -146,7 +146,7 @@ size_t NeighborInfoModule::cleanUpNeighbors()
     // Find neighbors to remove
     std::vector<int> indices_to_remove;
     for (int i = 0; i < num_neighbors; i++) {
-        meshtastic_Neighbor *dbEntry = getNeighborByIndex(i);
+        const meshtastic_Neighbor *dbEntry = getNeighborByIndex(i);
         // We will remove a neighbor if we haven't heard from them in twice the broadcast interval
         if ((now - dbEntry->last_rx_time > dbEntry->node_broadcast_interval_secs * 2) && (dbEntry->node_id != my_node_id)) {
             indices_to_remove.push_back(i);

src/mqtt/MQTT.cpp

@@ -519,10 +519,10 @@ std::string MQTT::meshPacketToJson(meshtastic_MeshPacket *mp)
     // the created jsonObj is immutable after creation, so
     // we need to do the heavy lifting before assembling it.
     std::string msgType;
-    JSONObject msgPayload;
     JSONObject jsonObj;
 
     if (mp->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
+        JSONObject msgPayload;
         switch (mp->decoded.portnum) {
         case meshtastic_PortNum_TEXT_MESSAGE_APP: {
             msgType = "text";

suppressions.txt

@@ -51,3 +51,6 @@ passedByValue:*/RedirectablePrint.h
 
 internalAstError:*/CrossPlatformCryptoEngine.cpp
 uninitMemberVar:*/AudioThread.h
+// False positive
+constVariableReference:*/Channels.cpp
+constParameterPointer:*/unishox2.c