Merge pull request #690 from geeksville/dev

oops - 1.1.47 had bad bug
Merge remote-tracking branch 'root/master' into dev
2026-01-12 04:47:23 +00:00 · 2021-02-14 15:26:00 +08:00 · 2021-02-14 15:15:28 +08:00 · 2021-02-14 15:13:58 +08:00 · 2021-02-14 15:06:49 +08:00 · 2021-02-14 14:14:50 +08:00
4 changed files with 7 additions and 5 deletions
--- 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

--- 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]
--- 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()
--- a/version.properties
+++ b/version.properties
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1  
 minor = 1
-build = 47
+build = 48
Author	SHA1	Message	Date
Kevin Hester	2b10a03178	Merge pull request #690 from geeksville/dev oops - 1.1.47 had bad bug	2021-02-14 15:26:00 +08:00
Kevin Hester	80fb7e4ab8	Merge remote-tracking branch 'root/master' into dev	2021-02-14 15:15:28 +08:00
Kevin Hester	7c1ddd9447	1.1.48	2021-02-14 15:13:58 +08:00
Kevin Hester	c55074f7fe	oops: we should crash if we >MAX_THREADS, also raise max threads	2021-02-14 15:06:49 +08:00
Kevin Hester	450e877cfb	fix #661 - create $archivedir	2021-02-14 14:14:50 +08:00