improve reset pin logic

Author: fabik111

examples/NetworkConfiguratorDemo/NetworkConfiguratorDemo.ino

@@ -15,8 +15,13 @@
  * At startup the NetworkConfigurator library reads the stored network settings from the storage
  * and loads them into the ConnectionHandler object.
  *
- * The NetworkConfigurator library provides a way for wiping out the stored network settings,
- * please read the documentation for more information.
+ * The NetworkConfigurator library provides a way for wiping out the stored network settings.
+ * Reconfiguration procedure:
+ * - Arduino Opta: press and hold the user button (BTN_USER) until the led (LED_USER) turns off
+ * - Arduino MKR WiFi 1010: short the pin 7 to GND until the led turns off
+ * - Arduino GIGA R1 WiFi: short the pin 7 to GND until the led turns off
+ * - Arduino Nano RP2040 Connect: short the pin 2 to 3.3V until the led turns off
+ * - Other boards: short the pin 2 to GND until the led turns off
  *
  * In this sketch the BLE and Serial interfaces are always enabled and ready for accepting
  * a new set of configuration.

src/ANetworkConfigurator_Config.h

@@ -58,7 +58,7 @@
 #if defined(ARDUINO_PORTENTA_H7_M7)
   #define NETWORK_CONFIGURATOR_COMPATIBLE 1
   #define ZERO_TOUCH_ENABLED 1
-  #define PIN_RECONFIGURE 2 //TODO update doc and test
+  #define PIN_RECONFIGURE 2
   #define LED_RECONFIGURE LED_BUILTIN
   #define BOARD_HAS_RGB
   #define GREEN_LED LEDG
@@ -84,8 +84,8 @@
 
 #if defined(ARDUINO_GIGA)
   #define NETWORK_CONFIGURATOR_COMPATIBLE 1
-  #define PIN_RECONFIGURE 2
-  #define LED_RECONFIGURE LED_BUILTIN
+  #define PIN_RECONFIGURE 7
+  #define LED_RECONFIGURE LEDG
   #define BOARD_HAS_RGB
   #define GREEN_LED LEDG
   #define BLUE_LED  LEDB
@@ -110,7 +110,7 @@
   #define NETWORK_CONFIGURATOR_COMPATIBLE 1
   #define ZERO_TOUCH_ENABLED 1
   #define PIN_RECONFIGURE 2
-  #define LED_RECONFIGURE LED_BUILTIN
+  #define LED_RECONFIGURE LEDG
   #define BOARD_HAS_RGB
   #define GREEN_LED LEDG
   #define BLUE_LED  LEDB

src/NetworkConfigurator.cpp

