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/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