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

Repair railcom prototype to get signal on main and prog

Browse Source
This commit is contained in:
Harald Barth 2022-05-14 00:49:39 +02:00
parent 67adf1e6c6
commit c245c27f5d
3 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DCCEXParser.cpp
View File

@ -56,7 +56,7 @@ const int16_t HASH_KEYWORD_LCN = 15137;
const int16_t HASH_KEYWORD_RESET = 26133; const int16_t HASH_KEYWORD_RESET = 26133;
const int16_t HASH_KEYWORD_SPEED28 = -17064; const int16_t HASH_KEYWORD_SPEED28 = -17064;
const int16_t HASH_KEYWORD_SPEED128 = 25816; const int16_t HASH_KEYWORD_SPEED128 = 25816;
const int16_t HASH_KEYWORD_RAILCOM = 29097; const int16_t HASH_KEYWORD_RAILCOM = -29097;
int16_t DCCEXParser::stashP[MAX_COMMAND_PARAMS]; int16_t DCCEXParser::stashP[MAX_COMMAND_PARAMS];
bool DCCEXParser::stashBusy; bool DCCEXParser::stashBusy;

42
DCCWaveform.cpp
View File

@ -83,7 +83,15 @@ void DCCWaveform::interruptHandler() {
progTrack.state=stateTransform[progTrack.state]; progTrack.state=stateTransform[progTrack.state];
// WAVE_START is at start of bit where we need to find
// out if this is an railcom start or stop time
if (useRailcom) {
if (mainTrack.state==WAVE_START) mainTrack.railcom2();
if (progTrack.state==WAVE_START) progTrack.railcom2();
}
// WAVE_PENDING means we dont yet know what the next bit is // WAVE_PENDING means we dont yet know what the next bit is
// so call interrupt2 to set it
if (mainTrack.state==WAVE_PENDING) mainTrack.interrupt2(); if (mainTrack.state==WAVE_PENDING) mainTrack.interrupt2();
if (progTrack.state==WAVE_PENDING) progTrack.interrupt2(); if (progTrack.state==WAVE_PENDING) progTrack.interrupt2();
else if (progTrack.ackPending) progTrack.checkAck(); else if (progTrack.ackPending) progTrack.checkAck();
@ -217,6 +225,28 @@ const bool DCCWaveform::signalTransform[]={
/* WAVE_LOW_0 -> */ LOW, /* WAVE_LOW_0 -> */ LOW,
/* WAVE_PENDING (should not happen) -> */ LOW}; /* WAVE_PENDING (should not happen) -> */ LOW};
void DCCWaveform::railcom2() {
volatile bool cutout;
if (remainingPreambles==(requiredPreambles-2)) {
cutout=true;
goto doit;
}
else if (remainingPreambles==(requiredPreambles-6)) {
cutout=false;
goto doit;
}
return; // neiter start or end of cutout, do nothing
doit:
if (isMainTrack) {
if (progTrackSyncMain) // we are main track and synced so we take care of prog track as well
progTrack.motorDriver->setRailcomCutout(cutout);
mainTrack.motorDriver->setRailcomCutout(cutout);
} else {
if (!progTrackSyncMain) // we are prog track and not synced so we take care of ourselves
progTrack.motorDriver->setRailcomCutout(cutout);
}
}
void DCCWaveform::interrupt2() { void DCCWaveform::interrupt2() {
// calculate the next bit to be sent: // calculate the next bit to be sent:
// set state WAVE_MID_1 for a 1=bit // set state WAVE_MID_1 for a 1=bit
@ -226,18 +256,10 @@ void DCCWaveform::interrupt2() {
state=WAVE_MID_1; // switch state to trigger LOW on next interrupt state=WAVE_MID_1; // switch state to trigger LOW on next interrupt
remainingPreambles--; remainingPreambles--;
// Railcom cutout processing but not on prog if synced with main
if (useRailcom && (isMainTrack || !progTrackSyncMain)) do {
bool cutout;
if (remainingPreambles==(requiredPreambles-2)) cutout=true;
else if (remainingPreambles==(requiredPreambles-6)) cutout=false;
else break;
motorDriver->setRailcomCutout(cutout);
if (progTrackSyncMain) progTrack.motorDriver->setRailcomCutout(cutout);
} while(false); // this is to allow break out of do {...} above
// Update free memory diagnostic as we don't have anything else to do this time. // Update free memory diagnostic as we don't have anything else to do this time.
// Allow for checkAck and its called functions using 22 bytes more. // Allow for checkAck and its called functions using 22 bytes more.
// Don't need to do that more than once per packet
if (remainingPreambles == 3)
updateMinimumFreeMemory(22); updateMinimumFreeMemory(22);
return; return;
} }

1
DCCWaveform.h
View File

@ -122,6 +122,7 @@ class DCCWaveform {
static void interruptHandler(); static void interruptHandler();
void interrupt2(); void interrupt2();
void railcom2();
void checkAck(); void checkAck();
bool isMainTrack; bool isMainTrack;