Bump to 1.2.60 for release

* Fix execution halt in nrf devices on assert

* Peg espressif platform to 3.5.0

* Add reboot to nrf52 devices

platformio.ini

@@ -121,7 +121,7 @@ lib_deps =
 ; Common settings for ESP targes, mixin with extends = esp32_base
 [esp32_base]
 extends = arduino_base
-platform = espressif32
+platform = espressif32@3.5.0
 src_filter = 
   ${arduino_base.src_filter} -<nrf52/>
 upload_speed = 921600

src/PowerFSM.cpp

@@ -279,6 +279,12 @@ void PowerFSM_setup()
     powerFSM.add_transition(&stateON, &stateSHUTDOWN, EVENT_SHUTDOWN, NULL, "Shutdown");
     powerFSM.add_transition(&stateSERIAL, &stateSHUTDOWN, EVENT_SHUTDOWN, NULL, "Shutdown");
 
+    // Inputbroker
+    powerFSM.add_transition(&stateLS, &stateON, EVENT_INPUT, NULL, "Input Device");
+    powerFSM.add_transition(&stateNB, &stateON, EVENT_INPUT, NULL, "Input Device");
+    powerFSM.add_transition(&stateDARK, &stateON, EVENT_INPUT, NULL, "Input Device");
+    powerFSM.add_transition(&stateON, &stateON, EVENT_INPUT, NULL, "Input Device"); // restarts the sleep timer
+
     powerFSM.add_transition(&stateDARK, &stateON, EVENT_BLUETOOTH_PAIR, NULL, "Bluetooth pairing");
     powerFSM.add_transition(&stateON, &stateON, EVENT_BLUETOOTH_PAIR, NULL, "Bluetooth pairing");
 

src/PowerFSM.h

@@ -20,6 +20,7 @@
 #define EVENT_POWER_DISCONNECTED 14
 #define EVENT_FIRMWARE_UPDATE 15 // We just received a new firmware update packet from the phone
 #define EVENT_SHUTDOWN 16 //force a full shutdown now (not just sleep)
+#define EVENT_INPUT 17 // input broker wants something, we need to wake up and enable screen
 
 extern Fsm powerFSM;
 extern State statePOWER, stateSERIAL;

src/input/InputBroker.cpp

@@ -1,4 +1,5 @@
 #include "InputBroker.h"
+#include "PowerFSM.h" // needed for event trigger
 
 InputBroker *inputBroker;
 
@@ -13,6 +14,7 @@ void InputBroker::registerSource(Observable<const InputEvent *> *source)
 
 int InputBroker::handleInputEvent(const InputEvent *event)
 {
+  powerFSM.trigger(EVENT_INPUT);
   this->notifyObservers(event);
   return 0;
 }

src/input/RotaryEncoderInterruptBase.cpp

@@ -54,7 +54,7 @@ int32_t RotaryEncoderInterruptBase::runOnce()
     }
     else if (this->action == ROTARY_ACTION_CCW)
     {
-        DEBUG_MSG("Rotary event CW\n");
+        DEBUG_MSG("Rotary event CCW\n");
         e.inputEvent = this->_eventCcw;
     }
 
@@ -84,7 +84,7 @@ void RotaryEncoderInterruptBase::intAHandler()
         return;
     }
     this->rotaryLevelA = currentLevelA;
-    intHandler(
+    this->rotaryStateCCW = intHandler(
         currentLevelA == HIGH,
         this->rotaryLevelB,
         ROTARY_ACTION_CCW,

src/main.cpp

@@ -295,7 +295,11 @@ class ButtonThread : public OSThread
     static void userButtonPressed()
     {
         // DEBUG_MSG("press!\n");
-        powerFSM.trigger(EVENT_PRESS);
+#ifdef BUTTON_PIN
+        if ((BUTTON_PIN != radioConfig.preferences.rotary1_pin_press) || !radioConfig.preferences.canned_message_plugin_enabled) {
+            powerFSM.trigger(EVENT_PRESS);
+        }
+#endif
     }
     static void userButtonPressedLong()
     {
@@ -710,6 +714,8 @@ void powerCommandsCheck()
 #ifndef NO_ESP32
         DEBUG_MSG("Rebooting for update\n");
         ESP.restart();
+#elif NRF52_SERIES
+    NVIC_SystemReset();
 #else
         DEBUG_MSG("FIXME implement reboot for this platform");
 #endif

src/mesh/NodeDB.cpp

@@ -97,7 +97,13 @@ bool NodeDB::resetRadioConfig()
         nvs_flash_erase();
 #endif
 #ifdef NRF52_SERIES
+
+        // first, remove the "/prefs" (this removes most prefs)
         FS.rmdir_r("/prefs");
+        // second, install default state (this will deal with the duplicate mac address issue)
+        installDefaultDeviceState();
+        // third, write to disk
+        saveToDisk();
 
         Bluefruit.begin();
 

src/nrf52/main-nrf52.cpp

@@ -32,8 +32,8 @@ void __attribute__((noreturn)) __assert_func(const char *file, int line, const c
 {
     DEBUG_MSG("assert failed %s: %d, %s, test=%s\n", file, line, func, failedexpr);
     // debugger_break(); FIXME doesn't work, possibly not for segger
-    while (1)
-        ; // FIXME, reboot!
+    // Reboot cpu
+    NVIC_SystemReset();
 }
 
 void getMacAddr(uint8_t *dmac)
@@ -193,4 +193,4 @@ void clearBonds() {
         nrf52Bluetooth->setup();
     }
     nrf52Bluetooth->clearBonds();
-}
+}

src/plugins/CannedMessagePlugin.cpp

@@ -1,5 +1,6 @@
 #include "configuration.h"
 #include "CannedMessagePlugin.h"
+#include "PowerFSM.h" // neede for button bypass
 #include "MeshService.h"
 
 // TODO: reuse defined from Screen.cpp
@@ -111,8 +112,13 @@ int CannedMessagePlugin::handleInputEvent(const InputEvent *event)
     if (event->inputEvent == static_cast<char>(InputEventChar_KEY_SELECT))
     {
         DEBUG_MSG("Canned message event Select\n");
-        this->runState = CANNED_MESSAGE_RUN_STATE_ACTION_SELECT;
-        validEvent = true;
+        // when inactive, call the onebutton shortpress instead. Activate Module only on up/down
+        if (this->runState == CANNED_MESSAGE_RUN_STATE_INACTIVE) {
+            powerFSM.trigger(EVENT_PRESS);
+        }else{
+            this->runState = CANNED_MESSAGE_RUN_STATE_ACTION_SELECT;
+            validEvent = true;
+        }
     }
 
     if (validEvent)

variants/diy/v1/variant.h

@@ -9,6 +9,8 @@
 //#define GPS_TX_PIN 12 // not connected
 
 #define BUTTON_PIN 39 // The middle button GPIO on the T-Beam
+#define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
+#define ADC_MULTIPLIER 1.85 // (R1 = 470k, R2 = 680k)
 #define EXT_NOTIFY_OUT 12 // Overridden default pin to use for Ext Notify Plugin (#975).
 #define LED_PIN 2 // add status LED (compatible with core-pcb and DIY targets)
 
@@ -45,4 +47,4 @@
 // Internally the TTGO module hooks the SX126x-DIO2 in to control the TX/RX switch
 // (which is the default for the sx1262interface code)
 #define SX126X_E22
-#endif
+#endif

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1  
 minor = 2
-build = 58
+build = 60