From 05a0266fc41677c1fa940c3abd0b7e28f2922901 Mon Sep 17 00:00:00 2001 From: geeksville Date: Sun, 5 Apr 2020 13:09:46 -0700 Subject: [PATCH 1/4] Fix #77: bluetooth is supposed to be on in DARK state --- src/PowerFSM.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/PowerFSM.cpp b/src/PowerFSM.cpp index 9aae4762d..ce7005ffa 100644 --- a/src/PowerFSM.cpp +++ b/src/PowerFSM.cpp @@ -113,6 +113,7 @@ static void nbEnter() static void darkEnter() { + setBluetoothEnable(true); screen.setOn(false); } From 13ac686c965a48c002c104aaaa5970438941c005 Mon Sep 17 00:00:00 2001 From: geeksville Date: Sun, 5 Apr 2020 13:58:38 -0700 Subject: [PATCH 2/4] minor doc cleanups --- src/MeshService.cpp | 7 ++++--- src/MeshService.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/MeshService.cpp b/src/MeshService.cpp index 5ded40dd0..85f4856d2 100644 --- a/src/MeshService.cpp +++ b/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() diff --git a/src/MeshService.h b/src/MeshService.h index 3eb06a6ca..884529237 100644 --- a/src/MeshService.h +++ b/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 From af35f3006c44a96cc3cffca7c50e5b5fc55cb2c4 Mon Sep 17 00:00:00 2001 From: geeksville Date: Sun, 5 Apr 2020 14:13:04 -0700 Subject: [PATCH 3/4] force other devs to update for fix https://github.com/meshtastic/Meshtastic-esp32/issues/76 --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index fb180d397..7eb59d9c6 100644 --- a/platformio.ini +++ b/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 From ef395a159611e4a739302b7f068444035dc5bfb9 Mon Sep 17 00:00:00 2001 From: geeksville Date: Sun, 5 Apr 2020 14:13:18 -0700 Subject: [PATCH 4/4] 0.2.3 --- bin/build-all.sh | 3 ++- bin/version.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/build-all.sh b/bin/build-all.sh index 90215931c..29a6af3a6 100755 --- a/bin/build-all.sh +++ b/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 < diff --git a/bin/version.sh b/bin/version.sh index 4fe810620..429d819cf 100644 --- a/bin/version.sh +++ b/bin/version.sh @@ -1,3 +1,3 @@ -export VERSION=0.2.0 \ No newline at end of file +export VERSION=0.2.3 \ No newline at end of file