update from devel 5.2.60

DCC-EX · May 24, 2024 · 0babe28 · 0babe28
2 parents e878f9a + 33a4cdb
commit 0babe28
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/EXRAIL2.cpp b/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;

diff --git a/GITHUB_SHA.h b/GITHUB_SHA.h
@@ -1 +1 @@
-#define GITHUB_SHA "devel-stm32ECa-202405230400Z"
+#define GITHUB_SHA "devel-stm32ECa-202405232319Z"
diff --git a/MotorDriver.cpp b/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;
   }

diff --git a/version.h b/version.h
@@ -3,7 +3,10 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.3.11"
+#define VERSION "5.3.12"
+// 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.3.11
 // 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