CommandDistributor.cpp

@@ -283,7 +283,7 @@ void  CommandDistributor::broadcastPower() {
   //DIAG(F("m=%d p=%d j=%d"), main, prog, join);
   const FSH * reason=F("");
   if (join) {
-    reason = F(" JOIN"); // with space at start so we can append without space
+    reason = F("JOIN");
     broadcastReply(COMMAND_TYPE, F("<p1 %S>\n"),reason);
   } else {
     if (main) {

DCC.cpp

@@ -122,7 +122,7 @@ void DCC::setThrottle2( uint16_t cab, byte speedCode)  {
   DCCWaveform::mainTrack.schedulePacket(b, nB, 0);
 }
 
-void DCC::setFunctionInternal(int cab, byte byte1, byte byte2, byte count) {
+void DCC::setFunctionInternal(int cab, byte byte1, byte byte2) {
   // DIAG(F("setFunctionInternal %d %x %x"),cab,byte1,byte2);
   byte b[4];
   byte nB = 0;
@@ -133,7 +133,7 @@ void DCC::setFunctionInternal(int cab, byte byte1, byte byte2, byte count) {
   if (byte1!=0) b[nB++] = byte1;
   b[nB++] = byte2;
 
-  DCCWaveform::mainTrack.schedulePacket(b, nB, count);
+  DCCWaveform::mainTrack.schedulePacket(b, nB, 0);
 }
 
 // returns speed steps 0 to 127 (1 == emergency stop)
@@ -619,39 +619,33 @@ bool DCC::issueReminder(int reg) {
          break;
        case 1: // remind function group 1 (F0-F4)
           if (flags & FN_GROUP_1)
-#ifndef DISABLE_FUNCTION_REMINDERS
-	    setFunctionInternal(loco,0, 128 | ((functions>>1)& 0x0F) | ((functions & 0x01)<<4),0); // 100D DDDD
-#else
-	    setFunctionInternal(loco,0, 128 | ((functions>>1)& 0x0F) | ((functions & 0x01)<<4),2);
+              setFunctionInternal(loco,0, 128 | ((functions>>1)& 0x0F) | ((functions & 0x01)<<4)); // 100D DDDD
+#ifdef DISABLE_FUNCTION_REMINDERS
           flags&= ~FN_GROUP_1;  // dont send them again
 #endif
           break;
        case 2: // remind function group 2 F5-F8
           if (flags & FN_GROUP_2)
-#ifndef DISABLE_FUNCTION_REMINDERS
-  	    setFunctionInternal(loco,0, 176 | ((functions>>5)& 0x0F),0);                           // 1011 DDDD
-#else
-	    setFunctionInternal(loco,0, 176 | ((functions>>5)& 0x0F),2);
+              setFunctionInternal(loco,0, 176 | ((functions>>5)& 0x0F));                           // 1011 DDDD
+#ifdef DISABLE_FUNCTION_REMINDERS
           flags&= ~FN_GROUP_2;  // dont send them again
 #endif
           break;
        case 3: // remind function group 3 F9-F12
           if (flags & FN_GROUP_3)
-#ifndef DISABLE_FUNCTION_REMINDERS
-	    setFunctionInternal(loco,0, 160 | ((functions>>9)& 0x0F),0);                           // 1010 DDDD
-#else
-	    setFunctionInternal(loco,0, 160 | ((functions>>9)& 0x0F),2);
+              setFunctionInternal(loco,0, 160 | ((functions>>9)& 0x0F));                           // 1010 DDDD
+#ifdef DISABLE_FUNCTION_REMINDERS
           flags&= ~FN_GROUP_3;  // dont send them again
 #endif
           break;
        case 4: // remind function group 4 F13-F20
           if (flags & FN_GROUP_4)
-	    setFunctionInternal(loco,222, ((functions>>13)& 0xFF),2);
+              setFunctionInternal(loco,222, ((functions>>13)& 0xFF));
           flags&= ~FN_GROUP_4;  // dont send them again
           break;
        case 5: // remind function group 5 F21-F28
           if (flags & FN_GROUP_5)
-	    setFunctionInternal(loco,223, ((functions>>21)& 0xFF),2);
+              setFunctionInternal(loco,223, ((functions>>21)& 0xFF));
           flags&= ~FN_GROUP_5;  // dont send them again
           break;
       }

DCC.h

@@ -109,7 +109,7 @@ private:
   static byte loopStatus;
   static void setThrottle2(uint16_t cab, uint8_t speedCode);
   static void updateLocoReminder(int loco, byte speedCode);
-  static void setFunctionInternal(int cab, byte fByte, byte eByte, byte count);
+  static void setFunctionInternal(int cab, byte fByte, byte eByte);
   static bool issueReminder(int reg);
   static int lastLocoReminder;
   static int highestUsedReg;

DCCEXParser.cpp

@@ -587,6 +587,7 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
             }
 	    else break; // will reply <X>
 	  }
+	  CommandDistributor::broadcastPower();
 	  //TrackManager::streamTrackState(NULL,t);
           
 	  return;
@@ -618,6 +619,7 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
 	    }
 	    else break; // will reply <X>
 	  }
+	  CommandDistributor::broadcastPower();
 	  return;
 	}
 

