|
|
@@ -43,7 +43,7 @@ const int _CAN_8_EMPTY = 0x07 ;
|
|
|
|
|
|
struct _Slave_Ports_Protocol_CAN_message_S {
|
|
|
_CAN_REMOTE_ID_T _CAN_REMOTE_ID ; // 1remote id - use FF for broadcast
|
|
|
- const _CAN_SENDER_ID_T _CAN_SENDER_ID = Active_ControllerID_HEX ; //2 sender //Device which orginated port
|
|
|
+ const _CAN_SENDER_ID_T _CAN_SENDER_ID = EEPROM_Active_ControllerID_read_A ;// Active_ControllerID_HEX ; //2 sender //Device which orginated port
|
|
|
int Port_ID ; //3 global id for device //const char * const _Protocol;
|
|
|
PortTypes_T PortTypes; //4 0xFF = 1111 1111 s
|
|
|
//int Address ; //
|
|
|
@@ -58,7 +58,7 @@ const int _CAN_8_EMPTY = 0x07 ;
|
|
|
|
|
|
struct _Slave_Ports_Protocol_CAN_broadcast_S {
|
|
|
const _CAN_REMOTE_ID_T _CAN_REMOTE_ID = _CAN_REMOTE_ID_BROADCAST ; // 1remote id - use FF for broadcast
|
|
|
- const _CAN_SENDER_ID_T _CAN_SENDER_ID = Active_ControllerID_HEX ; //2 sender //Device which orginated port
|
|
|
+ const _CAN_SENDER_ID_T _CAN_SENDER_ID = EEPROM_Active_ControllerID_read_A ;//Active_ControllerID_HEX ; //2 sender //Device which orginated port
|
|
|
int Port_ID ; //3 global id for device //const char * const _Protocol;
|
|
|
PortTypes_T PortTypes; //4 0xFF = 1111 1111 s
|
|
|
//int Address ; //
|
|
|
@@ -78,7 +78,7 @@ typedef struct _Slave_Ports_Protocol_CAN_broadcast_S _Slave_Ports_Protocol_CAN_b
|
|
|
|
|
|
struct Slave_Ports_Protocol_CAN_request_confirm_Exp_state_S {
|
|
|
const _CAN_REMOTE_ID_T _CAN_REMOTE_ID = _CAN_REMOTE_ID_BROADCAST ;
|
|
|
- const _CAN_SENDER_ID_T _CAN_SENDER_ID = Active_ControllerID_HEX ; //2 sender //Device which orginated port
|
|
|
+ const _CAN_SENDER_ID_T _CAN_SENDER_ID = EEPROM_Active_ControllerID_read_A ;//Active_ControllerID_HEX ; //2 sender //Device which orginated port
|
|
|
int Port_ID ; //3 global id for device //const char * const _Protocol;
|
|
|
PortTypes_T PortTypes; //4 0xFF = 1111 1111 s
|
|
|
Exp_state_T Exp_state; //5
|
|
|
@@ -97,7 +97,7 @@ typedef struct Slave_Ports_Protocol_CAN_request_confirm_Exp_state_S Slave_Ports_
|
|
|
|
|
|
struct _Slave_Ports_Protocol_CAN_request_set_new_Exp_state_S {
|
|
|
_CAN_REMOTE_ID_T _CAN_REMOTE_ID ; // 1remote id - use FF for broadcast
|
|
|
- const _CAN_SENDER_ID_T _CAN_SENDER_ID = Active_ControllerID_HEX ; //2 sender //Device which orginated port
|
|
|
+ const _CAN_SENDER_ID_T _CAN_SENDER_ID = EEPROM_Active_ControllerID_read_A ;//Active_ControllerID_HEX ; //2 sender //Device which orginated port
|
|
|
int Port_ID ; //3 global id for device //const char * const _Protocol;
|
|
|
PortTypes_T PortTypes; //4 0xFF = 1111 1111 s
|
|
|
Exp_state_T Exp_state; //5
|
|
|
@@ -114,7 +114,7 @@ typedef int _CAN_SEND_1_T ; //1 byte = 0
|
|
|
typedef int _CAN_SEND_2_T ; //2 byte = 8
|
|
|
|
|
|
struct _Slave_Ports_Protocol_CAN_SEND_S {
|
|
|
- const _CAN_SENDER_ID_T _CAN_SENDER_ID = Active_ControllerID_HEX ;
|
|
|
+ const _CAN_SENDER_ID_T _CAN_SENDER_ID = EEPROM_Active_ControllerID_read_A ; //Active_ControllerID_HEX ;
|
|
|
const _CAN_SEND_1_T _CAN_SEND_1 = 0 ;
|
|
|
const _CAN_SEND_2_T _CAN_SEND_2 = 8 ;
|
|
|
_Slave_Ports_Protocol_CAN_broadcast_T _Slave_Ports_Protocol_CAN_broadcast_A ;
|