diff --git a/examples/SMA/AccDec_13Servos_4LED_6Ftn/AccDec_13Servos_4LED_6Ftn.ino b/examples/SMA/AccDec_13Servos_4LED_6Ftn/AccDec_13Servos_4LED_6Ftn.ino index f4b649c..b887187 100755 --- a/examples/SMA/AccDec_13Servos_4LED_6Ftn/AccDec_13Servos_4LED_6Ftn.ino +++ b/examples/SMA/AccDec_13Servos_4LED_6Ftn/AccDec_13Servos_4LED_6Ftn.ino @@ -370,24 +370,20 @@ void loop() //**************************************************************** } } -extern void notifyDccAccState( uint16_t Addr, uint16_t BoardAddr, uint8_t OutputAddr, uint8_t State) { - uint16_t Current_Decoder_Addr; - uint8_t Bit_State; - Current_Decoder_Addr = Dcc.getAddr(); - Bit_State = OutputAddr & 0x01; +extern void notifyDccAccTurnoutOutput( uint16_t Addr, uint8_t Direction, uint8_t OutputPower ) { + uint16_t Current_Decoder_Addr = Dcc.getAddr(); if ( Addr >= Current_Decoder_Addr && Addr < Current_Decoder_Addr+17) { //Controls Accessory_Address+16 #ifdef DEBUG Serial.print("Addr = "); Serial.println(Addr); - Serial.print("BoardAddr = "); - Serial.println(BoardAddr); - Serial.print("Bit_State = "); - Serial.println(Bit_State); + Serial.print("Direction = "); + Serial.println(Direction); #endif - exec_function(Addr-Current_Decoder_Addr, Bit_State ); + exec_function(Addr-Current_Decoder_Addr, Direction ); } } + void exec_function (int function, int FuncState) { byte pin; int servo_temp; diff --git a/examples/SMA/AccDec_15Servos_2LED_6Ftn/AccDec_15Servos_2LED_6Ftn.ino b/examples/SMA/AccDec_15Servos_2LED_6Ftn/AccDec_15Servos_2LED_6Ftn.ino index ce96f16..087fe6d 100755 --- a/examples/SMA/AccDec_15Servos_2LED_6Ftn/AccDec_15Servos_2LED_6Ftn.ino +++ b/examples/SMA/AccDec_15Servos_2LED_6Ftn/AccDec_15Servos_2LED_6Ftn.ino @@ -370,24 +370,20 @@ void loop() //**************************************************************** } } -extern void notifyDccAccState( uint16_t Addr, uint16_t BoardAddr, uint8_t OutputAddr, uint8_t State) { - uint16_t Current_Decoder_Addr; - uint8_t Bit_State; - Current_Decoder_Addr = Dcc.getAddr(); - Bit_State = OutputAddr & 0x01; +extern void notifyDccAccTurnoutOutput( uint16_t Addr, uint8_t Direction, uint8_t OutputPower ) { + uint16_t Current_Decoder_Addr = Dcc.getAddr(); if ( Addr >= Current_Decoder_Addr && Addr < Current_Decoder_Addr+17) { //Controls Accessory_Address+16 #ifdef DEBUG Serial.print("Addr = "); Serial.println(Addr); - Serial.print("BoardAddr = "); - Serial.println(BoardAddr); - Serial.print("Bit_State = "); - Serial.println(Bit_State); + Serial.print("Direction = "); + Serial.println(Direction); #endif - exec_function(Addr-Current_Decoder_Addr, Bit_State ); + exec_function(Addr-Current_Decoder_Addr, Direction ); } } + void exec_function (int function, int FuncState) { byte pin; int servo_temp; diff --git a/examples/SMA/AccDec_17LED_1Ftn/AccDec_17LED_1Ftn.ino b/examples/SMA/AccDec_17LED_1Ftn/AccDec_17LED_1Ftn.ino index 4c7152a..658bfe3 100755 --- a/examples/SMA/AccDec_17LED_1Ftn/AccDec_17LED_1Ftn.ino +++ b/examples/SMA/AccDec_17LED_1Ftn/AccDec_17LED_1Ftn.ino @@ -93,9 +93,8 @@ void loop() // You MUST call the NmraDcc.process() method frequently from the Arduino loop() function for correct library operation Dcc.process(); } -extern void notifyDccAccState( uint16_t Addr, uint16_t BoardAddr, uint8_t OutputAddr, uint8_t State) { - uint8_t Bit_State = OutputAddr & 0x01; +extern void notifyDccAccTurnoutOutput( uint16_t Addr, uint8_t Direction, uint8_t OutputPower ) { if ( Addr >= This_Decoder_Address && Addr < This_Decoder_Address+17) //Controls This_Decoder_Address+16 - digitalWrite( ledpins[Addr-This_Decoder_Address], Bit_State ); + digitalWrite( ledpins[Addr-This_Decoder_Address], Direction ); } diff --git a/examples/SMA/AccDec_17LED_6Ftn/AccDec_17LED_6Ftn.ino b/examples/SMA/AccDec_17LED_6Ftn/AccDec_17LED_6Ftn.ino index 806495b..fea3c93 100755 --- a/examples/SMA/AccDec_17LED_6Ftn/AccDec_17LED_6Ftn.ino +++ b/examples/SMA/AccDec_17LED_6Ftn/AccDec_17LED_6Ftn.ino @@ -370,24 +370,20 @@ void loop() //**************************************************************** } } -extern void notifyDccAccState( uint16_t Addr, uint16_t BoardAddr, uint8_t OutputAddr, uint8_t State) { - uint16_t Current_Decoder_Addr; - uint8_t Bit_State; - Current_Decoder_Addr = Dcc.getAddr(); - Bit_State = OutputAddr & 0x01; +extern void notifyDccAccTurnoutOutput( uint16_t Addr, uint8_t Direction, uint8_t OutputPower ) { + uint16_t Current_Decoder_Addr = Dcc.getAddr(); if ( Addr >= Current_Decoder_Addr && Addr < Current_Decoder_Addr+17) { //Controls Accessory_Address+16 #ifdef DEBUG Serial.print("Addr = "); Serial.println(Addr); - Serial.print("BoardAddr = "); - Serial.println(BoardAddr); - Serial.print("Bit_State = "); - Serial.println(Bit_State); + Serial.print("Direction = "); + Serial.println(Direction); #endif - exec_function(Addr-Current_Decoder_Addr, Bit_State ); + exec_function(Addr-Current_Decoder_Addr, Direction ); } } + void exec_function (int function, int FuncState) { byte pin; int servo_temp; diff --git a/examples/SMA/AccDec_7ServoBackandForth6Ftn/AccDec_7ServoBackandForth6Ftn.ino b/examples/SMA/AccDec_7ServoBackandForth6Ftn/AccDec_7ServoBackandForth6Ftn.ino index a32accd..73ddc2d 100755 --- a/examples/SMA/AccDec_7ServoBackandForth6Ftn/AccDec_7ServoBackandForth6Ftn.ino +++ b/examples/SMA/AccDec_7ServoBackandForth6Ftn/AccDec_7ServoBackandForth6Ftn.ino @@ -352,24 +352,20 @@ void loop() //**************************************************************** } } -extern void notifyDccAccState( uint16_t Addr, uint16_t BoardAddr, uint8_t OutputAddr, uint8_t State) { - uint16_t Current_Decoder_Addr; - uint8_t Bit_State; - Current_Decoder_Addr = Dcc.getAddr(); - Bit_State = OutputAddr & 0x01; +extern void notifyDccAccTurnoutOutput( uint16_t Addr, uint8_t Direction, uint8_t OutputPower ) { + uint16_t Current_Decoder_Addr = Dcc.getAddr(); if ( Addr >= Current_Decoder_Addr && Addr < Current_Decoder_Addr+17) { //Controls Accessory_Address+16 #ifdef DEBUG Serial.print("Addr = "); Serial.println(Addr); - Serial.print("BoardAddr = "); - Serial.println(BoardAddr); - Serial.print("Bit_State = "); - Serial.println(Bit_State); + Serial.print("Direction = "); + Serial.println(Direction); #endif - exec_function(Addr-Current_Decoder_Addr, Bit_State ); + exec_function(Addr-Current_Decoder_Addr, Direction ); } } + void exec_function (int function, int FuncState) { byte pin; int servo_temp; diff --git a/examples/SMA/AccDec_7Servos_10LED_6Ftn/AccDec_7Servos_10LED_6Ftn.ino b/examples/SMA/AccDec_7Servos_10LED_6Ftn/AccDec_7Servos_10LED_6Ftn.ino index 661b7b3..ae92e0a 100755 --- a/examples/SMA/AccDec_7Servos_10LED_6Ftn/AccDec_7Servos_10LED_6Ftn.ino +++ b/examples/SMA/AccDec_7Servos_10LED_6Ftn/AccDec_7Servos_10LED_6Ftn.ino @@ -370,24 +370,20 @@ void loop() //**************************************************************** } } -extern void notifyDccAccState( uint16_t Addr, uint16_t BoardAddr, uint8_t OutputAddr, uint8_t State) { - uint16_t Current_Decoder_Addr; - uint8_t Bit_State; - Current_Decoder_Addr = Dcc.getAddr(); - Bit_State = OutputAddr & 0x01; +extern void notifyDccAccTurnoutOutput( uint16_t Addr, uint8_t Direction, uint8_t OutputPower ) { + uint16_t Current_Decoder_Addr = Dcc.getAddr(); if ( Addr >= Current_Decoder_Addr && Addr < Current_Decoder_Addr+17) { //Controls Accessory_Address+16 #ifdef DEBUG Serial.print("Addr = "); Serial.println(Addr); - Serial.print("BoardAddr = "); - Serial.println(BoardAddr); - Serial.print("Bit_State = "); - Serial.println(Bit_State); + Serial.print("Direction = "); + Serial.println(Direction); #endif - exec_function(Addr-Current_Decoder_Addr, Bit_State ); + exec_function(Addr-Current_Decoder_Addr, Direction ); } } + void exec_function (int function, int FuncState) { byte pin; int servo_temp;