Merge 2c133da140 into c518dcdc0b

CommandDistributor.cpp

@@ -248,10 +248,6 @@ void  CommandDistributor::broadcastLoco(byte slot) {
 #endif
 }
 
-void  CommandDistributor::broadcastForgetLoco(int16_t loco) {
-  broadcastReply(COMMAND_TYPE, F("<l %d 0 1 0>\n<- %d>\n"), loco,loco);
-}
-
 void  CommandDistributor::broadcastPower() {
   char pstr[] = "? x";
   for(byte t=0; t<TrackManager::MAX_TRACKS; t++)

CommandDistributor.h

@@ -47,7 +47,6 @@ private:
 public :
   static void parse(byte clientId,byte* buffer, RingStream * ring);
   static void broadcastLoco(byte slot);
-  static void broadcastForgetLoco(int16_t loco);
   static void broadcastSensor(int16_t id, bool value);
   static void broadcastTurnout(int16_t id, bool isClosed);
   static void broadcastTurntable(int16_t id, uint8_t position, bool moving);

DCC.cpp

@@ -742,15 +742,11 @@ void DCC::forgetLoco(int cab) {  // removes any speed reminders for this loco
   if (reg>=0) {
     speedTable[reg].loco=0;
     setThrottle2(cab,1); // ESTOP if this loco still on track
-    CommandDistributor::broadcastForgetLoco(cab);
   }
 }
 void DCC::forgetAllLocos() {  // removes all speed reminders
   setThrottle2(0,1); // ESTOP all locos still on track
-  for (int i=0;i<MAX_LOCOS;i++) {
-    if (speedTable[i].loco) CommandDistributor::broadcastForgetLoco(speedTable[i].loco);
-    speedTable[i].loco=0;
-  }
+  for (int i=0;i<MAX_LOCOS;i++) speedTable[i].loco=0;
 }
 
 byte DCC::loopStatus=0;

IODevice.h

@@ -547,6 +547,6 @@ protected:
 #include "IO_duinoNodes.h"
 #include "IO_EXIOExpander.h"
 #include "IO_trainbrains.h"
-#include "IO_EncoderThrottle.h"
+
 
 #endif // iodevice_h

IO_EncoderThrottle.h

@@ -1,53 +0,0 @@
-/*
- *  © 2024, Chris Harlow. All rights reserved.
- *
- *  This file is part of EX-CommandStation
- *
- *  This is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  It is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-/*
-* The IO_EncoderThrottle device driver uses a rotary encoder connected to vpins
-* to drive a loco.
-*  Loco id is selected by writeAnalog.
-*/
-
-#ifndef IO_EncoderThrottle_H
-#define IO_EncoderThrottle_H
-#include "IODevice.h"
-
-class EncoderThrottle : public IODevice {
-public:
-  
-  static void create(VPIN firstVpin, int dtPin, int clkPin, int clickPin, byte notch=10);
- 
-private:
-  int _dtPin,_clkPin,_clickPin, _locoid, _notch,_prevpinstate; 
-  enum {xrSTOP,xrFWD,xrREV} _stopState;
-  byte _rocoState;  
-
-  // Constructor
-  EncoderThrottle(VPIN firstVpin, int dtPin, int clkPin, int clickPin, byte notch);
-  
-  void _loop(unsigned long currentMicros) override ;
-
-  // Selocoid as analog value to start drive
-  // use <z vpin locoid [notch]>
-  void _writeAnalogue(VPIN vpin, int value, uint8_t param1, uint16_t param2) override;
-  
-  void _display() override ;
-
- };
-
-#endif

IO_RocoDriver.h

@@ -18,14 +18,17 @@
 */
 
 /*
-* The IO_EncoderThrottle device driver uses a rotary encoder connected to vpins
+* The IO_RocoDriver device driver uses a rotary encoder connected to vpins
 * to drive a loco.
 *  Loco id is selected by writeAnalog.
 */
 
+#ifndef IO_ROCODRIVER_H
+#define IO_ROCODRIVER_H
+
+#include "DCC.h"
 #include "IODevice.h"
 #include "DIAG.h"
-#include "DCC.h"
 
 const byte _DIR_CW = 0x10;  // Clockwise step
 const byte _DIR_CCW = 0x20;  // Counter-clockwise step
@@ -42,14 +45,21 @@ const byte _STATE_MASK = 0x07;
 const byte _DIR_MASK = 0x30;
 
 
-
-  void EncoderThrottle::create(VPIN firstVpin, int dtPin, int clkPin, int clickPin, byte notch) {
-    if (checkNoOverlap(firstVpin)) new EncoderThrottle(firstVpin, dtPin,clkPin,clickPin,notch);
+class RocoDriver : public IODevice {
+public:
+  
+  static void create(VPIN firstVpin, int dtPin, int clkPin, int clickPin, byte notch=10) {
+    if (checkNoOverlap(firstVpin)) new RocoDriver(firstVpin, dtPin,clkPin,clickPin,notch);
   }
 
+private:
+  int _dtPin,_clkPin,_clickPin, _locoid, _notch,_prevpinstate; 
+  enum {xrSTOP,xrFWD,xrREV} _stopState;
+  byte _rocoState;  
+
 
   // Constructor
-  EncoderThrottle::EncoderThrottle(VPIN firstVpin, int dtPin, int clkPin, int clickPin, byte notch){
+  RocoDriver(VPIN firstVpin, int dtPin, int clkPin, int clickPin, byte notch){
     _firstVpin = firstVpin;
     _nPins = 1;
     _I2CAddress = 0;
@@ -70,7 +80,7 @@ const byte _DIR_MASK = 0x30;
 
   
 
-  void EncoderThrottle::_loop(unsigned long currentMicros)  {
+  void _loop(unsigned long currentMicros) override {
     if (_locoid==0) return;  // not in use
     
     // Clicking down on the roco, stops the loco and sets the direction as unknown.
@@ -119,7 +129,7 @@ const byte _DIR_MASK = 0x30;
 
   // Selocoid as analog value to start drive
   // use <z vpin locoid [notch]>
-  void EncoderThrottle::_writeAnalogue(VPIN vpin, int value, uint8_t param1, uint16_t param2)  {  
+  void _writeAnalogue(VPIN vpin, int value, uint8_t param1, uint16_t param2) override {  
     (void) param2;
     _locoid=value;
     if (param1>0) _notch=param1;
@@ -138,7 +148,10 @@ const byte _DIR_MASK = 0x30;
   }
 
   
-  void EncoderThrottle::_display() {
+  void _display() override {
     DIAG(F("DRIVE vpin %d loco %d notch %d"),_firstVpin,_locoid,_notch);
   }
 
+ };
+
+#endif

version.h

@@ -3,10 +3,7 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.2.71"
-// 5.2.71 -  Broadcasts of loco forgets. 
-// 5.2.70 -  IO_RocoDriver renamed to IO_EncoderThrottle.
-//        -  and included in IODEvice.h (circular dependency removed) 
+#define VERSION "5.2.69"
 // 5.2.69 -  IO_RocoDriver. Direct drive train with rotary encoder hw.
 // 5.2.68 -  Revert function map to signed (from 5.2.66) to avoid
 //           incompatibilities with ED etc for F31 frequency flag.