mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-12-23 21:01:25 +01:00
Merge branch 'frightrisk-outputs' of https://github.com/DCC-EX/CommandStation-EX into frightrisk-outputs
Conflicts: DCCEXParser.cpp
This commit is contained in:
commit
1a1dbb42bc
@ -423,7 +423,7 @@ bool DCCEXParser::parseZ(Print *stream, int params, int p[])
|
||||
|
||||
switch (params)
|
||||
{
|
||||
|
||||
|
||||
case 2: // <Z ID ACTIVATE>
|
||||
{
|
||||
Output *o = Output::get(p[0]);
|
||||
|
@ -90,7 +90,6 @@ void Output::activate(int s){
|
||||
digitalWrite(data.pin,data.oStatus ^ bitRead(data.iFlag,0)); // set state of output pin to HIGH or LOW depending on whether bit zero of iFlag is set to 0 (ACTIVE=HIGH) or 1 (ACTIVE=LOW)
|
||||
if(num>0)
|
||||
EEPROM.put(num,data.oStatus);
|
||||
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
Loading…
Reference in New Issue
Block a user