mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-12-24 13:21:23 +01:00
Correct merge issues from master
This commit is contained in:
parent
4437f870b6
commit
7e3dcb8e8c
@ -808,12 +808,6 @@ void RMFT2::loop2() {
|
|||||||
DCCWaveform::setJoin(false);
|
DCCWaveform::setJoin(false);
|
||||||
CommandDistributor::broadcastPower();
|
CommandDistributor::broadcastPower();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case OPCODE_POWERON:
|
|
||||||
DCCWaveform::mainTrack.setPowerMode(POWERMODE::ON);
|
|
||||||
DCC::setProgTrackSyncMain(false);
|
|
||||||
CommandDistributor::broadcastPower();
|
|
||||||
break;
|
|
||||||
|
|
||||||
case OPCODE_UNJOIN:
|
case OPCODE_UNJOIN:
|
||||||
DCCWaveform::setJoin(false);
|
DCCWaveform::setJoin(false);
|
||||||
|
@ -542,8 +542,8 @@ void WiThrottle::getLocoCallback(int16_t locoid) {
|
|||||||
char addcmd[20]={'M',stashThrottleChar,'+', addrchar};
|
char addcmd[20]={'M',stashThrottleChar,'+', addrchar};
|
||||||
itoa(locoid,addcmd+4,10);
|
itoa(locoid,addcmd+4,10);
|
||||||
stashInstance->multithrottle(stashStream, (byte *)addcmd);
|
stashInstance->multithrottle(stashStream, (byte *)addcmd);
|
||||||
DCCWaveform::progTrack.setPowerMode(POWERMODE::ON);
|
TrackManager::setMainPower(POWERMODE::ON);
|
||||||
DCC::setProgTrackSyncMain(true); // <1 JOIN> so we can drive loco away
|
DCCWaveform::setJoin(true); // <1 JOIN> so we can drive loco away
|
||||||
stashStream->commit();
|
stashStream->commit();
|
||||||
CommandDistributor::broadcastPower();
|
CommandDistributor::broadcastPower();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user