move speed save from task -> locoslot. I don't like how the restore works. I would prefer a method at locoslot, but there are any calls to DCC until now. Maybe by reason.

Author: Kristian Kalweit

EXRAIL2.cpp

@@ -609,11 +609,19 @@ void RMFT2::loop2() {
     break;
 
   case OPCODE_SAVESPEED:
-    if (loco) saveSpeed = DCC::getThrottleSpeedByte(loco);
+    if (loco) {
+      auto slot=LocoSlot::getSlot(loco,false);
+      if (slot) {
+        slot->saveSpeed();
+      }
+    }
     break;
 
   case OPCODE_RESTORESPEED:
-    if (loco) DCC::setThrottle(loco,saveSpeed,invert);
+    if (loco) {
+      auto slot=LocoSlot::getSlot(loco,false);
+      if (slot) DCC::setThrottle(loco,slot->getSavedSpeed(),invert);
+    }
     break;
 
   case OPCODE_RESERVE:

EXRAIL2.h

@@ -302,7 +302,6 @@ class LookList {
     uint16_t loco;
     bool invert;
     byte pauseSpeed;
-    byte saveSpeed;
     int onEventStartPosition;
     byte stackDepth;
     int callStack[MAX_STACK_DEPTH];

LocoSlot.cpp

@@ -31,6 +31,7 @@ void LocoSlot::prepare(uint16_t locoId) {
     momentumA=MOMENTUM_USE_DEFAULT;
     momentumD=MOMENTUM_USE_DEFAULT;
     targetSpeed=128;
+    savedSpeed=128;
     blockOccupied=0;
 
     snifferSpeedCode=128; // default direction forward
@@ -80,6 +81,11 @@ void LocoSlot::forget() {
   chainModified=true;
 }
 
+void LocoSlot::saveSpeed() {
+  // targetSpeed should eventually to be the speed we want to reach and save
+  savedSpeed=targetSpeed;
+}
+
 /* static */ void LocoSlot::forgetAll() {
   // remove entire list
   LocoSlot * killnext=nullptr; 

LocoSlot.h

@@ -45,6 +45,7 @@ class LocoSlot {
   uint16_t blockOccupied;    // railcom detected block 
 
   byte targetSpeed;       // speed set by throttle
+  byte savedSpeed;
   byte speedCode;         // current DCC speed and direction
   byte snifferSpeedCode;  // sniffer speed and direction
   byte momentumA;         // momentum accelerating
@@ -82,6 +83,8 @@ class LocoSlot {
   void setMomentumBase(uint32_t v) { momentum_base=v; } 
   byte getTargetSpeed() { return targetSpeed; }
   void setTargetSpeed(byte v) { targetSpeed=v; }  
+  byte getSavedSpeed() { return savedSpeed; }
+  void setSavedSpeed(byte v) { savedSpeed=v; }
 
   byte getSpeedCode() { return speedCode; }
   void setSpeedCode(byte v) { speedCode=v; }
@@ -92,6 +95,7 @@ class LocoSlot {
   uint16_t getBlockOccupied() { return blockOccupied; }
   void setBlockOccupied(uint16_t v) { blockOccupied=v; }
   void forget();
+  void saveSpeed();
 
 };
 #endif