dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2025-06-29 10:35:24 +02:00
Code Releases Activity

correct 28 speed steps

Browse Source
This commit is contained in:
Harald Barth 2025-03-31 23:31:51 +02:00
parent 64f470a130
commit 4df7df7be5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
DCCDecoder.cpp
View File

@ -82,12 +82,12 @@ bool DCCDecoder::parse(DCCPacket &p) {
case 0x40: // 010x-xxxx 28 (or 14 step) speed we assume 28 case 0x40: // 010x-xxxx 28 (or 14 step) speed we assume 28
case 0x60: // 011x-xxxx case 0x60: // 011x-xxxx
if ((locoInfoChanged = LocoTable::updateLoco(addr, instr[0] & 0B00111111)) == true) { if ((locoInfoChanged = LocoTable::updateLoco(addr, instr[0] & 0B00111111)) == true) {
byte speed = instr[1] & 0B00001111; // first only look at 4 bits byte speed = instr[0] & 0B00001111; // first only look at 4 bits
if (speed > 1) { // neither stop nor emergency stop, recalculate speed if (speed > 1) { // neither stop nor emergency stop, recalculate speed
speed = ((instr[1] & 0B00001111) << 1) + bitRead(instr[1], 4); // reshuffle bits speed = ((instr[0] & 0B00001111) << 1) + bitRead(instr[0], 4); // reshuffle bits
speed = (speed - 3) * 9/2; speed = (speed - 3) * 9/2;
} }
byte direction = instr[1] & 0B00100000; byte direction = instr[0] & 0B00100000;
DCC::setThrottle(addr, speed, direction); DCC::setThrottle(addr, speed, direction);
} }
break; break;
@ -156,8 +156,8 @@ bool DCCDecoder::parse(DCCPacket &p) {
byte activate = (instr[0] & 0B00001000) >> 3; byte activate = (instr[0] & 0B00001000) >> 3;
byte coil = (instr[0] & 0B00000001); byte coil = (instr[0] & 0B00000001);
locoInfoChanged = true; locoInfoChanged = true;
(void)addr; (void)port; (void)coil; (void)activate; //(void)addr; (void)port; (void)coil; (void)activate;
DIAG(F("HL=%d LL=%d C=%d A=%d"), addr, port, coil, activate); //DIAG(F("HL=%d LL=%d C=%d A=%d"), addr, port, coil, activate);
DCC::setAccessory(addr, port, coil, activate); DCC::setAccessory(addr, port, coil, activate);
} else { // Accessory Extended NMRA spec, do we need to decode this? } else { // Accessory Extended NMRA spec, do we need to decode this?
/* /*