DCCTimerAVR.cpp

@@ -185,10 +185,8 @@ int DCCTimer::freeMemory() {
 }
 
 void DCCTimer::reset() {
-  // 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
+  wdt_enable( WDTO_15MS); // set Arduino watchdog timer for 15ms 
+  delay(50);            // wait for the prescaller time to expire
 
 }
 

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