diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml index fcc33ca23..28a3ba5ba 100644 --- a/.github/workflows/main_matrix.yml +++ b/.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 diff --git a/bin/platformio-custom.py b/bin/platformio-custom.py index d4117b4b8..4672dbc96 100644 --- a/bin/platformio-custom.py +++ b/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") diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index a5a2fb303..a1a4dffa7 100644 --- a/src/graphics/Screen.cpp +++ b/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"; } diff --git a/src/mesh/PhoneAPI.h b/src/mesh/PhoneAPI.h index 684f683f8..ca926b096 100644 --- a/src/mesh/PhoneAPI.h +++ b/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 diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp index 7f0dbd51f..f3210f1ec 100644 --- a/src/mesh/Router.cpp +++ b/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++) { diff --git a/suppressions.txt b/suppressions.txt index cdf858753..42dd40c33 100644 --- a/suppressions.txt +++ b/suppressions.txt @@ -36,3 +36,7 @@ cstyleCast // ignore stuff that is not ours *:.pio/* *:*/libdeps/* + +// these two caused issues +missingOverride +virtualCallInConstructor diff --git a/version.properties b/version.properties index 04de8d925..75bab9547 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] major = 1 minor = 3 -build = 1 +build = 3