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:40:08 +02:00
parent 90e4f3ea19
commit ac3c8661a6
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
DCCWaveform.cpp
View File

@ -211,11 +211,7 @@ void DCCWaveform::interrupt2() {
if (sentResetsSincePacket<250) sentResetsSincePacket++; if (sentResetsSincePacket<250) sentResetsSincePacket++;
} }
} }
<<<<<<< HEAD
} }
=======
}
>>>>>>> master
} }
@ -292,13 +288,8 @@ void DCCWaveform::checkAck() {
// detected trailing edge of pulse // detected trailing edge of pulse
ackPulseDuration=micros()-ackPulseStart; ackPulseDuration=micros()-ackPulseStart;
<<<<<<< HEAD
if (ackPulseDuration>3000 && ackPulseDuration<8500) {
=======
if (ackPulseDuration>=MIN_ACK_PULSE_DURATION && ackPulseDuration<=MAX_ACK_PULSE_DURATION) { if (ackPulseDuration>=MIN_ACK_PULSE_DURATION && ackPulseDuration<=MAX_ACK_PULSE_DURATION) {
>>>>>>> master
ackCheckDuration=millis()-ackCheckStart; ackCheckDuration=millis()-ackCheckStart;
ackDetected=true; ackDetected=true;
ackPending=false; ackPending=false;