Merge pull request #1270 from mkinney/bugfixes_from_1_2

merge the 1.2 hang bugfix to 1.3

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