Merge 04f0f56348 into 657c08c653

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-202401212011Z"
+#define GITHUB_SHA "devel-202401180721Z"

IO_EXIOExpander.h

@@ -1,6 +1,6 @@
 /*
  *  © 2022, Peter Cole. All rights reserved.
- *  © 2024, Harald Barth. All rights reserved.
+ *  © 2022, Harald Barth. All rights reserved.
  *
  *  This file is part of EX-CommandStation
  *
@@ -257,7 +257,7 @@ private:
 
     // If we're not doing anything now, check to see if a new input transfer is due.
     if (_readState == RDS_IDLE) {
-      if (_numDigitalPins>0 && currentMicros - _lastDigitalRead > _digitalRefresh) { // Delay for digital read refresh
+      if (currentMicros - _lastDigitalRead > _digitalRefresh && _numDigitalPins>0) { // Delay for digital read refresh
         // Issue new read request for digital states.  As the request is non-blocking, the buffer has to
         // be allocated from heap (object state).
         _readCommandBuffer[0] = EXIORDD;
@@ -265,7 +265,7 @@ private:
                                                                 // non-blocking read
         _lastDigitalRead = currentMicros;
         _readState = RDS_DIGITAL;
-      } else if (_numAnaloguePins>0 && currentMicros - _lastAnalogueRead > _analogueRefresh) { // Delay for analogue read refresh
+      } else if (currentMicros - _lastAnalogueRead > _analogueRefresh && _numAnaloguePins>0) { // Delay for analogue read refresh
         // Issue new read for analogue input states
         _readCommandBuffer[0] = EXIORDAN;
         I2CManager.read(_I2CAddress, _analogueInputBuffer,

WifiESP32.cpp

@@ -164,8 +164,6 @@ bool WifiESP::setup(const char *SSid,
   if (haveSSID && havePassword && !forceAP) {
     WiFi.setHostname(hostname); // Strangely does not work unless we do it HERE!
     WiFi.mode(WIFI_STA);
-    WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN); // Scan all channels so we find strongest
-                                               // (default in Wifi library is first match)
 #ifdef SERIAL_BT_COMMANDS
     WiFi.setSleep(true);
 #else
@@ -206,7 +204,7 @@ bool WifiESP::setup(const char *SSid,
   if (!haveSSID || forceAP) {
     // prepare all strings
     String strSSID(forceAP ? SSid : "DCCEX_");
-    String strPass( (forceAP && havePassword) ? password : "PASS_");
+    String strPass(forceAP ? password : "PASS_");
     if (!forceAP) {
       String strMac = WiFi.macAddress();
       strMac.remove(0,9);
@@ -230,8 +228,7 @@ bool WifiESP::setup(const char *SSid,
       // DIAG(F("Wifi AP SSID %s PASS %s"),strSSID.c_str(),havePassword ? password : strPass.c_str());
       DIAG(F("Wifi in AP mode"));
       LCD(5, F("Wifi: %s"), strSSID.c_str());
-      if (!havePassword)
-	LCD(6, F("PASS: %s"),strPass.c_str());
+      LCD(6, F("PASS: %s"),havePassword ? password : strPass.c_str());
       // DIAG(F("Wifi AP IP %s"),WiFi.softAPIP().toString().c_str());
       LCD(7, F("IP: %s"),WiFi.softAPIP().toString().c_str());
       wifiUp = true;

version.h

@@ -3,9 +3,7 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.2.28"
-// 5.2.28 - ESP32: Can all Wifi channels.
-//        - ESP32: Only write Wifi password to display if it is a well known one
+#define VERSION "5.2.27"
 // 5.2.27 - Bugfix: IOExpander memory allocation
 // 5.2.26 - Silently ignore overridden HAL defaults
 //        - include HAL_IGNORE_DEFAULTS macro in EXRAIL