Skip to content

Added broadcast for (extended) accessory commands #445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CommandDistributor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,14 @@ void CommandDistributor::broadcastSensor(int16_t id, bool on ) {
broadcastReply(COMMAND_TYPE, F("<%c %d>\n"), on?'Q':'q', id);
}

void CommandDistributor::broadcastAccessory(int16_t address, byte port, bool gate, bool on) {
broadcastReply(COMMAND_TYPE, F("<y A %d %d %c %c>\n"), address, port, gate?'1':'0', on?'1':'0');
}

void CommandDistributor::broadcastExtendedAccessory(int16_t address, int16_t value) {
broadcastReply(COMMAND_TYPE, F("<y E %d %d>\n"), address, value);
}

void CommandDistributor::broadcastTurnout(int16_t id, bool isClosed ) {
// For DCC++ classic compatibility, state reported to JMRI is 1 for thrown and 0 for closed;
// The string below contains serial and Withrottle protocols which should
Expand Down
2 changes: 2 additions & 0 deletions CommandDistributor.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ public :
static void broadcastLoco(byte slot);
static void broadcastForgetLoco(int16_t loco);
static void broadcastSensor(int16_t id, bool value);
static void broadcastAccessory(int16_t address, byte port, bool gate, bool on);
static void broadcastExtendedAccessory(int16_t address, int16_t value);
static void broadcastTurnout(int16_t id, bool isClosed);
static void broadcastTurntable(int16_t id, uint8_t position, bool moving);
static void broadcastClockTime(int16_t time, int8_t rate);
Expand Down
3 changes: 3 additions & 0 deletions DCC.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -307,10 +307,12 @@ void DCC::setAccessory(int address, byte port, bool gate, byte onoff /*= 2*/) {
#if defined(EXRAIL_ACTIVE)
RMFT2::activateEvent(address<<2|port,gate);
#endif
CommandDistributor::broadcastAccessory(address, port, gate, true);
}
if (onoff != 1) {
b[1] &= ~0x08; // set C to 0
DCCWaveform::mainTrack.schedulePacket(b, 2, 3); // Repeat off packet three times
CommandDistributor::broadcastAccessory(address, port, gate, false);
}
}

Expand Down Expand Up @@ -362,6 +364,7 @@ whole range of the 11 bits sent to track.
| ((address & 0x03)<<1); // mask 2 bits, shift up 1
b[2]=value;
DCCWaveform::mainTrack.schedulePacket(b, sizeof(b), repeats);
CommandDistributor::broadcastExtendedAccessory(address, value);
return true;
}

Expand Down
2 changes: 1 addition & 1 deletion DCCEXParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ Once a new OPCODE is decided upon, update this list.
W, Write CV
x,
X, Invalid command response
y,
y, Accessory/extended accessory broadcast
Y, Output broadcast
z, Direct output
Z, Output configuration/control
Expand Down