fix a bug where the speeds were not being updated when changed on ano…

…ther device
flash62au · Apr 1, 2024 · c2a5994 · c2a5994
1 parent d9a6d5e
commit c2a5994
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=WiThrottleProtocol
-version=1.1.14
+version=1.1.15
 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
@@ -846,16 +846,21 @@ void WiThrottleProtocol::processRosterFunctionListEntries(char multiThrottle, co
 
 void WiThrottleProtocol::processSpeed(char multiThrottle, const String& speedData) {
     console->print("processSpeed(): "); console->println(multiThrottle);
+    int multiThrottleIndex = getMultiThrottleIndex(multiThrottle);
 
     if (delegate && speedData.length() >= 2) {
         String speedStr = speedData.substring(1);
         int speed = speedStr.toInt();
 
-        if ((speed < MIN_SPEED) || (speed > MAX_SPEED)) {
+        if (speed < MIN_SPEED) {
             speed = 0;
+        } else if (speed > MAX_SPEED) {
+            speed = MAX_SPEED;
         }
 
+        currentSpeed[multiThrottleIndex] = speed;
         if (multiThrottle == DEFAULT_MULTITHROTTLE) {
+            currentSpeed[multiThrottleIndex] = speed;
             delegate->receivedSpeed(speed);
         } else {
             delegate->receivedSpeedMultiThrottle(multiThrottle, speed);

diff --git a/src/WiThrottleProtocol.h b/src/WiThrottleProtocol.h
@@ -29,6 +29,7 @@
 /*
 Version information:
 
+1.1.15   - fix a bug where the speeds were not being updated when changed on another device
 1.1.14   - addition of 'sendCommand(String cmd);
 1.1.13   - Bug fix for ESTOP
 1.1.12   - Add support for broadcast messages and alerts