Merge branch 'devel' of https://github.com/DCC-EX/CommandStation-EX into devel

Author: Asbelos

CommandStation-EX.ino

@@ -111,17 +111,14 @@ void setup()
   // Responsibility 2: Start all the communications before the DCC engine
   // Start the WiFi interface on a MEGA, Uno cannot currently handle WiFi
   // Start Ethernet if it exists
-#ifndef ARDUINO_ARCH_ESP32
 #if WIFI_ON
   PASSWDCHECK(WIFI_PASSWORD); // compile time check
+#ifndef ARDUINO_ARCH_ESP32
   WifiInterface::setup(WIFI_SERIAL_LINK_SPEED, F(WIFI_SSID), F(WIFI_PASSWORD), F(WIFI_HOSTNAME), IP_PORT, WIFI_CHANNEL, WIFI_FORCE_AP);
-#endif // WIFI_ON
 #else
-#if WIFI_ON
-  PASSWDCHECK(WIFI_PASSWORD); // compile time check  
   WifiESP::setup(WIFI_SSID, WIFI_PASSWORD, WIFI_HOSTNAME, IP_PORT, WIFI_CHANNEL, WIFI_FORCE_AP);
-#endif // WIFI_ON
 #endif // ARDUINO_ARCH_ESP32
+#endif // WIFI_ON
 
 #if ETHERNET_ON
   EthernetInterface::setup();

DCCEXParser.cpp

@@ -737,7 +737,7 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
 	DCCDecoder::onoff(on);
 	return;
       }
-#if ENABLE_WIFI
+#if WIFI_ON
       if (p[0] == "WIFI"_hk) { 	// <C WIFI SSID PASSWORD>
 	if (params != 5)        // the 5 params 0 to 4 are (kinda): WIFI_hk 0x7777 &SSID 0x7777 &PASSWORD
 	  break;
@@ -763,7 +763,16 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
         break;
 
     case '#': // NUMBER OF LOCOSLOTS <#>
-        StringFormatter::send(stream, F("<# %d>\n"), MAX_LOCOS);
+        {
+	  int free = DCCTimer::getMinimumFreeMemory();
+	  int freeSlotGuess = free/sizeof(LocoSlot);
+	  freeSlotGuess = freeSlotGuess - 2; // be conservative
+	  if (freeSlotGuess > MAX_LOCOS)
+	    freeSlotGuess = MAX_LOCOS;
+	  if (freeSlotGuess < 0)
+	    freeSlotGuess = 0;
+	  StringFormatter::send(stream, F("<# %d>\n"), freeSlotGuess);
+	}
         return;
 
     case '-': // Forget Loco <- [cab]>

WifiESP32.cpp

@@ -170,7 +170,11 @@ bool WifiESP::setup(const char *SSid,
   uint8_t tries = 40;
   if (wifiUp)
     teardown();
-
+  if (strcmp("OFF", SSid) == 0) {
+    WiFi.disconnect(true);
+    WiFi.mode(WIFI_OFF);
+    return false; // debatable if that is true (success) or false (no network)
+  }
   //#ifdef SERIAL_BT_COMMANDS
   //return false;
   //#endif