Merge 2c133da140 into 5f65fd5944

Commented MAX_LOCOS
Lowered the default Max for Uno CS from 30 to 10

DCC.h

@@ -43,9 +43,9 @@ const uint16_t LONG_ADDR_MARKER = 0x4000;
 // Allocations with memory implications..!
 // Base system takes approx 900 bytes + 8 per loco. Turnouts, Sensors etc are dynamically created
 #if defined(HAS_ENOUGH_MEMORY)
-const byte MAX_LOCOS = 50;
-#else
-const byte MAX_LOCOS = 30;
+const byte MAX_LOCOS = 50;  // Default 50 for Mega2560,  Increase for ESP32 and STM32 Nucleo 
+#else                       // Adjust Max Locos as needed.
+const byte MAX_LOCOS = 10;  // Lower Max Loco for Uno CS, Recommended as a JMRI DecoderPro Programming Station 
 #endif
 
 class DCC

DCCTimerESP.cpp

@@ -76,8 +76,13 @@ int DCCTimer::freeMemory() {
 #endif
 
 ////////////////////////////////////////////////////////////////////////
-
 #ifdef ARDUINO_ARCH_ESP32
+
+#include "esp_idf_version.h"
+#if ESP_IDF_VERSION_MAJOR > 4
+#error "DCC-EX does not support compiling with IDF version 5.0 or later. Downgrade your ESP32 library to a version that contains IDE version 4. Arduino ESP32 library 3.0.0 is too new. Downgrade to one of 2.0.9 to 2.0.17"
+#endif
+
 #include "DIAG.h"
 #include <driver/adc.h>
 #include <soc/sens_reg.h>

DCCTimerSTM32.cpp

@@ -36,7 +36,20 @@
 #include "DIAG.h"
 #include <wiring_private.h>
 
-#if defined(ARDUINO_NUCLEO_F401RE) || defined(ARDUINO_NUCLEO_F411RE)
+#if defined(ARDUINO_NUCLEO_F401RE)
+// Nucleo-64 boards don't have additional serial ports defined by default
+// Serial1 is available on the F401RE, but not hugely convenient.
+// Rx pin on PB7 is useful, but all the Tx pins map to Arduino digital pins, specifically:
+//   PA9 == D8
+//   PB6 == D10
+// of which D8 is needed by the standard and EX8874 motor shields. D10 would be used if a second
+// EX8874 is stacked. So only disable this if using a second motor shield.
+HardwareSerial Serial1(PB7, PB6);  // Rx=PB7, Tx=PB6 -- CN7 pin 17 and CN10 pin 17
+// Serial2 is defined to use USART2 by default, but is in fact used as the diag console
+// via the debugger on the Nucleo-64. It is therefore unavailable for other DCC-EX uses like WiFi, DFPlayer, etc.
+// Let's define Serial6 as an additional serial port (the only other option for the F401RE)
+HardwareSerial Serial6(PA12, PA11);  // Rx=PA12, Tx=PA11 -- CN10 pins 12 and 14 - F401RE
+#elif defined(ARDUINO_NUCLEO_F411RE)
 // Nucleo-64 boards don't have additional serial ports defined by default
 HardwareSerial Serial1(PB7, PA15);  // Rx=PB7, Tx=PA15 -- CN7 pins 17 and 21 - F411RE
 // Serial2 is defined to use USART2 by default, but is in fact used as the diag console
@@ -54,7 +67,7 @@ HardwareSerial Serial3(PC11, PC10);  // Rx=PC11, Tx=PC10 -- USART3 - F446RE
 HardwareSerial Serial5(PD2, PC12);  // Rx=PD2, Tx=PC12 -- UART5 - F446RE
 // On the F446RE, Serial4 and Serial6 also use pins we can't readily map while using the Arduino pins
 #elif defined(ARDUINO_NUCLEO_F412ZG) || defined(ARDUINO_NUCLEO_F413ZH) || defined(ARDUINO_NUCLEO_F446ZE) || \
-      defined(ARDUINO_NUCLEO_F429ZI) || defined(ARDUINO_NUCLEO_F439ZI)
+      defined(ARDUINO_NUCLEO_F429ZI) || defined(ARDUINO_NUCLEO_F439ZI) || defined(ARDUINO_NUCLEO_F4X9ZI)
 // Nucleo-144 boards don't have Serial1 defined by default
 HardwareSerial Serial6(PG9, PG14);  // Rx=PG9, Tx=PG14 -- USART6
 HardwareSerial Serial5(PD2, PC12);  // Rx=PD2, Tx=PC12 -- UART5

EXRAIL2.cpp

@@ -228,7 +228,6 @@ LookList* RMFT2::LookListLoader(OPCODE op1, OPCODE op2, OPCODE op3) {
     case OPCODE_AT:
     case OPCODE_ATTIMEOUT2:
     case OPCODE_AFTER:
-    case OPCODE_AFTEROVERLOAD:
     case OPCODE_IF:
     case OPCODE_IFNOT: {
       int16_t pin = (int16_t)operand;

EXRAILMacros.h

@@ -75,7 +75,7 @@
 // Pass 1 Implements aliases 
 #include "EXRAIL2MacroReset.h"
 #undef ALIAS
-#define ALIAS(name,value...) const int name= 1##value##0 ==10 ? -__COUNTER__  : value##0/10; 
+#define ALIAS(name,value...) const int name= #value[0] ? value+0: -__COUNTER__ ; 
 #include "myAutomation.h"
 
 // Pass 1d Detect sequence duplicates.

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-202404091507Z"
+#define GITHUB_SHA "devel-202406021945Z"

MotorDriver.cpp

@@ -638,6 +638,10 @@ void MotorDriver::checkPowerOverload(bool useProgLimit, byte trackno) {
       }
       throttleInrush(false);
       setPower(POWERMODE::ON);
+      break;
+    }
+    if (goodtime > POWER_SAMPLE_ALERT_GOOD/2) {
+      throttleInrush(false);
     }
     break;
   }

WifiInterface.cpp

@@ -1,4 +1,5 @@
 /*
+ *  © 2022-2024 Paul M. Antoine
  *  © 2021 Fred Decker
  *  © 2020-2022 Harald Barth
  *  © 2020-2022 Chris Harlow
@@ -70,7 +71,7 @@ Stream * WifiInterface::wifiStream;
 #define SERIAL3 Serial5
 #elif defined(ARDUINO_NUCLEO_F413ZH) || defined(ARDUINO_NUCLEO_F429ZI) \
     || defined(ARDUINO_NUCLEO_F446ZE) || defined(ARDUINO_NUCLEO_F412ZG) \
-    || defined(ARDUINO_NUCLEO_F439ZI)
+    || defined(ARDUINO_NUCLEO_F439ZI) || defined(ARDUINO_NUCLEO_F4X9ZI)
 #define NUM_SERIAL 2
 #define SERIAL1 Serial6
 #else

platformio.ini

@@ -164,7 +164,11 @@ monitor_echo = yes
 build_flags = -mcall-prologues
 
 [env:ESP32]
-platform = espressif32
+; Lock version to 6.7.0 as that is
+; Arduino v2.0.16 (based on IDF v4.4.7)
+; which is the latest version based
+; on IDF v4. We can not use IDF v5.
+platform = espressif32 @ 6.7.0
 board = esp32dev
 framework = arduino
 lib_deps = ${env.lib_deps}

version.h

@@ -3,7 +3,12 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.2.57"
+#define VERSION "5.2.60"
+// 5.2.60 - Bugfix: Opcode AFTEROVERLOAD does not have an argument that is a pin and needs to be initialized
+//        - Remove inrush throttle after half good time so that we go to mode overload if problem persists
+// 5.2.59 - STM32 bugfix correct Serial1 definition for Nucleo-F401RE
+//        - STM32 add support for ARDUINO_NUCLEO_F4X9ZI type to span F429/F439 in upcoming STM32duino release v2.8 as a result of our PR
+// 5.2.58 - EXRAIL ALIAS allows named pins
 // 5.2.57 - Bugfix autoreverse: Apply mode by binart bit match and not by equality
 // 5.2.56 - Bugfix and refactor for EXRAIL getSignalSlot
 // 5.2.55 - Move EXRAIL isSignal() to public to allow use in STEALTH call