Merge pull request #78 from geeksville/master

Fix #77: bluetooth is supposed to be on in DARK state

bin/build-all.sh

@@ -15,6 +15,7 @@ ARCHIVEDIR=release/archive
 rm -f $OUTDIR/firmware*
 
 mkdir -p $OUTDIR/bins $OUTDIR/elfs
+rm -f $OUTDIR/bins/*
 
 # build the named environment and copy the bins to the release directory
 function do_build {
@@ -43,7 +44,7 @@ for COUNTRY in $COUNTRIES; do
 done
 
 # keep the bins in archive also
-cp $OUTDIR/firmware* $ARCHIVEDIR
+cp $OUTDIR/bins/firmware* $OUTDIR/elfs/firmware* $ARCHIVEDIR
 
 cat >$OUTDIR/curfirmwareversion.xml <<XML
 <?xml version="1.0" encoding="utf-8"?>

bin/version.sh

@@ -1,3 +1,3 @@
 
 
-export VERSION=0.2.0
+export VERSION=0.2.3

platformio.ini

@@ -60,7 +60,7 @@ debug_tool = jlink
 debug_init_break = tbreak setup
 
 lib_deps =
-  https://github.com/meshtastic/RadioHead.git
+  https://github.com/meshtastic/RadioHead.git#a87518beacfff53bc2eec5ae33c607713e9596e6
   https://github.com/meshtastic/esp8266-oled-ssd1306.git ; ESP8266_SSD1306 
   AXP202X_Library
   SPI

src/MeshService.cpp

@@ -97,7 +97,7 @@ MeshPacket *MeshService::handleFromRadioUser(MeshPacket *mp)
         if (weWin) {
             DEBUG_MSG("NOTE! Received a nodenum collision and we are vetoing\n");
 
-            packetPool.release(mp); // discard it
+            releaseToPool(mp); // discard it
             mp = NULL;
 
             sendOurOwner(); // send our owner as a _broadcast_ because that other guy is mistakenly using our nodenum
@@ -178,8 +178,9 @@ void MeshService::handleFromRadio(MeshPacket *mp)
 
         if (mp->payload.want_response)
             sendNetworkPing(mp->from);
-    } else
-        DEBUG_MSG("Dropping vetoed User message\n");
+    } else {
+        DEBUG_MSG("Not delivering vetoed User message\n");
+    }
 }
 
 void MeshService::handleFromRadio()

src/MeshService.h

@@ -83,7 +83,7 @@ class MeshService : private Observer
     /// handle all the packets that just arrived from the mesh radio
     void handleFromRadio();
 
-    /// Handle a packet that just arrived from the radio
+    /// Handle a packet that just arrived from the radio.  We will either eventually enqueue the message to the phone or return it to the free pool
     void handleFromRadio(MeshPacket *p);
 
     /// handle a user packet that just arrived on the radio, return NULL if we should not process this packet at all

src/PowerFSM.cpp

@@ -113,6 +113,7 @@ static void nbEnter()
 
 static void darkEnter()
 {
+    setBluetoothEnable(true);
     screen.setOn(false);
 }