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

Merge branch 'EX-RAIL' into EX-RAIL-Ash

Browse Source
This commit is contained in:
Ash-4
2021-09-11 13:32:17 -05:00
committed by GitHub
parent ebabbbe59e 4121a5f4da
commit 72528658be
10 changed files with 291 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DCC.cpp
View File

@@ -757,7 +757,7 @@ void DCC::ackManagerLoop() {
// (typically waiting for a reset counter or ACK waiting, or when all finished.)
switch (opcode) {
case BASELINE:
if (DCCWaveform::progTrack.getPowerMode()==POWERMODE::OVERLOAD) return;
if (DCCWaveform::progTrack.getPowerMode()==POWERMODE::OVERLOAD) return;
if (checkResets(DCCWaveform::progTrack.autoPowerOff || ackManagerRejoin ? 20 : 3)) return;
DCCWaveform::progTrack.setAckBaseline();
callbackState=READY;