From 450e877cfb4d559c850a9b3cc211edae1f8721c3 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Sun, 14 Feb 2021 14:14:50 +0800 Subject: [PATCH 1/3] fix #661 - create $archivedir --- bin/build-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/build-all.sh b/bin/build-all.sh index ecb96e7a1..c4d48b122 100755 --- a/bin/build-all.sh +++ b/bin/build-all.sh @@ -21,7 +21,7 @@ ARCHIVEDIR=release/archive rm -f $OUTDIR/firmware* -mkdir -p $OUTDIR/bins +mkdir -p $OUTDIR/bins $ARCHIVEDIR rm -r $OUTDIR/bins/* mkdir -p $OUTDIR/bins/universal $OUTDIR/elfs/universal From c55074f7fead8a3adf27faea7500c304a14a6099 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Sun, 14 Feb 2021 15:06:49 +0800 Subject: [PATCH 2/3] oops: we should crash if we >MAX_THREADS, also raise max threads --- platformio.ini | 2 +- src/concurrency/OSThread.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/platformio.ini b/platformio.ini index c90e9c7c5..4b91317d9 100644 --- a/platformio.ini +++ b/platformio.ini @@ -75,7 +75,7 @@ lib_deps = https://github.com/meshtastic/AXP202X_Library.git#8404abb6d4b486748636bc6ad72d2a47baaf5460 Wire ; explicitly needed here because the AXP202 library forgets to add it SPI - https://github.com/geeksville/ArduinoThread.git#333ffd09b596977c217ba25da4258f588b462ac6 + https://github.com/geeksville/ArduinoThread.git#72921ac222eed6f526ba1682023cee290d9aa1b3 ; Common settings for conventional (non Portduino) Ardino targets [arduino_base] diff --git a/src/concurrency/OSThread.cpp b/src/concurrency/OSThread.cpp index 5e20debf9..4bde72b07 100644 --- a/src/concurrency/OSThread.cpp +++ b/src/concurrency/OSThread.cpp @@ -32,8 +32,10 @@ OSThread::OSThread(const char *_name, uint32_t period, ThreadController *_contro ThreadName = _name; - if (controller) - controller->add(this); + if (controller) { + bool added = controller->add(this); + assert(added); + } } OSThread::~OSThread() From 7c1ddd9447d9b777f74ce5ef6b0078eae9fa803b Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Sun, 14 Feb 2021 15:13:58 +0800 Subject: [PATCH 3/3] 1.1.48 --- version.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.properties b/version.properties index 30f4b34dd..6c1503acd 100644 --- a/version.properties +++ b/version.properties @@ -1,4 +1,4 @@ [VERSION] major = 1 minor = 1 -build = 47 +build = 48