allows WiFi to attempt reconnect more than once as defined, default 6 attempts.

src/mesh/wifi/WiFiAPClient.cpp

@@ -49,6 +49,15 @@ char ourHost[16];
 // To replace blocking wifi connect delay with a non-blocking sleep
 static unsigned long wifiReconnectStartMillis = 0;
 static bool wifiReconnectPending = false;
+static unsigned char wifiConnectAttempts=0;
+
+#ifndef MaxWifiConnectionAttempts
+#define  MaxWifiConnectionAttempts 6
+#endif
+
+#ifndef wifiReconnectGap
+#define  wifiReconnectGap 10000
+#endif
 
 bool APStartupComplete = 0;
 
@@ -168,28 +177,44 @@ static int32_t reconnectWiFi()
 #elif defined(ARCH_RP2040)
         WiFi.disconnect(false);
 #endif
-        LOG_INFO("Reconnecting to WiFi access point %s", wifiName);
+        LOG_INFO("Connecting to WiFi access point %s", wifiName);
 
         // Start the non-blocking wait for 5 seconds
         wifiReconnectStartMillis = millis();
         wifiReconnectPending = true;
         // Do not attempt to connect yet, wait for the next invocation
-        return 5000; // Schedule next check soon
+        return wifiReconnectGap; // Schedule next check soon
     }
 
     // Check if we are ready to proceed with the WiFi connection after the 5s wait
     if (wifiReconnectPending) {
-        if (millis() - wifiReconnectStartMillis >= 5000) {
+        if (millis() - wifiReconnectStartMillis >= wifiReconnectGap) {
             if (!WiFi.isConnected()) {
+                wifiConnectAttempts++;
+                LOG_INFO("Reconnecting to WiFi access point %s, attempt %d", wifiName, wifiConnectAttempts);
 #ifdef CONFIG_IDF_TARGET_ESP32C3
                 WiFi.mode(WIFI_MODE_NULL);
                 WiFi.useStaticBuffers(true);
                 WiFi.mode(WIFI_STA);
 #endif
                 WiFi.begin(wifiName, wifiPsw);
+                wifiReconnectStartMillis=millis();
+                if(wifiConnectAttempts<MaxWifiConnectionAttempts){
+                    needReconnect=true;
+                }
+                else{
+                    needReconnect=false;
+                    wifiReconnectPending = false;
+                    LOG_INFO("Maximum connection attempts reached %d", wifiConnectAttempts);
+                    LOG_INFO("Unable to connect access point %s", wifiName);
+                }
+
+            }
+            else{
+                LOG_INFO("WiFi succesfully connected to access point %s", wifiName);
+                LOG_INFO("Connection attempts %d", wifiConnectAttempts);
+                wifiReconnectPending = false;
             }
-            isReconnecting = false;
-            wifiReconnectPending = false;
         } else {
             // Still waiting for 5s to elapse
             return 100; // Check again soon

variants/nrf52840/diy/nrf52_promicro_diy_tcxo/variant.h

@@ -62,9 +62,9 @@ NRF52 PRO MICRO PIN ASSIGNMENT
 // Definition of milliVolt per LSB => 3.0V ADC range and 12-bit ADC resolution = 3000mV/4096
 #define VBAT_MV_PER_LSB (0.73242188F)
 // Voltage divider value => 1.5M + 1M voltage divider on VBAT = (1.5M / (1M + 1.5M))
-#define VBAT_DIVIDER (0.6F)
+#define VBAT_DIVIDER (0.39F)
 // Compensation factor for the VBAT divider
-#define VBAT_DIVIDER_COMP (1.73)
+#define VBAT_DIVIDER_COMP (1.65)
 // Fixed calculation of milliVolt from compensation value
 #define REAL_VBAT_MV_PER_LSB (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)
 #undef AREF_VOLTAGE
@@ -87,23 +87,23 @@ NRF52 PRO MICRO PIN ASSIGNMENT
 #define LED_STATE_ON 1 // State when LED is lit
 
 // Button
-#define BUTTON_PIN (32 + 0) // P1.00
+#define BUTTON_PIN (32 + 7) // P1.00 // modified
 
 // GPS
-#define PIN_GPS_TX (0 + 22) // P0.22
-#define PIN_GPS_RX (0 + 20) // P0.20
+#define PIN_GPS_TX (0 + 6) // P0.22 // modified
+#define PIN_GPS_RX (0 + 8) // P0.20 // modified
 
 #define PIN_GPS_EN (0 + 24) // P0.24
-#define GPS_POWER_TOGGLE
+// #define GPS_POWER_TOGGLE  /modified
 #define GPS_UBLOX
 // define GPS_DEBUG
 
-// UART interfaces
-#define PIN_SERIAL1_RX PIN_GPS_TX
-#define PIN_SERIAL1_TX PIN_GPS_RX
+// // UART interfaces  //modified
+ #define PIN_SERIAL1_RX PIN_GPS_TX
+ #define PIN_SERIAL1_TX PIN_GPS_RX
 
-#define PIN_SERIAL2_RX (0 + 6) // P0.06
-#define PIN_SERIAL2_TX (0 + 8) // P0.08
+ #define PIN_SERIAL2_RX (0 + 20) // P0.06
+ #define PIN_SERIAL2_TX (0 + 22) // P0.08
 
 // Serial interfaces
 #define SPI_INTERFACES_COUNT 1
@@ -118,11 +118,11 @@ NRF52 PRO MICRO PIN ASSIGNMENT
 #define LORA_CS (32 + 13) // P1.13
 
 // LORA MODULES
-#define USE_LLCC68
+// #define USE_LLCC68
 #define USE_SX1262
-#define USE_RF95
-#define USE_SX1268
-#define USE_LR1121
+// #define USE_RF95
+// #define USE_SX1268
+// #define USE_LR1121
 
 // RF95 CONFIG
 

variants/rp2040/rpipicow/variant.h

@@ -17,7 +17,8 @@
 // rxd = 9
 
 #define EXT_NOTIFY_OUT 22
-#define BUTTON_PIN 17
+
+#define BUTTON_PIN 6
 
 #define LED_PIN LED_BUILTIN