dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-23 21:01:25 +01:00
Code Releases Activity

Merge branch 'frightrisk-outputs' of https://github.com/DCC-EX/CommandStation-EX into frightrisk-outputs

Browse Source 
Conflicts:
	DCCEXParser.cpp
This commit is contained in:
Harald Barth 2020-10-28 20:41:25 +01:00
commit 1a1dbb42bc
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DCCEXParser.cpp
View File

@ -423,7 +423,7 @@ bool DCCEXParser::parseZ(Print *stream, int params, int p[])
switch (params) switch (params)
{ {
case 2: // <Z ID ACTIVATE> case 2: // <Z ID ACTIVATE>
{ {
Output *o = Output::get(p[0]); Output *o = Output::get(p[0]);

1
Outputs.cpp
View File

@ -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) 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) if(num>0)
EEPROM.put(num,data.oStatus); EEPROM.put(num,data.oStatus);
} }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////