dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-30 11:36:13 +01:00
Code Releases Activity

Working ACKs with diagnostics

Browse Source
This commit is contained in:
Asbelos 2020-06-07 15:29:09 +01:00
parent 0ad395a63a
commit 026ee0b7a8
2 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
DCC.cpp
View File

@ -268,38 +268,46 @@ int DCC::ackTriggerMilliamps;
ACK_CALLBACK DCC::ackManagerCallback; ACK_CALLBACK DCC::ackManagerCallback;
void DCC::ackManagerSetup(int cv, byte byteValue, ackOp const program[], ACK_CALLBACK callback) { void DCC::ackManagerSetup(int cv, byte byteValueOrBitnum, ackOp const program[], ACK_CALLBACK callback) {
ackManagerCv = cv; ackManagerCv = cv;
ackManagerProg = program; ackManagerProg = program;
ackManagerByte = byteValue; ackManagerByte = byteValueOrBitnum;
ackManagerBitNum=byteValueOrBitnum;
ackManagerCallback = callback; ackManagerCallback = callback;
ackManagerBitNum=0;
} }
#define RESET_MIN 8
void DCC::ackManagerLoop() { void DCC::ackManagerLoop() {
while (ackManagerProg) { while (ackManagerProg) {
// breaks from this switch will step to next prog entry // breaks from this switch will step to next prog entry
// returns from this switch will stay on same entry (typically WACK waiting and when all finished.) // returns from this switch will stay on same entry (typically WACK waiting and when all finished.)
byte opcode=*ackManagerProg; byte opcode=*ackManagerProg;
int resets=DCCWaveform::progTrack.sentResetsSincePacket;
// DIAG(F("\nopAck %d"),opcode);
switch (opcode) { switch (opcode) {
case W0: // write bit case W0: // write bit
case W1: // write bit case W1: // write bit
{ {
byte instruction = WRITE_BIT | (opcode==W1 ? BIT_ON : BIT_OFF) | ackManagerByte; if (resets<RESET_MIN) return; // try later
byte instruction = WRITE_BIT | (opcode==W1 ? BIT_ON : BIT_OFF) | ackManagerBitNum;
byte message[] = {cv1(BIT_MANIPULATE, ackManagerCv), cv2(ackManagerCv), instruction }; byte message[] = {cv1(BIT_MANIPULATE, ackManagerCv), cv2(ackManagerCv), instruction };
DCCWaveform::progTrack.schedulePacket(message, sizeof(message), 6); DCCWaveform::progTrack.schedulePacket(message, sizeof(message), 6);
} }
break; break;
case WB: // write byte case WB: // write byte
{ {
if (resets<RESET_MIN) return; // try later
byte message[] = {cv1(WRITE_BYTE, ackManagerCv), cv2(ackManagerCv), ackManagerByte}; byte message[] = {cv1(WRITE_BYTE, ackManagerCv), cv2(ackManagerCv), ackManagerByte};
DCCWaveform::progTrack.schedulePacket(message, sizeof(message), 6); DCCWaveform::progTrack.schedulePacket(message, sizeof(message), 6);
} }
break; break;
case VB: // Issue validate Byte packet case VB: // Issue validate Byte packet
{ {
if (resets<RESET_MIN) return; // try later
DIAG(F("\nVB %d %d"),ackManagerCv,ackManagerByte);
byte message[] = { cv1(VERIFY_BYTE, ackManagerCv), cv2(ackManagerCv), ackManagerByte}; byte message[] = { cv1(VERIFY_BYTE, ackManagerCv), cv2(ackManagerCv), ackManagerByte};
DCCWaveform::progTrack.schedulePacket(message, sizeof(message), 5); DCCWaveform::progTrack.schedulePacket(message, sizeof(message), 5);
} }
@ -307,21 +315,31 @@ void DCC::ackManagerLoop() {
case V0: case V0:
case V1: // Issue validate bit=0 or bit=1 packet case V1: // Issue validate bit=0 or bit=1 packet
{ {
byte instruction = VERIFY_BIT | (opcode==V0?BIT_OFF:BIT_ON) | ackManagerByte; if (resets<RESET_MIN) return; // try later
DIAG(F("V%d cv=%d bit=%d"),opcode==V1, ackManagerCv,ackManagerBitNum);
byte instruction = VERIFY_BIT | (opcode==V0?BIT_OFF:BIT_ON) | ackManagerBitNum;
byte message[] = {cv1(BIT_MANIPULATE, ackManagerCv), cv2(ackManagerCv), instruction }; byte message[] = {cv1(BIT_MANIPULATE, ackManagerCv), cv2(ackManagerCv), instruction };
DCCWaveform::progTrack.schedulePacket(message, sizeof(message), 5); DCCWaveform::progTrack.schedulePacket(message, sizeof(message), 5);
} }
break; break;
case WACK: // wait for ack (or absence of ack) case WACK: // wait for ack (or absence of ack)
if (DCCWaveform::progTrack.sentResetsSincePacket > 6) { {
if (resets > 6) {
DIAG(F("\nWACK fail %d\n"), resets);
ackReceived = false; ackReceived = false;
break; // move on to next prog step break; // move on to next prog step
} }
if (Hardware::getCurrentMilliamps(false) > ackTriggerMilliamps) {
int current=Hardware::getCurrentMilliamps(false);
if (current > ackTriggerMilliamps) {
DIAG(F("\nWACK ok %dmA, after %d resets\n"), current,resets);
ackReceived = true; ackReceived = true;
DCCWaveform::progTrack.killRemainingRepeats(); DCCWaveform::progTrack.killRemainingRepeats();
break; // move on tho next step break; // move on tho next step
} }
}
return; // maintain place for next poll cycle. return; // maintain place for next poll cycle.
case ITC0: case ITC0:
@ -342,19 +360,20 @@ void DCC::ackManagerLoop() {
case MERGE: // Merge previous wack response with byte value and increment bit number (use for reading CV bytes) case MERGE: // Merge previous wack response with byte value and increment bit number (use for reading CV bytes)
ackManagerByte <<= 1; ackManagerByte <<= 1;
if (ackReceived) ackManagerByte |= 1; if (ackReceived) ackManagerByte |= 1;
ackManagerBitNum++; ackManagerBitNum--;
break; break;
case FAIL: // callback(-1) case FAIL: // callback(-1)
ackManagerProg = NULL; ackManagerProg = NULL;
(ackManagerCallback)(-1); (ackManagerCallback)(-1);
return; return;
case ZERO: case ZERO:
ackManagerBitNum=0; ackManagerBitNum=7;
ackManagerByte=0; ackManagerByte=0;
break; break;
case BASELINE: case BASELINE:
if (DCCWaveform::progTrack.sentResetsSincePacket < 6) return; // try again later if (resets<RESET_MIN) return; // try later
ackTriggerMilliamps=Hardware::getCurrentMilliamps(false) + ACK_MIN_PULSE; ackTriggerMilliamps=Hardware::getCurrentMilliamps(false) + ACK_MIN_PULSE;
DIAG(F("BASELINE mA=%d"),ackTriggerMilliamps);
break; break;
} // end of switch } // end of switch
ackManagerProg++; ackManagerProg++;

1
DCCWaveform.cpp
View File

@ -211,6 +211,7 @@ void DCCWaveform::schedulePacket(const byte buffer[], byte byteCount, byte repea
pendingLength = byteCount + 1; pendingLength = byteCount + 1;
pendingRepeats = repeats; pendingRepeats = repeats;
packetPending = true; packetPending = true;
sentResetsSincePacket=0;
} }
int DCCWaveform::getLastCurrent() { int DCCWaveform::getLastCurrent() {