Bug fix for ESTOP

flash62au · Mar 16, 2024 · 1518a15 · 1518a15
1 parent 31402f5
commit 1518a15
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=WiThrottleProtocol
-version=1.1.12
+version=1.1.13
 author=David Zuhn <zoo@statebeltrailway.org>, Luca Dentella <luca@dentella.it>, Peter Akers <akersp62@gmail.com>
 maintainer=Peter Akers <akersp62@gmail.com>
 sentence=JMRI WiThrottle Protocol implementation

diff --git a/src/WiThrottleProtocol.cpp b/src/WiThrottleProtocol.cpp
@@ -121,6 +121,7 @@ void WiThrottleProtocol::connect(Stream *stream, int delayBetweenCommandsSent) {
     this->stream = stream;
 
     outboundCmdsMininumDelay = delayBetweenCommandsSent;
+    console->print("connect(): Outbound commands minimum delay: "); console->println(outboundCmdsMininumDelay);
 }
 
 void WiThrottleProtocol::disconnect() {
@@ -1373,6 +1374,7 @@ void WiThrottleProtocol::emergencyStop(char multiThrottle) {
 }
 
 void WiThrottleProtocol::emergencyStop(char multiThrottle, String address) {
+    setSpeed(multiThrottle,0);
     String cmd = "M" + String(multiThrottle) + "A" + address;
     cmd.concat(PROPERTY_SEPARATOR);
     cmd.concat("X");

diff --git a/src/WiThrottleProtocol.h b/src/WiThrottleProtocol.h
@@ -29,6 +29,7 @@
 /*
 Version information:
 
+1.1.13   - Bug fix for ESTOP
 1.1.12   - Add support for broadcast messages and alerts
 1.1.11   - Change to the fix for the _wifiTrax WFD-30, so that leading CR+LF is always sent
          - Removal of setSpeedCommandShouldBeSenttwice(bool twice)