mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-23 08:06:13 +01:00
Compare commits
2 Commits
ab72a75d8f
...
916d3baf63
Author | SHA1 | Date | |
---|---|---|---|
|
916d3baf63 | ||
|
27dc8059d7 |
|
@ -248,6 +248,10 @@ void CommandDistributor::broadcastLoco(byte slot) {
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CommandDistributor::broadcastForgetLoco(int16_t loco) {
|
||||||
|
broadcastReply(COMMAND_TYPE, F("<l %d 0 1 0>\n<- %d>\n"), loco,loco);
|
||||||
|
}
|
||||||
|
|
||||||
void CommandDistributor::broadcastPower() {
|
void CommandDistributor::broadcastPower() {
|
||||||
char pstr[] = "? x";
|
char pstr[] = "? x";
|
||||||
for(byte t=0; t<TrackManager::MAX_TRACKS; t++)
|
for(byte t=0; t<TrackManager::MAX_TRACKS; t++)
|
||||||
|
|
|
@ -47,6 +47,7 @@ private:
|
||||||
public :
|
public :
|
||||||
static void parse(byte clientId,byte* buffer, RingStream * ring);
|
static void parse(byte clientId,byte* buffer, RingStream * ring);
|
||||||
static void broadcastLoco(byte slot);
|
static void broadcastLoco(byte slot);
|
||||||
|
static void broadcastForgetLoco(int16_t loco);
|
||||||
static void broadcastSensor(int16_t id, bool value);
|
static void broadcastSensor(int16_t id, bool value);
|
||||||
static void broadcastTurnout(int16_t id, bool isClosed);
|
static void broadcastTurnout(int16_t id, bool isClosed);
|
||||||
static void broadcastTurntable(int16_t id, uint8_t position, bool moving);
|
static void broadcastTurntable(int16_t id, uint8_t position, bool moving);
|
||||||
|
|
6
DCC.cpp
6
DCC.cpp
|
@ -755,11 +755,15 @@ void DCC::forgetLoco(int cab) { // removes any speed reminders for this loco
|
||||||
if (reg>=0) {
|
if (reg>=0) {
|
||||||
speedTable[reg].loco=0;
|
speedTable[reg].loco=0;
|
||||||
setThrottle2(cab,1); // ESTOP if this loco still on track
|
setThrottle2(cab,1); // ESTOP if this loco still on track
|
||||||
|
CommandDistributor::broadcastForgetLoco(cab);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
void DCC::forgetAllLocos() { // removes all speed reminders
|
void DCC::forgetAllLocos() { // removes all speed reminders
|
||||||
setThrottle2(0,1); // ESTOP all locos still on track
|
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;
|
byte DCC::loopStatus=0;
|
||||||
|
|
|
@ -3,7 +3,8 @@
|
||||||
|
|
||||||
#include "StringFormatter.h"
|
#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.
|
// 5.2.70 - IO_RocoDriver renamed to IO_EncoderThrottle.
|
||||||
// - and included in IODEvice.h (circular dependency removed)
|
// - and included in IODEvice.h (circular dependency removed)
|
||||||
// 5.2.69 - IO_RocoDriver. Direct drive train with rotary encoder hw.
|
// 5.2.69 - IO_RocoDriver. Direct drive train with rotary encoder hw.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user