dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-26 17:46:14 +01:00
Code Releases Activity

oops

Browse Source
This commit is contained in:
Asbelos 2024-10-22 11:55:18 +01:00
parent 9ccf1fe41a
commit a849dddc9c
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DCC.cpp
View File

@ -940,8 +940,9 @@ void DCC::displayCabList(Print * stream) {
for (int reg = 0; reg <= highestUsedReg; reg++) { for (int reg = 0; reg <= highestUsedReg; reg++) {
if (speedTable[reg].loco>0) { if (speedTable[reg].loco>0) {
used ++; used ++;
StringFormatter::send(stream,F("cab=%d, speed=%d, dir=%c \n"), StringFormatter::send(stream,F("cab=%d, speed=%d, dir=%c blk=%d\n"),
speedTable[reg].loco, speedTable[reg].speedCode & 0x7f,(speedTable[reg].speedCode & 0x80) ? 'F':'R'); speedTable[reg].loco, speedTable[reg].speedCode & 0x7f,(speedTable[reg].speedCode & 0x80) ? 'F':'R',
speedTable[reg].blockOccupied);
} }
} }
StringFormatter::send(stream,F("Used=%d, max=%d\n"),used,MAX_LOCOS); StringFormatter::send(stream,F("Used=%d, max=%d\n"),used,MAX_LOCOS);

11
DCCWaveform.cpp
View File

@ -234,11 +234,12 @@ void DCCWaveform::promotePendingPacket() {
return; return;
} }
// Remember address bytes of last sent packet so that Railcom can if (isMainTrack) {
// work out where the channel2 data came from. // Remember address bytes of last sent packet so that Railcom can
railcomLastAddressHigh=transmitPacket[0]; // work out where the channel2 data came from.
railcomLastAddressLow =transmitPacket[1]; railcomLastAddressHigh=transmitPacket[0];
railcomLastAddressLow =transmitPacket[1];
}
if (packetPending) { if (packetPending) {
// Copy pending packet to transmit packet // Copy pending packet to transmit packet