dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2025-07-28 09:53:45 +02:00
Code Releases Activity

Acks

Browse Source
This commit is contained in:
Asbelos
2020-05-26 18:34:54 +01:00
parent c16358facc
commit 864d2936b1
6 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DCC.cpp
View File

@@ -125,8 +125,7 @@ bool DCC::writeCVBit(int cv, byte bNum, bool bValue) {
bitWrite(message[2],4,1); // change instruction code from Write Bit to Verify Bit
DCCWaveform::progTrack.schedulePacket(message,sizeof(message),6); // NMRA recommends 6 write or reset packets for decoder recovery time
*/
return DCCWaveform::progTrack.getAck();
return true; // <<<< NOT ACCURATE... see comment above
}
@@ -141,8 +140,8 @@ int DCC::readCV(int cv) {
// get each bit individually
for (int i = 0; i < 8; i++) {
message[2] = 0xE8 + i;
DCCWaveform::progTrack.schedulePacket(message, sizeof(message), 4); // NMRA recommends 5 read packets
value += (DCCWaveform::progTrack.getAck() << i);
bool one=DCCWaveform::progTrack.schedulePacketWithAck(message, sizeof(message), 4); // NMRA recommends 5 read packets
value += one << i;
}
return verifyCV(cv, value) ? value : -1;
@@ -183,10 +182,8 @@ byte DCC::cv2(int cv) {
bool DCC::verifyCV(int cv, byte value) {
byte message[] = { cv1(0x74, cv), cv2(cv), value};
DIAG(F("\n\nVerifying cv %d = %d"), cv, value);
DCCWaveform::progTrack.schedulePacket(message, sizeof(message), 5);
return DCCWaveform::progTrack.getAck();
}
return DCCWaveform::progTrack.schedulePacketWithAck(message, sizeof(message), 5);
}
void DCC::updateLocoReminder(int loco, byte tSpeed, bool forward) {
// determine speed reg for this loco