Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion bin/build-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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"?>
Expand Down
2 changes: 1 addition & 1 deletion bin/version.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@


export VERSION=0.2.0
export VERSION=0.2.3
2 changes: 1 addition & 1 deletion platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions src/MeshService.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/MeshService.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/PowerFSM.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ static void nbEnter()

static void darkEnter()
{
setBluetoothEnable(true);
screen.setOn(false);
}

Expand Down