pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-29 19:03:52 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #690 from geeksville/dev

Browse Source 
oops - 1.1.47 had bad bug
This commit is contained in:
Kevin Hester 2021-02-14 15:26:00 +08:00 committed by GitHub
commit 2b10a03178
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/build-all.sh
View File

@ -21,7 +21,7 @@ ARCHIVEDIR=release/archive
rm -f $OUTDIR/firmware* rm -f $OUTDIR/firmware*
mkdir -p $OUTDIR/bins mkdir -p $OUTDIR/bins $ARCHIVEDIR
rm -r $OUTDIR/bins/* rm -r $OUTDIR/bins/*
mkdir -p $OUTDIR/bins/universal $OUTDIR/elfs/universal mkdir -p $OUTDIR/bins/universal $OUTDIR/elfs/universal

2
platformio.ini
View File

@ -75,7 +75,7 @@ lib_deps =
https://github.com/meshtastic/AXP202X_Library.git#8404abb6d4b486748636bc6ad72d2a47baaf5460 https://github.com/meshtastic/AXP202X_Library.git#8404abb6d4b486748636bc6ad72d2a47baaf5460
Wire ; explicitly needed here because the AXP202 library forgets to add it Wire ; explicitly needed here because the AXP202 library forgets to add it
SPI SPI
https://github.com/geeksville/ArduinoThread.git#333ffd09b596977c217ba25da4258f588b462ac6 https://github.com/geeksville/ArduinoThread.git#72921ac222eed6f526ba1682023cee290d9aa1b3
; Common settings for conventional (non Portduino) Ardino targets ; Common settings for conventional (non Portduino) Ardino targets
[arduino_base] [arduino_base]

6
src/concurrency/OSThread.cpp
View File

@ -32,8 +32,10 @@ OSThread::OSThread(const char *_name, uint32_t period, ThreadController *_contro
ThreadName = _name; ThreadName = _name;
if (controller) if (controller) {
controller->add(this); bool added = controller->add(this);
assert(added);
}
} }
OSThread::~OSThread() OSThread::~OSThread()

2
version.properties
View File

@ -1,4 +1,4 @@
[VERSION] [VERSION]
major = 1 major = 1
minor = 1 minor = 1
build = 47 build = 48