EXRAIL2.cpp

@@ -414,6 +414,7 @@ void RMFT2::driveLoco(byte speed) {
  power on appropriate track if DC or main if dcc
   if (TrackManager::getMainPowerMode()==POWERMODE::OFF) {
     TrackManager::setMainPower(POWERMODE::ON);
+    CommandDistributor::broadcastPower();
   }
   **********/
 
@@ -641,6 +642,7 @@ void RMFT2::loop2() {
   case OPCODE_POWEROFF:
     TrackManager::setPower(POWERMODE::OFF);
     TrackManager::setJoin(false);
+    CommandDistributor::broadcastPower();
     break;
   
   case OPCODE_SET_POWER:
@@ -835,10 +837,12 @@ void RMFT2::loop2() {
   case OPCODE_JOIN:
     TrackManager::setPower(POWERMODE::ON);
     TrackManager::setJoin(true);
+    CommandDistributor::broadcastPower();
     break;
 
   case OPCODE_UNJOIN:
     TrackManager::setJoin(false);
+    CommandDistributor::broadcastPower();
     break;
 
   case OPCODE_READ_LOCO1: // READ_LOCO is implemented as 2 separate opcodes
@@ -866,6 +870,7 @@ void RMFT2::loop2() {
   case OPCODE_POWERON:
     TrackManager::setMainPower(POWERMODE::ON);
     TrackManager::setJoin(false);
+    CommandDistributor::broadcastPower();
     break;
     
   case OPCODE_START:

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-202312131041Z"
+#define GITHUB_SHA "devel-202311270714Z"

TrackManager.cpp

@@ -489,13 +489,10 @@ std::vector<MotorDriver *>TrackManager::getMainDrivers() {
 
 // Set track power for all tracks with this mode
 void TrackManager::setTrackPower(TRACK_MODE trackmodeToMatch, POWERMODE powermode) {
-  bool didChange=false;
   FOR_EACH_TRACK(t) {
     MotorDriver *driver=track[t];
     TRACK_MODE trackmodeOfTrack = driver->getMode();
     if (trackmodeToMatch & trackmodeOfTrack) {
-      if (powermode != driver->getPower())
-	didChange=true;
       if (powermode == POWERMODE::ON) {
 	if (trackmodeOfTrack & TRACK_MODE_DC) {
 	  driver->setBrake(true);   // DC starts with brake on
@@ -510,15 +507,12 @@ void TrackManager::setTrackPower(TRACK_MODE trackmodeToMatch, POWERMODE powermod
       driver->setPower(powermode);
     }
   }
-  if (didChange)
-    CommandDistributor::broadcastPower();
 }
 
 // Set track power for this track, inependent of mode
 void TrackManager::setTrackPower(POWERMODE powermode, byte t) {
   MotorDriver *driver=track[t]; 
   TRACK_MODE trackmode = driver->getMode();
-  POWERMODE oldpower = driver->getPower();
   if (trackmode & TRACK_MODE_NONE) {
     driver->setBrake(true);     // Track is unused. Brake is good to have.
     powermode = POWERMODE::OFF; // Track is unused. Force it to OFF
@@ -536,8 +530,6 @@ void TrackManager::setTrackPower(POWERMODE powermode, byte t) {
     }
   }
   driver->setPower(powermode);
-  if (oldpower != driver->getPower())
-    CommandDistributor::broadcastPower();
 }
 
 // returns state of the one and only prog track

WiThrottle.cpp

@@ -150,6 +150,7 @@ void WiThrottle::parse(RingStream * stream, byte * cmdx) {
 	  DCCWaveform::progTrack.setPowerMode(cmd[3]=='1'?POWERMODE::ON:POWERMODE::OFF);
 */
 
+	CommandDistributor::broadcastPower();
       }
 #if defined(EXRAIL_ACTIVE)
       else if (cmd[1]=='R' && cmd[2]=='A' && cmd[3]=='2' ) { // Route activate
@@ -495,6 +496,7 @@ void WiThrottle::getLocoCallback(int16_t locoid) {
   TrackManager::setJoin(true);          // <1 JOIN> so we can drive loco away
   DIAG(F("LocoCallback commit success"));
   stashStream->commit();
+  CommandDistributor::broadcastPower();
 }
 
 void WiThrottle::sendIntro(Print* stream) {

version.h

@@ -3,9 +3,7 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.2.15"
-// 5.2.15 - move call to CommandDistributor::broadcastPower() into the TrackManager::setTrackPower(*) functions
-//        - add repeats to function packets that are not reminded in accordance with accessory packets
+#define VERSION "5.2.14"
 // 5.2.14 - Reminder window DCC packet optimization
 //        - Optional #define DISABLE_FUNCTION_REMINDERS 
 // 5.2.13 - EXRAIL STEALTH