Merge branch 'meshtastic:master' into router

.github/workflows/main_matrix.yml

@@ -341,5 +341,8 @@ jobs:
         with:
           commit: ${{ (github.event.pull_request_target || github.event.pull_request).head.sha }}
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts-branch: artifacts
+          artifacts-token: ${{ secrets.ARTIFACTS_TOKEN }}
+          artifacts-repo: meshtastic/artifacts
+          artifacts-branch: device
+          artifacts-dir: pr
           artifacts: ./firmware-${{ steps.version.outputs.version }}.zip

bin/platformio-custom.py

@@ -11,7 +11,7 @@ env.Replace( MKSPIFFSTOOL=env.get("PROJECT_DIR") + '/bin/mklittlefs.py' )
 try:
     import littlefs
 except ImportError:
-    env.Execute("$PYTHONEXE -m pip install --user littlefs-python")
+    env.Execute("$PYTHONEXE -m pip install littlefs-python")
 
 Import("projenv")
 

src/graphics/Screen.cpp

@@ -1362,18 +1362,20 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
 
     auto mode = "";
 
-    if (channels.getPrimary().modem_config == 0) {
+      if (channels.getPrimary().modem_config == 0) {
         mode = "ShrtSlow";
     } else if (channels.getPrimary().modem_config == 1) {
         mode = "ShrtFast";
     } else if (channels.getPrimary().modem_config == 2) {
-        mode = "LngFast";
-    } else if (channels.getPrimary().modem_config == 3) {
-        mode = "LngSlow";
-    } else if (channels.getPrimary().modem_config == 4) {
         mode = "MedSlow";
-    } else if (channels.getPrimary().modem_config == 5) {
+    } else if (channels.getPrimary().modem_config == 3) {
         mode = "MedFast";
+    } else if (channels.getPrimary().modem_config == 4) {
+        mode = "LngFast";
+    } else if (channels.getPrimary().modem_config == 5) {
+        mode = "LngSlow";
+    } else if (channels.getPrimary().modem_config == 6) {
+        mode = "VngSlow";    
     } else {
         mode = "Custom";
     }

src/mesh/PhoneAPI.h

@@ -59,7 +59,7 @@ class PhoneAPI
 
     // Call this when the client drops the connection, resets the state to STATE_SEND_NOTHING
     // Unregisters our observer.  A closed connection **can** be reopened by calling init again.
-    void close();
+    virtual void close();
 
     /**
      * Handle a ToRadio protobuf

src/mesh/Router.cpp

@@ -276,7 +276,7 @@ bool perhapsDecode(MeshPacket *p)
     if (p->which_payloadVariant == MeshPacket_decoded_tag)
         return true; // If packet was already decoded just return
 
-    assert(p->which_payloadVariant == MeshPacket_encrypted_tag);
+    //assert(p->which_payloadVariant == MeshPacket_encrypted_tag);
 
     // Try to find a channel that works with this hash
     for (ChannelIndex chIndex = 0; chIndex < channels.getNumChannels(); chIndex++) {

suppressions.txt

@@ -36,3 +36,7 @@ cstyleCast
 // ignore stuff that is not ours
 *:.pio/*
 *:*/libdeps/*
+
+// these two caused issues
+missingOverride
+virtualCallInConstructor

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1
 minor = 3
-build = 1
+build = 3