mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-22 23:56:13 +01:00
oops
This commit is contained in:
parent
9ccf1fe41a
commit
a849dddc9c
5
DCC.cpp
5
DCC.cpp
|
@ -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);
|
||||||
|
|
|
@ -234,11 +234,12 @@ void DCCWaveform::promotePendingPacket() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isMainTrack) {
|
||||||
// Remember address bytes of last sent packet so that Railcom can
|
// Remember address bytes of last sent packet so that Railcom can
|
||||||
// work out where the channel2 data came from.
|
// work out where the channel2 data came from.
|
||||||
railcomLastAddressHigh=transmitPacket[0];
|
railcomLastAddressHigh=transmitPacket[0];
|
||||||
railcomLastAddressLow =transmitPacket[1];
|
railcomLastAddressLow =transmitPacket[1];
|
||||||
|
}
|
||||||
|
|
||||||
if (packetPending) {
|
if (packetPending) {
|
||||||
// Copy pending packet to transmit packet
|
// Copy pending packet to transmit packet
|
||||||
|
|
Loading…
Reference in New Issue
Block a user