From 27dc8059d78a6666ebb2c844ad64f952416d89bf Mon Sep 17 00:00:00 2001
From: Asbelos <asbelos@btinternet.com>
Date: Fri, 19 Jul 2024 09:29:43 +0100
Subject: [PATCH] Broadcast loco forgets.

---
 CommandDistributor.cpp | 4 ++++
 CommandDistributor.h   | 1 +
 DCC.cpp                | 6 +++++-
 version.h              | 3 ++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CommandDistributor.cpp b/CommandDistributor.cpp
index e7087ad..d2cf3f9 100644
--- a/CommandDistributor.cpp
+++ b/CommandDistributor.cpp
@@ -248,6 +248,10 @@ 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++)
diff --git a/CommandDistributor.h b/CommandDistributor.h
index f68a5e2..d86b87f 100644
--- a/CommandDistributor.h
+++ b/CommandDistributor.h
@@ -47,6 +47,7 @@ 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);
diff --git a/DCC.cpp b/DCC.cpp
index 99ee71f..e60cf25 100644
--- a/DCC.cpp
+++ b/DCC.cpp
@@ -742,11 +742,15 @@ 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++) speedTable[i].loco=0;
+  for (int i=0;i<MAX_LOCOS;i++) {
+    if (speedTable[i].loco) CommandDistributor::broadcastForgetLoco(speedTable[i].loco);
+    speedTable[i].loco=0;
+  }
 }
 
 byte DCC::loopStatus=0;
diff --git a/version.h b/version.h
index 1746bd5..52fbbb9 100644
--- a/version.h
+++ b/version.h
@@ -3,7 +3,8 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.2.70"
+#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) 
 // 5.2.69 -  IO_RocoDriver. Direct drive train with rotary encoder hw.