diff --git a/CommandDistributor.cpp b/CommandDistributor.cpp index 38fafff..a9a98e1 100644 --- a/CommandDistributor.cpp +++ b/CommandDistributor.cpp @@ -55,7 +55,7 @@ void CommandDistributor::forget(byte clientId) { } -void CommandDistributor::broadcast() { +void CommandDistributor::broadcast(bool includeWithrottleClients) { broadcastBufferWriter->write((byte)'\0'); /* Boadcast to Serials */ @@ -70,6 +70,7 @@ void CommandDistributor::broadcast() { /* loop through ring clients */ for (byte clientId=0; clientIdmark(clientId); broadcastBufferWriter->printBuffer(ring); ring->commit(); @@ -84,12 +85,14 @@ void CommandDistributor::broadcast() { // Redirect ring output ditrect to Serial #define broadcastBufferWriter &Serial // and ignore the internal broadcast call. - void CommandDistributor::broadcast() {} + void CommandDistributor::broadcast(bool includeWithrottleClients) { + (void)includeWithrottleClients; + } #endif void CommandDistributor::broadcastSensor(int16_t id, bool on ) { StringFormatter::send(broadcastBufferWriter,F("<%c %d>\n"), on?'Q':'q', id); - broadcast(); + broadcast(false); } void CommandDistributor::broadcastTurnout(int16_t id, bool isClosed ) { @@ -100,14 +103,14 @@ void CommandDistributor::broadcastTurnout(int16_t id, bool isClosed ) { #if defined(WIFI_ON) | defined(ETHERNET_ON) StringFormatter::send(broadcastBufferWriter,F("PTA%c%d\n"), isClosed?'2':'4', id); #endif - broadcast(); + broadcast(true); } void CommandDistributor::broadcastLoco(byte slot) { DCC::LOCO * sp=&DCC::speedTable[slot]; StringFormatter::send(broadcastBufferWriter,F("\n"), sp->loco,slot,sp->speedCode,sp->functions); - broadcast(); + broadcast(false); #if defined(WIFI_ON) | defined(ETHERNET_ON) WiThrottle::markForBroadcast(sp->loco); #endif @@ -128,7 +131,7 @@ void CommandDistributor::broadcastPower() { StringFormatter::send(broadcastBufferWriter, F("\nPPA%c\n"),state,reason, main?'1':'0'); LCD(2,F("Power %S%S"),state=='1'?F("On"):F("Off"),reason); - broadcast(); + broadcast(true); } diff --git a/CommandDistributor.h b/CommandDistributor.h index e855e51..43e4fff 100644 --- a/CommandDistributor.h +++ b/CommandDistributor.h @@ -31,7 +31,7 @@ public : static void broadcastPower(); static void forget(byte clientId); private: - static void broadcast(); + static void broadcast(bool includeWithrottleClients); static RingStream * ring; static RingStream * broadcastBufferWriter; static byte ringClient; diff --git a/DCC.cpp b/DCC.cpp index f3cba2f..1b9072e 100644 --- a/DCC.cpp +++ b/DCC.cpp @@ -669,8 +669,12 @@ void DCC::updateLocoReminder(int loco, byte speedCode) { if (loco==0) { // broadcast stop/estop but dont change direction for (int reg = 0; reg < MAX_LOCOS; reg++) { - speedTable[reg].speedCode = (speedTable[reg].speedCode & 0x80) | (speedCode & 0x7f); - CommandDistributor::broadcastLoco(reg); + if (speedTable[reg].loco==0) continue; + byte newspeed=(speedTable[reg].speedCode & 0x80) | (speedCode & 0x7f); + if (speedTable[reg].speedCode != newspeed) { + speedTable[reg].speedCode = newspeed; + CommandDistributor::broadcastLoco(reg); + } } return; }