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

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

This commit is contained in:
Asbelos 2022-07-06 22:26:44 +01:00
commit 12b5c2cdba

View File

@ -308,16 +308,17 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
address=p[0]; address=p[0];
subaddress=p[1]; subaddress=p[1];
activep=2; activep=2;
if ((p[3] < 0) || (p[3] > 1)) // invalid onoff 0|1
break;
onoff=p[3]; onoff=p[3];
} }
else break; // invalid no of parameters else break; // invalid no of parameters
if ( if (
((address & 0x01FF) != address) // invalid address (limit 9 bits ) ((address & 0x01FF) != address) // invalid address (limit 9 bits)
|| ((subaddress & 0x03) != subaddress) // invalid subaddress (limit 2 bits ) || ((subaddress & 0x03) != subaddress) // invalid subaddress (limit 2 bits)
|| ((p[activep] & 0x01) != p[activep]) // invalid activate 0|1 || (p[activep] > 1) || (p[activep] < 0) // invalid activate 0|1
|| ((onoff & 0x01) != onoff) // invalid onoff 0|1 ) break;
) break;
// Honour the configuration option (config.h) which allows the <a> command to be reversed // Honour the configuration option (config.h) which allows the <a> command to be reversed
#ifdef DCC_ACCESSORY_COMMAND_REVERSE #ifdef DCC_ACCESSORY_COMMAND_REVERSE
DCC::setAccessory(address, subaddress,p[activep]==0,onoff); DCC::setAccessory(address, subaddress,p[activep]==0,onoff);