@@ -108,10 +108,10 @@ NetworkConfiguratorStates NetworkConfiguratorClass::update() {
 
   /* Reconfiguration procedure:
    * - Arduino Opta: press and hold the user button (BTN_USER) until the led (LED_USER) turns off
-   * - Arduino Nano 33 IOT: short the pin 2 to GND until the led turns off
-   * - Arduino Uno R4 WiFi: short the pin 2 to GND until the led turns off
+   * - Arduino MKR WiFi 1010: short the pin 7 to GND until the led turns off
+   * - Arduino GIGA R1 WiFi: short the pin 7 to GND until the led turns off
    * - Arduino Nano RP2040 Connect: short the pin 2 to 3.3V until the led turns off
-   * - Other boards: short the pin 7 to GND until the led turns off
+   * - Other boards: short the pin 2 to GND until the led turns off
    */
 
   if(_resetInput->isEventFired()) {
@@ -600,7 +600,7 @@ void NetworkConfiguratorClass::printNetworkSettings() {
       DEBUG_INFO("WIFI");
       DEBUG_INFO("SSID: %s", _networkSetting.wifi.ssid);
       #if DEBUG_NETWORK_CREDENTIALS
-      DEBUG_INFO("PSW: %s", _networkSetting.wifi.ssid, _networkSetting.wifi.pwd);
+      DEBUG_INFO("PSW: %s", _networkSetting.wifi.pwd);
       #endif
       break;
 #endif

src/NetworkConfigurator.h

@@ -41,10 +41,10 @@ enum class NetworkConfiguratorStates { ZERO_TOUCH_CONFIG,
  * the restart of the BLE interface if turned off.
  * Reconfiguration procedure:
  * - Arduino Opta: press and hold the user button (BTN_USER) until the led (LED_USER) turns off
- * - Arduino Nano 33 IOT: short the pin 2 to GND until the led turns off
- * - Arduino Uno R4 WiFi: short the pin 2 to GND until the led turns off
+ * - Arduino MKR WiFi 1010: short the pin 7 to GND until the led turns off
+ * - Arduino GIGA R1 WiFi: short the pin 7 to GND until the led turns off
  * - Arduino Nano RP2040 Connect: short the pin 2 to 3.3V until the led turns off
- * - Other boards: short the pin 7 to GND until the led turns off
+ * - Other boards: short the pin 2 to GND until the led turns off
  *
  */
 class NetworkConfiguratorClass {

src/Utility/ResetInput/ResetInput.cpp

@@ -19,7 +19,7 @@ ResetInput &ResetInput::getInstance() {
 ResetInput::ResetInput():
   _pin {PIN_RECONFIGURE}
   {
-    _pressed = false;
+    _expired = false;
     _startPressed = 0;
     _fireEvent = false;
     _pressedCustomCallback = nullptr;
@@ -32,21 +32,19 @@ void ResetInput::begin() {
   pinMode(PIN_RECONFIGURE, INPUT_PULLUP);
 #endif
   pinMode(LED_RECONFIGURE, OUTPUT);
+  digitalWrite(LED_RECONFIGURE, LED_OFF);
 
   attachInterrupt(digitalPinToInterrupt(PIN_RECONFIGURE),_pressedCallback, CHANGE);
 }
 
 bool ResetInput::isEventFired() {
-  if(_pressed){
+  if(_startPressed != 0){
 #if defined(ARDUINO_NANO_RP2040_CONNECT) || defined(ARDUINO_SAMD_MKRWIFI1010)
     LEDFeedbackClass::getInstance().stop();
 #endif
     if(micros() - _startPressed > RESET_HOLD_TIME){
-#if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_GIGA)
-    digitalWrite(LED_RECONFIGURE, HIGH);
-#else
-    digitalWrite(LED_RECONFIGURE, LOW);
-#endif
+      digitalWrite(LED_RECONFIGURE, LED_OFF);
+      _expired = true;
     }
   }
 
@@ -71,21 +69,10 @@ void ResetInput::_pressedCallback() {
     LEDFeedbackClass::getInstance().stop();
 #endif
     _startPressed = micros();
-    _pressed = true;
-#if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_GIGA)
-    digitalWrite(LED_RECONFIGURE, LOW);
-#else
-    digitalWrite(LED_RECONFIGURE, HIGH);
-#endif
+    digitalWrite(LED_RECONFIGURE, LED_ON);
   } else {
-#if defined(ARDUINO_PORTENTA_H7_M7) || defined(ARDUINO_GIGA)
-    digitalWrite(LED_RECONFIGURE, HIGH);
-#else
-    digitalWrite(LED_RECONFIGURE, LOW);
-#endif
-
-    _pressed = false;
-    if(_startPressed != 0 && micros() - _startPressed > RESET_HOLD_TIME){
+    digitalWrite(LED_RECONFIGURE, LED_OFF);
+    if(_startPressed != 0 && _expired){
       _fireEvent = true;
     }else{
       LEDFeedbackClass::getInstance().restart();

src/Utility/ResetInput/ResetInput.h

@@ -27,7 +27,7 @@ class ResetInput{
   ResetInput();
   static inline ResetInputCallback _pressedCustomCallback;
   uint32_t _pin;
-  static inline volatile bool _pressed;
+  static inline volatile bool _expired;
   static inline volatile bool _fireEvent;
   static inline volatile uint32_t _startPressed;
   static void _pressedCallback();