dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2025-01-23 11:08:52 +01:00
Code Releases Activity

more merge

Browse Source
This commit is contained in:
Harald Barth 2020-07-04 21:44:36 +02:00
parent ac3c8661a6
commit e244de7835
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DCCWaveform.cpp
View File

@ -164,6 +164,7 @@ bool DCCWaveform::interrupt1() {
if (ackPending) checkAck();
return false;
}
@ -295,6 +296,6 @@ void DCCWaveform::checkAck() {
ackPending=false;
transmitRepeats=0; // shortcut remaining repeat packets
return; // we have a genuine ACK result
}
}
ackPulseStart=0; // We have detected a too-short or too-long pulse so ignore and wait for next leading edge
}

4
Hardware.cpp
View File

@ -65,6 +65,10 @@ int Hardware::getCurrentRaw(bool isMainTrack) {
}
unsigned int Hardware::getCurrentMilliamps(bool isMainTrack, int raw) {
return (int)(raw * (isMainTrack ? MAIN_SENSE_FACTOR : PROG_SENSE_FACTOR));
}
void Hardware::setCallback(int duration, void (*isr)()) {
Timer1.initialize(duration);
// We don't want the timer to set pins because these often clash with motor shields etc.