pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-16 18:12:07 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #78 from geeksville/master

Browse Source 
Fix #77: bluetooth is supposed to be on in DARK state
This commit is contained in:
Kevin Hester 2020-04-05 14:41:52 -07:00 committed by GitHub
commit e32b41938a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/build-all.sh
View File

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

2
bin/version.sh
View File

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

2
platformio.ini
View File

@ -60,7 +60,7 @@ debug_tool = jlink
debug_init_break = tbreak setup debug_init_break = tbreak setup
lib_deps = 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 https://github.com/meshtastic/esp8266-oled-ssd1306.git ; ESP8266_SSD1306
AXP202X_Library AXP202X_Library
SPI SPI

7
src/MeshService.cpp
View File

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

2
src/MeshService.h
View File

@ -83,7 +83,7 @@ class MeshService : private Observer
/// handle all the packets that just arrived from the mesh radio /// handle all the packets that just arrived from the mesh radio
void handleFromRadio(); 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); 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 /// handle a user packet that just arrived on the radio, return NULL if we should not process this packet at all

1
src/PowerFSM.cpp
View File

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