Merge 2c133da14040d63993a71bd82ded11560255d646 into 2172d2e1754fd9dbe87cf2c8c80a3ddab0bf9185

make WDT time longer to work around bootloader bug
signal id of 0 does not work
2025-04-22 04:51:20 +02:00 · 2024-05-12 11:32:46 -04:00 · 2024-05-11 08:46:25 +02:00 · 2024-05-11 07:45:28 +02:00 · 2024-05-11 07:43:24 +02:00 · 2024-04-12 10:37:04 -04:00
3 changed files with 8 additions and 6 deletions
--- a/DCC.h
+++ b/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
--- a/DCCTimerAVR.cpp
+++ b/DCCTimerAVR.cpp
@ -185,8 +185,10 @@ int DCCTimer::freeMemory() {
 }

 void DCCTimer::reset() {
-  wdt_enable( WDTO_15MS); // set Arduino watchdog timer for 15ms 
-  delay(50);            // wait for the prescaller time to expire
+  // 250ms chosen to circumwent bootloader bug which
+  // hangs at too short timepout (like 15ms)
+  wdt_enable( WDTO_250MS); // set Arduino watchdog timer for 250ms 
+  delay(500);              // wait for it to happen

 }

--- a/EXRAIL2.cpp
+++ b/EXRAIL2.cpp
@ -1145,7 +1145,7 @@ void RMFT2::kill(const FSH * reason, int operand) {

 int16_t RMFT2::getSignalSlot(int16_t id) {

-  if (id >= 0) {
+  if (id > 0) {
    int sigslot = 0;
    int16_t sighandle = 0;
    // Trundle down the signal list until we reach the end
Author	SHA1	Message	Date
Kcsmith0708	56a5c8b74e	Merge 2c133da14040d63993a71bd82ded11560255d646 into 2172d2e1754fd9dbe87cf2c8c80a3ddab0bf9185	2024-05-12 11:32:46 -04:00
Harald Barth	2172d2e175	make WDT time longer to work around bootloader bug	2024-05-11 08:46:25 +02:00
Harald Barth	86291cbec4	signal id of 0 does not work	2024-05-11 07:45:28 +02:00
Harald Barth	66791b19f5	remove stupid comment	2024-05-11 07:43:24 +02:00
Kcsmith0708	2c133da140	Update DCC.h Commented MAX_LOCOS Lowered the default Max for Uno CS from 30 to 10	2024-04-12 10:37:04 -04:00