easylinux/NmraDcc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated the examples to reflect the removal of support for the two call-back functions: notifyDccAccState(), notifyDccSigState()

Browse Source
This commit is contained in:
Alex Shepherd
2018-02-28 23:50:59 +13:00
parent 90470987a8
commit ec801bf463
8 changed files with 48 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
examples/NmraValidation/Accessory_Test/Accessory_Test.ino
View File

@@ -134,24 +134,6 @@ void notifyCVResetFactoryDefault()
FactoryDefaultCVIndex = sizeof(FactoryDefaultCVs)/sizeof(CVPair);
};
// This function is called whenever a normal DCC Turnout Packet is received
#define NOTITY_DCC_ACC_STATE
#ifdef NOTITY_DCC_ACC_STATE
void notifyDccAccState( uint16_t Addr, uint16_t BoardAddr, uint8_t OutputAddr, uint8_t State)
{
if (ShowData & S_DCC) {
Serial.print("notifyDccAccState: ") ;
Serial.print(Addr,DEC) ;
Serial.print(',');
Serial.print(BoardAddr,DEC) ;
Serial.print(',');
Serial.print(OutputAddr,DEC) ;
Serial.print(',');
Serial.println(State, HEX) ;
}
}
#endif // NOTITY_DCC_ACC_STATE
// This function is called whenever a normal DCC Turnout Packet is received
#define NOTITY_DCC_ACC_TURNOUT_BOARD
#ifdef NOTITY_DCC_ACC_TURNOUT_BOARD
@@ -202,7 +184,7 @@ void notifyDccAccTurnoutOutput( uint16_t Addr, uint8_t Direction, uint8_t Output
// if NOTIFY_DCC_SIG_STATE and SIGNAL_DCC are defined.
#define NOTITY_DCC_SIG_STATE
#if defined(NOTITY_DCC_SIG_STATE) && defined(SIGNAL_DCC)
void notifyDccSigState( uint16_t Addr, uint8_t OutputIndex, uint8_t State)
void notifyDccSigOutputState( uint16_t Addr, uint8_t State)
{
#ifdef DO_SCOPE
digitalWrite(SCOPE_PIN, HIGH);
@@ -210,11 +192,9 @@ void notifyDccSigState( uint16_t Addr, uint8_t OutputIndex, uint8_t State)
#endif // DO_SCOPE
if (ShowData & S_DCC) {
Serial.print("notifyDccSigState: ") ;
Serial.print("notifyDccSigOutputState: ") ;
Serial.print(Addr,DEC) ;
Serial.print(',');
Serial.print(OutputIndex,DEC) ;
Serial.print(',');
Serial.println(State, DEC) ;
}