diff --git a/APP/FC7240_flash.ld b/APP/FC7240_flash.ld index 2003bb3..0e003a3 100644 --- a/APP/FC7240_flash.ld +++ b/APP/FC7240_flash.ld @@ -177,20 +177,6 @@ SECTIONS { __itcm_start = .; - /* Начало .caldata */ - __caldata_start = .; - KEEP(*(.caldata)) - . = ALIGN(4); - - /* Проверяем и резервируем 20K */ - __caldata_actual_size = . - __caldata_start; - ASSERT(__caldata_actual_size <= 20K, "Ошибка: .caldata превышает 20K!"); - - /* Если данные меньше 20K, резервируем оставшееся пространство */ - . = __caldata_start + 20K; - - KEEP(*(.nvmdata)) - __itcm_end = .; . = ALIGN(4); } > ITCM @@ -198,6 +184,20 @@ SECTIONS .xcp_data(NOLOAD) : { + /* Начало .caldata */ + __caldata_start = .; + KEEP(*(.caldata)) + . = ALIGN(4); + + /* Проверяем и резервируем 20K */ + __caldata_actual_size = . - __caldata_start; + ASSERT(__caldata_actual_size <= 20K, "Ошибка: .caldata превышает 20K!"); + + /* Если данные меньше 20K, резервируем оставшееся пространство */ + . = __caldata_start + 20K; + + KEEP(*(.nvmdata)) + . = ALIGN(4); KEEP(*(.save_data)) . = ALIGN(4); diff --git a/MODULES/HVAC_M7_CAN_DBG_MATRIX/butl/ccu_candb_dbg-binutil.c b/MODULES/HVAC_M7_CAN_DBG_MATRIX/butl/ccu_candb_dbg-binutil.c index 01f677c..0bb9251 100644 --- a/MODULES/HVAC_M7_CAN_DBG_MATRIX/butl/ccu_candb_dbg-binutil.c +++ b/MODULES/HVAC_M7_CAN_DBG_MATRIX/butl/ccu_candb_dbg-binutil.c @@ -7,6 +7,9 @@ #error The CCU_CANDB_DBG binutil source file has inconsistency with core dbc lib! #endif +ccu_candb_dbg_rx_t ccu_candb_dbg_rx; +ccu_candb_dbg_tx_t ccu_candb_dbg_tx; + #ifdef __DEF_CCU_CANDB_DBG__ ccu_candb_dbg_rx_t ccu_candb_dbg_rx; diff --git a/MODULES/HVAC_M7_CAN_DBG_MATRIX/butl/ccu_candb_dbg-binutil.h b/MODULES/HVAC_M7_CAN_DBG_MATRIX/butl/ccu_candb_dbg-binutil.h index e15bae2..4bd67b3 100644 --- a/MODULES/HVAC_M7_CAN_DBG_MATRIX/butl/ccu_candb_dbg-binutil.h +++ b/MODULES/HVAC_M7_CAN_DBG_MATRIX/butl/ccu_candb_dbg-binutil.h @@ -10,53 +10,56 @@ extern "C" { #include "candb_dbg.h" -typedef struct { - dbg_Cmd_Act_Information_t dbg_Cmd_Act_Information; - XCP_CCU_RX_t XCP_CCU_RX; +typedef struct +{ + dbg_Cmd_Act_Information_t dbg_Cmd_Act_Information; + XCP_CCU_RX_t XCP_CCU_RX; } ccu_candb_dbg_rx_t; - -typedef struct { - dbg_Logic_State_t dbg_Logic_State; - dbg_Logic_KM_Status_t dbg_Logic_KM_Status; - dbg_Logic_Valve_t dbg_Logic_Valve; - dbg_Logic_Blower_t dbg_Logic_Blower; - dbg_Logic_Ac_t dbg_Logic_Ac; - dbg_Logic_Rec_t dbg_Logic_Rec; - dbg_DiffBlr_ValveOpen_t dbg_DiffBlr_ValveOpen; - dbg_Act0_t dbg_Act0; - dbg_Act1_t dbg_Act1; - dbg_Act2_t dbg_Act2; - dbg_Sen_Amb_t dbg_Sen_Amb; - dbg_Sen_0_t dbg_Sen_0; - dbg_CCU_IO_t dbg_CCU_IO; - dbg_CCU_Info_t dbg_CCU_Info; - dbg_Drs_t dbg_Drs; - dbg_Sen_Incar_t dbg_Sen_Incar; - dbg_Info_Act1_t dbg_Info_Act1; - dbg_Info_Act2_t dbg_Info_Act2; - dbg_Sen_Eva_t dbg_Sen_Eva; - dbg_Sen_Duct_t dbg_Sen_Duct; - dbg_Sen_Demist_t dbg_Sen_Demist; - dbg_LIN_AirQS_Stat_t dbg_LIN_AirQS_Stat; - dbg_LIN_Aroma_Stat_t dbg_LIN_Aroma_Stat; - dbg_LIN_Ionizer_Stat_t dbg_LIN_Ionizer_Stat; - dbg_LIN_eTXV_Stat_t dbg_LIN_eTXV_Stat; - dbg_LIN_DRS_Stat_t dbg_LIN_DRS_Stat; - dbg_Auto_AF_t dbg_Auto_AF; - dbg_Auto_Duct_t dbg_Auto_Duct; - dbg_Auto_Valve_Plus_t dbg_Auto_Valve_Plus; - XCP_CCU_TX_t XCP_CCU_TX; - dbg_Stat_PID_t dbg_stat_PID; +typedef struct +{ + dbg_Logic_State_t dbg_Logic_State; + dbg_Logic_KM_Status_t dbg_Logic_KM_Status; + dbg_Logic_Valve_t dbg_Logic_Valve; + dbg_Logic_Blower_t dbg_Logic_Blower; + dbg_Logic_Ac_t dbg_Logic_Ac; + dbg_Logic_Rec_t dbg_Logic_Rec; + dbg_DiffBlr_ValveOpen_t dbg_DiffBlr_ValveOpen; + dbg_Act0_t dbg_Act0; + dbg_Act1_t dbg_Act1; + dbg_Act2_t dbg_Act2; + dbg_Sen_Amb_t dbg_Sen_Amb; + dbg_PID_tune_t dbg_PID_tune; + dbg_Sen_0_t dbg_Sen_0; + dbg_CCU_IO_t dbg_CCU_IO; + dbg_CCU_Info_t dbg_CCU_Info; + dbg_Drs_t dbg_Drs; + dbg_Sen_Incar_t dbg_Sen_Incar; + dbg_Info_Act1_t dbg_Info_Act1; + dbg_Info_Act2_t dbg_Info_Act2; + dbg_Sen_Eva_t dbg_Sen_Eva; + dbg_Sen_Duct_t dbg_Sen_Duct; + dbg_Sen_Demist_t dbg_Sen_Demist; + dbg_LIN_AirQS_Stat_t dbg_LIN_AirQS_Stat; + dbg_LIN_Aroma_Stat_t dbg_LIN_Aroma_Stat; + dbg_LIN_Ionizer_Stat_t dbg_LIN_Ionizer_Stat; + dbg_LIN_eTXV_Stat_t dbg_LIN_eTXV_Stat; + dbg_LIN_DRS_Stat_t dbg_LIN_DRS_Stat; + dbg_Auto_AF_t dbg_Auto_AF; + dbg_Auto_Duct_t dbg_Auto_Duct; + dbg_Auto_Valve_Plus_t dbg_Auto_Valve_Plus; + dbg_Act_calibration_error_t dbg_Act_calibration_error; + dbg_Act_calibration_t dbg_Act_calibration; + XCP_CCU_TX_t XCP_CCU_TX; } ccu_candb_dbg_tx_t; -uint32_t ccu_candb_dbg_Receive(ccu_candb_dbg_rx_t *m, const uint8_t *d, uint32_t msgid, uint8_t dlc); +uint32_t ccu_candb_dbg_Receive(ccu_candb_dbg_rx_t* m, const uint8_t* d, uint32_t msgid, uint8_t dlc); + +extern ccu_candb_dbg_rx_t ccu_candb_dbg_rx; +extern ccu_candb_dbg_tx_t ccu_candb_dbg_tx; #ifdef __DEF_CCU_CANDB_DBG__ -extern ccu_candb_dbg_rx_t ccu_candb_dbg_rx; - -extern ccu_candb_dbg_tx_t ccu_candb_dbg_tx; #endif // __DEF_CCU_CANDB_DBG__ diff --git a/MODULES/HVAC_M7_CAN_DBG_MATRIX/butl/vector__xxx_candb_dbg-binutil.c b/MODULES/HVAC_M7_CAN_DBG_MATRIX/butl/vector__xxx_candb_dbg-binutil.c index 021044b..eacb5f4 100644 --- a/MODULES/HVAC_M7_CAN_DBG_MATRIX/butl/vector__xxx_candb_dbg-binutil.c +++ b/MODULES/HVAC_M7_CAN_DBG_MATRIX/butl/vector__xxx_candb_dbg-binutil.c @@ -11,16 +11,22 @@ vector__xxx_candb_dbg_rx_t vector__xxx_candb_dbg_rx; +vector__xxx_candb_dbg_tx_t vector__xxx_candb_dbg_tx; + #endif // __DEF_VECTOR__XXX_CANDB_DBG__ uint32_t vector__xxx_candb_dbg_Receive(vector__xxx_candb_dbg_rx_t* _m, const uint8_t* _d, uint32_t _id, uint8_t dlc_) { uint32_t recid = 0; - if ((_id >= 0x3E0U) && (_id < 0x3FFU)) { - if ((_id >= 0x3E0U) && (_id < 0x3F0U)) { - if ((_id >= 0x3E0U) && (_id < 0x3E3U)) { - if (_id == 0x3E0U) { - recid = Unpack_dbg_Logic_State_candb_dbg(&(_m->dbg_Logic_State), _d, dlc_); + if ((_id >= 0x0U) && (_id < 0x3FCU)) { + if ((_id >= 0x0U) && (_id < 0x3F0U)) { + if ((_id >= 0x0U) && (_id < 0x3E3U)) { + if ((_id >= 0x0U) && (_id < 0x3E1U)) { + if (_id == 0x0U) { + recid = Unpack_dbg_Act_calibration_error_candb_dbg(&(_m->dbg_Act_calibration_error), _d, dlc_); + } else if (_id == 0x3E0U) { + recid = Unpack_dbg_Logic_State_candb_dbg(&(_m->dbg_Logic_State), _d, dlc_); + } } else { if (_id == 0x3E1U) { recid = Unpack_dbg_Logic_KM_Status_candb_dbg(&(_m->dbg_Logic_KM_Status), _d, dlc_); @@ -44,7 +50,7 @@ uint32_t vector__xxx_candb_dbg_Receive(vector__xxx_candb_dbg_rx_t* _m, const uin } } } else { - if ((_id >= 0x3F0U) && (_id < 0x3F8U)) { + if ((_id >= 0x3F0U) && (_id < 0x3F4U)) { if ((_id >= 0x3F0U) && (_id < 0x3F2U)) { if (_id == 0x3F0U) { recid = Unpack_dbg_Act0_candb_dbg(&(_m->dbg_Act0), _d, dlc_); @@ -59,75 +65,83 @@ uint32_t vector__xxx_candb_dbg_Receive(vector__xxx_candb_dbg_rx_t* _m, const uin } } } else { - if ((_id >= 0x3F8U) && (_id < 0x3FCU)) { + if ((_id >= 0x3F4U) && (_id < 0x3F8U)) { + if (_id == 0x3F4U) { + recid = Unpack_dbg_Act_calibration_candb_dbg(&(_m->dbg_Act_calibration), _d, dlc_); + } else if (_id == 0x3F7U) { + recid = Unpack_dbg_PID_tune_candb_dbg(&(_m->dbg_PID_tune), _d, dlc_); + } + } else { if (_id == 0x3F8U) { recid = Unpack_dbg_Sen_0_candb_dbg(&(_m->dbg_Sen_0), _d, dlc_); } else if (_id == 0x3FBU) { recid = Unpack_dbg_CCU_IO_candb_dbg(&(_m->dbg_CCU_IO), _d, dlc_); } - } else { + } + } + } + } else { + if ((_id >= 0x3FCU) && (_id < 0x510U)) { + if ((_id >= 0x3FCU) && (_id < 0x402U)) { + if ((_id >= 0x3FCU) && (_id < 0x3FFU)) { if (_id == 0x3FCU) { recid = Unpack_dbg_CCU_Info_candb_dbg(&(_m->dbg_CCU_Info), _d, dlc_); } else if (_id == 0x3FDU) { recid = Unpack_dbg_Drs_candb_dbg(&(_m->dbg_Drs), _d, dlc_); } - } - } - } - } else { - if ((_id >= 0x3FFU) && (_id < 0x511U)) { - if ((_id >= 0x3FFU) && (_id < 0x504U)) { - if (_id == 0x3FFU) { - recid = Unpack_dbg_Sen_Incar_candb_dbg(&(_m->dbg_Sen_Incar), _d, dlc_); } else { - if (_id == 0x401U) { + if (_id == 0x3FFU) { + recid = Unpack_dbg_Sen_Incar_candb_dbg(&(_m->dbg_Sen_Incar), _d, dlc_); + } else if (_id == 0x401U) { recid = Unpack_dbg_Info_Act1_candb_dbg(&(_m->dbg_Info_Act1), _d, dlc_); - } else if (_id == 0x402U) { - recid = Unpack_dbg_Info_Act2_candb_dbg(&(_m->dbg_Info_Act2), _d, dlc_); } } } else { - if ((_id >= 0x504U) && (_id < 0x509U)) { - if (_id == 0x504U) { + if ((_id >= 0x402U) && (_id < 0x505U)) { + if (_id == 0x402U) { + recid = Unpack_dbg_Info_Act2_candb_dbg(&(_m->dbg_Info_Act2), _d, dlc_); + } else if (_id == 0x504U) { recid = Unpack_dbg_Sen_Eva_candb_dbg(&(_m->dbg_Sen_Eva), _d, dlc_); - } else if (_id == 0x505U) { - recid = Unpack_dbg_Sen_Duct_candb_dbg(&(_m->dbg_Sen_Duct), _d, dlc_); } } else { - if (_id == 0x509U) { + if (_id == 0x505U) { + recid = Unpack_dbg_Sen_Duct_candb_dbg(&(_m->dbg_Sen_Duct), _d, dlc_); + } else if (_id == 0x509U) { recid = Unpack_dbg_Sen_Demist_candb_dbg(&(_m->dbg_Sen_Demist), _d, dlc_); - } else if (_id == 0x510U) { - recid = Unpack_dbg_LIN_AirQS_Stat_candb_dbg(&(_m->dbg_LIN_AirQS_Stat), _d, dlc_); } } } } else { - if ((_id >= 0x511U) && (_id < 0x520U)) { - if ((_id >= 0x511U) && (_id < 0x514U)) { - if (_id == 0x511U) { + if ((_id >= 0x510U) && (_id < 0x518U)) { + if ((_id >= 0x510U) && (_id < 0x513U)) { + if (_id == 0x510U) { + recid = Unpack_dbg_LIN_AirQS_Stat_candb_dbg(&(_m->dbg_LIN_AirQS_Stat), _d, dlc_); + } else if (_id == 0x511U) { recid = Unpack_dbg_LIN_Aroma_Stat_candb_dbg(&(_m->dbg_LIN_Aroma_Stat), _d, dlc_); - } else if (_id == 0x513U) { - recid = Unpack_dbg_LIN_Ionizer_Stat_candb_dbg(&(_m->dbg_LIN_Ionizer_Stat), _d, dlc_); } } else { - if (_id == 0x514U) { + if (_id == 0x513U) { + recid = Unpack_dbg_LIN_Ionizer_Stat_candb_dbg(&(_m->dbg_LIN_Ionizer_Stat), _d, dlc_); + } else if (_id == 0x514U) { recid = Unpack_dbg_LIN_eTXV_Stat_candb_dbg(&(_m->dbg_LIN_eTXV_Stat), _d, dlc_); - } else if (_id == 0x518U) { - recid = Unpack_dbg_LIN_DRS_Stat_candb_dbg(&(_m->dbg_LIN_DRS_Stat), _d, dlc_); } } } else { - if ((_id >= 0x520U) && (_id < 0x530U)) { - if (_id == 0x520U) { + if ((_id >= 0x518U) && (_id < 0x524U)) { + if (_id == 0x518U) { + recid = Unpack_dbg_LIN_DRS_Stat_candb_dbg(&(_m->dbg_LIN_DRS_Stat), _d, dlc_); + } else if (_id == 0x520U) { recid = Unpack_dbg_Auto_AF_candb_dbg(&(_m->dbg_Auto_AF), _d, dlc_); - } else if (_id == 0x524U) { - recid = Unpack_dbg_Auto_Duct_candb_dbg(&(_m->dbg_Auto_Duct), _d, dlc_); } } else { - if (_id == 0x530U) { - recid = Unpack_dbg_Auto_Valve_Plus_candb_dbg(&(_m->dbg_Auto_Valve_Plus), _d, dlc_); - } else if (_id == 0x6BBU) { - recid = Unpack_XCP_CCU_TX_candb_dbg(&(_m->XCP_CCU_TX), _d, dlc_); + if (_id == 0x524U) { + recid = Unpack_dbg_Auto_Duct_candb_dbg(&(_m->dbg_Auto_Duct), _d, dlc_); + } else { + if (_id == 0x530U) { + recid = Unpack_dbg_Auto_Valve_Plus_candb_dbg(&(_m->dbg_Auto_Valve_Plus), _d, dlc_); + } else if (_id == 0x6BBU) { + recid = Unpack_XCP_CCU_TX_candb_dbg(&(_m->XCP_CCU_TX), _d, dlc_); + } } } } diff --git a/MODULES/HVAC_M7_CAN_DBG_MATRIX/butl/vector__xxx_candb_dbg-binutil.h b/MODULES/HVAC_M7_CAN_DBG_MATRIX/butl/vector__xxx_candb_dbg-binutil.h index c5f14de..05edca4 100644 --- a/MODULES/HVAC_M7_CAN_DBG_MATRIX/butl/vector__xxx_candb_dbg-binutil.h +++ b/MODULES/HVAC_M7_CAN_DBG_MATRIX/butl/vector__xxx_candb_dbg-binutil.h @@ -12,6 +12,7 @@ extern "C" { typedef struct { + dbg_Act_calibration_error_t dbg_Act_calibration_error; dbg_Logic_State_t dbg_Logic_State; dbg_Logic_KM_Status_t dbg_Logic_KM_Status; dbg_Logic_Valve_t dbg_Logic_Valve; @@ -23,6 +24,8 @@ typedef struct dbg_Act1_t dbg_Act1; dbg_Act2_t dbg_Act2; dbg_Sen_Amb_t dbg_Sen_Amb; + dbg_Act_calibration_t dbg_Act_calibration; + dbg_PID_tune_t dbg_PID_tune; dbg_Sen_0_t dbg_Sen_0; dbg_CCU_IO_t dbg_CCU_IO; dbg_CCU_Info_t dbg_CCU_Info; @@ -44,7 +47,11 @@ typedef struct XCP_CCU_TX_t XCP_CCU_TX; } vector__xxx_candb_dbg_rx_t; -// There is no any TX mapped massage. +typedef struct +{ + dbg_Act_calibration_error_t dbg_Act_calibration_error; + dbg_Act_calibration_t dbg_Act_calibration; +} vector__xxx_candb_dbg_tx_t; uint32_t vector__xxx_candb_dbg_Receive(vector__xxx_candb_dbg_rx_t* m, const uint8_t* d, uint32_t msgid, uint8_t dlc); @@ -52,6 +59,8 @@ uint32_t vector__xxx_candb_dbg_Receive(vector__xxx_candb_dbg_rx_t* m, const uint extern vector__xxx_candb_dbg_rx_t vector__xxx_candb_dbg_rx; +extern vector__xxx_candb_dbg_tx_t vector__xxx_candb_dbg_tx; + #endif // __DEF_VECTOR__XXX_CANDB_DBG__ #ifdef __cplusplus diff --git a/MODULES/HVAC_M7_CAN_DBG_MATRIX/conf/candb_dbg-config.h b/MODULES/HVAC_M7_CAN_DBG_MATRIX/conf/candb_dbg-config.h index b21a6ad..344bfe2 100644 --- a/MODULES/HVAC_M7_CAN_DBG_MATRIX/conf/candb_dbg-config.h +++ b/MODULES/HVAC_M7_CAN_DBG_MATRIX/conf/candb_dbg-config.h @@ -5,7 +5,7 @@ /* include common dbccode configurations */ #include "dbccodeconf.h" -#define __DEF_CCU_CANDB_DBG__ + /* ------------------------------------------------------------------------- * This define enables using CAN message structs with bit-fielded signals layout. diff --git a/MODULES/HVAC_M7_CAN_DBG_MATRIX/lib/candb_dbg-fmon.h b/MODULES/HVAC_M7_CAN_DBG_MATRIX/lib/candb_dbg-fmon.h index 7b61f91..18139ba 100644 --- a/MODULES/HVAC_M7_CAN_DBG_MATRIX/lib/candb_dbg-fmon.h +++ b/MODULES/HVAC_M7_CAN_DBG_MATRIX/lib/candb_dbg-fmon.h @@ -26,6 +26,7 @@ separated .c file. If it won't be done the linkage error will happen void _FMon_MONO_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); +#define FMon_dbg_Act_calibration_error_candb_dbg(x, y) _FMon_MONO_candb_dbg((x), (y)) #define FMon_dbg_Logic_State_candb_dbg(x, y) _FMon_MONO_candb_dbg((x), (y)) #define FMon_dbg_Logic_KM_Status_candb_dbg(x, y) _FMon_MONO_candb_dbg((x), (y)) #define FMon_dbg_Logic_Valve_candb_dbg(x, y) _FMon_MONO_candb_dbg((x), (y)) @@ -37,6 +38,8 @@ void _FMon_MONO_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); #define FMon_dbg_Act1_candb_dbg(x, y) _FMon_MONO_candb_dbg((x), (y)) #define FMon_dbg_Act2_candb_dbg(x, y) _FMon_MONO_candb_dbg((x), (y)) #define FMon_dbg_Sen_Amb_candb_dbg(x, y) _FMon_MONO_candb_dbg((x), (y)) +#define FMon_dbg_Act_calibration_candb_dbg(x, y) _FMon_MONO_candb_dbg((x), (y)) +#define FMon_dbg_PID_tune_candb_dbg(x, y) _FMon_MONO_candb_dbg((x), (y)) #define FMon_dbg_Sen_0_candb_dbg(x, y) _FMon_MONO_candb_dbg((x), (y)) #define FMon_dbg_CCU_IO_candb_dbg(x, y) _FMon_MONO_candb_dbg((x), (y)) #define FMon_dbg_CCU_Info_candb_dbg(x, y) _FMon_MONO_candb_dbg((x), (y)) @@ -61,6 +64,7 @@ void _FMon_MONO_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); #else +void _FMon_dbg_Act_calibration_error_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); void _FMon_dbg_Logic_State_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); void _FMon_dbg_Logic_KM_Status_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); void _FMon_dbg_Logic_Valve_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); @@ -72,6 +76,8 @@ void _FMon_dbg_Act0_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); void _FMon_dbg_Act1_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); void _FMon_dbg_Act2_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); void _FMon_dbg_Sen_Amb_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); +void _FMon_dbg_Act_calibration_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); +void _FMon_dbg_PID_tune_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); void _FMon_dbg_Sen_0_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); void _FMon_dbg_CCU_IO_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); void _FMon_dbg_CCU_Info_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); @@ -94,6 +100,7 @@ void _FMon_dbg_Auto_Valve_Plus_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); void _FMon_XCP_CCU_RX_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); void _FMon_XCP_CCU_TX_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); +#define FMon_dbg_Act_calibration_error_candb_dbg(x, y) _FMon_dbg_Act_calibration_error_candb_dbg((x), (y)) #define FMon_dbg_Logic_State_candb_dbg(x, y) _FMon_dbg_Logic_State_candb_dbg((x), (y)) #define FMon_dbg_Logic_KM_Status_candb_dbg(x, y) _FMon_dbg_Logic_KM_Status_candb_dbg((x), (y)) #define FMon_dbg_Logic_Valve_candb_dbg(x, y) _FMon_dbg_Logic_Valve_candb_dbg((x), (y)) @@ -105,6 +112,8 @@ void _FMon_XCP_CCU_TX_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid); #define FMon_dbg_Act1_candb_dbg(x, y) _FMon_dbg_Act1_candb_dbg((x), (y)) #define FMon_dbg_Act2_candb_dbg(x, y) _FMon_dbg_Act2_candb_dbg((x), (y)) #define FMon_dbg_Sen_Amb_candb_dbg(x, y) _FMon_dbg_Sen_Amb_candb_dbg((x), (y)) +#define FMon_dbg_Act_calibration_candb_dbg(x, y) _FMon_dbg_Act_calibration_candb_dbg((x), (y)) +#define FMon_dbg_PID_tune_candb_dbg(x, y) _FMon_dbg_PID_tune_candb_dbg((x), (y)) #define FMon_dbg_Sen_0_candb_dbg(x, y) _FMon_dbg_Sen_0_candb_dbg((x), (y)) #define FMon_dbg_CCU_IO_candb_dbg(x, y) _FMon_dbg_CCU_IO_candb_dbg((x), (y)) #define FMon_dbg_CCU_Info_candb_dbg(x, y) _FMon_dbg_CCU_Info_candb_dbg((x), (y)) diff --git a/MODULES/HVAC_M7_CAN_DBG_MATRIX/lib/candb_dbg.c b/MODULES/HVAC_M7_CAN_DBG_MATRIX/lib/candb_dbg.c index 81ebb5f..f8479ed 100644 --- a/MODULES/HVAC_M7_CAN_DBG_MATRIX/lib/candb_dbg.c +++ b/MODULES/HVAC_M7_CAN_DBG_MATRIX/lib/candb_dbg.c @@ -46,6 +46,78 @@ static bitext_t __ext_sig__(ubitext_t val, uint8_t bits) return ((val ^ m) - m); } +uint32_t Unpack_dbg_Act_calibration_error_candb_dbg(dbg_Act_calibration_error_t* _m, const uint8_t* _d, uint8_t dlc_) +{ + (void)dlc_; + _m->dbg_Act_calib_00_Def_error = (uint8_t) ( (_d[0] & (0x01U)) ); + _m->dbg_Act_calib_01_Vent_SFL_error = (uint8_t) ( ((_d[0] >> 1U) & (0x01U)) ); + _m->dbg_Act_calib_02_Vent_CFL_error = (uint8_t) ( ((_d[0] >> 2U) & (0x01U)) ); + _m->dbg_Act_calib_03_Foot_1FL_error = (uint8_t) ( ((_d[0] >> 3U) & (0x01U)) ); + _m->dbg_Act_calib_04_Foot_2FL_error = (uint8_t) ( ((_d[0] >> 4U) & (0x01U)) ); + _m->dbg_Act_calib_05_Vent_CFR_error = (uint8_t) ( ((_d[0] >> 5U) & (0x01U)) ); + _m->dbg_Act_calib_06_Vent_SFR_error = (uint8_t) ( ((_d[0] >> 6U) & (0x01U)) ); + _m->dbg_Act_calib_07_Foot_1FR_error = (uint8_t) ( ((_d[0] >> 7U) & (0x01U)) ); + _m->dbg_Act_calib_08_Foot_2FR_error = (uint8_t) ( (_d[1] & (0x01U)) ); + _m->dbg_Act_calib_09_Vent_SRL_error = (uint8_t) ( ((_d[1] >> 1U) & (0x01U)) ); + _m->dbg_Act_calib_10_Vent_CRL_error = (uint8_t) ( ((_d[1] >> 2U) & (0x01U)) ); + _m->dbg_Act_calib_11_Foot_RL_error = (uint8_t) ( ((_d[1] >> 3U) & (0x01U)) ); + _m->dbg_Act_calib_12_Vent_CRR_error = (uint8_t) ( ((_d[1] >> 4U) & (0x01U)) ); + _m->dbg_Act_calib_13_Vent_SRR_error = (uint8_t) ( ((_d[1] >> 5U) & (0x01U)) ); + _m->dbg_Act_calib_14_Foot_RR_error = (uint8_t) ( ((_d[1] >> 6U) & (0x01U)) ); + _m->dbg_Act_calib_15_TempU_FL_error = (uint8_t) ( ((_d[1] >> 7U) & (0x01U)) ); + _m->dbg_Act_calib_16_TempL_FL_error = (uint8_t) ( (_d[2] & (0x01U)) ); + _m->dbg_Act_calib_17_TempU_FR_error = (uint8_t) ( ((_d[2] >> 1U) & (0x01U)) ); + _m->dbg_Act_calib_18_TempL_FR_error = (uint8_t) ( ((_d[2] >> 2U) & (0x01U)) ); + _m->dbg_Act_calib_19_Temp_RL_error = (uint8_t) ( ((_d[2] >> 3U) & (0x01U)) ); + _m->dbg_Act_calib_20_Temp_RR_error = (uint8_t) ( ((_d[2] >> 4U) & (0x01U)) ); + _m->dbg_Act_calib_21_Rec_error = (uint8_t) ( ((_d[2] >> 5U) & (0x01U)) ); + _m->dbg_Act_calib_22_OSA_error = (uint8_t) ( ((_d[2] >> 6U) & (0x01U)) ); + _m->dbg_Act_calib_23_Sealing_error = (uint8_t) ( ((_d[2] >> 7U) & (0x01U)) ); + +#ifdef CANDB_DBG_USE_DIAG_MONITORS + _m->mon1.dlc_error = (dlc_ < dbg_Act_calibration_error_DLC); + _m->mon1.last_cycle = GetSystemTick(); + _m->mon1.frame_cnt++; + + FMon_dbg_Act_calibration_error_candb_dbg(&_m->mon1, dbg_Act_calibration_error_CANID); +#endif // CANDB_DBG_USE_DIAG_MONITORS + + return dbg_Act_calibration_error_CANID; +} + +#ifdef CANDB_DBG_USE_CANSTRUCT + +uint32_t Pack_dbg_Act_calibration_error_candb_dbg(dbg_Act_calibration_error_t* _m, __CoderDbcCanFrame_t__* cframe) +{ + uint8_t i; for (i = 0u; i < CANDB_DBG_VALIDATE_DLC(dbg_Act_calibration_error_DLC); cframe->Data[i++] = CANDB_DBG_INITIAL_BYTE_VALUE); + + cframe->Data[0] |= (uint8_t) ( (_m->dbg_Act_calib_00_Def_error & (0x01U)) | ((_m->dbg_Act_calib_01_Vent_SFL_error & (0x01U)) << 1U) | ((_m->dbg_Act_calib_02_Vent_CFL_error & (0x01U)) << 2U) | ((_m->dbg_Act_calib_03_Foot_1FL_error & (0x01U)) << 3U) | ((_m->dbg_Act_calib_04_Foot_2FL_error & (0x01U)) << 4U) | ((_m->dbg_Act_calib_05_Vent_CFR_error & (0x01U)) << 5U) | ((_m->dbg_Act_calib_06_Vent_SFR_error & (0x01U)) << 6U) | ((_m->dbg_Act_calib_07_Foot_1FR_error & (0x01U)) << 7U) ); + cframe->Data[1] |= (uint8_t) ( (_m->dbg_Act_calib_08_Foot_2FR_error & (0x01U)) | ((_m->dbg_Act_calib_09_Vent_SRL_error & (0x01U)) << 1U) | ((_m->dbg_Act_calib_10_Vent_CRL_error & (0x01U)) << 2U) | ((_m->dbg_Act_calib_11_Foot_RL_error & (0x01U)) << 3U) | ((_m->dbg_Act_calib_12_Vent_CRR_error & (0x01U)) << 4U) | ((_m->dbg_Act_calib_13_Vent_SRR_error & (0x01U)) << 5U) | ((_m->dbg_Act_calib_14_Foot_RR_error & (0x01U)) << 6U) | ((_m->dbg_Act_calib_15_TempU_FL_error & (0x01U)) << 7U) ); + cframe->Data[2] |= (uint8_t) ( (_m->dbg_Act_calib_16_TempL_FL_error & (0x01U)) | ((_m->dbg_Act_calib_17_TempU_FR_error & (0x01U)) << 1U) | ((_m->dbg_Act_calib_18_TempL_FR_error & (0x01U)) << 2U) | ((_m->dbg_Act_calib_19_Temp_RL_error & (0x01U)) << 3U) | ((_m->dbg_Act_calib_20_Temp_RR_error & (0x01U)) << 4U) | ((_m->dbg_Act_calib_21_Rec_error & (0x01U)) << 5U) | ((_m->dbg_Act_calib_22_OSA_error & (0x01U)) << 6U) | ((_m->dbg_Act_calib_23_Sealing_error & (0x01U)) << 7U) ); + + cframe->MsgId = (uint32_t) dbg_Act_calibration_error_CANID; + cframe->DLC = (uint8_t) dbg_Act_calibration_error_DLC; + cframe->IDE = (uint8_t) dbg_Act_calibration_error_IDE; + return dbg_Act_calibration_error_CANID; +} + +#else + +uint32_t Pack_dbg_Act_calibration_error_candb_dbg(dbg_Act_calibration_error_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide) +{ + uint8_t i; for (i = 0u; i < CANDB_DBG_VALIDATE_DLC(dbg_Act_calibration_error_DLC); _d[i++] = CANDB_DBG_INITIAL_BYTE_VALUE); + + _d[0] |= (uint8_t) ( (_m->dbg_Act_calib_00_Def_error & (0x01U)) | ((_m->dbg_Act_calib_01_Vent_SFL_error & (0x01U)) << 1U) | ((_m->dbg_Act_calib_02_Vent_CFL_error & (0x01U)) << 2U) | ((_m->dbg_Act_calib_03_Foot_1FL_error & (0x01U)) << 3U) | ((_m->dbg_Act_calib_04_Foot_2FL_error & (0x01U)) << 4U) | ((_m->dbg_Act_calib_05_Vent_CFR_error & (0x01U)) << 5U) | ((_m->dbg_Act_calib_06_Vent_SFR_error & (0x01U)) << 6U) | ((_m->dbg_Act_calib_07_Foot_1FR_error & (0x01U)) << 7U) ); + _d[1] |= (uint8_t) ( (_m->dbg_Act_calib_08_Foot_2FR_error & (0x01U)) | ((_m->dbg_Act_calib_09_Vent_SRL_error & (0x01U)) << 1U) | ((_m->dbg_Act_calib_10_Vent_CRL_error & (0x01U)) << 2U) | ((_m->dbg_Act_calib_11_Foot_RL_error & (0x01U)) << 3U) | ((_m->dbg_Act_calib_12_Vent_CRR_error & (0x01U)) << 4U) | ((_m->dbg_Act_calib_13_Vent_SRR_error & (0x01U)) << 5U) | ((_m->dbg_Act_calib_14_Foot_RR_error & (0x01U)) << 6U) | ((_m->dbg_Act_calib_15_TempU_FL_error & (0x01U)) << 7U) ); + _d[2] |= (uint8_t) ( (_m->dbg_Act_calib_16_TempL_FL_error & (0x01U)) | ((_m->dbg_Act_calib_17_TempU_FR_error & (0x01U)) << 1U) | ((_m->dbg_Act_calib_18_TempL_FR_error & (0x01U)) << 2U) | ((_m->dbg_Act_calib_19_Temp_RL_error & (0x01U)) << 3U) | ((_m->dbg_Act_calib_20_Temp_RR_error & (0x01U)) << 4U) | ((_m->dbg_Act_calib_21_Rec_error & (0x01U)) << 5U) | ((_m->dbg_Act_calib_22_OSA_error & (0x01U)) << 6U) | ((_m->dbg_Act_calib_23_Sealing_error & (0x01U)) << 7U) ); + + *_len = (uint8_t) dbg_Act_calibration_error_DLC; + *_ide = (uint8_t) dbg_Act_calibration_error_IDE; + return dbg_Act_calibration_error_CANID; +} + +#endif // CANDB_DBG_USE_CANSTRUCT + uint32_t Unpack_dbg_Logic_State_candb_dbg(dbg_Logic_State_t* _m, const uint8_t* _d, uint8_t dlc_) { (void)dlc_; @@ -63,11 +135,11 @@ uint32_t Unpack_dbg_Logic_State_candb_dbg(dbg_Logic_State_t* _m, const uint8_t* _m->Logic_Full_Auto_FR = (uint8_t) ( ((_d[4] >> 3U) & (0x01U)) ); _m->Logic_Full_Auto_RL = (uint8_t) ( ((_d[4] >> 4U) & (0x01U)) ); _m->Logic_Full_Auto_RR = (uint8_t) ( ((_d[4] >> 5U) & (0x01U)) ); - _m->Logic_Full_MaxAc = (uint8_t) ( ((_d[4] >> 6U) & (0x01U)) ); - _m->Logic_Full_MaxDef = (uint8_t) ( ((_d[4] >> 7U) & (0x01U)) ); - _m->Logic_Start_Ctrl_Front = (uint8_t) ( (_d[5] & (0x07U)) ); - _m->Logic_Start_Ctrl_Rear = (uint8_t) ( ((_d[5] >> 3U) & (0x07U)) ); - _m->Logic_Valve_Use_DiffBlr_R2 = (uint8_t) ( ((_d[5] >> 6U) & (0x01U)) ); + _m->Logic_Full_MaxAc = (uint8_t) ( ((_d[4] >> 6U) & (0x03U)) ); + _m->Logic_Full_MaxDef = (uint8_t) ( (_d[5] & (0x01U)) ); + _m->Logic_Start_Ctrl_Front = (uint8_t) ( ((_d[5] >> 1U) & (0x07U)) ); + _m->Logic_Start_Ctrl_Rear = (uint8_t) ( ((_d[5] >> 4U) & (0x07U)) ); + _m->Logic_Valve_Use_DiffBlr_R2 = (uint8_t) ( ((_d[5] >> 7U) & (0x01U)) ); _m->Logic_Duct_WaitCorrection_FRL = (uint8_t) ( (_d[6] & (0x03U)) ); _m->Logic_Duct_WaitCorrection_FLL = (uint8_t) ( ((_d[6] >> 2U) & (0x03U)) ); _m->Logic_AutoDemist_Lv_Winter = (uint8_t) ( ((_d[6] >> 4U) & (0x0FU)) ); @@ -95,8 +167,8 @@ uint32_t Pack_dbg_Logic_State_candb_dbg(dbg_Logic_State_t* _m, __CoderDbcCanFram cframe->Data[1] |= (uint8_t) ( (_m->Logic_AutoDemist_Lv_Summer & (0x0FU)) | ((_m->Logic_RemoteStart & (0x03U)) << 4U) | ((_m->Logic_Rest_Mode & (0x03U)) << 6U) ); cframe->Data[2] |= (uint8_t) ( (_m->Logic_LoHi_Front & (0xFFU)) ); cframe->Data[3] |= (uint8_t) ( (_m->Logic_LoHi_Rear & (0xFFU)) ); - cframe->Data[4] |= (uint8_t) ( (_m->Logic_2WayValve_Status & (0x03U)) | ((_m->Logic_Full_Auto_FL & (0x01U)) << 2U) | ((_m->Logic_Full_Auto_FR & (0x01U)) << 3U) | ((_m->Logic_Full_Auto_RL & (0x01U)) << 4U) | ((_m->Logic_Full_Auto_RR & (0x01U)) << 5U) | ((_m->Logic_Full_MaxAc & (0x01U)) << 6U) | ((_m->Logic_Full_MaxDef & (0x01U)) << 7U) ); - cframe->Data[5] |= (uint8_t) ( (_m->Logic_Start_Ctrl_Front & (0x07U)) | ((_m->Logic_Start_Ctrl_Rear & (0x07U)) << 3U) | ((_m->Logic_Valve_Use_DiffBlr_R2 & (0x01U)) << 6U) ); + cframe->Data[4] |= (uint8_t) ( (_m->Logic_2WayValve_Status & (0x03U)) | ((_m->Logic_Full_Auto_FL & (0x01U)) << 2U) | ((_m->Logic_Full_Auto_FR & (0x01U)) << 3U) | ((_m->Logic_Full_Auto_RL & (0x01U)) << 4U) | ((_m->Logic_Full_Auto_RR & (0x01U)) << 5U) | ((_m->Logic_Full_MaxAc & (0x03U)) << 6U) ); + cframe->Data[5] |= (uint8_t) ( (_m->Logic_Full_MaxDef & (0x01U)) | ((_m->Logic_Start_Ctrl_Front & (0x07U)) << 1U) | ((_m->Logic_Start_Ctrl_Rear & (0x07U)) << 4U) | ((_m->Logic_Valve_Use_DiffBlr_R2 & (0x01U)) << 7U) ); cframe->Data[6] |= (uint8_t) ( (_m->Logic_Duct_WaitCorrection_FRL & (0x03U)) | ((_m->Logic_Duct_WaitCorrection_FLL & (0x03U)) << 2U) | ((_m->Logic_AutoDemist_Lv_Winter & (0x0FU)) << 4U) ); cframe->Data[7] |= (uint8_t) ( (_m->Logic_AF_WaitCorrection_FL & (0x03U)) | ((_m->Logic_AF_WaitCorrection_FR & (0x03U)) << 2U) ); @@ -116,8 +188,8 @@ uint32_t Pack_dbg_Logic_State_candb_dbg(dbg_Logic_State_t* _m, uint8_t* _d, uint _d[1] |= (uint8_t) ( (_m->Logic_AutoDemist_Lv_Summer & (0x0FU)) | ((_m->Logic_RemoteStart & (0x03U)) << 4U) | ((_m->Logic_Rest_Mode & (0x03U)) << 6U) ); _d[2] |= (uint8_t) ( (_m->Logic_LoHi_Front & (0xFFU)) ); _d[3] |= (uint8_t) ( (_m->Logic_LoHi_Rear & (0xFFU)) ); - _d[4] |= (uint8_t) ( (_m->Logic_2WayValve_Status & (0x03U)) | ((_m->Logic_Full_Auto_FL & (0x01U)) << 2U) | ((_m->Logic_Full_Auto_FR & (0x01U)) << 3U) | ((_m->Logic_Full_Auto_RL & (0x01U)) << 4U) | ((_m->Logic_Full_Auto_RR & (0x01U)) << 5U) | ((_m->Logic_Full_MaxAc & (0x01U)) << 6U) | ((_m->Logic_Full_MaxDef & (0x01U)) << 7U) ); - _d[5] |= (uint8_t) ( (_m->Logic_Start_Ctrl_Front & (0x07U)) | ((_m->Logic_Start_Ctrl_Rear & (0x07U)) << 3U) | ((_m->Logic_Valve_Use_DiffBlr_R2 & (0x01U)) << 6U) ); + _d[4] |= (uint8_t) ( (_m->Logic_2WayValve_Status & (0x03U)) | ((_m->Logic_Full_Auto_FL & (0x01U)) << 2U) | ((_m->Logic_Full_Auto_FR & (0x01U)) << 3U) | ((_m->Logic_Full_Auto_RL & (0x01U)) << 4U) | ((_m->Logic_Full_Auto_RR & (0x01U)) << 5U) | ((_m->Logic_Full_MaxAc & (0x03U)) << 6U) ); + _d[5] |= (uint8_t) ( (_m->Logic_Full_MaxDef & (0x01U)) | ((_m->Logic_Start_Ctrl_Front & (0x07U)) << 1U) | ((_m->Logic_Start_Ctrl_Rear & (0x07U)) << 4U) | ((_m->Logic_Valve_Use_DiffBlr_R2 & (0x01U)) << 7U) ); _d[6] |= (uint8_t) ( (_m->Logic_Duct_WaitCorrection_FRL & (0x03U)) | ((_m->Logic_Duct_WaitCorrection_FLL & (0x03U)) << 2U) | ((_m->Logic_AutoDemist_Lv_Winter & (0x0FU)) << 4U) ); _d[7] |= (uint8_t) ( (_m->Logic_AF_WaitCorrection_FL & (0x03U)) | ((_m->Logic_AF_WaitCorrection_FR & (0x03U)) << 2U) ); @@ -397,6 +469,7 @@ uint32_t Unpack_dbg_Logic_Rec_candb_dbg(dbg_Logic_Rec_t* _m, const uint8_t* _d, _m->Logic_Rec_Idx = (uint8_t) ( (_d[0] & (0x01U)) ); _m->Logic_Rec_Partial_Spd_Sts = (uint8_t) ( ((_d[0] >> 1U) & (0x01U)) ); _m->Logic_Rec_Partial_Winter = (uint8_t) ( ((_d[0] >> 2U) & (0x01U)) ); + _m->Logic_Rec_Ajar_Stat = (uint8_t) ( ((_d[0] >> 3U) & (0x01U)) ); _m->Logic_Rec_Partial_Summer = (uint8_t) ( ((_d[0] >> 4U) & (0x03U)) ); _m->Logic_Rec_FreshAirPurge_Sts = (uint8_t) ( (_d[1] & (0x0FU)) ); @@ -417,7 +490,7 @@ uint32_t Pack_dbg_Logic_Rec_candb_dbg(dbg_Logic_Rec_t* _m, __CoderDbcCanFrame_t_ { uint8_t i; for (i = 0u; i < CANDB_DBG_VALIDATE_DLC(dbg_Logic_Rec_DLC); cframe->Data[i++] = CANDB_DBG_INITIAL_BYTE_VALUE); - cframe->Data[0] |= (uint8_t) ( (_m->Logic_Rec_Idx & (0x01U)) | ((_m->Logic_Rec_Partial_Spd_Sts & (0x01U)) << 1U) | ((_m->Logic_Rec_Partial_Winter & (0x01U)) << 2U) | ((_m->Logic_Rec_Partial_Summer & (0x03U)) << 4U) ); + cframe->Data[0] |= (uint8_t) ( (_m->Logic_Rec_Idx & (0x01U)) | ((_m->Logic_Rec_Partial_Spd_Sts & (0x01U)) << 1U) | ((_m->Logic_Rec_Partial_Winter & (0x01U)) << 2U) | ((_m->Logic_Rec_Ajar_Stat & (0x01U)) << 3U) | ((_m->Logic_Rec_Partial_Summer & (0x03U)) << 4U) ); cframe->Data[1] |= (uint8_t) ( (_m->Logic_Rec_FreshAirPurge_Sts & (0x0FU)) ); cframe->MsgId = (uint32_t) dbg_Logic_Rec_CANID; @@ -432,7 +505,7 @@ uint32_t Pack_dbg_Logic_Rec_candb_dbg(dbg_Logic_Rec_t* _m, uint8_t* _d, uint8_t* { uint8_t i; for (i = 0u; i < CANDB_DBG_VALIDATE_DLC(dbg_Logic_Rec_DLC); _d[i++] = CANDB_DBG_INITIAL_BYTE_VALUE); - _d[0] |= (uint8_t) ( (_m->Logic_Rec_Idx & (0x01U)) | ((_m->Logic_Rec_Partial_Spd_Sts & (0x01U)) << 1U) | ((_m->Logic_Rec_Partial_Winter & (0x01U)) << 2U) | ((_m->Logic_Rec_Partial_Summer & (0x03U)) << 4U) ); + _d[0] |= (uint8_t) ( (_m->Logic_Rec_Idx & (0x01U)) | ((_m->Logic_Rec_Partial_Spd_Sts & (0x01U)) << 1U) | ((_m->Logic_Rec_Partial_Winter & (0x01U)) << 2U) | ((_m->Logic_Rec_Ajar_Stat & (0x01U)) << 3U) | ((_m->Logic_Rec_Partial_Summer & (0x03U)) << 4U) ); _d[1] |= (uint8_t) ( (_m->Logic_Rec_FreshAirPurge_Sts & (0x0FU)) ); *_len = (uint8_t) dbg_Logic_Rec_DLC; @@ -781,6 +854,271 @@ uint32_t Pack_dbg_Sen_Amb_candb_dbg(dbg_Sen_Amb_t* _m, uint8_t* _d, uint8_t* _le #endif // CANDB_DBG_USE_CANSTRUCT +uint32_t Unpack_dbg_Act_calibration_candb_dbg(dbg_Act_calibration_t* _m, const uint8_t* _d, uint8_t dlc_) +{ + (void)dlc_; + _m->dbg_Act_calib_MultMsg_Idx = (int8_t) __ext_sig__(( (_d[0] & (0xFFU)) ), 8); + _m->dbg_Act_calib_21_Rec = (uint16_t) ( ((_d[2] & (0xFFU)) << 8U) | (_d[1] & (0xFFU)) ); + _m->dbg_Act_calib_00_Def = (uint16_t) ( ((_d[2] & (0xFFU)) << 8U) | (_d[1] & (0xFFU)) ); + _m->dbg_Act_calib_18_TempL_FR = (uint16_t) ( ((_d[2] & (0xFFU)) << 8U) | (_d[1] & (0xFFU)) ); + _m->dbg_Act_calib_03_Foot_1FL = (uint16_t) ( ((_d[2] & (0xFFU)) << 8U) | (_d[1] & (0xFFU)) ); + _m->dbg_Act_calib_15_TempU_FL = (uint16_t) ( ((_d[2] & (0xFFU)) << 8U) | (_d[1] & (0xFFU)) ); + _m->dbg_Act_calib_06_Vent_SFR = (uint16_t) ( ((_d[2] & (0xFFU)) << 8U) | (_d[1] & (0xFFU)) ); + _m->dbg_Act_calib_12_Vent_CRR = (uint16_t) ( ((_d[2] & (0xFFU)) << 8U) | (_d[1] & (0xFFU)) ); + _m->dbg_Act_calib_09_Vent_SRL = (uint16_t) ( ((_d[2] & (0xFFU)) << 8U) | (_d[1] & (0xFFU)) ); + _m->dbg_Act_calib_22_OSA = (uint16_t) ( ((_d[4] & (0xFFU)) << 8U) | (_d[3] & (0xFFU)) ); + _m->dbg_Act_calib_01_Vent_SFL = (uint16_t) ( ((_d[4] & (0xFFU)) << 8U) | (_d[3] & (0xFFU)) ); + _m->dbg_Act_calib_04_Foot_2FL = (uint16_t) ( ((_d[4] & (0xFFU)) << 8U) | (_d[3] & (0xFFU)) ); + _m->dbg_Act_calib_07_Foot_1FR = (uint16_t) ( ((_d[4] & (0xFFU)) << 8U) | (_d[3] & (0xFFU)) ); + _m->dbg_Act_calib_10_Vent_CRL = (uint16_t) ( ((_d[4] & (0xFFU)) << 8U) | (_d[3] & (0xFFU)) ); + _m->dbg_Act_calib_13_Vent_SRR = (uint16_t) ( ((_d[4] & (0xFFU)) << 8U) | (_d[3] & (0xFFU)) ); + _m->dbg_Act_calib_16_TempL_FL = (uint16_t) ( ((_d[4] & (0xFFU)) << 8U) | (_d[3] & (0xFFU)) ); + _m->dbg_Act_calib_19_Temp_RL = (uint16_t) ( ((_d[4] & (0xFFU)) << 8U) | (_d[3] & (0xFFU)) ); + _m->dbg_Act_calib_11_Foot_RL = (uint16_t) ( ((_d[6] & (0xFFU)) << 8U) | (_d[5] & (0xFFU)) ); + _m->dbg_Act_calib_08_Foot_2FR = (uint16_t) ( ((_d[6] & (0xFFU)) << 8U) | (_d[5] & (0xFFU)) ); + _m->dbg_Act_calib_14_Foot_RR = (uint16_t) ( ((_d[6] & (0xFFU)) << 8U) | (_d[5] & (0xFFU)) ); + _m->dbg_Act_calib_05_Vent_CFR = (uint16_t) ( ((_d[6] & (0xFFU)) << 8U) | (_d[5] & (0xFFU)) ); + _m->dbg_Act_calib_17_TempU_FR = (uint16_t) ( ((_d[6] & (0xFFU)) << 8U) | (_d[5] & (0xFFU)) ); + _m->dbg_Act_calib_02_Vent_CFL = (uint16_t) ( ((_d[6] & (0xFFU)) << 8U) | (_d[5] & (0xFFU)) ); + _m->dbg_Act_calib_20_Temp_RR = (uint16_t) ( ((_d[6] & (0xFFU)) << 8U) | (_d[5] & (0xFFU)) ); + _m->dbg_Act_calib_23_SealingValve = (uint16_t) ( ((_d[6] & (0xFFU)) << 8U) | (_d[5] & (0xFFU)) ); + +#ifdef CANDB_DBG_USE_DIAG_MONITORS + _m->mon1.dlc_error = (dlc_ < dbg_Act_calibration_DLC); + _m->mon1.last_cycle = GetSystemTick(); + _m->mon1.frame_cnt++; + + FMon_dbg_Act_calibration_candb_dbg(&_m->mon1, dbg_Act_calibration_CANID); +#endif // CANDB_DBG_USE_DIAG_MONITORS + + return dbg_Act_calibration_CANID; +} + +#ifdef CANDB_DBG_USE_CANSTRUCT + +uint32_t Pack_dbg_Act_calibration_candb_dbg(dbg_Act_calibration_t* _m, __CoderDbcCanFrame_t__* cframe) +{ + uint8_t i; for (i = 0u; i < CANDB_DBG_VALIDATE_DLC(dbg_Act_calibration_DLC); cframe->Data[i++] = CANDB_DBG_INITIAL_BYTE_VALUE); + + cframe->Data[0] |= (uint8_t) ( (_m->dbg_Act_calib_MultMsg_Idx & (0xFFU)) ); + cframe->Data[1] |= (uint8_t) ( (_m->dbg_Act_calib_21_Rec & (0xFFU)) | (_m->dbg_Act_calib_00_Def & (0xFFU)) | (_m->dbg_Act_calib_18_TempL_FR & (0xFFU)) | (_m->dbg_Act_calib_03_Foot_1FL & (0xFFU)) | (_m->dbg_Act_calib_15_TempU_FL & (0xFFU)) | (_m->dbg_Act_calib_06_Vent_SFR & (0xFFU)) | (_m->dbg_Act_calib_12_Vent_CRR & (0xFFU)) | (_m->dbg_Act_calib_09_Vent_SRL & (0xFFU)) ); + cframe->Data[2] |= (uint8_t) ( ((_m->dbg_Act_calib_21_Rec >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_00_Def >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_18_TempL_FR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_03_Foot_1FL >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_15_TempU_FL >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_06_Vent_SFR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_12_Vent_CRR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_09_Vent_SRL >> 8U) & (0xFFU)) ); + cframe->Data[3] |= (uint8_t) ( (_m->dbg_Act_calib_22_OSA & (0xFFU)) | (_m->dbg_Act_calib_01_Vent_SFL & (0xFFU)) | (_m->dbg_Act_calib_04_Foot_2FL & (0xFFU)) | (_m->dbg_Act_calib_07_Foot_1FR & (0xFFU)) | (_m->dbg_Act_calib_10_Vent_CRL & (0xFFU)) | (_m->dbg_Act_calib_13_Vent_SRR & (0xFFU)) | (_m->dbg_Act_calib_16_TempL_FL & (0xFFU)) | (_m->dbg_Act_calib_19_Temp_RL & (0xFFU)) ); + cframe->Data[4] |= (uint8_t) ( ((_m->dbg_Act_calib_22_OSA >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_01_Vent_SFL >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_04_Foot_2FL >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_07_Foot_1FR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_10_Vent_CRL >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_13_Vent_SRR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_16_TempL_FL >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_19_Temp_RL >> 8U) & (0xFFU)) ); + cframe->Data[5] |= (uint8_t) ( (_m->dbg_Act_calib_11_Foot_RL & (0xFFU)) | (_m->dbg_Act_calib_08_Foot_2FR & (0xFFU)) | (_m->dbg_Act_calib_14_Foot_RR & (0xFFU)) | (_m->dbg_Act_calib_05_Vent_CFR & (0xFFU)) | (_m->dbg_Act_calib_17_TempU_FR & (0xFFU)) | (_m->dbg_Act_calib_02_Vent_CFL & (0xFFU)) | (_m->dbg_Act_calib_20_Temp_RR & (0xFFU)) | (_m->dbg_Act_calib_23_SealingValve & (0xFFU)) ); + cframe->Data[6] |= (uint8_t) ( ((_m->dbg_Act_calib_11_Foot_RL >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_08_Foot_2FR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_14_Foot_RR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_05_Vent_CFR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_17_TempU_FR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_02_Vent_CFL >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_20_Temp_RR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_23_SealingValve >> 8U) & (0xFFU)) ); + + cframe->MsgId = (uint32_t) dbg_Act_calibration_CANID; + cframe->DLC = (uint8_t) dbg_Act_calibration_DLC; + cframe->IDE = (uint8_t) dbg_Act_calibration_IDE; + return dbg_Act_calibration_CANID; +} + +#else + +uint32_t Pack_dbg_Act_calibration_candb_dbg(dbg_Act_calibration_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide) +{ + uint8_t i; for (i = 0u; i < CANDB_DBG_VALIDATE_DLC(dbg_Act_calibration_DLC); _d[i++] = CANDB_DBG_INITIAL_BYTE_VALUE); + + _d[0] |= (uint8_t) ( (_m->dbg_Act_calib_MultMsg_Idx & (0xFFU)) ); + _d[1] |= (uint8_t) ( (_m->dbg_Act_calib_21_Rec & (0xFFU)) | (_m->dbg_Act_calib_00_Def & (0xFFU)) | (_m->dbg_Act_calib_18_TempL_FR & (0xFFU)) | (_m->dbg_Act_calib_03_Foot_1FL & (0xFFU)) | (_m->dbg_Act_calib_15_TempU_FL & (0xFFU)) | (_m->dbg_Act_calib_06_Vent_SFR & (0xFFU)) | (_m->dbg_Act_calib_12_Vent_CRR & (0xFFU)) | (_m->dbg_Act_calib_09_Vent_SRL & (0xFFU)) ); + _d[2] |= (uint8_t) ( ((_m->dbg_Act_calib_21_Rec >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_00_Def >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_18_TempL_FR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_03_Foot_1FL >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_15_TempU_FL >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_06_Vent_SFR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_12_Vent_CRR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_09_Vent_SRL >> 8U) & (0xFFU)) ); + _d[3] |= (uint8_t) ( (_m->dbg_Act_calib_22_OSA & (0xFFU)) | (_m->dbg_Act_calib_01_Vent_SFL & (0xFFU)) | (_m->dbg_Act_calib_04_Foot_2FL & (0xFFU)) | (_m->dbg_Act_calib_07_Foot_1FR & (0xFFU)) | (_m->dbg_Act_calib_10_Vent_CRL & (0xFFU)) | (_m->dbg_Act_calib_13_Vent_SRR & (0xFFU)) | (_m->dbg_Act_calib_16_TempL_FL & (0xFFU)) | (_m->dbg_Act_calib_19_Temp_RL & (0xFFU)) ); + _d[4] |= (uint8_t) ( ((_m->dbg_Act_calib_22_OSA >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_01_Vent_SFL >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_04_Foot_2FL >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_07_Foot_1FR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_10_Vent_CRL >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_13_Vent_SRR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_16_TempL_FL >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_19_Temp_RL >> 8U) & (0xFFU)) ); + _d[5] |= (uint8_t) ( (_m->dbg_Act_calib_11_Foot_RL & (0xFFU)) | (_m->dbg_Act_calib_08_Foot_2FR & (0xFFU)) | (_m->dbg_Act_calib_14_Foot_RR & (0xFFU)) | (_m->dbg_Act_calib_05_Vent_CFR & (0xFFU)) | (_m->dbg_Act_calib_17_TempU_FR & (0xFFU)) | (_m->dbg_Act_calib_02_Vent_CFL & (0xFFU)) | (_m->dbg_Act_calib_20_Temp_RR & (0xFFU)) | (_m->dbg_Act_calib_23_SealingValve & (0xFFU)) ); + _d[6] |= (uint8_t) ( ((_m->dbg_Act_calib_11_Foot_RL >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_08_Foot_2FR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_14_Foot_RR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_05_Vent_CFR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_17_TempU_FR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_02_Vent_CFL >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_20_Temp_RR >> 8U) & (0xFFU)) | ((_m->dbg_Act_calib_23_SealingValve >> 8U) & (0xFFU)) ); + + *_len = (uint8_t) dbg_Act_calibration_DLC; + *_ide = (uint8_t) dbg_Act_calibration_IDE; + return dbg_Act_calibration_CANID; +} + +#endif // CANDB_DBG_USE_CANSTRUCT + +uint32_t Unpack_dbg_PID_tune_candb_dbg(dbg_PID_tune_t* _m, const uint8_t* _d, uint8_t dlc_) +{ + (void)dlc_; + _m->PID_Temp_Msg_Idx = (uint8_t) ( (_d[0] & (0x0FU)) ); + _m->PID_Temp_FLL_P_ro = (uint16_t) ( ((_d[1] & (0xFFU)) << 4U) | ((_d[0] >> 4U) & (0x0FU)) ); +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_FLL_P_phys = (sigfloat_t)(CANDB_DBG_PID_Temp_FLL_P_ro_fromS(_m->PID_Temp_FLL_P_ro)); +#endif // CANDB_DBG_USE_SIGFLOAT + + _m->PID_Temp_FLU_P_ro = (uint16_t) ( ((_d[1] & (0xFFU)) << 4U) | ((_d[0] >> 4U) & (0x0FU)) ); +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_FLU_P_phys = (sigfloat_t)(CANDB_DBG_PID_Temp_FLU_P_ro_fromS(_m->PID_Temp_FLU_P_ro)); +#endif // CANDB_DBG_USE_SIGFLOAT + + _m->PID_Temp_FRU_P_ro = (uint16_t) ( ((_d[1] & (0xFFU)) << 4U) | ((_d[0] >> 4U) & (0x0FU)) ); +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_FRU_P_phys = (sigfloat_t)(CANDB_DBG_PID_Temp_FRU_P_ro_fromS(_m->PID_Temp_FRU_P_ro)); +#endif // CANDB_DBG_USE_SIGFLOAT + + _m->PID_Temp_RR_P_ro = (uint16_t) ( ((_d[1] & (0xFFU)) << 4U) | ((_d[0] >> 4U) & (0x0FU)) ); +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_RR_P_phys = (sigfloat_t)(CANDB_DBG_PID_Temp_RR_P_ro_fromS(_m->PID_Temp_RR_P_ro)); +#endif // CANDB_DBG_USE_SIGFLOAT + + _m->PID_Temp_FRL_P_ro = (uint16_t) ( ((_d[1] & (0xFFU)) << 4U) | ((_d[0] >> 4U) & (0x0FU)) ); +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_FRL_P_phys = (sigfloat_t)(CANDB_DBG_PID_Temp_FRL_P_ro_fromS(_m->PID_Temp_FRL_P_ro)); +#endif // CANDB_DBG_USE_SIGFLOAT + + _m->PID_Temp_RL_P_ro = (uint16_t) ( ((_d[1] & (0xFFU)) << 4U) | ((_d[0] >> 4U) & (0x0FU)) ); +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_RL_P_phys = (sigfloat_t)(CANDB_DBG_PID_Temp_RL_P_ro_fromS(_m->PID_Temp_RL_P_ro)); +#endif // CANDB_DBG_USE_SIGFLOAT + + _m->PID_Temp_FRL_I_ro = (uint16_t) ( ((_d[3] & (0x0FU)) << 8U) | (_d[2] & (0xFFU)) ); +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_FRL_I_phys = (sigfloat_t)(CANDB_DBG_PID_Temp_FRL_I_ro_fromS(_m->PID_Temp_FRL_I_ro)); +#endif // CANDB_DBG_USE_SIGFLOAT + + _m->PID_Temp_RL_I_ro = (uint16_t) ( ((_d[3] & (0x0FU)) << 8U) | (_d[2] & (0xFFU)) ); +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_RL_I_phys = (sigfloat_t)(CANDB_DBG_PID_Temp_RL_I_ro_fromS(_m->PID_Temp_RL_I_ro)); +#endif // CANDB_DBG_USE_SIGFLOAT + + _m->PID_Temp_FLL_I_ro = (uint16_t) ( ((_d[3] & (0x0FU)) << 8U) | (_d[2] & (0xFFU)) ); +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_FLL_I_phys = (sigfloat_t)(CANDB_DBG_PID_Temp_FLL_I_ro_fromS(_m->PID_Temp_FLL_I_ro)); +#endif // CANDB_DBG_USE_SIGFLOAT + + _m->PID_Temp_FRU_I_ro = (uint16_t) ( ((_d[3] & (0x0FU)) << 8U) | (_d[2] & (0xFFU)) ); +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_FRU_I_phys = (sigfloat_t)(CANDB_DBG_PID_Temp_FRU_I_ro_fromS(_m->PID_Temp_FRU_I_ro)); +#endif // CANDB_DBG_USE_SIGFLOAT + + _m->PID_Temp_FLU_I_ro = (uint16_t) ( ((_d[3] & (0x0FU)) << 8U) | (_d[2] & (0xFFU)) ); +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_FLU_I_phys = (sigfloat_t)(CANDB_DBG_PID_Temp_FLU_I_ro_fromS(_m->PID_Temp_FLU_I_ro)); +#endif // CANDB_DBG_USE_SIGFLOAT + + _m->PID_Temp_RR_I_ro = (uint16_t) ( ((_d[3] & (0x0FU)) << 8U) | (_d[2] & (0xFFU)) ); +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_RR_I_phys = (sigfloat_t)(CANDB_DBG_PID_Temp_RR_I_ro_fromS(_m->PID_Temp_RR_I_ro)); +#endif // CANDB_DBG_USE_SIGFLOAT + + _m->PID_Temp_RL_D_ro = (uint16_t) ( ((_d[4] & (0xFFU)) << 4U) | ((_d[3] >> 4U) & (0x0FU)) ); +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_RL_D_phys = (sigfloat_t)(CANDB_DBG_PID_Temp_RL_D_ro_fromS(_m->PID_Temp_RL_D_ro)); +#endif // CANDB_DBG_USE_SIGFLOAT + + _m->PID_Temp_FRL_D_ro = (uint16_t) ( ((_d[4] & (0xFFU)) << 4U) | ((_d[3] >> 4U) & (0x0FU)) ); +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_FRL_D_phys = (sigfloat_t)(CANDB_DBG_PID_Temp_FRL_D_ro_fromS(_m->PID_Temp_FRL_D_ro)); +#endif // CANDB_DBG_USE_SIGFLOAT + + _m->PID_Temp_FLL_D_ro = (uint16_t) ( ((_d[4] & (0xFFU)) << 4U) | ((_d[3] >> 4U) & (0x0FU)) ); +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_FLL_D_phys = (sigfloat_t)(CANDB_DBG_PID_Temp_FLL_D_ro_fromS(_m->PID_Temp_FLL_D_ro)); +#endif // CANDB_DBG_USE_SIGFLOAT + + _m->PID_Temp_FRU_D_ro = (uint16_t) ( ((_d[4] & (0xFFU)) << 4U) | ((_d[3] >> 4U) & (0x0FU)) ); +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_FRU_D_phys = (sigfloat_t)(CANDB_DBG_PID_Temp_FRU_D_ro_fromS(_m->PID_Temp_FRU_D_ro)); +#endif // CANDB_DBG_USE_SIGFLOAT + + _m->PID_Temp_RR_D_ro = (uint16_t) ( ((_d[4] & (0xFFU)) << 4U) | ((_d[3] >> 4U) & (0x0FU)) ); +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_RR_D_phys = (sigfloat_t)(CANDB_DBG_PID_Temp_RR_D_ro_fromS(_m->PID_Temp_RR_D_ro)); +#endif // CANDB_DBG_USE_SIGFLOAT + + _m->PID_Temp_FLU_D_ro = (uint16_t) ( ((_d[4] & (0xFFU)) << 4U) | ((_d[3] >> 4U) & (0x0FU)) ); +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_FLU_D_phys = (sigfloat_t)(CANDB_DBG_PID_Temp_FLU_D_ro_fromS(_m->PID_Temp_FLU_D_ro)); +#endif // CANDB_DBG_USE_SIGFLOAT + +#ifdef CANDB_DBG_USE_DIAG_MONITORS + _m->mon1.dlc_error = (dlc_ < dbg_PID_tune_DLC); + _m->mon1.last_cycle = GetSystemTick(); + _m->mon1.frame_cnt++; + + FMon_dbg_PID_tune_candb_dbg(&_m->mon1, dbg_PID_tune_CANID); +#endif // CANDB_DBG_USE_DIAG_MONITORS + + return dbg_PID_tune_CANID; +} + +#ifdef CANDB_DBG_USE_CANSTRUCT + +uint32_t Pack_dbg_PID_tune_candb_dbg(dbg_PID_tune_t* _m, __CoderDbcCanFrame_t__* cframe) +{ + uint8_t i; for (i = 0u; i < CANDB_DBG_VALIDATE_DLC(dbg_PID_tune_DLC); cframe->Data[i++] = CANDB_DBG_INITIAL_BYTE_VALUE); + +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_FLL_P_ro = (uint16_t) CANDB_DBG_PID_Temp_FLL_P_ro_toS(_m->PID_Temp_FLL_P_phys); + _m->PID_Temp_FLU_P_ro = (uint16_t) CANDB_DBG_PID_Temp_FLU_P_ro_toS(_m->PID_Temp_FLU_P_phys); + _m->PID_Temp_FRU_P_ro = (uint16_t) CANDB_DBG_PID_Temp_FRU_P_ro_toS(_m->PID_Temp_FRU_P_phys); + _m->PID_Temp_RR_P_ro = (uint16_t) CANDB_DBG_PID_Temp_RR_P_ro_toS(_m->PID_Temp_RR_P_phys); + _m->PID_Temp_FRL_P_ro = (uint16_t) CANDB_DBG_PID_Temp_FRL_P_ro_toS(_m->PID_Temp_FRL_P_phys); + _m->PID_Temp_RL_P_ro = (uint16_t) CANDB_DBG_PID_Temp_RL_P_ro_toS(_m->PID_Temp_RL_P_phys); + _m->PID_Temp_FRL_I_ro = (uint16_t) CANDB_DBG_PID_Temp_FRL_I_ro_toS(_m->PID_Temp_FRL_I_phys); + _m->PID_Temp_RL_I_ro = (uint16_t) CANDB_DBG_PID_Temp_RL_I_ro_toS(_m->PID_Temp_RL_I_phys); + _m->PID_Temp_FLL_I_ro = (uint16_t) CANDB_DBG_PID_Temp_FLL_I_ro_toS(_m->PID_Temp_FLL_I_phys); + _m->PID_Temp_FRU_I_ro = (uint16_t) CANDB_DBG_PID_Temp_FRU_I_ro_toS(_m->PID_Temp_FRU_I_phys); + _m->PID_Temp_FLU_I_ro = (uint16_t) CANDB_DBG_PID_Temp_FLU_I_ro_toS(_m->PID_Temp_FLU_I_phys); + _m->PID_Temp_RR_I_ro = (uint16_t) CANDB_DBG_PID_Temp_RR_I_ro_toS(_m->PID_Temp_RR_I_phys); + _m->PID_Temp_RL_D_ro = (uint16_t) CANDB_DBG_PID_Temp_RL_D_ro_toS(_m->PID_Temp_RL_D_phys); + _m->PID_Temp_FRL_D_ro = (uint16_t) CANDB_DBG_PID_Temp_FRL_D_ro_toS(_m->PID_Temp_FRL_D_phys); + _m->PID_Temp_FLL_D_ro = (uint16_t) CANDB_DBG_PID_Temp_FLL_D_ro_toS(_m->PID_Temp_FLL_D_phys); + _m->PID_Temp_FRU_D_ro = (uint16_t) CANDB_DBG_PID_Temp_FRU_D_ro_toS(_m->PID_Temp_FRU_D_phys); + _m->PID_Temp_RR_D_ro = (uint16_t) CANDB_DBG_PID_Temp_RR_D_ro_toS(_m->PID_Temp_RR_D_phys); + _m->PID_Temp_FLU_D_ro = (uint16_t) CANDB_DBG_PID_Temp_FLU_D_ro_toS(_m->PID_Temp_FLU_D_phys); +#endif // CANDB_DBG_USE_SIGFLOAT + + cframe->Data[0] |= (uint8_t) ( (_m->PID_Temp_Msg_Idx & (0x0FU)) | ((_m->PID_Temp_FLL_P_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_FLU_P_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_FRU_P_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_RR_P_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_FRL_P_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_RL_P_ro & (0x0FU)) << 4U) ); + cframe->Data[1] |= (uint8_t) ( ((_m->PID_Temp_FLL_P_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_FLU_P_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_FRU_P_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_RR_P_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_FRL_P_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_RL_P_ro >> 4U) & (0xFFU)) ); + cframe->Data[2] |= (uint8_t) ( (_m->PID_Temp_FRL_I_ro & (0xFFU)) | (_m->PID_Temp_RL_I_ro & (0xFFU)) | (_m->PID_Temp_FLL_I_ro & (0xFFU)) | (_m->PID_Temp_FRU_I_ro & (0xFFU)) | (_m->PID_Temp_FLU_I_ro & (0xFFU)) | (_m->PID_Temp_RR_I_ro & (0xFFU)) ); + cframe->Data[3] |= (uint8_t) ( ((_m->PID_Temp_FRL_I_ro >> 8U) & (0x0FU)) | ((_m->PID_Temp_RL_I_ro >> 8U) & (0x0FU)) | ((_m->PID_Temp_FLL_I_ro >> 8U) & (0x0FU)) | ((_m->PID_Temp_FRU_I_ro >> 8U) & (0x0FU)) | ((_m->PID_Temp_FLU_I_ro >> 8U) & (0x0FU)) | ((_m->PID_Temp_RR_I_ro >> 8U) & (0x0FU)) | ((_m->PID_Temp_RL_D_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_FRL_D_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_FLL_D_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_FRU_D_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_RR_D_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_FLU_D_ro & (0x0FU)) << 4U) ); + cframe->Data[4] |= (uint8_t) ( ((_m->PID_Temp_RL_D_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_FRL_D_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_FLL_D_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_FRU_D_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_RR_D_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_FLU_D_ro >> 4U) & (0xFFU)) ); + + cframe->MsgId = (uint32_t) dbg_PID_tune_CANID; + cframe->DLC = (uint8_t) dbg_PID_tune_DLC; + cframe->IDE = (uint8_t) dbg_PID_tune_IDE; + return dbg_PID_tune_CANID; +} + +#else + +uint32_t Pack_dbg_PID_tune_candb_dbg(dbg_PID_tune_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide) +{ + uint8_t i; for (i = 0u; i < CANDB_DBG_VALIDATE_DLC(dbg_PID_tune_DLC); _d[i++] = CANDB_DBG_INITIAL_BYTE_VALUE); + +#ifdef CANDB_DBG_USE_SIGFLOAT + _m->PID_Temp_FLL_P_ro = (uint16_t) CANDB_DBG_PID_Temp_FLL_P_ro_toS(_m->PID_Temp_FLL_P_phys); + _m->PID_Temp_FLU_P_ro = (uint16_t) CANDB_DBG_PID_Temp_FLU_P_ro_toS(_m->PID_Temp_FLU_P_phys); + _m->PID_Temp_FRU_P_ro = (uint16_t) CANDB_DBG_PID_Temp_FRU_P_ro_toS(_m->PID_Temp_FRU_P_phys); + _m->PID_Temp_RR_P_ro = (uint16_t) CANDB_DBG_PID_Temp_RR_P_ro_toS(_m->PID_Temp_RR_P_phys); + _m->PID_Temp_FRL_P_ro = (uint16_t) CANDB_DBG_PID_Temp_FRL_P_ro_toS(_m->PID_Temp_FRL_P_phys); + _m->PID_Temp_RL_P_ro = (uint16_t) CANDB_DBG_PID_Temp_RL_P_ro_toS(_m->PID_Temp_RL_P_phys); + _m->PID_Temp_FRL_I_ro = (uint16_t) CANDB_DBG_PID_Temp_FRL_I_ro_toS(_m->PID_Temp_FRL_I_phys); + _m->PID_Temp_RL_I_ro = (uint16_t) CANDB_DBG_PID_Temp_RL_I_ro_toS(_m->PID_Temp_RL_I_phys); + _m->PID_Temp_FLL_I_ro = (uint16_t) CANDB_DBG_PID_Temp_FLL_I_ro_toS(_m->PID_Temp_FLL_I_phys); + _m->PID_Temp_FRU_I_ro = (uint16_t) CANDB_DBG_PID_Temp_FRU_I_ro_toS(_m->PID_Temp_FRU_I_phys); + _m->PID_Temp_FLU_I_ro = (uint16_t) CANDB_DBG_PID_Temp_FLU_I_ro_toS(_m->PID_Temp_FLU_I_phys); + _m->PID_Temp_RR_I_ro = (uint16_t) CANDB_DBG_PID_Temp_RR_I_ro_toS(_m->PID_Temp_RR_I_phys); + _m->PID_Temp_RL_D_ro = (uint16_t) CANDB_DBG_PID_Temp_RL_D_ro_toS(_m->PID_Temp_RL_D_phys); + _m->PID_Temp_FRL_D_ro = (uint16_t) CANDB_DBG_PID_Temp_FRL_D_ro_toS(_m->PID_Temp_FRL_D_phys); + _m->PID_Temp_FLL_D_ro = (uint16_t) CANDB_DBG_PID_Temp_FLL_D_ro_toS(_m->PID_Temp_FLL_D_phys); + _m->PID_Temp_FRU_D_ro = (uint16_t) CANDB_DBG_PID_Temp_FRU_D_ro_toS(_m->PID_Temp_FRU_D_phys); + _m->PID_Temp_RR_D_ro = (uint16_t) CANDB_DBG_PID_Temp_RR_D_ro_toS(_m->PID_Temp_RR_D_phys); + _m->PID_Temp_FLU_D_ro = (uint16_t) CANDB_DBG_PID_Temp_FLU_D_ro_toS(_m->PID_Temp_FLU_D_phys); +#endif // CANDB_DBG_USE_SIGFLOAT + + _d[0] |= (uint8_t) ( (_m->PID_Temp_Msg_Idx & (0x0FU)) | ((_m->PID_Temp_FLL_P_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_FLU_P_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_FRU_P_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_RR_P_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_FRL_P_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_RL_P_ro & (0x0FU)) << 4U) ); + _d[1] |= (uint8_t) ( ((_m->PID_Temp_FLL_P_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_FLU_P_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_FRU_P_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_RR_P_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_FRL_P_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_RL_P_ro >> 4U) & (0xFFU)) ); + _d[2] |= (uint8_t) ( (_m->PID_Temp_FRL_I_ro & (0xFFU)) | (_m->PID_Temp_RL_I_ro & (0xFFU)) | (_m->PID_Temp_FLL_I_ro & (0xFFU)) | (_m->PID_Temp_FRU_I_ro & (0xFFU)) | (_m->PID_Temp_FLU_I_ro & (0xFFU)) | (_m->PID_Temp_RR_I_ro & (0xFFU)) ); + _d[3] |= (uint8_t) ( ((_m->PID_Temp_FRL_I_ro >> 8U) & (0x0FU)) | ((_m->PID_Temp_RL_I_ro >> 8U) & (0x0FU)) | ((_m->PID_Temp_FLL_I_ro >> 8U) & (0x0FU)) | ((_m->PID_Temp_FRU_I_ro >> 8U) & (0x0FU)) | ((_m->PID_Temp_FLU_I_ro >> 8U) & (0x0FU)) | ((_m->PID_Temp_RR_I_ro >> 8U) & (0x0FU)) | ((_m->PID_Temp_RL_D_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_FRL_D_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_FLL_D_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_FRU_D_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_RR_D_ro & (0x0FU)) << 4U) | ((_m->PID_Temp_FLU_D_ro & (0x0FU)) << 4U) ); + _d[4] |= (uint8_t) ( ((_m->PID_Temp_RL_D_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_FRL_D_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_FLL_D_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_FRU_D_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_RR_D_ro >> 4U) & (0xFFU)) | ((_m->PID_Temp_FLU_D_ro >> 4U) & (0xFFU)) ); + + *_len = (uint8_t) dbg_PID_tune_DLC; + *_ide = (uint8_t) dbg_PID_tune_IDE; + return dbg_PID_tune_CANID; +} + +#endif // CANDB_DBG_USE_CANSTRUCT + uint32_t Unpack_dbg_Sen_0_candb_dbg(dbg_Sen_0_t* _m, const uint8_t* _d, uint8_t dlc_) { (void)dlc_; @@ -960,14 +1298,18 @@ uint32_t Unpack_dbg_CCU_Info_candb_dbg(dbg_CCU_Info_t* _m, const uint8_t* _d, ui { (void)dlc_; _m->dbg_Info_MultMsg_Idx = (uint8_t) ( (_d[0] & (0x03U)) ); + _m->dbg_Info_CCU_Aroma_Cfg = (uint8_t) ( ((_d[0] >> 2U) & (0x0FU)) ); _m->dbg_Info_Calibration_Ver_Date = (uint32_t) ( ((_d[2] & (0xFFU)) << 14U) | ((_d[1] & (0xFFU)) << 6U) | ((_d[0] >> 2U) & (0x3FU)) ); _m->dbg_Info_CCU_SW_Ver_Date = (uint32_t) ( ((_d[2] & (0xFFU)) << 14U) | ((_d[1] & (0xFFU)) << 6U) | ((_d[0] >> 2U) & (0x3FU)) ); + _m->dbg_Info_CCU_Algorithm_Cfg = (uint8_t) ( (_d[1] & (0x0FU)) ); + _m->dbg_Info_CCU_RearHvac_Cfg = (uint8_t) ( ((_d[1] >> 4U) & (0x0FU)) ); _m->dbg_Info_Calibration_Ver_Rev = (uint8_t) ( (_d[3] & (0xFFU)) ); _m->dbg_Info_CCU_SW_Ver_Rev = (uint8_t) ( (_d[3] & (0xFFU)) ); _m->dbg_Info_ActivatedCAL = (uint8_t) ( (_d[4] & (0x0FU)) ); _m->dbg_Info_MBD_Ver_Date = (uint32_t) ( ((_d[6] & (0xFFU)) << 14U) | ((_d[5] & (0xFFU)) << 6U) | ((_d[4] >> 2U) & (0x3FU)) ); - _m->dbg_Info_CCU_Aroma_Cfg = (uint8_t) ( ((_d[4] >> 4U) & (0x0FU)) ); - _m->dbg_Info_CCU_Algorithm_Cfg = (uint8_t) ( (_d[5] & (0x0FU)) ); + _m->dbg_Info_Rear_Installed_Act_Num = (uint8_t) ( ((_d[5] >> 4U) & (0x03U)) ); + _m->dbg_Info_ActNum_Mismatch = (uint8_t) ( ((_d[5] >> 6U) & (0x01U)) ); + _m->dbg_Info_VIN_Mismatch = (uint8_t) ( ((_d[5] >> 7U) & (0x01U)) ); _m->dbg_Info_VehicleBody = (uint16_t) ( ((_d[7] & (0xFFU)) << 8U) | (_d[6] & (0xFFU)) ); _m->dbg_Info_MBD_Ver_Rev = (uint8_t) ( (_d[7] & (0xFFU)) ); @@ -988,12 +1330,12 @@ uint32_t Pack_dbg_CCU_Info_candb_dbg(dbg_CCU_Info_t* _m, __CoderDbcCanFrame_t__* { uint8_t i; for (i = 0u; i < CANDB_DBG_VALIDATE_DLC(dbg_CCU_Info_DLC); cframe->Data[i++] = CANDB_DBG_INITIAL_BYTE_VALUE); - cframe->Data[0] |= (uint8_t) ( (_m->dbg_Info_MultMsg_Idx & (0x03U)) | ((_m->dbg_Info_Calibration_Ver_Date & (0x3FU)) << 2U) | ((_m->dbg_Info_CCU_SW_Ver_Date & (0x3FU)) << 2U) ); - cframe->Data[1] |= (uint8_t) ( ((_m->dbg_Info_Calibration_Ver_Date >> 6U) & (0xFFU)) | ((_m->dbg_Info_CCU_SW_Ver_Date >> 6U) & (0xFFU)) ); + cframe->Data[0] |= (uint8_t) ( (_m->dbg_Info_MultMsg_Idx & (0x03U)) | ((_m->dbg_Info_CCU_Aroma_Cfg & (0x0FU)) << 2U) | ((_m->dbg_Info_Calibration_Ver_Date & (0x3FU)) << 2U) | ((_m->dbg_Info_CCU_SW_Ver_Date & (0x3FU)) << 2U) ); + cframe->Data[1] |= (uint8_t) ( ((_m->dbg_Info_Calibration_Ver_Date >> 6U) & (0xFFU)) | ((_m->dbg_Info_CCU_SW_Ver_Date >> 6U) & (0xFFU)) | (_m->dbg_Info_CCU_Algorithm_Cfg & (0x0FU)) | ((_m->dbg_Info_CCU_RearHvac_Cfg & (0x0FU)) << 4U) ); cframe->Data[2] |= (uint8_t) ( ((_m->dbg_Info_Calibration_Ver_Date >> 14U) & (0xFFU)) | ((_m->dbg_Info_CCU_SW_Ver_Date >> 14U) & (0xFFU)) ); cframe->Data[3] |= (uint8_t) ( (_m->dbg_Info_Calibration_Ver_Rev & (0xFFU)) | (_m->dbg_Info_CCU_SW_Ver_Rev & (0xFFU)) ); - cframe->Data[4] |= (uint8_t) ( (_m->dbg_Info_ActivatedCAL & (0x0FU)) | ((_m->dbg_Info_MBD_Ver_Date & (0x3FU)) << 2U) | ((_m->dbg_Info_CCU_Aroma_Cfg & (0x0FU)) << 4U) ); - cframe->Data[5] |= (uint8_t) ( ((_m->dbg_Info_MBD_Ver_Date >> 6U) & (0xFFU)) | (_m->dbg_Info_CCU_Algorithm_Cfg & (0x0FU)) ); + cframe->Data[4] |= (uint8_t) ( (_m->dbg_Info_ActivatedCAL & (0x0FU)) | ((_m->dbg_Info_MBD_Ver_Date & (0x3FU)) << 2U) ); + cframe->Data[5] |= (uint8_t) ( ((_m->dbg_Info_MBD_Ver_Date >> 6U) & (0xFFU)) | ((_m->dbg_Info_Rear_Installed_Act_Num & (0x03U)) << 4U) | ((_m->dbg_Info_ActNum_Mismatch & (0x01U)) << 6U) | ((_m->dbg_Info_VIN_Mismatch & (0x01U)) << 7U) ); cframe->Data[6] |= (uint8_t) ( ((_m->dbg_Info_MBD_Ver_Date >> 14U) & (0xFFU)) | (_m->dbg_Info_VehicleBody & (0xFFU)) ); cframe->Data[7] |= (uint8_t) ( ((_m->dbg_Info_VehicleBody >> 8U) & (0xFFU)) | (_m->dbg_Info_MBD_Ver_Rev & (0xFFU)) ); @@ -1009,12 +1351,12 @@ uint32_t Pack_dbg_CCU_Info_candb_dbg(dbg_CCU_Info_t* _m, uint8_t* _d, uint8_t* _ { uint8_t i; for (i = 0u; i < CANDB_DBG_VALIDATE_DLC(dbg_CCU_Info_DLC); _d[i++] = CANDB_DBG_INITIAL_BYTE_VALUE); - _d[0] |= (uint8_t) ( (_m->dbg_Info_MultMsg_Idx & (0x03U)) | ((_m->dbg_Info_Calibration_Ver_Date & (0x3FU)) << 2U) | ((_m->dbg_Info_CCU_SW_Ver_Date & (0x3FU)) << 2U) ); - _d[1] |= (uint8_t) ( ((_m->dbg_Info_Calibration_Ver_Date >> 6U) & (0xFFU)) | ((_m->dbg_Info_CCU_SW_Ver_Date >> 6U) & (0xFFU)) ); + _d[0] |= (uint8_t) ( (_m->dbg_Info_MultMsg_Idx & (0x03U)) | ((_m->dbg_Info_CCU_Aroma_Cfg & (0x0FU)) << 2U) | ((_m->dbg_Info_Calibration_Ver_Date & (0x3FU)) << 2U) | ((_m->dbg_Info_CCU_SW_Ver_Date & (0x3FU)) << 2U) ); + _d[1] |= (uint8_t) ( ((_m->dbg_Info_Calibration_Ver_Date >> 6U) & (0xFFU)) | ((_m->dbg_Info_CCU_SW_Ver_Date >> 6U) & (0xFFU)) | (_m->dbg_Info_CCU_Algorithm_Cfg & (0x0FU)) | ((_m->dbg_Info_CCU_RearHvac_Cfg & (0x0FU)) << 4U) ); _d[2] |= (uint8_t) ( ((_m->dbg_Info_Calibration_Ver_Date >> 14U) & (0xFFU)) | ((_m->dbg_Info_CCU_SW_Ver_Date >> 14U) & (0xFFU)) ); _d[3] |= (uint8_t) ( (_m->dbg_Info_Calibration_Ver_Rev & (0xFFU)) | (_m->dbg_Info_CCU_SW_Ver_Rev & (0xFFU)) ); - _d[4] |= (uint8_t) ( (_m->dbg_Info_ActivatedCAL & (0x0FU)) | ((_m->dbg_Info_MBD_Ver_Date & (0x3FU)) << 2U) | ((_m->dbg_Info_CCU_Aroma_Cfg & (0x0FU)) << 4U) ); - _d[5] |= (uint8_t) ( ((_m->dbg_Info_MBD_Ver_Date >> 6U) & (0xFFU)) | (_m->dbg_Info_CCU_Algorithm_Cfg & (0x0FU)) ); + _d[4] |= (uint8_t) ( (_m->dbg_Info_ActivatedCAL & (0x0FU)) | ((_m->dbg_Info_MBD_Ver_Date & (0x3FU)) << 2U) ); + _d[5] |= (uint8_t) ( ((_m->dbg_Info_MBD_Ver_Date >> 6U) & (0xFFU)) | ((_m->dbg_Info_Rear_Installed_Act_Num & (0x03U)) << 4U) | ((_m->dbg_Info_ActNum_Mismatch & (0x01U)) << 6U) | ((_m->dbg_Info_VIN_Mismatch & (0x01U)) << 7U) ); _d[6] |= (uint8_t) ( ((_m->dbg_Info_MBD_Ver_Date >> 14U) & (0xFFU)) | (_m->dbg_Info_VehicleBody & (0xFFU)) ); _d[7] |= (uint8_t) ( ((_m->dbg_Info_VehicleBody >> 8U) & (0xFFU)) | (_m->dbg_Info_MBD_Ver_Rev & (0xFFU)) ); @@ -1749,12 +2091,12 @@ uint32_t Unpack_dbg_LIN_AirQS_Stat_candb_dbg(dbg_LIN_AirQS_Stat_t* _m, const uin { (void)dlc_; _m->LIN_AirQS_LinRespErr_Stat = (uint8_t) ( (_d[0] & (0x01U)) ); - _m->LIN_AirQualSen_Stat = (uint8_t) ( ((_d[0] >> 1U) & (0x03U)) ); - _m->LIN_AirQualSenCombined_Val = (uint8_t) ( ((_d[0] >> 3U) & (0x03U)) ); - _m->LIN_AirQualSen_Error_Stat = (uint8_t) ( ((_d[1] >> 1U) & (0x03U)) ); - _m->LIN_AirQualSenCOlvl_Val = (uint8_t) ( ((_d[1] >> 4U) & (0x0FU)) ); - _m->LIN_AirQualSenNOxlvl_Val = (uint8_t) ( (_d[2] & (0x0FU)) ); - _m->LIN_AirQualSenNH3lvl_Val = (uint8_t) ( ((_d[2] >> 4U) & (0x0FU)) ); + _m->LIN_AirQS_Stat = (uint8_t) ( ((_d[0] >> 1U) & (0x03U)) ); + _m->LIN_AirQS_Combined_Stat = (uint8_t) ( ((_d[0] >> 3U) & (0x07U)) ); + _m->LIN_AirQS_Error_Stat = (uint8_t) ( ((_d[1] >> 1U) & (0x07U)) ); + _m->LIN_AirQS_COlvl_Stat = (uint8_t) ( ((_d[1] >> 4U) & (0x0FU)) ); + _m->LIN_AirQS_NOxlvl_Stat = (uint8_t) ( (_d[2] & (0x0FU)) ); + _m->LIN_AirQS_NH3lvl_Stat = (uint8_t) ( ((_d[2] >> 4U) & (0x0FU)) ); #ifdef CANDB_DBG_USE_DIAG_MONITORS _m->mon1.dlc_error = (dlc_ < dbg_LIN_AirQS_Stat_DLC); @@ -1773,9 +2115,9 @@ uint32_t Pack_dbg_LIN_AirQS_Stat_candb_dbg(dbg_LIN_AirQS_Stat_t* _m, __CoderDbcC { uint8_t i; for (i = 0u; i < CANDB_DBG_VALIDATE_DLC(dbg_LIN_AirQS_Stat_DLC); cframe->Data[i++] = CANDB_DBG_INITIAL_BYTE_VALUE); - cframe->Data[0] |= (uint8_t) ( (_m->LIN_AirQS_LinRespErr_Stat & (0x01U)) | ((_m->LIN_AirQualSen_Stat & (0x03U)) << 1U) | ((_m->LIN_AirQualSenCombined_Val & (0x03U)) << 3U) ); - cframe->Data[1] |= (uint8_t) ( ((_m->LIN_AirQualSen_Error_Stat & (0x03U)) << 1U) | ((_m->LIN_AirQualSenCOlvl_Val & (0x0FU)) << 4U) ); - cframe->Data[2] |= (uint8_t) ( (_m->LIN_AirQualSenNOxlvl_Val & (0x0FU)) | ((_m->LIN_AirQualSenNH3lvl_Val & (0x0FU)) << 4U) ); + cframe->Data[0] |= (uint8_t) ( (_m->LIN_AirQS_LinRespErr_Stat & (0x01U)) | ((_m->LIN_AirQS_Stat & (0x03U)) << 1U) | ((_m->LIN_AirQS_Combined_Stat & (0x07U)) << 3U) ); + cframe->Data[1] |= (uint8_t) ( ((_m->LIN_AirQS_Error_Stat & (0x07U)) << 1U) | ((_m->LIN_AirQS_COlvl_Stat & (0x0FU)) << 4U) ); + cframe->Data[2] |= (uint8_t) ( (_m->LIN_AirQS_NOxlvl_Stat & (0x0FU)) | ((_m->LIN_AirQS_NH3lvl_Stat & (0x0FU)) << 4U) ); cframe->MsgId = (uint32_t) dbg_LIN_AirQS_Stat_CANID; cframe->DLC = (uint8_t) dbg_LIN_AirQS_Stat_DLC; @@ -1789,9 +2131,9 @@ uint32_t Pack_dbg_LIN_AirQS_Stat_candb_dbg(dbg_LIN_AirQS_Stat_t* _m, uint8_t* _d { uint8_t i; for (i = 0u; i < CANDB_DBG_VALIDATE_DLC(dbg_LIN_AirQS_Stat_DLC); _d[i++] = CANDB_DBG_INITIAL_BYTE_VALUE); - _d[0] |= (uint8_t) ( (_m->LIN_AirQS_LinRespErr_Stat & (0x01U)) | ((_m->LIN_AirQualSen_Stat & (0x03U)) << 1U) | ((_m->LIN_AirQualSenCombined_Val & (0x03U)) << 3U) ); - _d[1] |= (uint8_t) ( ((_m->LIN_AirQualSen_Error_Stat & (0x03U)) << 1U) | ((_m->LIN_AirQualSenCOlvl_Val & (0x0FU)) << 4U) ); - _d[2] |= (uint8_t) ( (_m->LIN_AirQualSenNOxlvl_Val & (0x0FU)) | ((_m->LIN_AirQualSenNH3lvl_Val & (0x0FU)) << 4U) ); + _d[0] |= (uint8_t) ( (_m->LIN_AirQS_LinRespErr_Stat & (0x01U)) | ((_m->LIN_AirQS_Stat & (0x03U)) << 1U) | ((_m->LIN_AirQS_Combined_Stat & (0x07U)) << 3U) ); + _d[1] |= (uint8_t) ( ((_m->LIN_AirQS_Error_Stat & (0x07U)) << 1U) | ((_m->LIN_AirQS_COlvl_Stat & (0x0FU)) << 4U) ); + _d[2] |= (uint8_t) ( (_m->LIN_AirQS_NOxlvl_Stat & (0x0FU)) | ((_m->LIN_AirQS_NH3lvl_Stat & (0x0FU)) << 4U) ); *_len = (uint8_t) dbg_LIN_AirQS_Stat_DLC; *_ide = (uint8_t) dbg_LIN_AirQS_Stat_IDE; @@ -1804,29 +2146,15 @@ uint32_t Unpack_dbg_LIN_Aroma_Stat_candb_dbg(dbg_LIN_Aroma_Stat_t* _m, const uin { (void)dlc_; _m->LIN_AromaLinRespErr_Stat = (uint8_t) ( (_d[0] & (0x01U)) ); - _m->LIN_Aroma_1CartridgeSw = (uint8_t) ( ((_d[0] >> 1U) & (0x01U)) ); - _m->LIN_Aroma_2CartridgeSw = (uint8_t) ( ((_d[0] >> 2U) & (0x01U)) ); - _m->LIN_Aroma_3CartridgeSw = (uint8_t) ( ((_d[0] >> 3U) & (0x01U)) ); + _m->LIN_Aroma_CartridgeSw = (uint8_t) ( ((_d[0] >> 1U) & (0x01U)) ); _m->LIN_Aroma_Error_Stat = (uint8_t) ( ((_d[0] >> 4U) & (0x03U)) ); _m->LIN_Aroma_Intens = (uint8_t) ( ((_d[0] >> 6U) & (0x03U)) ); - _m->LIN_Aroma_CartridgeSel = (uint8_t) ( (_d[1] & (0x03U)) ); - _m->LIN_Aroma_1CartridgeFlavor = (uint8_t) ( ((_d[1] >> 2U) & (0x0FU)) ); - _m->LIN_Aroma_2CartridgeFlavor = (uint8_t) ( (_d[2] & (0x0FU)) ); - _m->LIN_Aroma_3CartridgeFlavor = (uint8_t) ( ((_d[2] >> 4U) & (0x0FU)) ); - _m->LIN_Aroma_1CartridgeCapacity_ro = (uint8_t) ( (_d[3] & (0x0FU)) ); + _m->LIN_Aroma_CartridgeCapacity_ro = (uint8_t) ( (_d[1] & (0x0FU)) ); #ifdef CANDB_DBG_USE_SIGFLOAT - _m->LIN_Aroma_1CartridgeCapacity_phys = (uint8_t) CANDB_DBG_LIN_Aroma_1CartridgeCapacity_ro_fromS(_m->LIN_Aroma_1CartridgeCapacity_ro); + _m->LIN_Aroma_CartridgeCapacity_phys = (uint8_t) CANDB_DBG_LIN_Aroma_CartridgeCapacity_ro_fromS(_m->LIN_Aroma_CartridgeCapacity_ro); #endif // CANDB_DBG_USE_SIGFLOAT - _m->LIN_Aroma_2CartridgeCapacity_ro = (uint8_t) ( ((_d[3] >> 4U) & (0x0FU)) ); -#ifdef CANDB_DBG_USE_SIGFLOAT - _m->LIN_Aroma_2CartridgeCapacity_phys = (uint8_t) CANDB_DBG_LIN_Aroma_2CartridgeCapacity_ro_fromS(_m->LIN_Aroma_2CartridgeCapacity_ro); -#endif // CANDB_DBG_USE_SIGFLOAT - - _m->LIN_Aroma_3CartridgeCapacity_ro = (uint8_t) ( (_d[4] & (0x0FU)) ); -#ifdef CANDB_DBG_USE_SIGFLOAT - _m->LIN_Aroma_3CartridgeCapacity_phys = (uint8_t) CANDB_DBG_LIN_Aroma_3CartridgeCapacity_ro_fromS(_m->LIN_Aroma_3CartridgeCapacity_ro); -#endif // CANDB_DBG_USE_SIGFLOAT + _m->LIN_Aroma_CartridgeFlavor = (uint8_t) ( ((_d[1] >> 4U) & (0x0FU)) ); #ifdef CANDB_DBG_USE_DIAG_MONITORS _m->mon1.dlc_error = (dlc_ < dbg_LIN_Aroma_Stat_DLC); @@ -1846,16 +2174,11 @@ uint32_t Pack_dbg_LIN_Aroma_Stat_candb_dbg(dbg_LIN_Aroma_Stat_t* _m, __CoderDbcC uint8_t i; for (i = 0u; i < CANDB_DBG_VALIDATE_DLC(dbg_LIN_Aroma_Stat_DLC); cframe->Data[i++] = CANDB_DBG_INITIAL_BYTE_VALUE); #ifdef CANDB_DBG_USE_SIGFLOAT - _m->LIN_Aroma_1CartridgeCapacity_ro = (uint8_t) CANDB_DBG_LIN_Aroma_1CartridgeCapacity_ro_toS(_m->LIN_Aroma_1CartridgeCapacity_phys); - _m->LIN_Aroma_2CartridgeCapacity_ro = (uint8_t) CANDB_DBG_LIN_Aroma_2CartridgeCapacity_ro_toS(_m->LIN_Aroma_2CartridgeCapacity_phys); - _m->LIN_Aroma_3CartridgeCapacity_ro = (uint8_t) CANDB_DBG_LIN_Aroma_3CartridgeCapacity_ro_toS(_m->LIN_Aroma_3CartridgeCapacity_phys); + _m->LIN_Aroma_CartridgeCapacity_ro = (uint8_t) CANDB_DBG_LIN_Aroma_CartridgeCapacity_ro_toS(_m->LIN_Aroma_CartridgeCapacity_phys); #endif // CANDB_DBG_USE_SIGFLOAT - cframe->Data[0] |= (uint8_t) ( (_m->LIN_AromaLinRespErr_Stat & (0x01U)) | ((_m->LIN_Aroma_1CartridgeSw & (0x01U)) << 1U) | ((_m->LIN_Aroma_2CartridgeSw & (0x01U)) << 2U) | ((_m->LIN_Aroma_3CartridgeSw & (0x01U)) << 3U) | ((_m->LIN_Aroma_Error_Stat & (0x03U)) << 4U) | ((_m->LIN_Aroma_Intens & (0x03U)) << 6U) ); - cframe->Data[1] |= (uint8_t) ( (_m->LIN_Aroma_CartridgeSel & (0x03U)) | ((_m->LIN_Aroma_1CartridgeFlavor & (0x0FU)) << 2U) ); - cframe->Data[2] |= (uint8_t) ( (_m->LIN_Aroma_2CartridgeFlavor & (0x0FU)) | ((_m->LIN_Aroma_3CartridgeFlavor & (0x0FU)) << 4U) ); - cframe->Data[3] |= (uint8_t) ( (_m->LIN_Aroma_1CartridgeCapacity_ro & (0x0FU)) | ((_m->LIN_Aroma_2CartridgeCapacity_ro & (0x0FU)) << 4U) ); - cframe->Data[4] |= (uint8_t) ( (_m->LIN_Aroma_3CartridgeCapacity_ro & (0x0FU)) ); + cframe->Data[0] |= (uint8_t) ( (_m->LIN_AromaLinRespErr_Stat & (0x01U)) | ((_m->LIN_Aroma_CartridgeSw & (0x01U)) << 1U) | ((_m->LIN_Aroma_Error_Stat & (0x03U)) << 4U) | ((_m->LIN_Aroma_Intens & (0x03U)) << 6U) ); + cframe->Data[1] |= (uint8_t) ( (_m->LIN_Aroma_CartridgeCapacity_ro & (0x0FU)) | ((_m->LIN_Aroma_CartridgeFlavor & (0x0FU)) << 4U) ); cframe->MsgId = (uint32_t) dbg_LIN_Aroma_Stat_CANID; cframe->DLC = (uint8_t) dbg_LIN_Aroma_Stat_DLC; @@ -1870,16 +2193,11 @@ uint32_t Pack_dbg_LIN_Aroma_Stat_candb_dbg(dbg_LIN_Aroma_Stat_t* _m, uint8_t* _d uint8_t i; for (i = 0u; i < CANDB_DBG_VALIDATE_DLC(dbg_LIN_Aroma_Stat_DLC); _d[i++] = CANDB_DBG_INITIAL_BYTE_VALUE); #ifdef CANDB_DBG_USE_SIGFLOAT - _m->LIN_Aroma_1CartridgeCapacity_ro = (uint8_t) CANDB_DBG_LIN_Aroma_1CartridgeCapacity_ro_toS(_m->LIN_Aroma_1CartridgeCapacity_phys); - _m->LIN_Aroma_2CartridgeCapacity_ro = (uint8_t) CANDB_DBG_LIN_Aroma_2CartridgeCapacity_ro_toS(_m->LIN_Aroma_2CartridgeCapacity_phys); - _m->LIN_Aroma_3CartridgeCapacity_ro = (uint8_t) CANDB_DBG_LIN_Aroma_3CartridgeCapacity_ro_toS(_m->LIN_Aroma_3CartridgeCapacity_phys); + _m->LIN_Aroma_CartridgeCapacity_ro = (uint8_t) CANDB_DBG_LIN_Aroma_CartridgeCapacity_ro_toS(_m->LIN_Aroma_CartridgeCapacity_phys); #endif // CANDB_DBG_USE_SIGFLOAT - _d[0] |= (uint8_t) ( (_m->LIN_AromaLinRespErr_Stat & (0x01U)) | ((_m->LIN_Aroma_1CartridgeSw & (0x01U)) << 1U) | ((_m->LIN_Aroma_2CartridgeSw & (0x01U)) << 2U) | ((_m->LIN_Aroma_3CartridgeSw & (0x01U)) << 3U) | ((_m->LIN_Aroma_Error_Stat & (0x03U)) << 4U) | ((_m->LIN_Aroma_Intens & (0x03U)) << 6U) ); - _d[1] |= (uint8_t) ( (_m->LIN_Aroma_CartridgeSel & (0x03U)) | ((_m->LIN_Aroma_1CartridgeFlavor & (0x0FU)) << 2U) ); - _d[2] |= (uint8_t) ( (_m->LIN_Aroma_2CartridgeFlavor & (0x0FU)) | ((_m->LIN_Aroma_3CartridgeFlavor & (0x0FU)) << 4U) ); - _d[3] |= (uint8_t) ( (_m->LIN_Aroma_1CartridgeCapacity_ro & (0x0FU)) | ((_m->LIN_Aroma_2CartridgeCapacity_ro & (0x0FU)) << 4U) ); - _d[4] |= (uint8_t) ( (_m->LIN_Aroma_3CartridgeCapacity_ro & (0x0FU)) ); + _d[0] |= (uint8_t) ( (_m->LIN_AromaLinRespErr_Stat & (0x01U)) | ((_m->LIN_Aroma_CartridgeSw & (0x01U)) << 1U) | ((_m->LIN_Aroma_Error_Stat & (0x03U)) << 4U) | ((_m->LIN_Aroma_Intens & (0x03U)) << 6U) ); + _d[1] |= (uint8_t) ( (_m->LIN_Aroma_CartridgeCapacity_ro & (0x0FU)) | ((_m->LIN_Aroma_CartridgeFlavor & (0x0FU)) << 4U) ); *_len = (uint8_t) dbg_LIN_Aroma_Stat_DLC; *_ide = (uint8_t) dbg_LIN_Aroma_Stat_IDE; diff --git a/MODULES/HVAC_M7_CAN_DBG_MATRIX/lib/candb_dbg.h b/MODULES/HVAC_M7_CAN_DBG_MATRIX/lib/candb_dbg.h index 2f7b784..e19ca17 100644 --- a/MODULES/HVAC_M7_CAN_DBG_MATRIX/lib/candb_dbg.h +++ b/MODULES/HVAC_M7_CAN_DBG_MATRIX/lib/candb_dbg.h @@ -42,6 +42,124 @@ extern "C" { #endif +// This is a message for not used signals, created by Vector CANdb++ DBC OLE DB Provider. +// def @dbg_Act_calibration_error CAN Message (0 0) +#define dbg_Act_calibration_error_IDE (0U) +#define dbg_Act_calibration_error_DLC (8U) +#define dbg_Act_calibration_error_CANID (0U) + +typedef struct +{ +#ifdef CANDB_DBG_USE_BITS_SIGNAL + + uint8_t dbg_Act_calib_00_Def_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_01_Vent_SFL_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_02_Vent_CFL_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_03_Foot_1FL_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_04_Foot_2FL_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_05_Vent_CFR_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_06_Vent_SFR_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_07_Foot_1FR_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_08_Foot_2FR_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_09_Vent_SRL_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_10_Vent_CRL_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_11_Foot_RL_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_12_Vent_CRR_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_13_Vent_SRR_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_14_Foot_RR_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_15_TempU_FL_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_16_TempL_FL_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_17_TempU_FR_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_18_TempL_FR_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_19_Temp_RL_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_20_Temp_RR_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_21_Rec_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_22_OSA_error : 1; // Bits= 1 + + uint8_t dbg_Act_calib_23_Sealing_error : 1; // Bits= 1 + +#else + + uint8_t dbg_Act_calib_00_Def_error; // Bits= 1 + + uint8_t dbg_Act_calib_01_Vent_SFL_error; // Bits= 1 + + uint8_t dbg_Act_calib_02_Vent_CFL_error; // Bits= 1 + + uint8_t dbg_Act_calib_03_Foot_1FL_error; // Bits= 1 + + uint8_t dbg_Act_calib_04_Foot_2FL_error; // Bits= 1 + + uint8_t dbg_Act_calib_05_Vent_CFR_error; // Bits= 1 + + uint8_t dbg_Act_calib_06_Vent_SFR_error; // Bits= 1 + + uint8_t dbg_Act_calib_07_Foot_1FR_error; // Bits= 1 + + uint8_t dbg_Act_calib_08_Foot_2FR_error; // Bits= 1 + + uint8_t dbg_Act_calib_09_Vent_SRL_error; // Bits= 1 + + uint8_t dbg_Act_calib_10_Vent_CRL_error; // Bits= 1 + + uint8_t dbg_Act_calib_11_Foot_RL_error; // Bits= 1 + + uint8_t dbg_Act_calib_12_Vent_CRR_error; // Bits= 1 + + uint8_t dbg_Act_calib_13_Vent_SRR_error; // Bits= 1 + + uint8_t dbg_Act_calib_14_Foot_RR_error; // Bits= 1 + + uint8_t dbg_Act_calib_15_TempU_FL_error; // Bits= 1 + + uint8_t dbg_Act_calib_16_TempL_FL_error; // Bits= 1 + + uint8_t dbg_Act_calib_17_TempU_FR_error; // Bits= 1 + + uint8_t dbg_Act_calib_18_TempL_FR_error; // Bits= 1 + + uint8_t dbg_Act_calib_19_Temp_RL_error; // Bits= 1 + + uint8_t dbg_Act_calib_20_Temp_RR_error; // Bits= 1 + + uint8_t dbg_Act_calib_21_Rec_error; // Bits= 1 + + uint8_t dbg_Act_calib_22_OSA_error; // Bits= 1 + + uint8_t dbg_Act_calib_23_Sealing_error; // Bits= 1 + +#endif // CANDB_DBG_USE_BITS_SIGNAL + +#ifdef CANDB_DBG_USE_DIAG_MONITORS + + FrameMonitor_t mon1; + +#endif // CANDB_DBG_USE_DIAG_MONITORS + +} dbg_Act_calibration_error_t; + // def @dbg_Logic_State CAN Message (992 0x3e0) #define dbg_Logic_State_IDE (0U) #define dbg_Logic_State_DLC (8U) @@ -410,7 +528,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - // 3 : "Full Mode" + // 3 : "Full Mode" // 1 : "Reduced Mode" // 0 : "Off Mode" uint8_t Logic_Operation_Mode : 2; // Bits= 2 @@ -484,7 +602,7 @@ typedef struct uint8_t Logic_Full_Auto_RR : 1; // Bits= 1 Unit:'(off 0, on 1)' - uint8_t Logic_Full_MaxAc : 1; // Bits= 1 Unit:'(off 0, on 1)' + uint8_t Logic_Full_MaxAc : 2; // Bits= 2 Unit:'(off 0, on 1)' uint8_t Logic_Full_MaxDef : 1; // Bits= 1 Unit:'(off 0, on 1)' @@ -537,136 +655,136 @@ typedef struct #else - // 3 : "Full Mode" - // 1 : "Reduced Mode" - // 0 : "Off Mode" - uint8_t Logic_Operation_Mode; // Bits= 2 + // 3 : "Full Mode" + // 1 : "Reduced Mode" + // 0 : "Off Mode" + uint8_t Logic_Operation_Mode; // Bits= 2 - // 5 : "AMB_LV5" - // 4 : "AMB_LV4" - // 3 : "AMB_LV3" - // 2 : "AMB_LV2" - // 1 : "AMB_LV1" - // 0 : "AMB_LV0" - uint8_t Logic_Amb_Level; // Bits= 4 + // 5 : "AMB_LV5" + // 4 : "AMB_LV4" + // 3 : "AMB_LV3" + // 2 : "AMB_LV2" + // 1 : "AMB_LV1" + // 0 : "AMB_LV0" + uint8_t Logic_Amb_Level; // Bits= 4 - // 1 : "On" - // 0 : "OFF" - uint8_t Logic_AutoDemist_Electric; // Bits= 1 + // 1 : "On" + // 0 : "OFF" + uint8_t Logic_AutoDemist_Electric; // Bits= 1 - // 1 : "On" - // 0 : "OFF" - uint8_t Logic_AutoDemist_Garage; // Bits= 1 + // 1 : "On" + // 0 : "OFF" + uint8_t Logic_AutoDemist_Garage; // Bits= 1 - // 4 : "AutoDemist_LV4" - // 3 : "AutoDemist_LV3" - // 2 : "AutoDemist_LV2" - // 1 : "AutoDemist_LV1" - // 0 : "AutoDemist_LV0" - uint8_t Logic_AutoDemist_Lv_Summer; // Bits= 4 + // 4 : "AutoDemist_LV4" + // 3 : "AutoDemist_LV3" + // 2 : "AutoDemist_LV2" + // 1 : "AutoDemist_LV1" + // 0 : "AutoDemist_LV0" + uint8_t Logic_AutoDemist_Lv_Summer; // Bits= 4 - // 3 : "Remote Starte Step 3" - // 2 : "Remote Starte Step 2" - // 1 : "Remote Starte Step 1" - // 0 : "Remote Starte Step 0" - uint8_t Logic_RemoteStart; // Bits= 2 + // 3 : "Remote Starte Step 3" + // 2 : "Remote Starte Step 2" + // 1 : "Remote Starte Step 1" + // 0 : "Remote Starte Step 0" + uint8_t Logic_RemoteStart; // Bits= 2 - // 2 : "Rest Mode_Summer" - // 1 : "Rest Mode_Winter" - // 0 : "No Rest Mode" - uint8_t Logic_Rest_Mode; // Bits= 2 + // 2 : "Rest Mode_Summer" + // 1 : "Rest Mode_Winter" + // 0 : "No Rest Mode" + uint8_t Logic_Rest_Mode; // Bits= 2 - // 99 : "HI_Full_4zone" - // 88 : "HI_Both_Left_Right" - // 80 : "HI_Left_Only" - // 22 : "LO_Full_4zone" - // 11 : "LO_Both_Left_Right" - // 10 : "LO_Left_Only" - // 8 : "HI_Right_Only" - // 1 : "LO_Right_Only" - // 0 : "IDLE_No_LoHi" - uint8_t Logic_LoHi_Front; // Bits= 8 + // 99 : "HI_Full_4zone" + // 88 : "HI_Both_Left_Right" + // 80 : "HI_Left_Only" + // 22 : "LO_Full_4zone" + // 11 : "LO_Both_Left_Right" + // 10 : "LO_Left_Only" + // 8 : "HI_Right_Only" + // 1 : "LO_Right_Only" + // 0 : "IDLE_No_LoHi" + uint8_t Logic_LoHi_Front; // Bits= 8 - // 99 : "HI_Full_4zone" - // 88 : "HI_Both_Left_Right" - // 80 : "HI_Left_Only" - // 22 : "LO_Full_4zone" - // 11 : "LO_Both_Left_Right" - // 10 : "LO_Left_Only" - // 8 : "HI_Right_Only" - // 1 : "LO_Right_Only" - // 0 : "IDLE_No_LoHi" - uint8_t Logic_LoHi_Rear; // Bits= 8 + // 99 : "HI_Full_4zone" + // 88 : "HI_Both_Left_Right" + // 80 : "HI_Left_Only" + // 22 : "LO_Full_4zone" + // 11 : "LO_Both_Left_Right" + // 10 : "LO_Left_Only" + // 8 : "HI_Right_Only" + // 1 : "LO_Right_Only" + // 0 : "IDLE_No_LoHi" + uint8_t Logic_LoHi_Rear; // Bits= 8 - // 2 : "Open" - // 1 : "Close_Exit" - // 0 : "Close" - uint8_t Logic_2WayValve_Status; // Bits= 2 + // 2 : "Open" + // 1 : "Close_Exit" + // 0 : "Close" + uint8_t Logic_2WayValve_Status; // Bits= 2 - uint8_t Logic_Full_Auto_FL; // Bits= 1 Unit:'(off 0, on 1)' + uint8_t Logic_Full_Auto_FL; // Bits= 1 Unit:'(off 0, on 1)' - uint8_t Logic_Full_Auto_FR; // Bits= 1 Unit:'(off 0, on 1)' + uint8_t Logic_Full_Auto_FR; // Bits= 1 Unit:'(off 0, on 1)' - uint8_t Logic_Full_Auto_RL; // Bits= 1 Unit:'(off 0, on 1)' + uint8_t Logic_Full_Auto_RL; // Bits= 1 Unit:'(off 0, on 1)' - uint8_t Logic_Full_Auto_RR; // Bits= 1 Unit:'(off 0, on 1)' + uint8_t Logic_Full_Auto_RR; // Bits= 1 Unit:'(off 0, on 1)' - uint8_t Logic_Full_MaxAc; // Bits= 1 Unit:'(off 0, on 1)' + uint8_t Logic_Full_MaxAc; // Bits= 2 Unit:'(off 0, on 1)' - uint8_t Logic_Full_MaxDef; // Bits= 1 Unit:'(off 0, on 1)' + uint8_t Logic_Full_MaxDef; // Bits= 1 Unit:'(off 0, on 1)' - // 4 : "Start_Ctrl_Step3" - // 2 : "Start_Ctrl_Step1" - // 3 : "Start_Ctrl_Step2" - // 1 : "Start_Ctrl_Step0" - // 0 : "No_Start_Ctrl" - uint8_t Logic_Start_Ctrl_Front; // Bits= 3 + // 4 : "Start_Ctrl_Step3" + // 2 : "Start_Ctrl_Step1" + // 3 : "Start_Ctrl_Step2" + // 1 : "Start_Ctrl_Step0" + // 0 : "No_Start_Ctrl" + uint8_t Logic_Start_Ctrl_Front; // Bits= 3 - // 4 : "Start_Ctrl_Step3" - // 2 : "Start_Ctrl_Step1" - // 3 : "Start_Ctrl_Step2" - // 1 : "Start_Ctrl_Step0" - // 0 : "No_Start_Ctrl" - uint8_t Logic_Start_Ctrl_Rear; // Bits= 3 + // 4 : "Start_Ctrl_Step3" + // 2 : "Start_Ctrl_Step1" + // 3 : "Start_Ctrl_Step2" + // 1 : "Start_Ctrl_Step0" + // 0 : "No_Start_Ctrl" + uint8_t Logic_Start_Ctrl_Rear; // Bits= 3 - uint8_t Logic_Valve_Use_DiffBlr_R2; // Bits= 1 Unit:'(off 0, on 1)' + uint8_t Logic_Valve_Use_DiffBlr_R2; // Bits= 1 Unit:'(off 0, on 1)' - // 3 : "DONE" - // 2 : "CHANGE" - // 1 : "WAIT" - // 0 : "OFF" - uint8_t Logic_Duct_WaitCorrection_FRL; // Bits= 2 + // 3 : "DONE" + // 2 : "CHANGE" + // 1 : "WAIT" + // 0 : "OFF" + uint8_t Logic_Duct_WaitCorrection_FRL; // Bits= 2 - // 3 : "DONE" - // 2 : "CHANGE" - // 1 : "WAIT" - // 0 : "OFF" - uint8_t Logic_Duct_WaitCorrection_FLL; // Bits= 2 + // 3 : "DONE" + // 2 : "CHANGE" + // 1 : "WAIT" + // 0 : "OFF" + uint8_t Logic_Duct_WaitCorrection_FLL; // Bits= 2 - // 4 : "AutoDemist_LV4" - // 3 : "AutoDemist_LV3" - // 2 : "AutoDemist_LV2" - // 1 : "AutoDemist_LV1" - // 0 : "AutoDemist_LV0" - uint8_t Logic_AutoDemist_Lv_Winter; // Bits= 4 + // 4 : "AutoDemist_LV4" + // 3 : "AutoDemist_LV3" + // 2 : "AutoDemist_LV2" + // 1 : "AutoDemist_LV1" + // 0 : "AutoDemist_LV0" + uint8_t Logic_AutoDemist_Lv_Winter; // Bits= 4 - // 3 : "DONE" - // 2 : "CHANGE" - // 1 : "WAIT" - // 0 : "OFF" - uint8_t Logic_AF_WaitCorrection_FL; // Bits= 2 + // 3 : "DONE" + // 2 : "CHANGE" + // 1 : "WAIT" + // 0 : "OFF" + uint8_t Logic_AF_WaitCorrection_FL; // Bits= 2 - // 3 : "DONE" - // 2 : "CHANGE" - // 1 : "WAIT" - // 0 : "OFF" - uint8_t Logic_AF_WaitCorrection_FR; // Bits= 2 + // 3 : "DONE" + // 2 : "CHANGE" + // 1 : "WAIT" + // 0 : "OFF" + uint8_t Logic_AF_WaitCorrection_FR; // Bits= 2 #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -929,7 +1047,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - // 6 : "AC_Max" + // 6 : "AC_Max" // 5 : "Fire_Extinguis" // 4 : "Rest_Mode" // 3 : "Auto" @@ -1003,83 +1121,83 @@ typedef struct #else - // 6 : "AC_Max" - // 5 : "Fire_Extinguis" - // 4 : "Rest_Mode" - // 3 : "Auto" - // 2 : "Defrost" - // 1 : "Manual" - // 0 : "OFF" - uint8_t Logic_KM_Mode_FL; // Bits= 4 + // 6 : "AC_Max" + // 5 : "Fire_Extinguis" + // 4 : "Rest_Mode" + // 3 : "Auto" + // 2 : "Defrost" + // 1 : "Manual" + // 0 : "OFF" + uint8_t Logic_KM_Mode_FL; // Bits= 4 - // 6 : "AC_Max" - // 5 : "Fire_Extinguis" - // 4 : "Rest_Mode" - // 3 : "Auto" - // 2 : "Defrost" - // 1 : "Manual" - // 0 : "OFF" - uint8_t Logic_KM_Mode_FR; // Bits= 4 + // 6 : "AC_Max" + // 5 : "Fire_Extinguis" + // 4 : "Rest_Mode" + // 3 : "Auto" + // 2 : "Defrost" + // 1 : "Manual" + // 0 : "OFF" + uint8_t Logic_KM_Mode_FR; // Bits= 4 - // 6 : "AC_Max" - // 5 : "Fire_Extinguis" - // 4 : "Rest_Mode" - // 3 : "Auto" - // 2 : "Defrost" - // 1 : "Manual" - // 0 : "OFF" - uint8_t Logic_KM_Mode_RL; // Bits= 4 + // 6 : "AC_Max" + // 5 : "Fire_Extinguis" + // 4 : "Rest_Mode" + // 3 : "Auto" + // 2 : "Defrost" + // 1 : "Manual" + // 0 : "OFF" + uint8_t Logic_KM_Mode_RL; // Bits= 4 - // 6 : "AC_Max" - // 5 : "Fire_Extinguis" - // 4 : "Rest_Mode" - // 3 : "Auto" - // 2 : "Defrost" - // 1 : "Manual" - // 0 : "OFF" - uint8_t Logic_KM_Mode_RR; // Bits= 4 + // 6 : "AC_Max" + // 5 : "Fire_Extinguis" + // 4 : "Rest_Mode" + // 3 : "Auto" + // 2 : "Defrost" + // 1 : "Manual" + // 0 : "OFF" + uint8_t Logic_KM_Mode_RR; // Bits= 4 - // 6 : "AC_Max" - // 5 : "Fire_Extinguis" - // 4 : "Rest_Mode" - // 3 : "Auto" - // 2 : "Defrost" - // 1 : "Manual" - // 0 : "OFF" - uint8_t Logic_KM_Blower_FL; // Bits= 4 + // 6 : "AC_Max" + // 5 : "Fire_Extinguis" + // 4 : "Rest_Mode" + // 3 : "Auto" + // 2 : "Defrost" + // 1 : "Manual" + // 0 : "OFF" + uint8_t Logic_KM_Blower_FL; // Bits= 4 - // 6 : "AC_Max" - // 5 : "Fire_Extinguis" - // 4 : "Rest_Mode" - // 3 : "Auto" - // 2 : "Defrost" - // 1 : "Manual" - // 0 : "OFF" - uint8_t Logic_KM_Blower_FR; // Bits= 4 + // 6 : "AC_Max" + // 5 : "Fire_Extinguis" + // 4 : "Rest_Mode" + // 3 : "Auto" + // 2 : "Defrost" + // 1 : "Manual" + // 0 : "OFF" + uint8_t Logic_KM_Blower_FR; // Bits= 4 - // 6 : "AC_Max" - // 5 : "Fire_Extinguis" - // 4 : "Rest_Mode" - // 3 : "Auto" - // 2 : "Defrost" - // 1 : "Manual" - // 0 : "OFF" - uint8_t Logic_KM_Blower_RL; // Bits= 4 + // 6 : "AC_Max" + // 5 : "Fire_Extinguis" + // 4 : "Rest_Mode" + // 3 : "Auto" + // 2 : "Defrost" + // 1 : "Manual" + // 0 : "OFF" + uint8_t Logic_KM_Blower_RL; // Bits= 4 - // 6 : "AC_Max" - // 5 : "Fire_Extinguis" - // 4 : "Rest_Mode" - // 3 : "Auto" - // 2 : "Defrost" - // 1 : "Manual" - // 0 : "OFF" - uint8_t Logic_KM_Blower_RR; // Bits= 4 + // 6 : "AC_Max" + // 5 : "Fire_Extinguis" + // 4 : "Rest_Mode" + // 3 : "Auto" + // 2 : "Defrost" + // 1 : "Manual" + // 0 : "OFF" + uint8_t Logic_KM_Blower_RR; // Bits= 4 #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -1550,7 +1668,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - // 200 : "200_Re_Bi2Valve manual" + // 200 : "200_Re_Bi2Valve manual" // 190 : "190_Re_Vent manual" // 180 : "180_Re_Bi2Valve_3" // 170 : "170_Re_Vent_3" @@ -1676,135 +1794,135 @@ typedef struct #else - // 200 : "200_Re_Bi2Valve manual" - // 190 : "190_Re_Vent manual" - // 180 : "180_Re_Bi2Valve_3" - // 170 : "170_Re_Vent_3" - // 160 : "160_Re_Bi2Valve_2" - // 150 : "150_Re_Vent_2" - // 140 : "140_Re_Fo2Valve" - // 130 : "130_Re_Bi2Valve" - // 120 : "120_Re_Vent" - // 110 : "110_Fr_BiValve manual" - // 100 : "100_Fr_Hi2Valve" - // 90 : "090_Fr_Tr2Valve" - // 80 : "080_Fr_De2Valve" - // 70 : "070_Fr_Fd2Valve" - // 60 : "060_Fr_Fo2Valve" - // 50 : "050_Fr_AF2Valve_Summer" - // 40 : "040_Fr_AF2Valve" - // 30 : "030_Fr_Bi2Valve" - // 20 : "020_Fr_BiValve" - // 10 : "010_Fr_Ve2Valve" - uint8_t Logic_Valve_Index_FL; // Bits= 8 + // 200 : "200_Re_Bi2Valve manual" + // 190 : "190_Re_Vent manual" + // 180 : "180_Re_Bi2Valve_3" + // 170 : "170_Re_Vent_3" + // 160 : "160_Re_Bi2Valve_2" + // 150 : "150_Re_Vent_2" + // 140 : "140_Re_Fo2Valve" + // 130 : "130_Re_Bi2Valve" + // 120 : "120_Re_Vent" + // 110 : "110_Fr_BiValve manual" + // 100 : "100_Fr_Hi2Valve" + // 90 : "090_Fr_Tr2Valve" + // 80 : "080_Fr_De2Valve" + // 70 : "070_Fr_Fd2Valve" + // 60 : "060_Fr_Fo2Valve" + // 50 : "050_Fr_AF2Valve_Summer" + // 40 : "040_Fr_AF2Valve" + // 30 : "030_Fr_Bi2Valve" + // 20 : "020_Fr_BiValve" + // 10 : "010_Fr_Ve2Valve" + uint8_t Logic_Valve_Index_FL; // Bits= 8 - // 200 : "200_Re_Bi2Valve manual" - // 190 : "190_Re_Vent manual" - // 180 : "180_Re_Bi2Valve_3" - // 170 : "170_Re_Vent_3" - // 160 : "160_Re_Bi2Valve_2" - // 150 : "150_Re_Vent_2" - // 140 : "140_Re_Fo2Valve" - // 130 : "130_Re_Bi2Valve" - // 120 : "120_Re_Vent" - // 110 : "110_Fr_BiValve manual" - // 100 : "100_Fr_Hi2Valve" - // 90 : "090_Fr_Tr2Valve" - // 80 : "080_Fr_De2Valve" - // 70 : "070_Fr_Fd2Valve" - // 60 : "060_Fr_Fo2Valve" - // 50 : "050_Fr_AF2Valve_Summer" - // 40 : "040_Fr_AF2Valve" - // 30 : "030_Fr_Bi2Valve" - // 20 : "020_Fr_BiValve" - // 10 : "010_Fr_Ve2Valve" - uint8_t Logic_Valve_Index_FR; // Bits= 8 + // 200 : "200_Re_Bi2Valve manual" + // 190 : "190_Re_Vent manual" + // 180 : "180_Re_Bi2Valve_3" + // 170 : "170_Re_Vent_3" + // 160 : "160_Re_Bi2Valve_2" + // 150 : "150_Re_Vent_2" + // 140 : "140_Re_Fo2Valve" + // 130 : "130_Re_Bi2Valve" + // 120 : "120_Re_Vent" + // 110 : "110_Fr_BiValve manual" + // 100 : "100_Fr_Hi2Valve" + // 90 : "090_Fr_Tr2Valve" + // 80 : "080_Fr_De2Valve" + // 70 : "070_Fr_Fd2Valve" + // 60 : "060_Fr_Fo2Valve" + // 50 : "050_Fr_AF2Valve_Summer" + // 40 : "040_Fr_AF2Valve" + // 30 : "030_Fr_Bi2Valve" + // 20 : "020_Fr_BiValve" + // 10 : "010_Fr_Ve2Valve" + uint8_t Logic_Valve_Index_FR; // Bits= 8 - // 200 : "200_Re_Bi2Valve manual" - // 190 : "190_Re_Vent manual" - // 180 : "180_Re_Bi2Valve_3" - // 170 : "170_Re_Vent_3" - // 160 : "160_Re_Bi2Valve_2" - // 150 : "150_Re_Vent_2" - // 140 : "140_Re_Fo2Valve" - // 130 : "130_Re_Bi2Valve" - // 120 : "120_Re_Vent" - // 110 : "110_Fr_BiValve manual" - // 100 : "100_Fr_Hi2Valve" - // 90 : "090_Fr_Tr2Valve" - // 80 : "080_Fr_De2Valve" - // 70 : "070_Fr_Fd2Valve" - // 60 : "060_Fr_Fo2Valve" - // 50 : "050_Fr_AF2Valve_Summer" - // 40 : "040_Fr_AF2Valve" - // 30 : "030_Fr_Bi2Valve" - // 20 : "020_Fr_BiValve" - // 10 : "010_Fr_Ve2Valve" - uint8_t Logic_Valve_Index_RL; // Bits= 8 + // 200 : "200_Re_Bi2Valve manual" + // 190 : "190_Re_Vent manual" + // 180 : "180_Re_Bi2Valve_3" + // 170 : "170_Re_Vent_3" + // 160 : "160_Re_Bi2Valve_2" + // 150 : "150_Re_Vent_2" + // 140 : "140_Re_Fo2Valve" + // 130 : "130_Re_Bi2Valve" + // 120 : "120_Re_Vent" + // 110 : "110_Fr_BiValve manual" + // 100 : "100_Fr_Hi2Valve" + // 90 : "090_Fr_Tr2Valve" + // 80 : "080_Fr_De2Valve" + // 70 : "070_Fr_Fd2Valve" + // 60 : "060_Fr_Fo2Valve" + // 50 : "050_Fr_AF2Valve_Summer" + // 40 : "040_Fr_AF2Valve" + // 30 : "030_Fr_Bi2Valve" + // 20 : "020_Fr_BiValve" + // 10 : "010_Fr_Ve2Valve" + uint8_t Logic_Valve_Index_RL; // Bits= 8 - // 200 : "200_Re_Bi2Valve manual" - // 190 : "190_Re_Vent manual" - // 180 : "180_Re_Bi2Valve_3" - // 170 : "170_Re_Vent_3" - // 160 : "160_Re_Bi2Valve_2" - // 150 : "150_Re_Vent_2" - // 140 : "140_Re_Fo2Valve" - // 130 : "130_Re_Bi2Valve" - // 120 : "120_Re_Vent" - // 110 : "110_Fr_BiValve manual" - // 100 : "100_Fr_Hi2Valve" - // 90 : "090_Fr_Tr2Valve" - // 80 : "080_Fr_De2Valve" - // 70 : "070_Fr_Fd2Valve" - // 60 : "060_Fr_Fo2Valve" - // 50 : "050_Fr_AF2Valve_Summer" - // 40 : "040_Fr_AF2Valve" - // 30 : "030_Fr_Bi2Valve" - // 20 : "020_Fr_BiValve" - // 10 : "010_Fr_Ve2Valve" - uint8_t Logic_Valve_Index_RR; // Bits= 8 + // 200 : "200_Re_Bi2Valve manual" + // 190 : "190_Re_Vent manual" + // 180 : "180_Re_Bi2Valve_3" + // 170 : "170_Re_Vent_3" + // 160 : "160_Re_Bi2Valve_2" + // 150 : "150_Re_Vent_2" + // 140 : "140_Re_Fo2Valve" + // 130 : "130_Re_Bi2Valve" + // 120 : "120_Re_Vent" + // 110 : "110_Fr_BiValve manual" + // 100 : "100_Fr_Hi2Valve" + // 90 : "090_Fr_Tr2Valve" + // 80 : "080_Fr_De2Valve" + // 70 : "070_Fr_Fd2Valve" + // 60 : "060_Fr_Fo2Valve" + // 50 : "050_Fr_AF2Valve_Summer" + // 40 : "040_Fr_AF2Valve" + // 30 : "030_Fr_Bi2Valve" + // 20 : "020_Fr_BiValve" + // 10 : "010_Fr_Ve2Valve" + uint8_t Logic_Valve_Index_RR; // Bits= 8 - // 6 : "Tri-Level / Glass&Vent&Foot" - // 5 : "Hi-Level / Glass&Vent" - // 4 : "Def / Glass" - // 3 : "FDef / Glass&Foot" - // 2 : "Foot / Floor" - // 1 : "Bi-Level" - // 0 : "Face / Vent" - uint8_t Logic_Valve_Direction_FL; // Bits= 4 Unit:'-' + // 6 : "Tri-Level / Glass&Vent&Foot" + // 5 : "Hi-Level / Glass&Vent" + // 4 : "Def / Glass" + // 3 : "FDef / Glass&Foot" + // 2 : "Foot / Floor" + // 1 : "Bi-Level" + // 0 : "Face / Vent" + uint8_t Logic_Valve_Direction_FL; // Bits= 4 Unit:'-' - // 6 : "Tri-Level / Glass&Vent&Foot" - // 5 : "Hi-Level / Glass&Vent" - // 4 : "Def / Glass" - // 3 : "FDef / Glass&Foot" - // 2 : "Foot / Floor" - // 1 : "Bi-Level" - // 0 : "Face / Vent" - uint8_t Logic_Valve_Direction_FR; // Bits= 4 Unit:'-' + // 6 : "Tri-Level / Glass&Vent&Foot" + // 5 : "Hi-Level / Glass&Vent" + // 4 : "Def / Glass" + // 3 : "FDef / Glass&Foot" + // 2 : "Foot / Floor" + // 1 : "Bi-Level" + // 0 : "Face / Vent" + uint8_t Logic_Valve_Direction_FR; // Bits= 4 Unit:'-' - // 6 : "Tri-Level / Glass&Vent&Foot" - // 5 : "Hi-Level / Glass&Vent" - // 4 : "Def / Glass" - // 3 : "FDef / Glass&Foot" - // 2 : "Foot / Floor" - // 1 : "Bi-Level" - // 0 : "Face / Vent" - uint8_t Logic_Valve_Direction_RL; // Bits= 4 Unit:'-' + // 6 : "Tri-Level / Glass&Vent&Foot" + // 5 : "Hi-Level / Glass&Vent" + // 4 : "Def / Glass" + // 3 : "FDef / Glass&Foot" + // 2 : "Foot / Floor" + // 1 : "Bi-Level" + // 0 : "Face / Vent" + uint8_t Logic_Valve_Direction_RL; // Bits= 4 Unit:'-' - // 6 : "Tri-Level / Glass&Vent&Foot" - // 5 : "Hi-Level / Glass&Vent" - // 4 : "Def / Glass" - // 3 : "FDef / Glass&Foot" - // 2 : "Foot / Floor" - // 1 : "Bi-Level" - // 0 : "Face / Vent" - uint8_t Logic_Valve_Direction_RR; // Bits= 4 Unit:'-' + // 6 : "Tri-Level / Glass&Vent&Foot" + // 5 : "Hi-Level / Glass&Vent" + // 4 : "Def / Glass" + // 3 : "FDef / Glass&Foot" + // 2 : "Foot / Floor" + // 1 : "Bi-Level" + // 0 : "Face / Vent" + uint8_t Logic_Valve_Direction_RR; // Bits= 4 Unit:'-' #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -1819,7 +1937,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - uint8_t Logic_Blower_Step_FL : 4; // Bits= 4 + uint8_t Logic_Blower_Step_FL : 4; // Bits= 4 uint8_t Logic_Blower_Step_FR : 4; // Bits= 4 @@ -1841,31 +1959,31 @@ typedef struct #else - uint8_t Logic_Blower_Step_FL; // Bits= 4 + uint8_t Logic_Blower_Step_FL; // Bits= 4 - uint8_t Logic_Blower_Step_FR; // Bits= 4 + uint8_t Logic_Blower_Step_FR; // Bits= 4 - uint8_t Logic_Blower_Step_RL; // Bits= 4 + uint8_t Logic_Blower_Step_RL; // Bits= 4 - uint8_t Logic_Blower_Step_RR; // Bits= 4 + uint8_t Logic_Blower_Step_RR; // Bits= 4 - uint8_t Logic_Blower_Pwm_Front; // Bits= 8 Unit:'%' + uint8_t Logic_Blower_Pwm_Front; // Bits= 8 Unit:'%' - uint8_t Logic_Blower_Pwm_Rear; // Bits= 8 Unit:'%' + uint8_t Logic_Blower_Pwm_Rear; // Bits= 8 Unit:'%' - uint8_t Logic_Blower_AF_FL; // Bits= 8 Unit:'AF' + uint8_t Logic_Blower_AF_FL; // Bits= 8 Unit:'AF' - uint8_t Logic_Blower_AF_FR; // Bits= 8 Unit:'AF' + uint8_t Logic_Blower_AF_FR; // Bits= 8 Unit:'AF' - uint8_t Logic_Blower_AF_RL; // Bits= 8 Unit:'AF' + uint8_t Logic_Blower_AF_RL; // Bits= 8 Unit:'AF' - uint8_t Logic_Blower_AF_RR; // Bits= 8 Unit:'AF' + uint8_t Logic_Blower_AF_RR; // Bits= 8 Unit:'AF' #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -2023,7 +2141,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - // 1 : "On" + // 1 : "On" // 0 : "Off" uint8_t Logic_Ac_Req_Front : 1; // Bits= 1 Unit:'(off 0, on 1)' @@ -2083,69 +2201,69 @@ typedef struct #else - // 1 : "On" - // 0 : "Off" - uint8_t Logic_Ac_Req_Front; // Bits= 1 Unit:'(off 0, on 1)' + // 1 : "On" + // 0 : "Off" + uint8_t Logic_Ac_Req_Front; // Bits= 1 Unit:'(off 0, on 1)' - // 1 : "On" - // 0 : "Off" - uint8_t Logic_Ac_Txv_Front; // Bits= 1 Unit:'(off 0, on 1)' + // 1 : "On" + // 0 : "Off" + uint8_t Logic_Ac_Txv_Front; // Bits= 1 Unit:'(off 0, on 1)' - // 1 : "On" - // 0 : "Off" - uint8_t Logic_Ac_Txv_Rear; // Bits= 1 Unit:'(off 0, on 1)' + // 1 : "On" + // 0 : "Off" + uint8_t Logic_Ac_Txv_Rear; // Bits= 1 Unit:'(off 0, on 1)' - // 1 : "On" - // 0 : "Off" - uint8_t Logic_Ac_Req_Rear; // Bits= 1 Unit:'(off 0, on 1)' + // 1 : "On" + // 0 : "Off" + uint8_t Logic_Ac_Req_Rear; // Bits= 1 Unit:'(off 0, on 1)' - // 1 : "On" - // 0 : "Off" - uint8_t Logic_Ac_Req_Chiller; // Bits= 1 Unit:'(off 0, on 1)' + // 1 : "On" + // 0 : "Off" + uint8_t Logic_Ac_Req_Chiller; // Bits= 1 Unit:'(off 0, on 1)' - // 1 : "On" - // 0 : "Off" - uint8_t Logic_Ac_Txv_Chiller; // Bits= 1 Unit:'(off 0, on 1)' + // 1 : "On" + // 0 : "Off" + uint8_t Logic_Ac_Txv_Chiller; // Bits= 1 Unit:'(off 0, on 1)' - // 7 : "Both On but olny Rear works" - // 6 : "Both On but olny Front works" - // 5 : "Both On with Rear FB" - // 4 : "Both On with Front FB" - // 3 : "Only Rear On" - // 2 : "Only Front On" - // 1 : "Only Chiller On" - // 0 : "All Off" - uint8_t Logic_Ac_EvaCtrl; // Bits= 4 + // 7 : "Both On but olny Rear works" + // 6 : "Both On but olny Front works" + // 5 : "Both On with Rear FB" + // 4 : "Both On with Front FB" + // 3 : "Only Rear On" + // 2 : "Only Front On" + // 1 : "Only Chiller On" + // 0 : "All Off" + uint8_t Logic_Ac_EvaCtrl; // Bits= 4 - uint8_t Logic_Ac_Comp_EmrStop_Reason; // Bits= 4 + uint8_t Logic_Ac_Comp_EmrStop_Reason; // Bits= 4 - uint8_t Logic_Ac_Comp_LimitRpm_ro; // Bits= 8 Factor= 50 Unit:'rpm' + uint8_t Logic_Ac_Comp_LimitRpm_ro; // Bits= 8 Factor= 50 Unit:'rpm' #ifdef CANDB_DBG_USE_SIGFLOAT - uint16_t Logic_Ac_Comp_LimitRpm_phys; + uint16_t Logic_Ac_Comp_LimitRpm_phys; #endif // CANDB_DBG_USE_SIGFLOAT - uint8_t Logic_Ac_Txv_Closed_bySen; // Bits= 1 + uint8_t Logic_Ac_Txv_Closed_bySen; // Bits= 1 - uint8_t Logic_Ac_Comp_Protection_Level; // Bits= 2 Unit:'Lv' + uint8_t Logic_Ac_Comp_Protection_Level; // Bits= 2 Unit:'Lv' - // 3 : "ON_atWinter" - // 2 : "OFF_atWinter" - // 1 : "Not_Used" - // 0 : "No_Winter" - uint8_t Logic_Ac_WinterSts_Front; // Bits= 2 + // 3 : "ON_atWinter" + // 2 : "OFF_atWinter" + // 1 : "Not_Used" + // 0 : "No_Winter" + uint8_t Logic_Ac_WinterSts_Front; // Bits= 2 - // 3 : "ON_atWinter" - // 2 : "OFF_atWinter" - // 1 : "Not_Used" - // 0 : "No_Winter" - uint8_t Logic_Ac_WinterSts_Rear; // Bits= 2 + // 3 : "ON_atWinter" + // 2 : "OFF_atWinter" + // 1 : "Not_Used" + // 0 : "No_Winter" + uint8_t Logic_Ac_WinterSts_Rear; // Bits= 2 #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -2153,7 +2271,7 @@ typedef struct // def @dbg_Logic_Rec CAN Message (997 0x3e5) #define dbg_Logic_Rec_IDE (0U) -#define dbg_Logic_Rec_DLC (3U) +#define dbg_Logic_Rec_DLC (2U) #define dbg_Logic_Rec_CANID (0x3e5U) // Value tables for @Logic_Rec_Idx signal @@ -2171,7 +2289,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - // 1 : "REC" + // 1 : "REC" // 0 : "FRESH" uint8_t Logic_Rec_Idx : 1; // Bits= 1 @@ -2179,29 +2297,33 @@ typedef struct uint8_t Logic_Rec_Partial_Winter : 1; // Bits= 1 + uint8_t Logic_Rec_Ajar_Stat : 1; // Bits= 1 + uint8_t Logic_Rec_Partial_Summer : 2; // Bits= 2 uint8_t Logic_Rec_FreshAirPurge_Sts : 4; // Bits= 4 #else - // 1 : "REC" - // 0 : "FRESH" - uint8_t Logic_Rec_Idx; // Bits= 1 + // 1 : "REC" + // 0 : "FRESH" + uint8_t Logic_Rec_Idx; // Bits= 1 - uint8_t Logic_Rec_Partial_Spd_Sts; // Bits= 1 + uint8_t Logic_Rec_Partial_Spd_Sts; // Bits= 1 - uint8_t Logic_Rec_Partial_Winter; // Bits= 1 + uint8_t Logic_Rec_Partial_Winter; // Bits= 1 - uint8_t Logic_Rec_Partial_Summer; // Bits= 2 + uint8_t Logic_Rec_Ajar_Stat; // Bits= 1 - uint8_t Logic_Rec_FreshAirPurge_Sts; // Bits= 4 + uint8_t Logic_Rec_Partial_Summer; // Bits= 2 + + uint8_t Logic_Rec_FreshAirPurge_Sts; // Bits= 4 #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -2217,7 +2339,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - // MULTIPLEX master signal + // MULTIPLEX master signal uint8_t Logic_ValveOpen_MultMsg_Idx : 2; // Bits= 2 // multiplex variable @@ -2246,44 +2368,43 @@ typedef struct #else - // MULTIPLEX master signal - uint8_t Logic_ValveOpen_MultMsg_Idx; // Bits= 2 + // MULTIPLEX master signal + uint8_t Logic_ValveOpen_MultMsg_Idx; // Bits= 2 - // multiplex variable - uint8_t Logic_ValveOpen_R2_SFL; // Bits= 8 Unit:'%' + // multiplex variable + uint8_t Logic_ValveOpen_R2_SFL; // Bits= 8 Unit:'%' - // multiplex variable - uint8_t Logic_ValveOpen_R1_SFL; // Bits= 8 Unit:'%' + // multiplex variable + uint8_t Logic_ValveOpen_R1_SFL; // Bits= 8 Unit:'%' - // multiplex variable - uint8_t Logic_ValveOpen_R2_CFL; // Bits= 8 Unit:'%' + // multiplex variable + uint8_t Logic_ValveOpen_R2_CFL; // Bits= 8 Unit:'%' - // multiplex variable - uint8_t Logic_ValveOpen_R1_CFL; // Bits= 8 Unit:'%' + // multiplex variable + uint8_t Logic_ValveOpen_R1_CFL; // Bits= 8 Unit:'%' - // multiplex variable - uint8_t Logic_ValveOpen_R2_CFR; // Bits= 8 Unit:'%' + // multiplex variable + uint8_t Logic_ValveOpen_R2_CFR; // Bits= 8 Unit:'%' - // multiplex variable - uint8_t Logic_ValveOpen_R1_CFR; // Bits= 8 Unit:'%' + // multiplex variable + uint8_t Logic_ValveOpen_R1_CFR; // Bits= 8 Unit:'%' - // multiplex variable - uint8_t Logic_ValveOpen_R2_SFR; // Bits= 8 Unit:'%' + // multiplex variable + uint8_t Logic_ValveOpen_R2_SFR; // Bits= 8 Unit:'%' - // multiplex variable - uint8_t Logic_ValveOpen_R1_SFR; // Bits= 8 Unit:'%' + // multiplex variable + uint8_t Logic_ValveOpen_R1_SFR; // Bits= 8 Unit:'%' #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS } dbg_DiffBlr_ValveOpen_t; -// This is a message for not used signals, created by Vector CANdb++ DBC OLE DB Provider. // def @dbg_Act0 CAN Message (1008 0x3f0) #define dbg_Act0_IDE (0U) #define dbg_Act0_DLC (8U) @@ -2293,7 +2414,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - uint8_t dbg_Act00_Def; // Bits= 8 Unit:'%' + uint8_t dbg_Act00_Def; // Bits= 8 Unit:'%' uint8_t dbg_Act01_Vent_SFL; // Bits= 8 Unit:'%' @@ -2311,27 +2432,27 @@ typedef struct #else - uint8_t dbg_Act00_Def; // Bits= 8 Unit:'%' + uint8_t dbg_Act00_Def; // Bits= 8 Unit:'%' - uint8_t dbg_Act01_Vent_SFL; // Bits= 8 Unit:'%' + uint8_t dbg_Act01_Vent_SFL; // Bits= 8 Unit:'%' - uint8_t dbg_Act02_Vent_CFL; // Bits= 8 Unit:'%' + uint8_t dbg_Act02_Vent_CFL; // Bits= 8 Unit:'%' - uint8_t dbg_Act03_Foot_1FL; // Bits= 8 Unit:'%' + uint8_t dbg_Act03_Foot_1FL; // Bits= 8 Unit:'%' - uint8_t dbg_Act04_Foot_2FL; // Bits= 8 Unit:'%' + uint8_t dbg_Act04_Foot_2FL; // Bits= 8 Unit:'%' - uint8_t dbg_Act05_Vent_CFR; // Bits= 8 Unit:'%' + uint8_t dbg_Act05_Vent_CFR; // Bits= 8 Unit:'%' - uint8_t dbg_Act06_Vent_SFR; // Bits= 8 Unit:'%' + uint8_t dbg_Act06_Vent_SFR; // Bits= 8 Unit:'%' - uint8_t dbg_Act07_Foot_1FR; // Bits= 8 Unit:'%' + uint8_t dbg_Act07_Foot_1FR; // Bits= 8 Unit:'%' #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -2346,7 +2467,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - uint8_t dbg_Act08_Foot_2FR; // Bits= 8 Unit:'%' + uint8_t dbg_Act08_Foot_2FR; // Bits= 8 Unit:'%' uint8_t dbg_Act09_Vent_SRL; // Bits= 8 Unit:'%' @@ -2364,27 +2485,27 @@ typedef struct #else - uint8_t dbg_Act08_Foot_2FR; // Bits= 8 Unit:'%' + uint8_t dbg_Act08_Foot_2FR; // Bits= 8 Unit:'%' - uint8_t dbg_Act09_Vent_SRL; // Bits= 8 Unit:'%' + uint8_t dbg_Act09_Vent_SRL; // Bits= 8 Unit:'%' - uint8_t dbg_Act10_Vent_CRL; // Bits= 8 Unit:'%' + uint8_t dbg_Act10_Vent_CRL; // Bits= 8 Unit:'%' - uint8_t dbg_Act11_Foot_RL; // Bits= 8 Unit:'%' + uint8_t dbg_Act11_Foot_RL; // Bits= 8 Unit:'%' - uint8_t dbg_Act12_Vent_CRR; // Bits= 8 Unit:'%' + uint8_t dbg_Act12_Vent_CRR; // Bits= 8 Unit:'%' - uint8_t dbg_Act13_Vent_SRR; // Bits= 8 Unit:'%' + uint8_t dbg_Act13_Vent_SRR; // Bits= 8 Unit:'%' - uint8_t dbg_Act14_Foot_RR; // Bits= 8 Unit:'%' + uint8_t dbg_Act14_Foot_RR; // Bits= 8 Unit:'%' - uint8_t dbg_Act15_TempU_FL; // Bits= 8 Unit:'%' + uint8_t dbg_Act15_TempU_FL; // Bits= 8 Unit:'%' #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -2399,7 +2520,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - uint8_t dbg_Act16_TempL_FL; // Bits= 8 Unit:'%' + uint8_t dbg_Act16_TempL_FL; // Bits= 8 Unit:'%' uint8_t dbg_Act17_TempU_FR; // Bits= 8 Unit:'%' @@ -2417,27 +2538,27 @@ typedef struct #else - uint8_t dbg_Act16_TempL_FL; // Bits= 8 Unit:'%' + uint8_t dbg_Act16_TempL_FL; // Bits= 8 Unit:'%' - uint8_t dbg_Act17_TempU_FR; // Bits= 8 Unit:'%' + uint8_t dbg_Act17_TempU_FR; // Bits= 8 Unit:'%' - uint8_t dbg_Act18_TempL_FR; // Bits= 8 Unit:'%' + uint8_t dbg_Act18_TempL_FR; // Bits= 8 Unit:'%' - uint8_t dbg_Act19_Temp_RL; // Bits= 8 Unit:'%' + uint8_t dbg_Act19_Temp_RL; // Bits= 8 Unit:'%' - uint8_t dbg_Act20_Temp_RR; // Bits= 8 Unit:'%' + uint8_t dbg_Act20_Temp_RR; // Bits= 8 Unit:'%' - uint8_t dbg_Act21_Rec; // Bits= 8 Unit:'%' + uint8_t dbg_Act21_Rec; // Bits= 8 Unit:'%' - uint8_t dbg_Act22_OSA; // Bits= 8 Unit:'%' + uint8_t dbg_Act22_OSA; // Bits= 8 Unit:'%' - uint8_t dbg_Act23_SealingValve; // Bits= 8 Unit:'%' + uint8_t dbg_Act23_SealingValve; // Bits= 8 Unit:'%' #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -2464,7 +2585,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - int16_t dbg_Sen_Amb_ro; // [-] Bits=16 Factor= 0.1 Unit:'��' + int16_t dbg_Sen_Amb_ro; // [-] Bits=16 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT sigfloat_t dbg_Sen_Amb_phys; @@ -2484,39 +2605,563 @@ typedef struct #else - int16_t dbg_Sen_Amb_ro; // [-] Bits=16 Factor= 0.1 Unit:'��' + int16_t dbg_Sen_Amb_ro; // [-] Bits=16 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Amb_phys; + sigfloat_t dbg_Sen_Amb_phys; #endif // CANDB_DBG_USE_SIGFLOAT - int16_t dbg_Sen_Amb_Raw_ro; // [-] Bits=16 Factor= 0.1 Unit:'��' + int16_t dbg_Sen_Amb_Raw_ro; // [-] Bits=16 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Amb_Raw_phys; + sigfloat_t dbg_Sen_Amb_Raw_phys; #endif // CANDB_DBG_USE_SIGFLOAT - int16_t dbg_Amb_Tg_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + int16_t dbg_Amb_Tg_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Amb_Tg_phys; + sigfloat_t dbg_Amb_Tg_phys; #endif // CANDB_DBG_USE_SIGFLOAT #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS } dbg_Sen_Amb_t; +// def @dbg_Act_calibration CAN Message (1012 0x3f4) +#define dbg_Act_calibration_IDE (0U) +#define dbg_Act_calibration_DLC (8U) +#define dbg_Act_calibration_CANID (0x3f4U) + +typedef struct +{ +#ifdef CANDB_DBG_USE_BITS_SIGNAL + + // MULTIPLEX master signal + int8_t dbg_Act_calib_MultMsg_Idx; // [-] Bits= 8 + + // multiplex variable + uint16_t dbg_Act_calib_21_Rec; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_00_Def; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_18_TempL_FR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_03_Foot_1FL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_15_TempU_FL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_06_Vent_SFR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_12_Vent_CRR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_09_Vent_SRL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_22_OSA; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_01_Vent_SFL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_04_Foot_2FL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_07_Foot_1FR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_10_Vent_CRL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_13_Vent_SRR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_16_TempL_FL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_19_Temp_RL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_11_Foot_RL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_08_Foot_2FR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_14_Foot_RR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_05_Vent_CFR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_17_TempU_FR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_02_Vent_CFL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_20_Temp_RR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_23_SealingValve; // Bits=16 + +#else + + // MULTIPLEX master signal + uint8_t dbg_Act_calib_MultMsg_Idx; // [-] Bits= 8 + + // multiplex variable + uint16_t dbg_Act_calib_21_Rec; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_00_Def; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_18_TempL_FR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_03_Foot_1FL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_15_TempU_FL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_06_Vent_SFR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_12_Vent_CRR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_09_Vent_SRL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_22_OSA; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_01_Vent_SFL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_04_Foot_2FL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_07_Foot_1FR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_10_Vent_CRL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_13_Vent_SRR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_16_TempL_FL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_19_Temp_RL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_11_Foot_RL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_08_Foot_2FR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_14_Foot_RR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_05_Vent_CFR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_17_TempU_FR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_02_Vent_CFL; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_20_Temp_RR; // Bits=16 + + // multiplex variable + uint16_t dbg_Act_calib_23_SealingValve; // Bits=16 + +#endif // CANDB_DBG_USE_BITS_SIGNAL + +#ifdef CANDB_DBG_USE_DIAG_MONITORS + + FrameMonitor_t mon1; + +#endif // CANDB_DBG_USE_DIAG_MONITORS + +} dbg_Act_calibration_t; + +// Test message with PID parameters info of Front Upper Temperature valves +// def @dbg_PID_tune CAN Message (1015 0x3f7) +#define dbg_PID_tune_IDE (0U) +#define dbg_PID_tune_DLC (8U) +#define dbg_PID_tune_CANID (0x3f7U) +#define dbg_PID_tune_CYC (100U) +// signal: @PID_Temp_FLL_P_ro +#define CANDB_DBG_PID_Temp_FLL_P_ro_CovFactor (0.1) +#define CANDB_DBG_PID_Temp_FLL_P_ro_toS(x) ( (uint16_t) (((x) - (-204.8)) / (0.1)) ) +#define CANDB_DBG_PID_Temp_FLL_P_ro_fromS(x) ( (((x) * (0.1)) + (-204.8)) ) +// signal: @PID_Temp_FLU_P_ro +#define CANDB_DBG_PID_Temp_FLU_P_ro_CovFactor (0.1) +#define CANDB_DBG_PID_Temp_FLU_P_ro_toS(x) ( (uint16_t) (((x) - (-204.8)) / (0.1)) ) +#define CANDB_DBG_PID_Temp_FLU_P_ro_fromS(x) ( (((x) * (0.1)) + (-204.8)) ) +// signal: @PID_Temp_FRU_P_ro +#define CANDB_DBG_PID_Temp_FRU_P_ro_CovFactor (0.1) +#define CANDB_DBG_PID_Temp_FRU_P_ro_toS(x) ( (uint16_t) (((x) - (-204.8)) / (0.1)) ) +#define CANDB_DBG_PID_Temp_FRU_P_ro_fromS(x) ( (((x) * (0.1)) + (-204.8)) ) +// signal: @PID_Temp_RR_P_ro +#define CANDB_DBG_PID_Temp_RR_P_ro_CovFactor (0.1) +#define CANDB_DBG_PID_Temp_RR_P_ro_toS(x) ( (uint16_t) (((x) - (-204.8)) / (0.1)) ) +#define CANDB_DBG_PID_Temp_RR_P_ro_fromS(x) ( (((x) * (0.1)) + (-204.8)) ) +// signal: @PID_Temp_FRL_P_ro +#define CANDB_DBG_PID_Temp_FRL_P_ro_CovFactor (0.1) +#define CANDB_DBG_PID_Temp_FRL_P_ro_toS(x) ( (uint16_t) (((x) - (-204.8)) / (0.1)) ) +#define CANDB_DBG_PID_Temp_FRL_P_ro_fromS(x) ( (((x) * (0.1)) + (-204.8)) ) +// signal: @PID_Temp_RL_P_ro +#define CANDB_DBG_PID_Temp_RL_P_ro_CovFactor (0.1) +#define CANDB_DBG_PID_Temp_RL_P_ro_toS(x) ( (uint16_t) (((x) - (-204.8)) / (0.1)) ) +#define CANDB_DBG_PID_Temp_RL_P_ro_fromS(x) ( (((x) * (0.1)) + (-204.8)) ) +// signal: @PID_Temp_FRL_I_ro +#define CANDB_DBG_PID_Temp_FRL_I_ro_CovFactor (0.1) +#define CANDB_DBG_PID_Temp_FRL_I_ro_toS(x) ( (uint16_t) (((x) - (-204.8)) / (0.1)) ) +#define CANDB_DBG_PID_Temp_FRL_I_ro_fromS(x) ( (((x) * (0.1)) + (-204.8)) ) +// signal: @PID_Temp_RL_I_ro +#define CANDB_DBG_PID_Temp_RL_I_ro_CovFactor (0.1) +#define CANDB_DBG_PID_Temp_RL_I_ro_toS(x) ( (uint16_t) (((x) - (-204.8)) / (0.1)) ) +#define CANDB_DBG_PID_Temp_RL_I_ro_fromS(x) ( (((x) * (0.1)) + (-204.8)) ) +// signal: @PID_Temp_FLL_I_ro +#define CANDB_DBG_PID_Temp_FLL_I_ro_CovFactor (0.1) +#define CANDB_DBG_PID_Temp_FLL_I_ro_toS(x) ( (uint16_t) (((x) - (-204.8)) / (0.1)) ) +#define CANDB_DBG_PID_Temp_FLL_I_ro_fromS(x) ( (((x) * (0.1)) + (-204.8)) ) +// signal: @PID_Temp_FRU_I_ro +#define CANDB_DBG_PID_Temp_FRU_I_ro_CovFactor (0.1) +#define CANDB_DBG_PID_Temp_FRU_I_ro_toS(x) ( (uint16_t) (((x) - (-204.8)) / (0.1)) ) +#define CANDB_DBG_PID_Temp_FRU_I_ro_fromS(x) ( (((x) * (0.1)) + (-204.8)) ) +// signal: @PID_Temp_FLU_I_ro +#define CANDB_DBG_PID_Temp_FLU_I_ro_CovFactor (0.1) +#define CANDB_DBG_PID_Temp_FLU_I_ro_toS(x) ( (uint16_t) (((x) - (-204.8)) / (0.1)) ) +#define CANDB_DBG_PID_Temp_FLU_I_ro_fromS(x) ( (((x) * (0.1)) + (-204.8)) ) +// signal: @PID_Temp_RR_I_ro +#define CANDB_DBG_PID_Temp_RR_I_ro_CovFactor (0.1) +#define CANDB_DBG_PID_Temp_RR_I_ro_toS(x) ( (uint16_t) (((x) - (-204.8)) / (0.1)) ) +#define CANDB_DBG_PID_Temp_RR_I_ro_fromS(x) ( (((x) * (0.1)) + (-204.8)) ) +// signal: @PID_Temp_RL_D_ro +#define CANDB_DBG_PID_Temp_RL_D_ro_CovFactor (0.1) +#define CANDB_DBG_PID_Temp_RL_D_ro_toS(x) ( (uint16_t) (((x) - (-204.8)) / (0.1)) ) +#define CANDB_DBG_PID_Temp_RL_D_ro_fromS(x) ( (((x) * (0.1)) + (-204.8)) ) +// signal: @PID_Temp_FRL_D_ro +#define CANDB_DBG_PID_Temp_FRL_D_ro_CovFactor (0.1) +#define CANDB_DBG_PID_Temp_FRL_D_ro_toS(x) ( (uint16_t) (((x) - (-204.8)) / (0.1)) ) +#define CANDB_DBG_PID_Temp_FRL_D_ro_fromS(x) ( (((x) * (0.1)) + (-204.8)) ) +// signal: @PID_Temp_FLL_D_ro +#define CANDB_DBG_PID_Temp_FLL_D_ro_CovFactor (0.1) +#define CANDB_DBG_PID_Temp_FLL_D_ro_toS(x) ( (uint16_t) (((x) - (-204.8)) / (0.1)) ) +#define CANDB_DBG_PID_Temp_FLL_D_ro_fromS(x) ( (((x) * (0.1)) + (-204.8)) ) +// signal: @PID_Temp_FRU_D_ro +#define CANDB_DBG_PID_Temp_FRU_D_ro_CovFactor (0.1) +#define CANDB_DBG_PID_Temp_FRU_D_ro_toS(x) ( (uint16_t) (((x) - (-204.8)) / (0.1)) ) +#define CANDB_DBG_PID_Temp_FRU_D_ro_fromS(x) ( (((x) * (0.1)) + (-204.8)) ) +// signal: @PID_Temp_RR_D_ro +#define CANDB_DBG_PID_Temp_RR_D_ro_CovFactor (0.1) +#define CANDB_DBG_PID_Temp_RR_D_ro_toS(x) ( (uint16_t) (((x) - (-204.8)) / (0.1)) ) +#define CANDB_DBG_PID_Temp_RR_D_ro_fromS(x) ( (((x) * (0.1)) + (-204.8)) ) +// signal: @PID_Temp_FLU_D_ro +#define CANDB_DBG_PID_Temp_FLU_D_ro_CovFactor (0.1) +#define CANDB_DBG_PID_Temp_FLU_D_ro_toS(x) ( (uint16_t) (((x) - (-204.8)) / (0.1)) ) +#define CANDB_DBG_PID_Temp_FLU_D_ro_fromS(x) ( (((x) * (0.1)) + (-204.8)) ) + +typedef struct +{ +#ifdef CANDB_DBG_USE_BITS_SIGNAL + + // MULTIPLEX master signal + uint8_t PID_Temp_Msg_Idx : 4; // Bits= 4 + + // multiplex variable + uint16_t PID_Temp_FLL_P_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FLL_P_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FLU_P_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FLU_P_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FRU_P_ro; // Bits=12 Offset= -204.8 Factor= 0.1 Unit:'u' + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FRU_P_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_RR_P_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_RR_P_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FRL_P_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FRL_P_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_RL_P_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_RL_P_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FRL_I_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FRL_I_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_RL_I_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_RL_I_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FLL_I_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FLL_I_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FRU_I_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FRU_I_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FLU_I_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FLU_I_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_RR_I_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_RR_I_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_RL_D_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_RL_D_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FRL_D_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FRL_D_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FLL_D_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FLL_D_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FRU_D_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FRU_D_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_RR_D_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_RR_D_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FLU_D_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FLU_D_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + +#else + + // MULTIPLEX master signal + uint8_t PID_Temp_Msg_Idx; // Bits= 4 + + // multiplex variable + uint16_t PID_Temp_FLL_P_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FLL_P_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FLU_P_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FLU_P_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FRU_P_ro; // Bits=12 Offset= -204.8 Factor= 0.1 Unit:'u' + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FRU_P_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_RR_P_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_RR_P_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FRL_P_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FRL_P_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_RL_P_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_RL_P_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FRL_I_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FRL_I_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_RL_I_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_RL_I_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FLL_I_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FLL_I_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FRU_I_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FRU_I_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FLU_I_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FLU_I_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_RR_I_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_RR_I_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_RL_D_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_RL_D_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FRL_D_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FRL_D_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FLL_D_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FLL_D_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FRU_D_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FRU_D_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_RR_D_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_RR_D_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + + // multiplex variable + uint16_t PID_Temp_FLU_D_ro; // Bits=12 Offset= -204.8 Factor= 0.1 + +#ifdef CANDB_DBG_USE_SIGFLOAT + sigfloat_t PID_Temp_FLU_D_phys; +#endif // CANDB_DBG_USE_SIGFLOAT + +#endif // CANDB_DBG_USE_BITS_SIGNAL + +#ifdef CANDB_DBG_USE_DIAG_MONITORS + + FrameMonitor_t mon1; + +#endif // CANDB_DBG_USE_DIAG_MONITORS + +} dbg_PID_tune_t; + // def @dbg_Sen_0 CAN Message (1016 0x3f8) #define dbg_Sen_0_IDE (0U) #define dbg_Sen_0_DLC (8U) #define dbg_Sen_0_CANID (0x3f8U) -#define dbg_Sen_0_CYC (250U) +#define dbg_Sen_0_CYC (1000U) // signal: @dbg_Sen_BattVolt_ro #define CANDB_DBG_dbg_Sen_BattVolt_ro_CovFactor (0.1) #define CANDB_DBG_dbg_Sen_BattVolt_ro_toS(x) ( (uint8_t) (((x) - (0.0)) / (0.1)) ) @@ -2530,7 +3175,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - uint8_t dbg_Sen_BattVolt_ro; // Bits= 8 Factor= 0.1 Unit:'Volt' + uint8_t dbg_Sen_BattVolt_ro; // Bits= 8 Factor= 0.1 Unit:'Volt' #ifdef CANDB_DBG_USE_SIGFLOAT sigfloat_t dbg_Sen_BattVolt_phys; @@ -2548,27 +3193,27 @@ typedef struct #else - uint8_t dbg_Sen_BattVolt_ro; // Bits= 8 Factor= 0.1 Unit:'Volt' + uint8_t dbg_Sen_BattVolt_ro; // Bits= 8 Factor= 0.1 Unit:'Volt' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_BattVolt_phys; + sigfloat_t dbg_Sen_BattVolt_phys; #endif // CANDB_DBG_USE_SIGFLOAT - uint16_t dbg_Sen_Pressure_ro; // Bits=12 Factor= 0.1 Unit:'ATM' + uint16_t dbg_Sen_Pressure_ro; // Bits=12 Factor= 0.1 Unit:'ATM' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Pressure_phys; + sigfloat_t dbg_Sen_Pressure_phys; #endif // CANDB_DBG_USE_SIGFLOAT - uint16_t dbg_Sen_Sun_L; // Bits=16 Unit:'W/m2' + uint16_t dbg_Sen_Sun_L; // Bits=16 Unit:'W/m2' - uint16_t dbg_Sen_Sun_R; // Bits=16 Unit:'W/m2' + uint16_t dbg_Sen_Sun_R; // Bits=16 Unit:'W/m2' #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -2698,7 +3343,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - // 1 : "On" + // 1 : "On" // 0 : "Off" uint8_t dbg_IO_Txv_F : 1; // Bits= 1 @@ -2760,71 +3405,71 @@ typedef struct #else - // 1 : "On" - // 0 : "Off" - uint8_t dbg_IO_Txv_F; // Bits= 1 + // 1 : "On" + // 0 : "Off" + uint8_t dbg_IO_Txv_F; // Bits= 1 - // 1 : "On" - // 0 : "Off" - uint8_t dbg_IO_Txv_R; // Bits= 1 + // 1 : "On" + // 0 : "Off" + uint8_t dbg_IO_Txv_R; // Bits= 1 - // 1 : "On" - // 0 : "Off" - uint8_t dbg_IO_Txv_Ch; // Bits= 1 + // 1 : "On" + // 0 : "Off" + uint8_t dbg_IO_Txv_Ch; // Bits= 1 - // 1 : "Open" - // 0 : "Close" - uint8_t dbg_IO_2WayValve; // Bits= 1 + // 1 : "Open" + // 0 : "Close" + uint8_t dbg_IO_2WayValve; // Bits= 1 - // 1 : "On" - // 0 : "Off" - uint8_t dbg_IO_IncarMotor_F; // Bits= 1 + // 1 : "On" + // 0 : "Off" + uint8_t dbg_IO_IncarMotor_F; // Bits= 1 - // 1 : "On" - // 0 : "Off" - uint8_t dbg_IO_IncarMotor_R; // Bits= 1 + // 1 : "On" + // 0 : "Off" + uint8_t dbg_IO_IncarMotor_R; // Bits= 1 - uint8_t dbg_SetTemp_FL_ro; // Bits= 8 Offset= 16.0 Factor= 0.5 Unit:'��' + uint8_t dbg_SetTemp_FL_ro; // Bits= 8 Offset= 16.0 Factor= 0.5 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_SetTemp_FL_phys; + sigfloat_t dbg_SetTemp_FL_phys; #endif // CANDB_DBG_USE_SIGFLOAT - uint8_t dbg_SetTemp_FR_ro; // Bits= 8 Offset= 16.0 Factor= 0.5 Unit:'��' + uint8_t dbg_SetTemp_FR_ro; // Bits= 8 Offset= 16.0 Factor= 0.5 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_SetTemp_FR_phys; + sigfloat_t dbg_SetTemp_FR_phys; #endif // CANDB_DBG_USE_SIGFLOAT - uint8_t dbg_SetTemp_RL_ro; // Bits= 8 Offset= 16.0 Factor= 0.5 Unit:'��' + uint8_t dbg_SetTemp_RL_ro; // Bits= 8 Offset= 16.0 Factor= 0.5 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_SetTemp_RL_phys; + sigfloat_t dbg_SetTemp_RL_phys; #endif // CANDB_DBG_USE_SIGFLOAT - uint8_t dbg_SetTemp_RR_ro; // Bits= 8 Offset= 16.0 Factor= 0.5 Unit:'��' + uint8_t dbg_SetTemp_RR_ro; // Bits= 8 Offset= 16.0 Factor= 0.5 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_SetTemp_RR_phys; + sigfloat_t dbg_SetTemp_RR_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // 1 : "On" - // 0 : "Off" - uint8_t dbg_IO_Input_Emergency; // Bits= 1 + // 1 : "On" + // 0 : "Off" + uint8_t dbg_IO_Input_Emergency; // Bits= 1 - // 1 : "On" - // 0 : "Off" - uint8_t dbg_IO_Input_FireExtinguisher; // Bits= 1 + // 1 : "On" + // 0 : "Off" + uint8_t dbg_IO_Input_FireExtinguisher; // Bits= 1 - // 1 : "On" - // 0 : "Off" - uint8_t dbg_IO_Install_Sealing_Valve; // Bits= 1 + // 1 : "On" + // 0 : "Off" + uint8_t dbg_IO_Install_Sealing_Valve; // Bits= 1 #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -2834,34 +3479,7 @@ typedef struct #define dbg_CCU_Info_IDE (0U) #define dbg_CCU_Info_DLC (8U) #define dbg_CCU_Info_CANID (0x3fcU) -#define dbg_CCU_Info_CYC (1000U) - -// Value tables for @dbg_Info_ActivatedCAL signal - -#ifndef dbg_Info_ActivatedCAL_dbg_CCU_Info_MPV_Cal -#define dbg_Info_ActivatedCAL_dbg_CCU_Info_MPV_Cal (5) -#endif - -#ifndef dbg_Info_ActivatedCAL_dbg_CCU_Info_SUV_Cal -#define dbg_Info_ActivatedCAL_dbg_CCU_Info_SUV_Cal (4) -#endif - -#ifndef dbg_Info_ActivatedCAL_dbg_CCU_Info_Limo_Cal -#define dbg_Info_ActivatedCAL_dbg_CCU_Info_Limo_Cal (3) -#endif - -#ifndef dbg_Info_ActivatedCAL_dbg_CCU_Info_SedanH_Cal -#define dbg_Info_ActivatedCAL_dbg_CCU_Info_SedanH_Cal (2) -#endif - -#ifndef dbg_Info_ActivatedCAL_dbg_CCU_Info_SedanL_Cal -#define dbg_Info_ActivatedCAL_dbg_CCU_Info_SedanL_Cal (1) -#endif - -#ifndef dbg_Info_ActivatedCAL_dbg_CCU_Info_Base_Cal -#define dbg_Info_ActivatedCAL_dbg_CCU_Info_Base_Cal (0) -#endif - +#define dbg_CCU_Info_CYC (500U) // Value tables for @dbg_Info_CCU_Aroma_Cfg signal @@ -2893,6 +3511,85 @@ typedef struct #endif +// Value tables for @dbg_Info_CCU_RearHvac_Cfg signal + +#ifndef dbg_Info_CCU_RearHvac_Cfg_dbg_CCU_Info_Incomplete +#define dbg_Info_CCU_RearHvac_Cfg_dbg_CCU_Info_Incomplete (15) +#endif + +#ifndef dbg_Info_CCU_RearHvac_Cfg_dbg_CCU_Info_Present +#define dbg_Info_CCU_RearHvac_Cfg_dbg_CCU_Info_Present (1) +#endif + +#ifndef dbg_Info_CCU_RearHvac_Cfg_dbg_CCU_Info_Not_Present +#define dbg_Info_CCU_RearHvac_Cfg_dbg_CCU_Info_Not_Present (0) +#endif + + +// Value tables for @dbg_Info_ActivatedCAL signal + +#ifndef dbg_Info_ActivatedCAL_dbg_CCU_Info_MPV_Cal +#define dbg_Info_ActivatedCAL_dbg_CCU_Info_MPV_Cal (5) +#endif + +#ifndef dbg_Info_ActivatedCAL_dbg_CCU_Info_SUV_Cal +#define dbg_Info_ActivatedCAL_dbg_CCU_Info_SUV_Cal (4) +#endif + +#ifndef dbg_Info_ActivatedCAL_dbg_CCU_Info_Limo_Cal +#define dbg_Info_ActivatedCAL_dbg_CCU_Info_Limo_Cal (3) +#endif + +#ifndef dbg_Info_ActivatedCAL_dbg_CCU_Info_SedanH_Cal +#define dbg_Info_ActivatedCAL_dbg_CCU_Info_SedanH_Cal (2) +#endif + +#ifndef dbg_Info_ActivatedCAL_dbg_CCU_Info_SedanL_Cal +#define dbg_Info_ActivatedCAL_dbg_CCU_Info_SedanL_Cal (1) +#endif + +#ifndef dbg_Info_ActivatedCAL_dbg_CCU_Info_Base_Cal +#define dbg_Info_ActivatedCAL_dbg_CCU_Info_Base_Cal (0) +#endif + + +// Value tables for @dbg_Info_Rear_Installed_Act_Num signal + +#ifndef dbg_Info_Rear_Installed_Act_Num_dbg_CCU_Info_TBD +#define dbg_Info_Rear_Installed_Act_Num_dbg_CCU_Info_TBD (2) +#endif + +#ifndef dbg_Info_Rear_Installed_Act_Num_dbg_CCU_Info_Rear_9ea +#define dbg_Info_Rear_Installed_Act_Num_dbg_CCU_Info_Rear_9ea (1) +#endif + +#ifndef dbg_Info_Rear_Installed_Act_Num_dbg_CCU_Info_Rear_8ea +#define dbg_Info_Rear_Installed_Act_Num_dbg_CCU_Info_Rear_8ea (0) +#endif + + +// Value tables for @dbg_Info_ActNum_Mismatch signal + +#ifndef dbg_Info_ActNum_Mismatch_dbg_CCU_Info_Mismatch +#define dbg_Info_ActNum_Mismatch_dbg_CCU_Info_Mismatch (1) +#endif + +#ifndef dbg_Info_ActNum_Mismatch_dbg_CCU_Info_Match +#define dbg_Info_ActNum_Mismatch_dbg_CCU_Info_Match (0) +#endif + + +// Value tables for @dbg_Info_VIN_Mismatch signal + +#ifndef dbg_Info_VIN_Mismatch_dbg_CCU_Info_Mismatch +#define dbg_Info_VIN_Mismatch_dbg_CCU_Info_Mismatch (1) +#endif + +#ifndef dbg_Info_VIN_Mismatch_dbg_CCU_Info_Match +#define dbg_Info_VIN_Mismatch_dbg_CCU_Info_Match (0) +#endif + + // Value tables for @dbg_Info_VehicleBody signal #ifndef dbg_Info_VehicleBody_dbg_CCU_Info_MPVTabletka_29 @@ -2976,20 +3673,38 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - // MULTIPLEX master signal - uint8_t dbg_Info_MultMsg_Idx : 2; // Bits= 2 + // MULTIPLEX master signal + uint8_t dbg_Info_MultMsg_Idx : 2; // Bits= 2 + + // 15 : "Incomplete" + // 1 : "Present" + // 0 : "Not_Present" + // multiplex variable + uint8_t dbg_Info_CCU_Aroma_Cfg : 4; // Bits= 4 // multiplex variable - uint32_t dbg_Info_Calibration_Ver_Date; // Bits=22 Unit:'yymmdd' + uint32_t dbg_Info_Calibration_Ver_Date; // Bits=22 Unit:'yymmdd' // multiplex variable - uint32_t dbg_Info_CCU_SW_Ver_Date; // Bits=22 Unit:'yymmdd' + uint32_t dbg_Info_CCU_SW_Ver_Date; // Bits=22 Unit:'yymmdd' + + // 15 : "Incomplete" + // 1 : "Limousine_Variant" + // 0 : "Stadard_Variant" + // multiplex variable + uint8_t dbg_Info_CCU_Algorithm_Cfg : 4; // Bits= 4 + + // 15 : "Incomplete" + // 1 : "Present" + // 0 : "Not_Present" + // multiplex variable + uint8_t dbg_Info_CCU_RearHvac_Cfg : 4; // Bits= 4 // multiplex variable - uint8_t dbg_Info_Calibration_Ver_Rev; // Bits= 8 Unit:'Rev.' + uint8_t dbg_Info_Calibration_Ver_Rev; // Bits= 8 Unit:'Rev.' // multiplex variable - uint8_t dbg_Info_CCU_SW_Ver_Rev; // Bits= 8 Unit:'Rev.' + uint8_t dbg_Info_CCU_SW_Ver_Rev; // Bits= 8 Unit:'Rev.' // 5 : "MPV_Cal" // 4 : "SUV_Cal" @@ -2998,22 +3713,31 @@ typedef struct // 1 : "SedanL_Cal" // 0 : "Base_Cal" // multiplex variable - uint8_t dbg_Info_ActivatedCAL : 4; // Bits= 4 Unit:'Num' + uint8_t dbg_Info_ActivatedCAL : 4; // Bits= 4 Unit:'Num' // multiplex variable - uint32_t dbg_Info_MBD_Ver_Date; // Bits=22 Unit:'yymmdd' + uint32_t dbg_Info_MBD_Ver_Date; // Bits=22 Unit:'yymmdd' - // 15 : "Incomplete" - // 1 : "Present" - // 0 : "Not_Present" + // Number of Installed Rear Actuator. + // This is based physical installed actuator, not configuration by VIN or diagnostic. + // 2 : "TBD" + // 1 : "Rear_9ea" + // 0 : "Rear_8ea" // multiplex variable - uint8_t dbg_Info_CCU_Aroma_Cfg : 4; // Bits= 4 + uint8_t dbg_Info_Rear_Installed_Act_Num : 2; // Bits= 2 - // 15 : "Incomplete" - // 1 : "Limousine_Variant" - // 0 : "Stadard_Variant" + // Actuator Num from (Stored)VIN and installed in CCU are different. + // After ignition on and receiving the VIN message from the BCM, it is checked only once. + // 1 : "Mismatch" + // 0 : "Match" // multiplex variable - uint8_t dbg_Info_CCU_Algorithm_Cfg : 4; // Bits= 4 + uint8_t dbg_Info_ActNum_Mismatch : 1; // Bits= 1 + + // VIN from BCM and Stored VIN in CCU are different + // 1 : "Mismatch" + // 0 : "Match" + // multiplex variable + uint8_t dbg_Info_VIN_Mismatch : 1; // Bits= 1 // 12857 : "MPVTabletka ='29'" // 12856 : "MPVOrbita ='28'" @@ -3035,82 +3759,109 @@ typedef struct // 12337 : "SedanArmored = '01'" // 12336 : "SedanNonArmored='00'" // multiplex variable - uint16_t dbg_Info_VehicleBody; // Bits=16 Unit:'Vehicle' + uint16_t dbg_Info_VehicleBody; // Bits=16 Unit:'Vehicle' // multiplex variable - uint8_t dbg_Info_MBD_Ver_Rev; // Bits= 8 Unit:'Rev.' + uint8_t dbg_Info_MBD_Ver_Rev; // Bits= 8 Unit:'Rev.' #else - // MULTIPLEX master signal - uint8_t dbg_Info_MultMsg_Idx; // Bits= 2 + // MULTIPLEX master signal + uint8_t dbg_Info_MultMsg_Idx; // Bits= 2 - // multiplex variable - uint32_t dbg_Info_Calibration_Ver_Date; // Bits=22 Unit:'yymmdd' + // 15 : "Incomplete" + // 1 : "Present" + // 0 : "Not_Present" + // multiplex variable + uint8_t dbg_Info_CCU_Aroma_Cfg; // Bits= 4 - // multiplex variable - uint32_t dbg_Info_CCU_SW_Ver_Date; // Bits=22 Unit:'yymmdd' + // multiplex variable + uint32_t dbg_Info_Calibration_Ver_Date; // Bits=22 Unit:'yymmdd' - // multiplex variable - uint8_t dbg_Info_Calibration_Ver_Rev; // Bits= 8 Unit:'Rev.' + // multiplex variable + uint32_t dbg_Info_CCU_SW_Ver_Date; // Bits=22 Unit:'yymmdd' - // multiplex variable - uint8_t dbg_Info_CCU_SW_Ver_Rev; // Bits= 8 Unit:'Rev.' + // 15 : "Incomplete" + // 1 : "Limousine_Variant" + // 0 : "Stadard_Variant" + // multiplex variable + uint8_t dbg_Info_CCU_Algorithm_Cfg; // Bits= 4 - // 5 : "MPV_Cal" - // 4 : "SUV_Cal" - // 3 : "Limo_Cal" - // 2 : "SedanH_Cal" - // 1 : "SedanL_Cal" - // 0 : "Base_Cal" - // multiplex variable - uint8_t dbg_Info_ActivatedCAL; // Bits= 4 Unit:'Num' + // 15 : "Incomplete" + // 1 : "Present" + // 0 : "Not_Present" + // multiplex variable + uint8_t dbg_Info_CCU_RearHvac_Cfg; // Bits= 4 - // multiplex variable - uint32_t dbg_Info_MBD_Ver_Date; // Bits=22 Unit:'yymmdd' + // multiplex variable + uint8_t dbg_Info_Calibration_Ver_Rev; // Bits= 8 Unit:'Rev.' - // 15 : "Incomplete" - // 1 : "Present" - // 0 : "Not_Present" - // multiplex variable - uint8_t dbg_Info_CCU_Aroma_Cfg; // Bits= 4 + // multiplex variable + uint8_t dbg_Info_CCU_SW_Ver_Rev; // Bits= 8 Unit:'Rev.' - // 15 : "Incomplete" - // 1 : "Limousine_Variant" - // 0 : "Stadard_Variant" - // multiplex variable - uint8_t dbg_Info_CCU_Algorithm_Cfg; // Bits= 4 + // 5 : "MPV_Cal" + // 4 : "SUV_Cal" + // 3 : "Limo_Cal" + // 2 : "SedanH_Cal" + // 1 : "SedanL_Cal" + // 0 : "Base_Cal" + // multiplex variable + uint8_t dbg_Info_ActivatedCAL; // Bits= 4 Unit:'Num' - // 12857 : "MPVTabletka ='29'" - // 12856 : "MPVOrbita ='28'" - // 12855 : "MPVArmored4SEAT ='27'" - // 12851 : "MPVArmored9SEAT ='23'" - // 12850 : "MPVNonArmored9SEAT ='22'" - // 12849 : "MPVArmored8SEAT ='21'" - // 12848 : "MPVNonArmored4SEAT ='20'" - // 12595 : "SUVArmored = '13'" - // 12594 : "SUVNonArmored ='12'" - // 12355 : "LimoArmoredV8CiVil ='0C'_NotUsed" - // 12354 : "CabrioShow ='0B'_NotUsed_Phase1" - // 12353 : "SedanLongArmored ='0A'" - // 12345 : "SedanLong = '09'" - // 12344 : "Sedan4x2 = '08'_NotUsed_Phase1" - // 12341 : "Cabrio ='05'" - // 12340 : "LimoArmoredV8 ='04'" - // 12339 : "LimoArmoredV12 ='03'" - // 12337 : "SedanArmored = '01'" - // 12336 : "SedanNonArmored='00'" - // multiplex variable - uint16_t dbg_Info_VehicleBody; // Bits=16 Unit:'Vehicle' + // multiplex variable + uint32_t dbg_Info_MBD_Ver_Date; // Bits=22 Unit:'yymmdd' - // multiplex variable - uint8_t dbg_Info_MBD_Ver_Rev; // Bits= 8 Unit:'Rev.' + // Number of Installed Rear Actuator. + // This is based physical installed actuator, not configuration by VIN or diagnostic. + // 2 : "TBD" + // 1 : "Rear_9ea" + // 0 : "Rear_8ea" + // multiplex variable + uint8_t dbg_Info_Rear_Installed_Act_Num; // Bits= 2 + + // Actuator Num from (Stored)VIN and installed in CCU are different. + // After ignition on and receiving the VIN message from the BCM, it is checked only once. + // 1 : "Mismatch" + // 0 : "Match" + // multiplex variable + uint8_t dbg_Info_ActNum_Mismatch; // Bits= 1 + + // VIN from BCM and Stored VIN in CCU are different + // 1 : "Mismatch" + // 0 : "Match" + // multiplex variable + uint8_t dbg_Info_VIN_Mismatch; // Bits= 1 + + // 12857 : "MPVTabletka ='29'" + // 12856 : "MPVOrbita ='28'" + // 12855 : "MPVArmored4SEAT ='27'" + // 12851 : "MPVArmored9SEAT ='23'" + // 12850 : "MPVNonArmored9SEAT ='22'" + // 12849 : "MPVArmored8SEAT ='21'" + // 12848 : "MPVNonArmored4SEAT ='20'" + // 12595 : "SUVArmored = '13'" + // 12594 : "SUVNonArmored ='12'" + // 12355 : "LimoArmoredV8CiVil ='0C'_NotUsed" + // 12354 : "CabrioShow ='0B'_NotUsed_Phase1" + // 12353 : "SedanLongArmored ='0A'" + // 12345 : "SedanLong = '09'" + // 12344 : "Sedan4x2 = '08'_NotUsed_Phase1" + // 12341 : "Cabrio ='05'" + // 12340 : "LimoArmoredV8 ='04'" + // 12339 : "LimoArmoredV12 ='03'" + // 12337 : "SedanArmored = '01'" + // 12336 : "SedanNonArmored='00'" + // multiplex variable + uint16_t dbg_Info_VehicleBody; // Bits=16 Unit:'Vehicle' + + // multiplex variable + uint8_t dbg_Info_MBD_Ver_Rev; // Bits= 8 Unit:'Rev.' #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -3125,7 +3876,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - uint8_t dbg_Drs_0_SFL_DL : 7; // Bits= 7 Unit:'%' + uint8_t dbg_Drs_0_SFL_DL : 7; // Bits= 7 Unit:'%' uint8_t dbg_Drs_1_CFL_FPL : 7; // Bits= 7 Unit:'%' @@ -3143,27 +3894,27 @@ typedef struct #else - uint8_t dbg_Drs_0_SFL_DL; // Bits= 7 Unit:'%' + uint8_t dbg_Drs_0_SFL_DL; // Bits= 7 Unit:'%' - uint8_t dbg_Drs_1_CFL_FPL; // Bits= 7 Unit:'%' + uint8_t dbg_Drs_1_CFL_FPL; // Bits= 7 Unit:'%' - uint8_t dbg_Drs_2_CFR_FPR; // Bits= 7 Unit:'%' + uint8_t dbg_Drs_2_CFR_FPR; // Bits= 7 Unit:'%' - uint8_t dbg_Drs_3_SFR_DR; // Bits= 7 Unit:'%' + uint8_t dbg_Drs_3_SFR_DR; // Bits= 7 Unit:'%' - uint8_t dbg_Drs_4_SRL_RLB; // Bits= 7 Unit:'%' + uint8_t dbg_Drs_4_SRL_RLB; // Bits= 7 Unit:'%' - uint8_t dbg_Drs_5_CRL_FCL; // Bits= 7 Unit:'%' + uint8_t dbg_Drs_5_CRL_FCL; // Bits= 7 Unit:'%' - uint8_t dbg_Drs_6_CRR_FCR; // Bits= 7 Unit:'%' + uint8_t dbg_Drs_6_CRR_FCR; // Bits= 7 Unit:'%' - uint8_t dbg_Drs_7_SRR_RRB; // Bits= 7 Unit:'%' + uint8_t dbg_Drs_7_SRR_RRB; // Bits= 7 Unit:'%' #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -3211,7 +3962,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - // MULTIPLEX master signal + // MULTIPLEX master signal uint8_t dbg_Sen_Incar_MultMsg_Idx : 2; // Bits= 2 // multiplex variable @@ -3272,70 +4023,70 @@ typedef struct #else - // MULTIPLEX master signal - uint8_t dbg_Sen_Incar_MultMsg_Idx; // Bits= 2 + // MULTIPLEX master signal + uint8_t dbg_Sen_Incar_MultMsg_Idx; // Bits= 2 - // multiplex variable - int16_t dbg_Sen_Incar_Raw_FL_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Incar_Raw_FL_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Incar_Raw_FL_phys; + sigfloat_t dbg_Sen_Incar_Raw_FL_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Incar_FL_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Incar_FL_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Incar_FL_phys; + sigfloat_t dbg_Sen_Incar_FL_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Incar_Raw_FR_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Incar_Raw_FR_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Incar_Raw_FR_phys; + sigfloat_t dbg_Sen_Incar_Raw_FR_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Incar_FR_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Incar_FR_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Incar_FR_phys; + sigfloat_t dbg_Sen_Incar_FR_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Incar_Raw_RL_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Incar_Raw_RL_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Incar_Raw_RL_phys; + sigfloat_t dbg_Sen_Incar_Raw_RL_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Incar_RL_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Incar_RL_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Incar_RL_phys; + sigfloat_t dbg_Sen_Incar_RL_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Incar_Raw_RR_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Incar_Raw_RR_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Incar_Raw_RR_phys; + sigfloat_t dbg_Sen_Incar_Raw_RR_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Incar_RR_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Incar_RR_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Incar_RR_phys; + sigfloat_t dbg_Sen_Incar_RR_phys; #endif // CANDB_DBG_USE_SIGFLOAT #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -3453,7 +4204,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - // 63 : "AutoChange" + // 63 : "AutoChange" // 23 : "23_SealingValve" // 22 : "22_OSA" // 21 : "21_Rec" @@ -3482,38 +4233,38 @@ typedef struct #else - // 63 : "AutoChange" - // 23 : "23_SealingValve" - // 22 : "22_OSA" - // 21 : "21_Rec" - // 20 : "20_Temp_RR" - // 19 : "19_Temp_RL" - // 18 : "18_TempL_FR" - // 17 : "17_TempU_FR" - // 16 : "16_TempL_FL" - // 15 : "15_TempU_FL" - // 14 : "14_Foot_RR" - // 13 : "13_Vent_SRR" - // 12 : "12_Vent_CRR" - // 11 : "11_Foot_RL" - // 10 : "10_Vent_CRL" - // 9 : "09_Vent_SRL" - // 8 : "08_Foot_2FR" - // 7 : "07_Foot_1FR" - // 6 : "06_Vent_SFR" - // 5 : "05_Vent_CFR" - // 4 : "04_Foot_2FL" - // 3 : "03_Foot_1FL" - // 2 : "02_Vent_CFL" - // 1 : "01_Vent_SFL" - // 0 : "00_Def" - uint8_t Cmd_Target_Act_Index; // Bits= 6 Unit:'Index' + // 63 : "AutoChange" + // 23 : "23_SealingValve" + // 22 : "22_OSA" + // 21 : "21_Rec" + // 20 : "20_Temp_RR" + // 19 : "19_Temp_RL" + // 18 : "18_TempL_FR" + // 17 : "17_TempU_FR" + // 16 : "16_TempL_FL" + // 15 : "15_TempU_FL" + // 14 : "14_Foot_RR" + // 13 : "13_Vent_SRR" + // 12 : "12_Vent_CRR" + // 11 : "11_Foot_RL" + // 10 : "10_Vent_CRL" + // 9 : "09_Vent_SRL" + // 8 : "08_Foot_2FR" + // 7 : "07_Foot_1FR" + // 6 : "06_Vent_SFR" + // 5 : "05_Vent_CFR" + // 4 : "04_Foot_2FL" + // 3 : "03_Foot_1FL" + // 2 : "02_Vent_CFL" + // 1 : "01_Vent_SFL" + // 0 : "00_Def" + uint8_t Cmd_Target_Act_Index; // Bits= 6 Unit:'Index' #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -3635,7 +4386,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - // 23 : "23_SealingValve" + // 23 : "23_SealingValve" // 22 : "22_OSA" // 21 : "21_Rec" // 20 : "20_Temp_RR" @@ -3681,55 +4432,55 @@ typedef struct #else - // 23 : "23_SealingValve" - // 22 : "22_OSA" - // 21 : "21_Rec" - // 20 : "20_Temp_RR" - // 19 : "19_Temp_RL" - // 18 : "18_TempL_FR" - // 17 : "17_TempU_FR" - // 16 : "16_TempL_FL" - // 15 : "15_TempU_FL" - // 14 : "14_Foot_RR" - // 13 : "13_Vent_SRR" - // 12 : "12_Vent_CRR" - // 11 : "11_Foot_RL" - // 10 : "10_Vent_CRL" - // 9 : "09_Vent_SRL" - // 8 : "08_Foot_2FR" - // 7 : "07_Foot_1FR" - // 6 : "06_Vent_SFR" - // 5 : "05_Vent_CFR" - // 4 : "04_Foot_2FL" - // 3 : "03_Foot_1FL" - // 2 : "02_Vent_CFL" - // 1 : "01_Vent_SFL" - // 0 : "00_Def" - uint8_t dbg_Info_Act_Index; // Bits= 6 Unit:'Idx' + // 23 : "23_SealingValve" + // 22 : "22_OSA" + // 21 : "21_Rec" + // 20 : "20_Temp_RR" + // 19 : "19_Temp_RL" + // 18 : "18_TempL_FR" + // 17 : "17_TempU_FR" + // 16 : "16_TempL_FL" + // 15 : "15_TempU_FL" + // 14 : "14_Foot_RR" + // 13 : "13_Vent_SRR" + // 12 : "12_Vent_CRR" + // 11 : "11_Foot_RL" + // 10 : "10_Vent_CRL" + // 9 : "09_Vent_SRL" + // 8 : "08_Foot_2FR" + // 7 : "07_Foot_1FR" + // 6 : "06_Vent_SFR" + // 5 : "05_Vent_CFR" + // 4 : "04_Foot_2FL" + // 3 : "03_Foot_1FL" + // 2 : "02_Vent_CFL" + // 1 : "01_Vent_SFL" + // 0 : "00_Def" + uint8_t dbg_Info_Act_Index; // Bits= 6 Unit:'Idx' - uint16_t dbg_Info_Act_App_Percent_ro; // Bits=10 Factor= 0.1 Unit:'%' + uint16_t dbg_Info_Act_App_Percent_ro; // Bits=10 Factor= 0.1 Unit:'%' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Info_Act_App_Percent_phys; + sigfloat_t dbg_Info_Act_App_Percent_phys; #endif // CANDB_DBG_USE_SIGFLOAT - uint16_t dbg_Info_Act_with_Limit_Percent_ro; // Bits=10 Factor= 0.1 Unit:'%' + uint16_t dbg_Info_Act_with_Limit_Percent_ro; // Bits=10 Factor= 0.1 Unit:'%' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Info_Act_with_Limit_Percent_phys; + sigfloat_t dbg_Info_Act_with_Limit_Percent_phys; #endif // CANDB_DBG_USE_SIGFLOAT - uint16_t dbg_Info_Act_Current_Count; // Bits=12 Unit:'Count' + uint16_t dbg_Info_Act_Current_Count; // Bits=12 Unit:'Count' - uint16_t dbg_Info_Act_Range_Count; // Bits=12 Unit:'Count' + uint16_t dbg_Info_Act_Range_Count; // Bits=12 Unit:'Count' - uint16_t dbg_Info_Act_Default_Count; // Bits=12 Unit:'Count' + uint16_t dbg_Info_Act_Default_Count; // Bits=12 Unit:'Count' #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -3744,7 +4495,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - uint8_t dbg_Info_Act_Msg_Missing_Flag : 1; // Bits= 1 Unit:'(clear 0, set 1)' + uint8_t dbg_Info_Act_Msg_Missing_Flag : 1; // Bits= 1 Unit:'(clear 0, set 1)' uint8_t dbg_Info_Act_Internal_Fail_Flag : 1; // Bits= 1 Unit:'(clear 0, set 1)' @@ -3762,27 +4513,27 @@ typedef struct #else - uint8_t dbg_Info_Act_Msg_Missing_Flag; // Bits= 1 Unit:'(clear 0, set 1)' + uint8_t dbg_Info_Act_Msg_Missing_Flag; // Bits= 1 Unit:'(clear 0, set 1)' - uint8_t dbg_Info_Act_Internal_Fail_Flag; // Bits= 1 Unit:'(clear 0, set 1)' + uint8_t dbg_Info_Act_Internal_Fail_Flag; // Bits= 1 Unit:'(clear 0, set 1)' - uint8_t dbg_Info_Act_Homing_Err_Flag; // Bits= 1 Unit:'(clear 0, set 1)' + uint8_t dbg_Info_Act_Homing_Err_Flag; // Bits= 1 Unit:'(clear 0, set 1)' - uint8_t dbg_Info_Act_Range_Err_Flag; // Bits= 1 Unit:'(clear 0, set 1)' + uint8_t dbg_Info_Act_Range_Err_Flag; // Bits= 1 Unit:'(clear 0, set 1)' - uint8_t dbg_Info_Act_Range_Fail_Flag; // Bits= 1 Unit:'(clear 0, set 1)' + uint8_t dbg_Info_Act_Range_Fail_Flag; // Bits= 1 Unit:'(clear 0, set 1)' - uint8_t dbg_Info_Act_Range_Err_Operation; // Bits= 1 Unit:'(clear 0, set 1)' + uint8_t dbg_Info_Act_Range_Err_Operation; // Bits= 1 Unit:'(clear 0, set 1)' - uint8_t dbg_Info_Act_Range_Err_Check_Cnt; // Bits= 8 Unit:'count' + uint8_t dbg_Info_Act_Range_Err_Check_Cnt; // Bits= 8 Unit:'count' - uint16_t dbg_Info_Act_Range_Err_Timer; // Bits=10 Unit:'sec' + uint16_t dbg_Info_Act_Range_Err_Timer; // Bits=10 Unit:'sec' #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -3813,7 +4564,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - int16_t dbg_Sen_Eva_Target_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + int16_t dbg_Sen_Eva_Target_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT sigfloat_t dbg_Sen_Eva_Target_phys; @@ -3839,35 +4590,35 @@ typedef struct #else - int16_t dbg_Sen_Eva_Target_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + int16_t dbg_Sen_Eva_Target_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Eva_Target_phys; + sigfloat_t dbg_Sen_Eva_Target_phys; #endif // CANDB_DBG_USE_SIGFLOAT - int16_t dbg_Sen_Eva_Diff_FrontRear_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + int16_t dbg_Sen_Eva_Diff_FrontRear_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Eva_Diff_FrontRear_phys; + sigfloat_t dbg_Sen_Eva_Diff_FrontRear_phys; #endif // CANDB_DBG_USE_SIGFLOAT - int16_t dbg_Sen_Eva_F_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + int16_t dbg_Sen_Eva_F_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Eva_F_phys; + sigfloat_t dbg_Sen_Eva_F_phys; #endif // CANDB_DBG_USE_SIGFLOAT - int16_t dbg_Sen_Eva_R_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + int16_t dbg_Sen_Eva_R_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Eva_R_phys; + sigfloat_t dbg_Sen_Eva_R_phys; #endif // CANDB_DBG_USE_SIGFLOAT #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -4010,7 +4761,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - // 3 : "RR" + // 3 : "RR" // 2 : "RL" // 1 : "FR" // 0 : "FL" @@ -4151,150 +4902,150 @@ typedef struct #else - // 3 : "RR" - // 2 : "RL" - // 1 : "FR" - // 0 : "FL" - // MULTIPLEX master signal - uint8_t dbg_Sen_Duct_MultMsg_Idx; // Bits= 2 + // 3 : "RR" + // 2 : "RL" + // 1 : "FR" + // 0 : "FL" + // MULTIPLEX master signal + uint8_t dbg_Sen_Duct_MultMsg_Idx; // Bits= 2 - // 1 : "Side" - // 0 : "Central" - // multiplex variable - uint8_t dbg_Sen_Duct_FL_Fb_Select; // Bits= 1 Unit:'(central 0, side 1)' + // 1 : "Side" + // 0 : "Central" + // multiplex variable + uint8_t dbg_Sen_Duct_FL_Fb_Select; // Bits= 1 Unit:'(central 0, side 1)' - // 1 : "Side" - // 0 : "Central" - // multiplex variable - uint8_t dbg_Sen_Duct_RR_Fb_Select; // Bits= 1 Unit:'(central 0, side 1)' + // 1 : "Side" + // 0 : "Central" + // multiplex variable + uint8_t dbg_Sen_Duct_RR_Fb_Select; // Bits= 1 Unit:'(central 0, side 1)' - // 1 : "Side" - // 0 : "Central" - // multiplex variable - uint8_t dbg_Sen_Duct_RL_Fb_Select; // Bits= 1 Unit:'(central 0, side 1)' + // 1 : "Side" + // 0 : "Central" + // multiplex variable + uint8_t dbg_Sen_Duct_RL_Fb_Select; // Bits= 1 Unit:'(central 0, side 1)' - // 1 : "Side" - // 0 : "Central" - // multiplex variable - uint8_t dbg_Sen_Duct_FR_Fb_Select; // Bits= 1 Unit:'(central 0, side 1)' + // 1 : "Side" + // 0 : "Central" + // multiplex variable + uint8_t dbg_Sen_Duct_FR_Fb_Select; // Bits= 1 Unit:'(central 0, side 1)' - // multiplex variable - int16_t dbg_Sen_Duct_RL_Tgt_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Duct_RL_Tgt_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Duct_RL_Tgt_phys; + sigfloat_t dbg_Sen_Duct_RL_Tgt_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Duct_FR_Upper_Tgt_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Duct_FR_Upper_Tgt_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Duct_FR_Upper_Tgt_phys; + sigfloat_t dbg_Sen_Duct_FR_Upper_Tgt_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Duct_RR_Tgt_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Duct_RR_Tgt_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Duct_RR_Tgt_phys; + sigfloat_t dbg_Sen_Duct_RR_Tgt_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Duct_FL_Upper_Tgt_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Duct_FL_Upper_Tgt_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Duct_FL_Upper_Tgt_phys; + sigfloat_t dbg_Sen_Duct_FL_Upper_Tgt_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Duct_RR_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Duct_RR_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Duct_RR_Fb_phys; + sigfloat_t dbg_Sen_Duct_RR_Fb_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Duct_RL_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Duct_RL_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Duct_RL_Fb_phys; + sigfloat_t dbg_Sen_Duct_RL_Fb_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Duct_FR_Upper_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Duct_FR_Upper_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Duct_FR_Upper_Fb_phys; + sigfloat_t dbg_Sen_Duct_FR_Upper_Fb_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Duct_FL_Upper_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Duct_FL_Upper_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Duct_FL_Upper_Fb_phys; + sigfloat_t dbg_Sen_Duct_FL_Upper_Fb_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Duct_FR_Side_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Duct_FR_Side_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Duct_FR_Side_Fb_phys; + sigfloat_t dbg_Sen_Duct_FR_Side_Fb_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Duct_FL_Side_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Duct_FL_Side_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Duct_FL_Side_Fb_phys; + sigfloat_t dbg_Sen_Duct_FL_Side_Fb_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Duct_RL_Side_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Duct_RL_Side_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Duct_RL_Side_Fb_phys; + sigfloat_t dbg_Sen_Duct_RL_Side_Fb_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Duct_RR_Side_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Duct_RR_Side_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Duct_RR_Side_Fb_phys; + sigfloat_t dbg_Sen_Duct_RR_Side_Fb_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Duct_FR_Lower_Tgt_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Duct_FR_Lower_Tgt_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Duct_FR_Lower_Tgt_phys; + sigfloat_t dbg_Sen_Duct_FR_Lower_Tgt_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Duct_FL_Lower_Tgt_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Duct_FL_Lower_Tgt_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Duct_FL_Lower_Tgt_phys; + sigfloat_t dbg_Sen_Duct_FL_Lower_Tgt_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Duct_FR_Lower_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Duct_FR_Lower_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Duct_FR_Lower_Fb_phys; + sigfloat_t dbg_Sen_Duct_FR_Lower_Fb_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Sen_Duct_FL_Lower_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Sen_Duct_FL_Lower_Fb_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_Duct_FL_Lower_Fb_phys; + sigfloat_t dbg_Sen_Duct_FL_Lower_Fb_phys; #endif // CANDB_DBG_USE_SIGFLOAT #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -4321,7 +5072,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - int16_t dbg_Sen_DewPoint_Diff_ro; // [-] Bits=16 Factor= 0.1 Unit:'��' + int16_t dbg_Sen_DewPoint_Diff_ro; // [-] Bits=16 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT sigfloat_t dbg_Sen_DewPoint_Diff_phys; @@ -4341,29 +5092,29 @@ typedef struct #else - int16_t dbg_Sen_DewPoint_Diff_ro; // [-] Bits=16 Factor= 0.1 Unit:'��' + int16_t dbg_Sen_DewPoint_Diff_ro; // [-] Bits=16 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_DewPoint_Diff_phys; + sigfloat_t dbg_Sen_DewPoint_Diff_phys; #endif // CANDB_DBG_USE_SIGFLOAT - uint16_t dbg_Sen_WindShield_Humidity_ro; // Bits=10 Factor= 0.1 Unit:'%' + uint16_t dbg_Sen_WindShield_Humidity_ro; // Bits=10 Factor= 0.1 Unit:'%' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_WindShield_Humidity_phys; + sigfloat_t dbg_Sen_WindShield_Humidity_phys; #endif // CANDB_DBG_USE_SIGFLOAT - int16_t dbg_Sen_WindShield_Temp_ro; // [-] Bits=16 Factor= 0.1 Unit:'��' + int16_t dbg_Sen_WindShield_Temp_ro; // [-] Bits=16 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Sen_WindShield_Temp_phys; + sigfloat_t dbg_Sen_WindShield_Temp_phys; #endif // CANDB_DBG_USE_SIGFLOAT #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -4385,197 +5136,209 @@ typedef struct #endif -// Value tables for @LIN_AirQualSen_Stat signal +// Value tables for @LIN_AirQS_Stat signal -#ifndef LIN_AirQualSen_Stat_dbg_LIN_AirQS_Stat_Sensor_is_off_standby_mode -#define LIN_AirQualSen_Stat_dbg_LIN_AirQS_Stat_Sensor_is_off_standby_mode (2) +#ifndef LIN_AirQS_Stat_dbg_LIN_AirQS_Stat_Error +#define LIN_AirQS_Stat_dbg_LIN_AirQS_Stat_Error (3) #endif -#ifndef LIN_AirQualSen_Stat_dbg_LIN_AirQS_Stat_Sensor_is_on_active_mode -#define LIN_AirQualSen_Stat_dbg_LIN_AirQS_Stat_Sensor_is_on_active_mode (1) +#ifndef LIN_AirQS_Stat_dbg_LIN_AirQS_Stat_Sensor_is_off_standby_mode +#define LIN_AirQS_Stat_dbg_LIN_AirQS_Stat_Sensor_is_off_standby_mode (2) #endif -#ifndef LIN_AirQualSen_Stat_dbg_LIN_AirQS_Stat_Initializing -#define LIN_AirQualSen_Stat_dbg_LIN_AirQS_Stat_Initializing (0) +#ifndef LIN_AirQS_Stat_dbg_LIN_AirQS_Stat_Sensor_is_on_active_mode +#define LIN_AirQS_Stat_dbg_LIN_AirQS_Stat_Sensor_is_on_active_mode (1) +#endif + +#ifndef LIN_AirQS_Stat_dbg_LIN_AirQS_Stat_Initializing +#define LIN_AirQS_Stat_dbg_LIN_AirQS_Stat_Initializing (0) #endif -// Value tables for @LIN_AirQualSenCombined_Val signal +// Value tables for @LIN_AirQS_Combined_Stat signal -#ifndef LIN_AirQualSenCombined_Val_dbg_LIN_AirQS_Stat_Low_air_quality_ -#define LIN_AirQualSenCombined_Val_dbg_LIN_AirQS_Stat_Low_air_quality_ (3) +#ifndef LIN_AirQS_Combined_Stat_dbg_LIN_AirQS_Stat_Signal_not_available +#define LIN_AirQS_Combined_Stat_dbg_LIN_AirQS_Stat_Signal_not_available (4) #endif -#ifndef LIN_AirQualSenCombined_Val_dbg_LIN_AirQS_Stat_Medium_air_quality -#define LIN_AirQualSenCombined_Val_dbg_LIN_AirQS_Stat_Medium_air_quality (2) +#ifndef LIN_AirQS_Combined_Stat_dbg_LIN_AirQS_Stat_Low_air_quality_ +#define LIN_AirQS_Combined_Stat_dbg_LIN_AirQS_Stat_Low_air_quality_ (3) #endif -#ifndef LIN_AirQualSenCombined_Val_dbg_LIN_AirQS_Stat_Hight_air_quality -#define LIN_AirQualSenCombined_Val_dbg_LIN_AirQS_Stat_Hight_air_quality (1) +#ifndef LIN_AirQS_Combined_Stat_dbg_LIN_AirQS_Stat_Medium_air_quality +#define LIN_AirQS_Combined_Stat_dbg_LIN_AirQS_Stat_Medium_air_quality (2) #endif -#ifndef LIN_AirQualSenCombined_Val_dbg_LIN_AirQS_Stat_No_Clean_air -#define LIN_AirQualSenCombined_Val_dbg_LIN_AirQS_Stat_No_Clean_air (0) +#ifndef LIN_AirQS_Combined_Stat_dbg_LIN_AirQS_Stat_Hight_air_quality +#define LIN_AirQS_Combined_Stat_dbg_LIN_AirQS_Stat_Hight_air_quality (1) +#endif + +#ifndef LIN_AirQS_Combined_Stat_dbg_LIN_AirQS_Stat_No_Clean_air +#define LIN_AirQS_Combined_Stat_dbg_LIN_AirQS_Stat_No_Clean_air (0) #endif -// Value tables for @LIN_AirQualSen_Error_Stat signal +// Value tables for @LIN_AirQS_Error_Stat signal -#ifndef LIN_AirQualSen_Error_Stat_dbg_LIN_AirQS_Stat_Component_malfunction -#define LIN_AirQualSen_Error_Stat_dbg_LIN_AirQS_Stat_Component_malfunction (3) +#ifndef LIN_AirQS_Error_Stat_dbg_LIN_AirQS_Stat_Component_malfunction +#define LIN_AirQS_Error_Stat_dbg_LIN_AirQS_Stat_Component_malfunction (4) #endif -#ifndef LIN_AirQualSen_Error_Stat_dbg_LIN_AirQS_Stat_Supply_chain_short -#define LIN_AirQualSen_Error_Stat_dbg_LIN_AirQS_Stat_Supply_chain_short (2) +#ifndef LIN_AirQS_Error_Stat_dbg_LIN_AirQS_Stat_Supply_chain_short +#define LIN_AirQS_Error_Stat_dbg_LIN_AirQS_Stat_Supply_chain_short (3) #endif -#ifndef LIN_AirQualSen_Error_Stat_dbg_LIN_AirQS_Stat_Supply_chain_break -#define LIN_AirQualSen_Error_Stat_dbg_LIN_AirQS_Stat_Supply_chain_break (1) +#ifndef LIN_AirQS_Error_Stat_dbg_LIN_AirQS_Stat_Supply_chain_break +#define LIN_AirQS_Error_Stat_dbg_LIN_AirQS_Stat_Supply_chain_break (2) #endif -#ifndef LIN_AirQualSen_Error_Stat_dbg_LIN_AirQS_Stat_No_error -#define LIN_AirQualSen_Error_Stat_dbg_LIN_AirQS_Stat_No_error (0) +#ifndef LIN_AirQS_Error_Stat_dbg_LIN_AirQS_Stat_No_error +#define LIN_AirQS_Error_Stat_dbg_LIN_AirQS_Stat_No_error (1) +#endif + +#ifndef LIN_AirQS_Error_Stat_dbg_LIN_AirQS_Stat_Signal_not_available +#define LIN_AirQS_Error_Stat_dbg_LIN_AirQS_Stat_Signal_not_available (0) #endif -// Value tables for @LIN_AirQualSenCOlvl_Val signal +// Value tables for @LIN_AirQS_COlvl_Stat signal -#ifndef LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_10_100_pollunion_ -#define LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_10_100_pollunion_ (10) +#ifndef LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_10_100_pollunion_ +#define LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_10_100_pollunion_ (10) #endif -#ifndef LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_9_90_pollunion_ -#define LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_9_90_pollunion_ (9) +#ifndef LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_9_90_pollunion_ +#define LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_9_90_pollunion_ (9) #endif -#ifndef LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_8_80_pollunion_ -#define LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_8_80_pollunion_ (8) +#ifndef LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_8_80_pollunion_ +#define LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_8_80_pollunion_ (8) #endif -#ifndef LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_7_70_pollunion_ -#define LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_7_70_pollunion_ (7) +#ifndef LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_7_70_pollunion_ +#define LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_7_70_pollunion_ (7) #endif -#ifndef LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_6_60_pollunion_ -#define LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_6_60_pollunion_ (6) +#ifndef LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_6_60_pollunion_ +#define LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_6_60_pollunion_ (6) #endif -#ifndef LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_5_50_pollunion -#define LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_5_50_pollunion (5) +#ifndef LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_5_50_pollunion +#define LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_5_50_pollunion (5) #endif -#ifndef LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_4_40_pollunion_ -#define LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_4_40_pollunion_ (4) +#ifndef LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_4_40_pollunion_ +#define LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_4_40_pollunion_ (4) #endif -#ifndef LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_3_30_pollunion -#define LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_3_30_pollunion (3) +#ifndef LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_3_30_pollunion +#define LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_3_30_pollunion (3) #endif -#ifndef LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_2_20_pollunion -#define LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_2_20_pollunion (2) +#ifndef LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_2_20_pollunion +#define LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_2_20_pollunion (2) #endif -#ifndef LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_1_10_pollunion_ -#define LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_1_10_pollunion_ (1) +#ifndef LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_1_10_pollunion_ +#define LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_1_10_pollunion_ (1) #endif -#ifndef LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_0_clean_air -#define LIN_AirQualSenCOlvl_Val_dbg_LIN_AirQS_Stat_Level_0_clean_air (0) +#ifndef LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_0_clean_air +#define LIN_AirQS_COlvl_Stat_dbg_LIN_AirQS_Stat_Level_0_clean_air (0) #endif -// Value tables for @LIN_AirQualSenNOxlvl_Val signal +// Value tables for @LIN_AirQS_NOxlvl_Stat signal -#ifndef LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_10_100_pollunion_ -#define LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_10_100_pollunion_ (10) +#ifndef LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_10_100_pollunion_ +#define LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_10_100_pollunion_ (10) #endif -#ifndef LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_9_90_pollunion_ -#define LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_9_90_pollunion_ (9) +#ifndef LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_9_90_pollunion_ +#define LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_9_90_pollunion_ (9) #endif -#ifndef LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_8_80_pollunion_ -#define LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_8_80_pollunion_ (8) +#ifndef LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_8_80_pollunion_ +#define LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_8_80_pollunion_ (8) #endif -#ifndef LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_7_70_pollunion_ -#define LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_7_70_pollunion_ (7) +#ifndef LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_7_70_pollunion_ +#define LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_7_70_pollunion_ (7) #endif -#ifndef LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_6_60_pollunion_ -#define LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_6_60_pollunion_ (6) +#ifndef LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_6_60_pollunion_ +#define LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_6_60_pollunion_ (6) #endif -#ifndef LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_5_50_pollunion -#define LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_5_50_pollunion (5) +#ifndef LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_5_50_pollunion +#define LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_5_50_pollunion (5) #endif -#ifndef LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_4_40_pollunion_ -#define LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_4_40_pollunion_ (4) +#ifndef LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_4_40_pollunion_ +#define LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_4_40_pollunion_ (4) #endif -#ifndef LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_3_30_pollunion -#define LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_3_30_pollunion (3) +#ifndef LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_3_30_pollunion +#define LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_3_30_pollunion (3) #endif -#ifndef LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_2_20_pollunion -#define LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_2_20_pollunion (2) +#ifndef LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_2_20_pollunion +#define LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_2_20_pollunion (2) #endif -#ifndef LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_1_10_pollunion_ -#define LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_1_10_pollunion_ (1) +#ifndef LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_1_10_pollunion_ +#define LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_1_10_pollunion_ (1) #endif -#ifndef LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_0_clean_air -#define LIN_AirQualSenNOxlvl_Val_dbg_LIN_AirQS_Stat_Level_0_clean_air (0) +#ifndef LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_0_clean_air +#define LIN_AirQS_NOxlvl_Stat_dbg_LIN_AirQS_Stat_Level_0_clean_air (0) #endif -// Value tables for @LIN_AirQualSenNH3lvl_Val signal +// Value tables for @LIN_AirQS_NH3lvl_Stat signal -#ifndef LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_10_100_pollunion_ -#define LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_10_100_pollunion_ (10) +#ifndef LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_10_100_pollunion_ +#define LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_10_100_pollunion_ (10) #endif -#ifndef LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_9_90_pollunion_ -#define LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_9_90_pollunion_ (9) +#ifndef LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_9_90_pollunion_ +#define LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_9_90_pollunion_ (9) #endif -#ifndef LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_8_80_pollunion_ -#define LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_8_80_pollunion_ (8) +#ifndef LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_8_80_pollunion_ +#define LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_8_80_pollunion_ (8) #endif -#ifndef LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_7_70_pollunion_ -#define LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_7_70_pollunion_ (7) +#ifndef LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_7_70_pollunion_ +#define LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_7_70_pollunion_ (7) #endif -#ifndef LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_6_60_pollunion_ -#define LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_6_60_pollunion_ (6) +#ifndef LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_6_60_pollunion_ +#define LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_6_60_pollunion_ (6) #endif -#ifndef LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_5_50_pollunion -#define LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_5_50_pollunion (5) +#ifndef LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_5_50_pollunion +#define LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_5_50_pollunion (5) #endif -#ifndef LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_4_40_pollunion_ -#define LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_4_40_pollunion_ (4) +#ifndef LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_4_40_pollunion_ +#define LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_4_40_pollunion_ (4) #endif -#ifndef LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_3_30_pollunion -#define LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_3_30_pollunion (3) +#ifndef LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_3_30_pollunion +#define LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_3_30_pollunion (3) #endif -#ifndef LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_2_20_pollunion -#define LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_2_20_pollunion (2) +#ifndef LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_2_20_pollunion +#define LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_2_20_pollunion (2) #endif -#ifndef LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_1_10_pollunion_ -#define LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_1_10_pollunion_ (1) +#ifndef LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_1_10_pollunion_ +#define LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_1_10_pollunion_ (1) #endif -#ifndef LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_0_clean_air -#define LIN_AirQualSenNH3lvl_Val_dbg_LIN_AirQS_Stat_Level_0_clean_air (0) +#ifndef LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_0_clean_air +#define LIN_AirQS_NH3lvl_Stat_dbg_LIN_AirQS_Stat_Level_0_clean_air (0) #endif @@ -4583,26 +5346,29 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - // 1 : "Error" + // 1 : "Error" // 0 : "No_Error" uint8_t LIN_AirQS_LinRespErr_Stat : 1; // Bits= 1 + // 3 : "Error" // 2 : "Sensor is off (standby mode)" // 1 : "Sensor is on (active mode)" // 0 : "Initializing" - uint8_t LIN_AirQualSen_Stat : 2; // Bits= 2 + uint8_t LIN_AirQS_Stat : 2; // Bits= 2 + // 4 : "Signal not available" // 3 : "Low air quality " // 2 : "Medium air quality" // 1 : "Hight air quality" // 0 : "No (Clean air)" - uint8_t LIN_AirQualSenCombined_Val : 2; // Bits= 2 + uint8_t LIN_AirQS_Combined_Stat : 3; // Bits= 3 - // 3 : "Component malfunction" - // 2 : "Supply chain short" - // 1 : "Supply chain break" - // 0 : "No error" - uint8_t LIN_AirQualSen_Error_Stat : 2; // Bits= 2 + // 4 : "Component malfunction" + // 3 : "Supply chain short" + // 2 : "Supply chain break" + // 1 : "No error" + // 0 : "Signal not available" + uint8_t LIN_AirQS_Error_Stat : 3; // Bits= 3 // 10 : "Level 10 (100% pollunion) " // 9 : "Level 9 (90% pollunion) " @@ -4615,7 +5381,7 @@ typedef struct // 2 : "Level 2 (20% pollunion)" // 1 : "Level 1 (10% pollunion) " // 0 : "Level 0 (clean air)" - uint8_t LIN_AirQualSenCOlvl_Val : 4; // Bits= 4 + uint8_t LIN_AirQS_COlvl_Stat : 4; // Bits= 4 // 10 : "Level 10 (100% pollunion) " // 9 : "Level 9 (90% pollunion) " @@ -4628,7 +5394,7 @@ typedef struct // 2 : "Level 2 (20% pollunion)" // 1 : "Level 1 (10% pollunion) " // 0 : "Level 0 (clean air)" - uint8_t LIN_AirQualSenNOxlvl_Val : 4; // Bits= 4 + uint8_t LIN_AirQS_NOxlvl_Stat : 4; // Bits= 4 // 10 : "Level 10 (100% pollunion) " // 9 : "Level 9 (90% pollunion) " @@ -4641,75 +5407,78 @@ typedef struct // 2 : "Level 2 (20% pollunion)" // 1 : "Level 1 (10% pollunion) " // 0 : "Level 0 (clean air)" - uint8_t LIN_AirQualSenNH3lvl_Val : 4; // Bits= 4 + uint8_t LIN_AirQS_NH3lvl_Stat : 4; // Bits= 4 #else - // 1 : "Error" - // 0 : "No_Error" - uint8_t LIN_AirQS_LinRespErr_Stat; // Bits= 1 + // 1 : "Error" + // 0 : "No_Error" + uint8_t LIN_AirQS_LinRespErr_Stat; // Bits= 1 - // 2 : "Sensor is off (standby mode)" - // 1 : "Sensor is on (active mode)" - // 0 : "Initializing" - uint8_t LIN_AirQualSen_Stat; // Bits= 2 + // 3 : "Error" + // 2 : "Sensor is off (standby mode)" + // 1 : "Sensor is on (active mode)" + // 0 : "Initializing" + uint8_t LIN_AirQS_Stat; // Bits= 2 - // 3 : "Low air quality " - // 2 : "Medium air quality" - // 1 : "Hight air quality" - // 0 : "No (Clean air)" - uint8_t LIN_AirQualSenCombined_Val; // Bits= 2 + // 4 : "Signal not available" + // 3 : "Low air quality " + // 2 : "Medium air quality" + // 1 : "Hight air quality" + // 0 : "No (Clean air)" + uint8_t LIN_AirQS_Combined_Stat; // Bits= 3 - // 3 : "Component malfunction" - // 2 : "Supply chain short" - // 1 : "Supply chain break" - // 0 : "No error" - uint8_t LIN_AirQualSen_Error_Stat; // Bits= 2 + // 4 : "Component malfunction" + // 3 : "Supply chain short" + // 2 : "Supply chain break" + // 1 : "No error" + // 0 : "Signal not available" + uint8_t LIN_AirQS_Error_Stat; // Bits= 3 - // 10 : "Level 10 (100% pollunion) " - // 9 : "Level 9 (90% pollunion) " - // 8 : "Level 8 (80% pollunion) " - // 7 : "Level 7 (70% pollunion) " - // 6 : "Level 6 (60% pollunion) " - // 5 : "Level 5 (50% pollunion)" - // 4 : "Level 4 (40% pollunion) " - // 3 : "Level 3 (30% pollunion)" - // 2 : "Level 2 (20% pollunion)" - // 1 : "Level 1 (10% pollunion) " - // 0 : "Level 0 (clean air)" - uint8_t LIN_AirQualSenCOlvl_Val; // Bits= 4 + // 10 : "Level 10 (100% pollunion) " + // 9 : "Level 9 (90% pollunion) " + // 8 : "Level 8 (80% pollunion) " + // 7 : "Level 7 (70% pollunion) " + // 6 : "Level 6 (60% pollunion) " + // 5 : "Level 5 (50% pollunion)" + // 4 : "Level 4 (40% pollunion) " + // 3 : "Level 3 (30% pollunion)" + // 2 : "Level 2 (20% pollunion)" + // 1 : "Level 1 (10% pollunion) " + // 0 : "Level 0 (clean air)" + uint8_t LIN_AirQS_COlvl_Stat; // Bits= 4 - // 10 : "Level 10 (100% pollunion) " - // 9 : "Level 9 (90% pollunion) " - // 8 : "Level 8 (80% pollunion) " - // 7 : "Level 7 (70% pollunion) " - // 6 : "Level 6 (60% pollunion) " - // 5 : "Level 5 (50% pollunion)" - // 4 : "Level 4 (40% pollunion) " - // 3 : "Level 3 (30% pollunion)" - // 2 : "Level 2 (20% pollunion)" - // 1 : "Level 1 (10% pollunion) " - // 0 : "Level 0 (clean air)" - uint8_t LIN_AirQualSenNOxlvl_Val; // Bits= 4 + // 10 : "Level 10 (100% pollunion) " + // 9 : "Level 9 (90% pollunion) " + // 8 : "Level 8 (80% pollunion) " + // 7 : "Level 7 (70% pollunion) " + // 6 : "Level 6 (60% pollunion) " + // 5 : "Level 5 (50% pollunion)" + // 4 : "Level 4 (40% pollunion) " + // 3 : "Level 3 (30% pollunion)" + // 2 : "Level 2 (20% pollunion)" + // 1 : "Level 1 (10% pollunion) " + // 0 : "Level 0 (clean air)" + uint8_t LIN_AirQS_NOxlvl_Stat; // Bits= 4 - // 10 : "Level 10 (100% pollunion) " - // 9 : "Level 9 (90% pollunion) " - // 8 : "Level 8 (80% pollunion) " - // 7 : "Level 7 (70% pollunion) " - // 6 : "Level 6 (60% pollunion) " - // 5 : "Level 5 (50% pollunion)" - // 4 : "Level 4 (40% pollunion) " - // 3 : "Level 3 (30% pollunion)" - // 2 : "Level 2 (20% pollunion)" - // 1 : "Level 1 (10% pollunion) " - // 0 : "Level 0 (clean air)" - uint8_t LIN_AirQualSenNH3lvl_Val; // Bits= 4 + // 10 : "Level 10 (100% pollunion) " + // 9 : "Level 9 (90% pollunion) " + // 8 : "Level 8 (80% pollunion) " + // 7 : "Level 7 (70% pollunion) " + // 6 : "Level 6 (60% pollunion) " + // 5 : "Level 5 (50% pollunion)" + // 4 : "Level 4 (40% pollunion) " + // 3 : "Level 3 (30% pollunion)" + // 2 : "Level 2 (20% pollunion)" + // 1 : "Level 1 (10% pollunion) " + // 0 : "Level 0 (clean air)" + uint8_t LIN_AirQS_NH3lvl_Stat; // Bits= 4 #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -4717,7 +5486,7 @@ typedef struct // def @dbg_LIN_Aroma_Stat CAN Message (1297 0x511) #define dbg_LIN_Aroma_Stat_IDE (0U) -#define dbg_LIN_Aroma_Stat_DLC (5U) +#define dbg_LIN_Aroma_Stat_DLC (2U) #define dbg_LIN_Aroma_Stat_CANID (0x511U) // Value tables for @LIN_AromaLinRespErr_Stat signal @@ -4731,36 +5500,14 @@ typedef struct #endif -// Value tables for @LIN_Aroma_1CartridgeSw signal +// Value tables for @LIN_Aroma_CartridgeSw signal -#ifndef LIN_Aroma_1CartridgeSw_dbg_LIN_Aroma_Stat_Cartridge_removed -#define LIN_Aroma_1CartridgeSw_dbg_LIN_Aroma_Stat_Cartridge_removed (1) +#ifndef LIN_Aroma_CartridgeSw_dbg_LIN_Aroma_Stat_Cartridge_removed +#define LIN_Aroma_CartridgeSw_dbg_LIN_Aroma_Stat_Cartridge_removed (1) #endif -#ifndef LIN_Aroma_1CartridgeSw_dbg_LIN_Aroma_Stat_Cartridge_installed -#define LIN_Aroma_1CartridgeSw_dbg_LIN_Aroma_Stat_Cartridge_installed (0) -#endif - - -// Value tables for @LIN_Aroma_2CartridgeSw signal - -#ifndef LIN_Aroma_2CartridgeSw_dbg_LIN_Aroma_Stat_Cartridge_removed -#define LIN_Aroma_2CartridgeSw_dbg_LIN_Aroma_Stat_Cartridge_removed (1) -#endif - -#ifndef LIN_Aroma_2CartridgeSw_dbg_LIN_Aroma_Stat_Cartridge_installed -#define LIN_Aroma_2CartridgeSw_dbg_LIN_Aroma_Stat_Cartridge_installed (0) -#endif - - -// Value tables for @LIN_Aroma_3CartridgeSw signal - -#ifndef LIN_Aroma_3CartridgeSw_dbg_LIN_Aroma_Stat_Cartridge_removed -#define LIN_Aroma_3CartridgeSw_dbg_LIN_Aroma_Stat_Cartridge_removed (1) -#endif - -#ifndef LIN_Aroma_3CartridgeSw_dbg_LIN_Aroma_Stat_Cartridge_installed -#define LIN_Aroma_3CartridgeSw_dbg_LIN_Aroma_Stat_Cartridge_installed (0) +#ifndef LIN_Aroma_CartridgeSw_dbg_LIN_Aroma_Stat_Cartridge_installed +#define LIN_Aroma_CartridgeSw_dbg_LIN_Aroma_Stat_Cartridge_installed (0) #endif @@ -4785,8 +5532,8 @@ typedef struct // Value tables for @LIN_Aroma_Intens signal -#ifndef LIN_Aroma_Intens_dbg_LIN_Aroma_Stat_Aroma_malfunction -#define LIN_Aroma_Intens_dbg_LIN_Aroma_Stat_Aroma_malfunction (3) +#ifndef LIN_Aroma_Intens_dbg_LIN_Aroma_Stat_Aromatization_mode_3step +#define LIN_Aroma_Intens_dbg_LIN_Aroma_Stat_Aromatization_mode_3step (3) #endif #ifndef LIN_Aroma_Intens_dbg_LIN_Aroma_Stat_Aromatization_mode_2_step @@ -4801,276 +5548,107 @@ typedef struct #define LIN_Aroma_Intens_dbg_LIN_Aroma_Stat_Aromatization_off (0) #endif +// signal: @LIN_Aroma_CartridgeCapacity_ro +#define CANDB_DBG_LIN_Aroma_CartridgeCapacity_ro_CovFactor (10) +#define CANDB_DBG_LIN_Aroma_CartridgeCapacity_ro_toS(x) ( (uint8_t) ((x) / (10)) ) +#define CANDB_DBG_LIN_Aroma_CartridgeCapacity_ro_fromS(x) ( ((x) * (10)) ) -// Value tables for @LIN_Aroma_CartridgeSel signal +// Value tables for @LIN_Aroma_CartridgeFlavor signal -#ifndef LIN_Aroma_CartridgeSel_dbg_LIN_Aroma_Stat_Third_cartridge_selected -#define LIN_Aroma_CartridgeSel_dbg_LIN_Aroma_Stat_Third_cartridge_selected (3) +#ifndef LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_16 +#define LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_16 (15) #endif -#ifndef LIN_Aroma_CartridgeSel_dbg_LIN_Aroma_Stat_Second_cartridge_selected -#define LIN_Aroma_CartridgeSel_dbg_LIN_Aroma_Stat_Second_cartridge_selected (2) +#ifndef LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_15 +#define LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_15 (14) #endif -#ifndef LIN_Aroma_CartridgeSel_dbg_LIN_Aroma_Stat_First_cartridge_selected -#define LIN_Aroma_CartridgeSel_dbg_LIN_Aroma_Stat_First_cartridge_selected (1) +#ifndef LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_14 +#define LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_14 (13) #endif -#ifndef LIN_Aroma_CartridgeSel_dbg_LIN_Aroma_Stat_No_cartridge_selected -#define LIN_Aroma_CartridgeSel_dbg_LIN_Aroma_Stat_No_cartridge_selected (0) +#ifndef LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_13 +#define LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_13 (12) #endif - -// Value tables for @LIN_Aroma_1CartridgeFlavor signal - -#ifndef LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_16 -#define LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_16 (15) +#ifndef LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_12 +#define LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_12 (11) #endif -#ifndef LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_15 -#define LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_15 (14) +#ifndef LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_11 +#define LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_11 (10) #endif -#ifndef LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_14 -#define LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_14 (13) +#ifndef LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_10 +#define LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_10 (9) #endif -#ifndef LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_13 -#define LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_13 (12) +#ifndef LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_9 +#define LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_9 (8) #endif -#ifndef LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_12 -#define LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_12 (11) +#ifndef LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_8 +#define LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_8 (7) #endif -#ifndef LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_11 -#define LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_11 (10) +#ifndef LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_7 +#define LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_7 (6) #endif -#ifndef LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_10 -#define LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_10 (9) +#ifndef LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_6 +#define LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_6 (5) #endif -#ifndef LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_9 -#define LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_9 (8) +#ifndef LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_5 +#define LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_5 (4) #endif -#ifndef LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_8 -#define LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_8 (7) +#ifndef LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_4 +#define LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_4 (3) #endif -#ifndef LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_7 -#define LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_7 (6) +#ifndef LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_3 +#define LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_3 (2) #endif -#ifndef LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_6 -#define LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_6 (5) +#ifndef LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_2 +#define LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_2 (1) #endif -#ifndef LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_5 -#define LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_5 (4) +#ifndef LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_1 +#define LIN_Aroma_CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_1 (0) #endif -#ifndef LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_4 -#define LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_4 (3) -#endif - -#ifndef LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_3 -#define LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_3 (2) -#endif - -#ifndef LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_2 -#define LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_2 (1) -#endif - -#ifndef LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_1 -#define LIN_Aroma_1CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_1 (0) -#endif - - -// Value tables for @LIN_Aroma_2CartridgeFlavor signal - -#ifndef LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_16 -#define LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_16 (15) -#endif - -#ifndef LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_15 -#define LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_15 (14) -#endif - -#ifndef LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_14 -#define LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_14 (13) -#endif - -#ifndef LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_13 -#define LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_13 (12) -#endif - -#ifndef LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_12 -#define LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_12 (11) -#endif - -#ifndef LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_11 -#define LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_11 (10) -#endif - -#ifndef LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_10 -#define LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_10 (9) -#endif - -#ifndef LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_9 -#define LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_9 (8) -#endif - -#ifndef LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_8 -#define LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_8 (7) -#endif - -#ifndef LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_7 -#define LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_7 (6) -#endif - -#ifndef LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_6 -#define LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_6 (5) -#endif - -#ifndef LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_5 -#define LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_5 (4) -#endif - -#ifndef LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_4 -#define LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_4 (3) -#endif - -#ifndef LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_3 -#define LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_3 (2) -#endif - -#ifndef LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_2 -#define LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_2 (1) -#endif - -#ifndef LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_1 -#define LIN_Aroma_2CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_1 (0) -#endif - - -// Value tables for @LIN_Aroma_3CartridgeFlavor signal - -#ifndef LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_16 -#define LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_16 (15) -#endif - -#ifndef LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_15 -#define LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_15 (14) -#endif - -#ifndef LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_14 -#define LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_14 (13) -#endif - -#ifndef LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_13 -#define LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_13 (12) -#endif - -#ifndef LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_12 -#define LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_12 (11) -#endif - -#ifndef LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_11 -#define LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_11 (10) -#endif - -#ifndef LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_10 -#define LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_10 (9) -#endif - -#ifndef LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_9 -#define LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_9 (8) -#endif - -#ifndef LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_8 -#define LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_8 (7) -#endif - -#ifndef LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_7 -#define LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_7 (6) -#endif - -#ifndef LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_6 -#define LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_6 (5) -#endif - -#ifndef LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_5 -#define LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_5 (4) -#endif - -#ifndef LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_4 -#define LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_4 (3) -#endif - -#ifndef LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_3 -#define LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_3 (2) -#endif - -#ifndef LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_2 -#define LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_2 (1) -#endif - -#ifndef LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_1 -#define LIN_Aroma_3CartridgeFlavor_dbg_LIN_Aroma_Stat_Flavor_1 (0) -#endif - -// signal: @LIN_Aroma_1CartridgeCapacity_ro -#define CANDB_DBG_LIN_Aroma_1CartridgeCapacity_ro_CovFactor (10) -#define CANDB_DBG_LIN_Aroma_1CartridgeCapacity_ro_toS(x) ( (uint8_t) ((x) / (10)) ) -#define CANDB_DBG_LIN_Aroma_1CartridgeCapacity_ro_fromS(x) ( ((x) * (10)) ) -// signal: @LIN_Aroma_2CartridgeCapacity_ro -#define CANDB_DBG_LIN_Aroma_2CartridgeCapacity_ro_CovFactor (10) -#define CANDB_DBG_LIN_Aroma_2CartridgeCapacity_ro_toS(x) ( (uint8_t) ((x) / (10)) ) -#define CANDB_DBG_LIN_Aroma_2CartridgeCapacity_ro_fromS(x) ( ((x) * (10)) ) -// signal: @LIN_Aroma_3CartridgeCapacity_ro -#define CANDB_DBG_LIN_Aroma_3CartridgeCapacity_ro_CovFactor (10) -#define CANDB_DBG_LIN_Aroma_3CartridgeCapacity_ro_toS(x) ( (uint8_t) ((x) / (10)) ) -#define CANDB_DBG_LIN_Aroma_3CartridgeCapacity_ro_fromS(x) ( ((x) * (10)) ) typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - // 1 : "Error" + // 1 : "Error" // 0 : "No_Error" - uint8_t LIN_AromaLinRespErr_Stat : 1; // Bits= 1 + uint8_t LIN_AromaLinRespErr_Stat : 1; // Bits= 1 // 1 : "Cartridge removed" // 0 : "Cartridge installed" - uint8_t LIN_Aroma_1CartridgeSw : 1; // Bits= 1 - - // 1 : "Cartridge removed" - // 0 : "Cartridge installed" - uint8_t LIN_Aroma_2CartridgeSw : 1; // Bits= 1 - - // 1 : "Cartridge removed" - // 0 : "Cartridge installed" - uint8_t LIN_Aroma_3CartridgeSw : 1; // Bits= 1 + uint8_t LIN_Aroma_CartridgeSw : 1; // Bits= 1 // 3 : "Aroma malfunction" // 2 : "Supply chain short circuit" // 1 : "Supply chain break" // 0 : "No error" - uint8_t LIN_Aroma_Error_Stat : 2; // Bits= 2 + uint8_t LIN_Aroma_Error_Stat : 2; // Bits= 2 - // 3 : "Aroma malfunction" + // 3 : "Aromatization mode 3step" // 2 : "Aromatization mode 2 step" // 1 : "Aromatization mode 1 step" // 0 : "Aromatization off" - uint8_t LIN_Aroma_Intens : 2; // Bits= 2 + uint8_t LIN_Aroma_Intens : 2; // Bits= 2 - // 3 : "Third cartridge selected" - // 2 : "Second cartridge selected" - // 1 : "First cartridge selected" - // 0 : "No cartridge selected" - uint8_t LIN_Aroma_CartridgeSel : 2; // Bits= 2 + uint8_t LIN_Aroma_CartridgeCapacity_ro : 4; // Bits= 4 Factor= 10 Unit:'%' + +#ifdef CANDB_DBG_USE_SIGFLOAT + uint8_t LIN_Aroma_CartridgeCapacity_phys; +#endif // CANDB_DBG_USE_SIGFLOAT // 15 : "Flavor 16" // 14 : "Flavor 15" @@ -5088,175 +5666,59 @@ typedef struct // 2 : "Flavor 3" // 1 : "Flavor 2" // 0 : "Flavor 1" - uint8_t LIN_Aroma_1CartridgeFlavor : 4; // Bits= 4 - - // 15 : "Flavor 16" - // 14 : "Flavor 15" - // 13 : "Flavor 14" - // 12 : "Flavor 13" - // 11 : "Flavor 12" - // 10 : "Flavor 11" - // 9 : "Flavor 10" - // 8 : "Flavor 9" - // 7 : "Flavor 8" - // 6 : "Flavor 7" - // 5 : "Flavor 6" - // 4 : "Flavor 5" - // 3 : "Flavor 4" - // 2 : "Flavor 3" - // 1 : "Flavor 2" - // 0 : "Flavor 1" - uint8_t LIN_Aroma_2CartridgeFlavor : 4; // Bits= 4 - - // 15 : "Flavor 16" - // 14 : "Flavor 15" - // 13 : "Flavor 14" - // 12 : "Flavor 13" - // 11 : "Flavor 12" - // 10 : "Flavor 11" - // 9 : "Flavor 10" - // 8 : "Flavor 9" - // 7 : "Flavor 8" - // 6 : "Flavor 7" - // 5 : "Flavor 6" - // 4 : "Flavor 5" - // 3 : "Flavor 4" - // 2 : "Flavor 3" - // 1 : "Flavor 2" - // 0 : "Flavor 1" - uint8_t LIN_Aroma_3CartridgeFlavor : 4; // Bits= 4 - - uint8_t LIN_Aroma_1CartridgeCapacity_ro : 4; // Bits= 4 Factor= 10 Unit:'%' - -#ifdef CANDB_DBG_USE_SIGFLOAT - uint8_t LIN_Aroma_1CartridgeCapacity_phys; -#endif // CANDB_DBG_USE_SIGFLOAT - - uint8_t LIN_Aroma_2CartridgeCapacity_ro : 4; // Bits= 4 Factor= 10 Unit:'%' - -#ifdef CANDB_DBG_USE_SIGFLOAT - uint8_t LIN_Aroma_2CartridgeCapacity_phys; -#endif // CANDB_DBG_USE_SIGFLOAT - - uint8_t LIN_Aroma_3CartridgeCapacity_ro : 4; // Bits= 4 Factor= 10 Unit:'%' - -#ifdef CANDB_DBG_USE_SIGFLOAT - uint8_t LIN_Aroma_3CartridgeCapacity_phys; -#endif // CANDB_DBG_USE_SIGFLOAT + uint8_t LIN_Aroma_CartridgeFlavor : 4; // Bits= 4 #else - // 1 : "Error" - // 0 : "No_Error" - uint8_t LIN_AromaLinRespErr_Stat; // Bits= 1 + // 1 : "Error" + // 0 : "No_Error" + uint8_t LIN_AromaLinRespErr_Stat; // Bits= 1 - // 1 : "Cartridge removed" - // 0 : "Cartridge installed" - uint8_t LIN_Aroma_1CartridgeSw; // Bits= 1 + // 1 : "Cartridge removed" + // 0 : "Cartridge installed" + uint8_t LIN_Aroma_CartridgeSw; // Bits= 1 - // 1 : "Cartridge removed" - // 0 : "Cartridge installed" - uint8_t LIN_Aroma_2CartridgeSw; // Bits= 1 + // 3 : "Aroma malfunction" + // 2 : "Supply chain short circuit" + // 1 : "Supply chain break" + // 0 : "No error" + uint8_t LIN_Aroma_Error_Stat; // Bits= 2 - // 1 : "Cartridge removed" - // 0 : "Cartridge installed" - uint8_t LIN_Aroma_3CartridgeSw; // Bits= 1 + // 3 : "Aromatization mode 3step" + // 2 : "Aromatization mode 2 step" + // 1 : "Aromatization mode 1 step" + // 0 : "Aromatization off" + uint8_t LIN_Aroma_Intens; // Bits= 2 - // 3 : "Aroma malfunction" - // 2 : "Supply chain short circuit" - // 1 : "Supply chain break" - // 0 : "No error" - uint8_t LIN_Aroma_Error_Stat; // Bits= 2 - - // 3 : "Aroma malfunction" - // 2 : "Aromatization mode 2 step" - // 1 : "Aromatization mode 1 step" - // 0 : "Aromatization off" - uint8_t LIN_Aroma_Intens; // Bits= 2 - - // 3 : "Third cartridge selected" - // 2 : "Second cartridge selected" - // 1 : "First cartridge selected" - // 0 : "No cartridge selected" - uint8_t LIN_Aroma_CartridgeSel; // Bits= 2 - - // 15 : "Flavor 16" - // 14 : "Flavor 15" - // 13 : "Flavor 14" - // 12 : "Flavor 13" - // 11 : "Flavor 12" - // 10 : "Flavor 11" - // 9 : "Flavor 10" - // 8 : "Flavor 9" - // 7 : "Flavor 8" - // 6 : "Flavor 7" - // 5 : "Flavor 6" - // 4 : "Flavor 5" - // 3 : "Flavor 4" - // 2 : "Flavor 3" - // 1 : "Flavor 2" - // 0 : "Flavor 1" - uint8_t LIN_Aroma_1CartridgeFlavor; // Bits= 4 - - // 15 : "Flavor 16" - // 14 : "Flavor 15" - // 13 : "Flavor 14" - // 12 : "Flavor 13" - // 11 : "Flavor 12" - // 10 : "Flavor 11" - // 9 : "Flavor 10" - // 8 : "Flavor 9" - // 7 : "Flavor 8" - // 6 : "Flavor 7" - // 5 : "Flavor 6" - // 4 : "Flavor 5" - // 3 : "Flavor 4" - // 2 : "Flavor 3" - // 1 : "Flavor 2" - // 0 : "Flavor 1" - uint8_t LIN_Aroma_2CartridgeFlavor; // Bits= 4 - - // 15 : "Flavor 16" - // 14 : "Flavor 15" - // 13 : "Flavor 14" - // 12 : "Flavor 13" - // 11 : "Flavor 12" - // 10 : "Flavor 11" - // 9 : "Flavor 10" - // 8 : "Flavor 9" - // 7 : "Flavor 8" - // 6 : "Flavor 7" - // 5 : "Flavor 6" - // 4 : "Flavor 5" - // 3 : "Flavor 4" - // 2 : "Flavor 3" - // 1 : "Flavor 2" - // 0 : "Flavor 1" - uint8_t LIN_Aroma_3CartridgeFlavor; // Bits= 4 - - uint8_t LIN_Aroma_1CartridgeCapacity_ro; // Bits= 4 Factor= 10 Unit:'%' + uint8_t LIN_Aroma_CartridgeCapacity_ro; // Bits= 4 Factor= 10 Unit:'%' #ifdef CANDB_DBG_USE_SIGFLOAT - uint8_t LIN_Aroma_1CartridgeCapacity_phys; + uint8_t LIN_Aroma_CartridgeCapacity_phys; #endif // CANDB_DBG_USE_SIGFLOAT - uint8_t LIN_Aroma_2CartridgeCapacity_ro; // Bits= 4 Factor= 10 Unit:'%' - -#ifdef CANDB_DBG_USE_SIGFLOAT - uint8_t LIN_Aroma_2CartridgeCapacity_phys; -#endif // CANDB_DBG_USE_SIGFLOAT - - uint8_t LIN_Aroma_3CartridgeCapacity_ro; // Bits= 4 Factor= 10 Unit:'%' - -#ifdef CANDB_DBG_USE_SIGFLOAT - uint8_t LIN_Aroma_3CartridgeCapacity_phys; -#endif // CANDB_DBG_USE_SIGFLOAT + // 15 : "Flavor 16" + // 14 : "Flavor 15" + // 13 : "Flavor 14" + // 12 : "Flavor 13" + // 11 : "Flavor 12" + // 10 : "Flavor 11" + // 9 : "Flavor 10" + // 8 : "Flavor 9" + // 7 : "Flavor 8" + // 6 : "Flavor 7" + // 5 : "Flavor 6" + // 4 : "Flavor 5" + // 3 : "Flavor 4" + // 2 : "Flavor 3" + // 1 : "Flavor 2" + // 0 : "Flavor 1" + uint8_t LIN_Aroma_CartridgeFlavor; // Bits= 4 #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -5316,7 +5778,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - // 3 : "Component malfunction" + // 3 : "Component malfunction" // 2 : "Supply chain short" // 1 : "Supply chain break" // 0 : "No error" @@ -5333,26 +5795,26 @@ typedef struct #else - // 3 : "Component malfunction" - // 2 : "Supply chain short" - // 1 : "Supply chain break" - // 0 : "No error" - uint8_t LIN_Ionizer_Err_Stat; // Bits= 2 + // 3 : "Component malfunction" + // 2 : "Supply chain short" + // 1 : "Supply chain break" + // 0 : "No error" + uint8_t LIN_Ionizer_Err_Stat; // Bits= 2 - // 1 : "Error" - // 0 : "No_Error" - uint8_t LIN_Ionizer_LinRespErr; // Bits= 1 + // 1 : "Error" + // 0 : "No_Error" + uint8_t LIN_Ionizer_LinRespErr; // Bits= 1 - // 2 : "Ionization is off (standby mode)" - // 1 : "Ionization is on (active mode)" - // 0 : "Initializing" - uint8_t LIN_Ionizer_Ionization; // Bits= 2 + // 2 : "Ionization is off (standby mode)" + // 1 : "Ionization is on (active mode)" + // 0 : "Initializing" + uint8_t LIN_Ionizer_Ionization; // Bits= 2 #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -5487,7 +5949,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - uint8_t LIN_eTXVee1_Pos_Stat : 7; // Bits= 7 Unit:'%' + uint8_t LIN_eTXVee1_Pos_Stat : 7; // Bits= 7 Unit:'%' // 1 : "Error" // 0 : "No error" @@ -5537,59 +5999,59 @@ typedef struct #else - uint8_t LIN_eTXVee1_Pos_Stat; // Bits= 7 Unit:'%' + uint8_t LIN_eTXVee1_Pos_Stat; // Bits= 7 Unit:'%' - // 1 : "Error" - // 0 : "No error" - uint8_t LIN_eTXV1_LinRespErr_Stat; // Bits= 1 + // 1 : "Error" + // 0 : "No error" + uint8_t LIN_eTXV1_LinRespErr_Stat; // Bits= 1 - // 3 : "Component malfunction" - // 2 : "Supply chain short circuit" - // 1 : "Supply chain break" - // 0 : "No error" - uint8_t LIN_eTXVee1_Err_Stat; // Bits= 2 + // 3 : "Component malfunction" + // 2 : "Supply chain short circuit" + // 1 : "Supply chain break" + // 0 : "No error" + uint8_t LIN_eTXVee1_Err_Stat; // Bits= 2 - uint8_t LIN_eTXVee2_Pos_Stat; // Bits= 7 Unit:'%' + uint8_t LIN_eTXVee2_Pos_Stat; // Bits= 7 Unit:'%' - // 1 : "Error" - // 0 : "No error" - uint8_t LIN_eTXV2_LinRespErr_Stat; // Bits= 1 + // 1 : "Error" + // 0 : "No error" + uint8_t LIN_eTXV2_LinRespErr_Stat; // Bits= 1 - // 3 : "Component malfunction" - // 2 : "Supply chain short circuit" - // 1 : "Supply chain break" - // 0 : "No error" - uint8_t LIN_eTXVee2_Err_Stat; // Bits= 2 + // 3 : "Component malfunction" + // 2 : "Supply chain short circuit" + // 1 : "Supply chain break" + // 0 : "No error" + uint8_t LIN_eTXVee2_Err_Stat; // Bits= 2 - uint8_t LIN_eTXVeeChiller1_Pos_Stat; // Bits= 7 Unit:'%' + uint8_t LIN_eTXVeeChiller1_Pos_Stat; // Bits= 7 Unit:'%' - // 1 : "Error" - // 0 : "No error" - uint8_t LIN_eTXV3_LinRespErr_Stat; // Bits= 1 + // 1 : "Error" + // 0 : "No error" + uint8_t LIN_eTXV3_LinRespErr_Stat; // Bits= 1 - // 3 : "Component malfunction" - // 2 : "Supply chain short circuit" - // 1 : "Supply chain break" - // 0 : "No error" - uint8_t LIN_eTXVeeChiller1_Err_Stat; // Bits= 2 + // 3 : "Component malfunction" + // 2 : "Supply chain short circuit" + // 1 : "Supply chain break" + // 0 : "No error" + uint8_t LIN_eTXVeeChiller1_Err_Stat; // Bits= 2 - uint8_t LIN_eTXVeeChiller2_Pos_Stat; // Bits= 7 Unit:'%' + uint8_t LIN_eTXVeeChiller2_Pos_Stat; // Bits= 7 Unit:'%' - // 1 : "Error" - // 0 : "No error" - uint8_t LIN_eTXV4_LinRespErr_Stat; // Bits= 1 + // 1 : "Error" + // 0 : "No error" + uint8_t LIN_eTXV4_LinRespErr_Stat; // Bits= 1 - // 3 : "Component malfunction" - // 2 : "Supply chain short circuit" - // 1 : "Supply chain break" - // 0 : "No error" - uint8_t LIN_eTXVeeChiller2_Err_Stat; // Bits= 2 + // 3 : "Component malfunction" + // 2 : "Supply chain short circuit" + // 1 : "Supply chain break" + // 0 : "No error" + uint8_t LIN_eTXVeeChiller2_Err_Stat; // Bits= 2 #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -5619,7 +6081,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - uint8_t LIN_DRS_DLLed1 : 1; // Bits= 1 + uint8_t LIN_DRS_DLLed1 : 1; // Bits= 1 uint8_t LIN_DRS_DLLed2 : 1; // Bits= 1 @@ -5679,69 +6141,69 @@ typedef struct #else - uint8_t LIN_DRS_DLLed1; // Bits= 1 + uint8_t LIN_DRS_DLLed1; // Bits= 1 - uint8_t LIN_DRS_DLLed2; // Bits= 1 + uint8_t LIN_DRS_DLLed2; // Bits= 1 - uint8_t LIN_DRS_DLLed3; // Bits= 1 + uint8_t LIN_DRS_DLLed3; // Bits= 1 - uint8_t LIN_DRS_DRLed1; // Bits= 1 + uint8_t LIN_DRS_DRLed1; // Bits= 1 - uint8_t LIN_DRS_DRLed2; // Bits= 1 + uint8_t LIN_DRS_DRLed2; // Bits= 1 - uint8_t LIN_DRS_DRLed3; // Bits= 1 + uint8_t LIN_DRS_DRLed3; // Bits= 1 - uint8_t LIN_DRS_FPLLed1; // Bits= 1 + uint8_t LIN_DRS_FPLLed1; // Bits= 1 - uint8_t LIN_DRS_FPLLed2; // Bits= 1 + uint8_t LIN_DRS_FPLLed2; // Bits= 1 - uint8_t LIN_DRS_FPLLed3; // Bits= 1 + uint8_t LIN_DRS_FPLLed3; // Bits= 1 - uint8_t LIN_DRS_FPRLed1; // Bits= 1 + uint8_t LIN_DRS_FPRLed1; // Bits= 1 - uint8_t LIN_DRS_FPRLed2; // Bits= 1 + uint8_t LIN_DRS_FPRLed2; // Bits= 1 - uint8_t LIN_DRS_FPRLed3; // Bits= 1 + uint8_t LIN_DRS_FPRLed3; // Bits= 1 - uint8_t LIN_DRS_RLBLed1; // Bits= 1 + uint8_t LIN_DRS_RLBLed1; // Bits= 1 - uint8_t LIN_DRS_RLBLed2; // Bits= 1 + uint8_t LIN_DRS_RLBLed2; // Bits= 1 - uint8_t LIN_DRS_RLBLed3; // Bits= 1 + uint8_t LIN_DRS_RLBLed3; // Bits= 1 - uint8_t LIN_DRS_RRBLed1; // Bits= 1 + uint8_t LIN_DRS_RRBLed1; // Bits= 1 - uint8_t LIN_DRS_RRBLed2; // Bits= 1 + uint8_t LIN_DRS_RRBLed2; // Bits= 1 - uint8_t LIN_DRS_RRBLed3; // Bits= 1 + uint8_t LIN_DRS_RRBLed3; // Bits= 1 - uint8_t LIN_DRS_FCLLed1; // Bits= 1 + uint8_t LIN_DRS_FCLLed1; // Bits= 1 - uint8_t LIN_DRS_FCLLed2; // Bits= 1 + uint8_t LIN_DRS_FCLLed2; // Bits= 1 - uint8_t LIN_DRS_FCLLed3; // Bits= 1 + uint8_t LIN_DRS_FCLLed3; // Bits= 1 - uint8_t LIN_DRS_FCRLed1; // Bits= 1 + uint8_t LIN_DRS_FCRLed1; // Bits= 1 - uint8_t LIN_DRS_FCRLed2; // Bits= 1 + uint8_t LIN_DRS_FCRLed2; // Bits= 1 - uint8_t LIN_DRS_FCRLed3; // Bits= 1 + uint8_t LIN_DRS_FCRLed3; // Bits= 1 - uint8_t LIN_DRS_BCM_IndFadingTime_ro; // Bits= 5 Factor= 0.1 Unit:'sec' + uint8_t LIN_DRS_BCM_IndFadingTime_ro; // Bits= 5 Factor= 0.1 Unit:'sec' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t LIN_DRS_BCM_IndFadingTime_phys; + sigfloat_t LIN_DRS_BCM_IndFadingTime_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // 1 : "Low level" - // 0 : "Hight level" - uint8_t LIN_DRS_BCM_SwIndIntens; // Bits= 1 + // 1 : "Low level" + // 0 : "Hight level" + uint8_t LIN_DRS_BCM_SwIndIntens; // Bits= 1 #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -5776,7 +6238,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - // 3 : "RR" + // 3 : "RR" // 2 : "RL" // 1 : "FR" // 0 : "FL" @@ -5845,78 +6307,78 @@ typedef struct #else - // 3 : "RR" - // 2 : "RL" - // 1 : "FR" - // 0 : "FL" - // MULTIPLEX master signal - uint8_t dbg_Auto_AF_MultMsg_Idx; // Bits= 2 + // 3 : "RR" + // 2 : "RL" + // 1 : "FR" + // 0 : "FL" + // MULTIPLEX master signal + uint8_t dbg_Auto_AF_MultMsg_Idx; // Bits= 2 - // multiplex variable - int16_t dbg_Auto_AF_Correct_FL; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Correct_FL; // [-] Bits=12 Unit:'AF' - // multiplex variable - int16_t dbg_Auto_AF_Correct_FR; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Correct_FR; // [-] Bits=12 Unit:'AF' - // multiplex variable - int16_t dbg_Auto_AF_Correct_RL; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Correct_RL; // [-] Bits=12 Unit:'AF' - // multiplex variable - int16_t dbg_Auto_AF_Correct_RR; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Correct_RR; // [-] Bits=12 Unit:'AF' - // multiplex variable - int16_t dbg_Auto_AF_Vtg_RL; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Vtg_RL; // [-] Bits=12 Unit:'AF' - // multiplex variable - int16_t dbg_Auto_AF_Vtg_FL; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Vtg_FL; // [-] Bits=12 Unit:'AF' - // multiplex variable - int16_t dbg_Auto_AF_Vtg_FR; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Vtg_FR; // [-] Bits=12 Unit:'AF' - // multiplex variable - int16_t dbg_Auto_AF_Vtg_RR; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Vtg_RR; // [-] Bits=12 Unit:'AF' - // multiplex variable - int16_t dbg_Auto_AF_Incar_RL; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Incar_RL; // [-] Bits=12 Unit:'AF' - // multiplex variable - int16_t dbg_Auto_AF_Incar_FR; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Incar_FR; // [-] Bits=12 Unit:'AF' - // multiplex variable - int16_t dbg_Auto_AF_Incar_RR; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Incar_RR; // [-] Bits=12 Unit:'AF' - // multiplex variable - int16_t dbg_Auto_AF_Incar_FL; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Incar_FL; // [-] Bits=12 Unit:'AF' - // multiplex variable - int16_t dbg_Auto_AF_Amb_RL; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Amb_RL; // [-] Bits=12 Unit:'AF' - // multiplex variable - int16_t dbg_Auto_AF_Amb_FR; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Amb_FR; // [-] Bits=12 Unit:'AF' - // multiplex variable - int16_t dbg_Auto_AF_Sun_RR; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Sun_RR; // [-] Bits=12 Unit:'AF' - // multiplex variable - int16_t dbg_Auto_AF_Amb_FL; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Amb_FL; // [-] Bits=12 Unit:'AF' - // multiplex variable - int16_t dbg_Auto_AF_Sun_FR; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Sun_FR; // [-] Bits=12 Unit:'AF' - // multiplex variable - int16_t dbg_Auto_AF_Sun_RL; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Sun_RL; // [-] Bits=12 Unit:'AF' - // multiplex variable - int16_t dbg_Auto_AF_Amb_RR; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Amb_RR; // [-] Bits=12 Unit:'AF' - // multiplex variable - int16_t dbg_Auto_AF_Sun_FL; // [-] Bits=12 Unit:'AF' + // multiplex variable + int16_t dbg_Auto_AF_Sun_FL; // [-] Bits=12 Unit:'AF' #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -6107,7 +6569,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - // 6 : "IncarTg" + // 6 : "IncarTg" // 5 : "RR" // 4 : "RL" // 3 : "FR_Lower" @@ -6371,273 +6833,273 @@ typedef struct #else - // 6 : "IncarTg" - // 5 : "RR" - // 4 : "RL" - // 3 : "FR_Lower" - // 2 : "FR_Upper" - // 1 : "FL_Lower" - // 0 : "FL_Upper" - // MULTIPLEX master signal - uint8_t dbg_Auto_Duct_MultMsg_Idx; // Bits= 4 + // 6 : "IncarTg" + // 5 : "RR" + // 4 : "RL" + // 3 : "FR_Lower" + // 2 : "FR_Upper" + // 1 : "FL_Lower" + // 0 : "FL_Upper" + // MULTIPLEX master signal + uint8_t dbg_Auto_Duct_MultMsg_Idx; // Bits= 4 - // multiplex variable - int16_t dbg_Auto_Duct_Tgt_FL_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Tgt_FL_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Tgt_FL_Upper_phys; + sigfloat_t dbg_Auto_Duct_Tgt_FL_Upper_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Tg_Incar_FL_Upper_ro; // [-] Bits=10 Offset= 20.0 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Tg_Incar_FL_Upper_ro; // [-] Bits=10 Offset= 20.0 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Tg_Incar_FL_Upper_phys; + sigfloat_t dbg_Auto_Duct_Tg_Incar_FL_Upper_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Tgt_RR_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Tgt_RR_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Tgt_RR_phys; + sigfloat_t dbg_Auto_Duct_Tgt_RR_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Tgt_RL_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Tgt_RL_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Tgt_RL_phys; + sigfloat_t dbg_Auto_Duct_Tgt_RL_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Tgt_FR_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Tgt_FR_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Tgt_FR_Upper_phys; + sigfloat_t dbg_Auto_Duct_Tgt_FR_Upper_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Tgt_FR_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Tgt_FR_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Tgt_FR_Lower_phys; + sigfloat_t dbg_Auto_Duct_Tgt_FR_Lower_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Tgt_FL_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Tgt_FL_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Tgt_FL_Lower_phys; + sigfloat_t dbg_Auto_Duct_Tgt_FL_Lower_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Tg_Incar_FR_Upper_ro; // [-] Bits=10 Offset= 20.0 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Tg_Incar_FR_Upper_ro; // [-] Bits=10 Offset= 20.0 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Tg_Incar_FR_Upper_phys; + sigfloat_t dbg_Auto_Duct_Tg_Incar_FR_Upper_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Tg_FL_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Tg_FL_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Tg_FL_Upper_phys; + sigfloat_t dbg_Auto_Duct_Tg_FL_Upper_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Tg_FL_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Tg_FL_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Tg_FL_Lower_phys; + sigfloat_t dbg_Auto_Duct_Tg_FL_Lower_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Tg_FR_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Tg_FR_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Tg_FR_Lower_phys; + sigfloat_t dbg_Auto_Duct_Tg_FR_Lower_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Tg_FR_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Tg_FR_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Tg_FR_Upper_phys; + sigfloat_t dbg_Auto_Duct_Tg_FR_Upper_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Tg_RL_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Tg_RL_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Tg_RL_phys; + sigfloat_t dbg_Auto_Duct_Tg_RL_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Tg_RR_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Tg_RR_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Tg_RR_phys; + sigfloat_t dbg_Auto_Duct_Tg_RR_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Tg_Incar_FL_Lower_ro; // [-] Bits=10 Offset= 20.0 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Tg_Incar_FL_Lower_ro; // [-] Bits=10 Offset= 20.0 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Tg_Incar_FL_Lower_phys; + sigfloat_t dbg_Auto_Duct_Tg_Incar_FL_Lower_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Incar_FL_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Incar_FL_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Incar_FL_Lower_phys; + sigfloat_t dbg_Auto_Duct_Incar_FL_Lower_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Incar_RR_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Incar_RR_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Incar_RR_phys; + sigfloat_t dbg_Auto_Duct_Incar_RR_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Incar_RL_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Incar_RL_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Incar_RL_phys; + sigfloat_t dbg_Auto_Duct_Incar_RL_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Incar_FR_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Incar_FR_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Incar_FR_Upper_phys; + sigfloat_t dbg_Auto_Duct_Incar_FR_Upper_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Incar_FR_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Incar_FR_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Incar_FR_Lower_phys; + sigfloat_t dbg_Auto_Duct_Incar_FR_Lower_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Incar_FL_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Incar_FL_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Incar_FL_Upper_phys; + sigfloat_t dbg_Auto_Duct_Incar_FL_Upper_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Tg_Incar_FR_Lower_ro; // [-] Bits=10 Offset= 20.0 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Tg_Incar_FR_Lower_ro; // [-] Bits=10 Offset= 20.0 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Tg_Incar_FR_Lower_phys; + sigfloat_t dbg_Auto_Duct_Tg_Incar_FR_Lower_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Amb_RL_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Amb_RL_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Amb_RL_phys; + sigfloat_t dbg_Auto_Duct_Amb_RL_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Amb_FR_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Amb_FR_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Amb_FR_Upper_phys; + sigfloat_t dbg_Auto_Duct_Amb_FR_Upper_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Amb_FR_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Amb_FR_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Amb_FR_Lower_phys; + sigfloat_t dbg_Auto_Duct_Amb_FR_Lower_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Amb_RR_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Amb_RR_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Amb_RR_phys; + sigfloat_t dbg_Auto_Duct_Amb_RR_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Amb_FL_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Amb_FL_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Amb_FL_Lower_phys; + sigfloat_t dbg_Auto_Duct_Amb_FL_Lower_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Amb_FL_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Amb_FL_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Amb_FL_Upper_phys; + sigfloat_t dbg_Auto_Duct_Amb_FL_Upper_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Tg_Incar_RL_ro; // [-] Bits=10 Offset= 20.0 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Tg_Incar_RL_ro; // [-] Bits=10 Offset= 20.0 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Tg_Incar_RL_phys; + sigfloat_t dbg_Auto_Duct_Tg_Incar_RL_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Sun_FL_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Sun_FL_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Sun_FL_Lower_phys; + sigfloat_t dbg_Auto_Duct_Sun_FL_Lower_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Sun_FR_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Sun_FR_Lower_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Sun_FR_Lower_phys; + sigfloat_t dbg_Auto_Duct_Sun_FR_Lower_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Sun_FR_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Sun_FR_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Sun_FR_Upper_phys; + sigfloat_t dbg_Auto_Duct_Sun_FR_Upper_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Sun_RL_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Sun_RL_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Sun_RL_phys; + sigfloat_t dbg_Auto_Duct_Sun_RL_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Sun_FL_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Sun_FL_Upper_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Sun_FL_Upper_phys; + sigfloat_t dbg_Auto_Duct_Sun_FL_Upper_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Sun_RR_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Sun_RR_ro; // [-] Bits=12 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Sun_RR_phys; + sigfloat_t dbg_Auto_Duct_Sun_RR_phys; #endif // CANDB_DBG_USE_SIGFLOAT - // multiplex variable - int16_t dbg_Auto_Duct_Tg_Incar_RR_ro; // [-] Bits=10 Offset= 20.0 Factor= 0.1 Unit:'��' + // multiplex variable + int16_t dbg_Auto_Duct_Tg_Incar_RR_ro; // [-] Bits=10 Offset= 20.0 Factor= 0.1 Unit:'��' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Duct_Tg_Incar_RR_phys; + sigfloat_t dbg_Auto_Duct_Tg_Incar_RR_phys; #endif // CANDB_DBG_USE_SIGFLOAT #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -6676,7 +7138,7 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - int16_t dbg_Auto_Valve_Plus_Vent_SFL_ro; // [-] Bits=10 Factor= 0.1 Unit:'0.1%' + int16_t dbg_Auto_Valve_Plus_Vent_SFL_ro; // [-] Bits=10 Factor= 0.1 Unit:'0.1%' #ifdef CANDB_DBG_USE_SIGFLOAT sigfloat_t dbg_Auto_Valve_Plus_Vent_SFL_phys; @@ -6714,47 +7176,47 @@ typedef struct #else - int16_t dbg_Auto_Valve_Plus_Vent_SFL_ro; // [-] Bits=10 Factor= 0.1 Unit:'0.1%' + int16_t dbg_Auto_Valve_Plus_Vent_SFL_ro; // [-] Bits=10 Factor= 0.1 Unit:'0.1%' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Valve_Plus_Vent_SFL_phys; + sigfloat_t dbg_Auto_Valve_Plus_Vent_SFL_phys; #endif // CANDB_DBG_USE_SIGFLOAT - int16_t dbg_Auto_Valve_Plus_Vent_CFL_ro; // [-] Bits=10 Factor= 0.1 Unit:'0.1%' + int16_t dbg_Auto_Valve_Plus_Vent_CFL_ro; // [-] Bits=10 Factor= 0.1 Unit:'0.1%' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Valve_Plus_Vent_CFL_phys; + sigfloat_t dbg_Auto_Valve_Plus_Vent_CFL_phys; #endif // CANDB_DBG_USE_SIGFLOAT - int16_t dbg_Auto_Valve_Plus_Foot_FL_ro; // [-] Bits=10 Factor= 0.1 Unit:'0.1%' + int16_t dbg_Auto_Valve_Plus_Foot_FL_ro; // [-] Bits=10 Factor= 0.1 Unit:'0.1%' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Valve_Plus_Foot_FL_phys; + sigfloat_t dbg_Auto_Valve_Plus_Foot_FL_phys; #endif // CANDB_DBG_USE_SIGFLOAT - int16_t dbg_Auto_Valve_Plus_Vent_SFR_ro; // [-] Bits=10 Factor= 0.1 Unit:'0.1%' + int16_t dbg_Auto_Valve_Plus_Vent_SFR_ro; // [-] Bits=10 Factor= 0.1 Unit:'0.1%' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Valve_Plus_Vent_SFR_phys; + sigfloat_t dbg_Auto_Valve_Plus_Vent_SFR_phys; #endif // CANDB_DBG_USE_SIGFLOAT - int16_t dbg_Auto_Valve_Plus_Vent_CFR_ro; // [-] Bits=10 Factor= 0.1 Unit:'0.1%' + int16_t dbg_Auto_Valve_Plus_Vent_CFR_ro; // [-] Bits=10 Factor= 0.1 Unit:'0.1%' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Valve_Plus_Vent_CFR_phys; + sigfloat_t dbg_Auto_Valve_Plus_Vent_CFR_phys; #endif // CANDB_DBG_USE_SIGFLOAT - int16_t dbg_Auto_Valve_Plus_Foot_FR_ro; // [-] Bits=10 Factor= 0.1 Unit:'0.1%' + int16_t dbg_Auto_Valve_Plus_Foot_FR_ro; // [-] Bits=10 Factor= 0.1 Unit:'0.1%' #ifdef CANDB_DBG_USE_SIGFLOAT - sigfloat_t dbg_Auto_Valve_Plus_Foot_FR_phys; + sigfloat_t dbg_Auto_Valve_Plus_Foot_FR_phys; #endif // CANDB_DBG_USE_SIGFLOAT #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -6769,17 +7231,17 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - int64_t XcpCcuRx; // [-] Bits=64 Unit:'-' + int64_t XcpCcuRx; // [-] Bits=64 Unit:'-' #else - int64_t XcpCcuRx; // [-] Bits=64 Unit:'-' + int64_t XcpCcuRx; // [-] Bits=64 Unit:'-' #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS @@ -6794,54 +7256,31 @@ typedef struct { #ifdef CANDB_DBG_USE_BITS_SIGNAL - int64_t XcpCcuTx; // [-] Bits=64 Unit:'-' + int64_t XcpCcuTx; // [-] Bits=64 Unit:'-' #else - int64_t XcpCcuTx; // [-] Bits=64 Unit:'-' + int64_t XcpCcuTx; // [-] Bits=64 Unit:'-' #endif // CANDB_DBG_USE_BITS_SIGNAL #ifdef CANDB_DBG_USE_DIAG_MONITORS - FrameMonitor_t mon1; + FrameMonitor_t mon1; #endif // CANDB_DBG_USE_DIAG_MONITORS } XCP_CCU_TX_t; - -typedef struct { - - uint16_t P_FUL; - uint16_t I_FUL; - uint16_t D_FUL; - - uint16_t P_FUR; - uint16_t I_FUR; - uint16_t D_FUR; - - uint16_t P_FLL; - uint16_t I_FLL; - uint16_t D_FLL; - - - uint16_t P_FRL; - uint16_t I_FRL; - uint16_t D_FRL; - - uint16_t P_RL; - uint16_t I_RL; - uint16_t D_RL; - - uint16_t P_RR; - uint16_t I_RR; - uint16_t D_RR; - -} dbg_Stat_PID_t; - // Function signatures +uint32_t Unpack_dbg_Act_calibration_error_candb_dbg(dbg_Act_calibration_error_t* _m, const uint8_t* _d, uint8_t dlc_); +#ifdef CANDB_DBG_USE_CANSTRUCT +uint32_t Pack_dbg_Act_calibration_error_candb_dbg(dbg_Act_calibration_error_t* _m, __CoderDbcCanFrame_t__* cframe); +#else +uint32_t Pack_dbg_Act_calibration_error_candb_dbg(dbg_Act_calibration_error_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide); +#endif // CANDB_DBG_USE_CANSTRUCT + uint32_t Unpack_dbg_Logic_State_candb_dbg(dbg_Logic_State_t* _m, const uint8_t* _d, uint8_t dlc_); #ifdef CANDB_DBG_USE_CANSTRUCT uint32_t Pack_dbg_Logic_State_candb_dbg(dbg_Logic_State_t* _m, __CoderDbcCanFrame_t__* cframe); @@ -6919,6 +7358,20 @@ uint32_t Pack_dbg_Sen_Amb_candb_dbg(dbg_Sen_Amb_t* _m, __CoderDbcCanFrame_t__* c uint32_t Pack_dbg_Sen_Amb_candb_dbg(dbg_Sen_Amb_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide); #endif // CANDB_DBG_USE_CANSTRUCT +uint32_t Unpack_dbg_Act_calibration_candb_dbg(dbg_Act_calibration_t* _m, const uint8_t* _d, uint8_t dlc_); +#ifdef CANDB_DBG_USE_CANSTRUCT +uint32_t Pack_dbg_Act_calibration_candb_dbg(dbg_Act_calibration_t* _m, __CoderDbcCanFrame_t__* cframe); +#else +uint32_t Pack_dbg_Act_calibration_candb_dbg(dbg_Act_calibration_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide); +#endif // CANDB_DBG_USE_CANSTRUCT + +uint32_t Unpack_dbg_PID_tune_candb_dbg(dbg_PID_tune_t* _m, const uint8_t* _d, uint8_t dlc_); +#ifdef CANDB_DBG_USE_CANSTRUCT +uint32_t Pack_dbg_PID_tune_candb_dbg(dbg_PID_tune_t* _m, __CoderDbcCanFrame_t__* cframe); +#else +uint32_t Pack_dbg_PID_tune_candb_dbg(dbg_PID_tune_t* _m, uint8_t* _d, uint8_t* _len, uint8_t* _ide); +#endif // CANDB_DBG_USE_CANSTRUCT + uint32_t Unpack_dbg_Sen_0_candb_dbg(dbg_Sen_0_t* _m, const uint8_t* _d, uint8_t dlc_); #ifdef CANDB_DBG_USE_CANSTRUCT uint32_t Pack_dbg_Sen_0_candb_dbg(dbg_Sen_0_t* _m, __CoderDbcCanFrame_t__* cframe); diff --git a/MODULES/HVAC_M7_CAN_DBG_MATRIX/usr/candb_dbg-fmon.c b/MODULES/HVAC_M7_CAN_DBG_MATRIX/usr/candb_dbg-fmon.c index 5477f17..65a7605 100644 --- a/MODULES/HVAC_M7_CAN_DBG_MATRIX/usr/candb_dbg-fmon.c +++ b/MODULES/HVAC_M7_CAN_DBG_MATRIX/usr/candb_dbg-fmon.c @@ -19,6 +19,12 @@ void _FMon_MONO_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid) #else +void _FMon_dbg_Act_calibration_error_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid) +{ + (void)_mon; + (void)msgid; +} + void _FMon_dbg_Logic_State_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid) { (void)_mon; @@ -85,6 +91,18 @@ void _FMon_dbg_Sen_Amb_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid) (void)msgid; } +void _FMon_dbg_Act_calibration_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid) +{ + (void)_mon; + (void)msgid; +} + +void _FMon_dbg_PID_tune_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid) +{ + (void)_mon; + (void)msgid; +} + void _FMon_dbg_Sen_0_candb_dbg(FrameMonitor_t* _mon, uint32_t msgid) { (void)_mon; diff --git a/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.c b/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.c index 03f896c..a30fbaa 100644 --- a/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.c +++ b/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.c @@ -446,7 +446,7 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) { ++env->dbg_PID_MultMsg_Idx; } - env->can_id = Pack_dbg_Stat_PID_candb_dbg2(&ccu_candb_dbg_tx.dbg_stat_PID, env->dbg_PID_MultMsg_Idx, + env->can_id = Pack_dbg_Stat_PID_candb_dbg2(&ccu_candb_dbg_tx.dbg_PID_tune, env->dbg_PID_MultMsg_Idx, env->canFrame.data, &env->canFrame.dlc, &env->ide); @@ -454,6 +454,36 @@ static eTimeEventDbgTransmit isEventTransmitter(tCanSpamDebugTransmitter *env) { } #endif +#if (dbg_Act_calibration_error_SEND == 1) + if (env->time_dbg_Act_calibration_error_CYC < env->timeMs) { + env->time_dbg_Act_calibration_error_CYC = env->timeMs + dbg_Act_calibration_error_CYC; + + env->can_id = Pack_dbg_Act_calibration_error_candb_dbg(&ccu_candb_dbg_tx.dbg_Act_calibration_error, env->canFrame.data, + &env->canFrame.dlc, &env->ide); + + return event_dbg_Act_calibration_error_CYC; + } +#endif + +#if (dbg_Act_calibration_SEND == 1) + if (env->time_dbg_Act_calibration_CYC < env->timeMs) { + env->time_dbg_Act_calibration_CYC = env->timeMs + dbg_Act_calibration_CYC; + + if (env->dbg_Act_calib_MultMsg_Idx >= 7) { + env->dbg_Act_calib_MultMsg_Idx = 0; + } else { + ++env->dbg_Act_calib_MultMsg_Idx; + } + + env->can_id = Pack_dbg_Act_calibration_candb_dbg2(&ccu_candb_dbg_tx.dbg_Act_calibration, env->dbg_Act_calib_MultMsg_Idx, + env->canFrame.data, + &env->canFrame.dlc, &env->ide); + + return event_dbg_Act_calibration_CYC; + } +#endif + + return event_dbg_none; } diff --git a/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.h b/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.h index bb68d44..78d5cab 100644 --- a/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.h +++ b/MODULES/HVAC_M7_CAN_DEBUG_SPAM/CanSpamDebugTransmitter.h @@ -41,6 +41,8 @@ #define dbg_Sen_Eva_SEND 1 #define dbg_Sen_Incar_SEND 1 #define dbg_Stat_PID_SEND 1 +#define dbg_Act_calibration_error_SEND 1 +#define dbg_Act_calibration_SEND 1 #define dbg_Act0_CYC 100 @@ -73,6 +75,8 @@ #define dbg_Sen_Eva_CYC 100 #define dbg_Sen_Incar_CYC__ 100 #define dbg_Stat_PID_SEND_CYC 100 +#define dbg_Act_calibration_error_CYC 100 +#define dbg_Act_calibration_CYC 100 typedef enum { event_dbg_none = 0x00, @@ -105,7 +109,9 @@ typedef enum { event_dbg_Sen_Duct_CYC = 0x1B, event_dbg_Sen_Eva_CYC = 0x1C, event_dbg_Sen_Incar_CYC = 0x1D, - event_dbg_Stat_PID_CYC = 0x1E + event_dbg_Stat_PID_CYC = 0x1E, + event_dbg_Act_calibration_error_CYC = 0x1F, + event_dbg_Act_calibration_CYC = 0x20 } eTimeEventDbgTransmit; @@ -154,6 +160,8 @@ typedef struct { uint32_t time_dbg_Sen_Eva_CYC; uint32_t time_dbg_Sen_Incar_CYC; uint32_t time_dbg_Stat_PID_CYC; + uint32_t time_dbg_Act_calibration_error_CYC; + uint32_t time_dbg_Act_calibration_CYC; tLoggerInterface *logger; @@ -165,6 +173,7 @@ typedef struct { uint8_t dbg_Auto_Duct_MultMsg_Idx; uint8_t dbg_Auto_AF_MultMsg_Idx; uint8_t dbg_PID_MultMsg_Idx; + uint8_t dbg_Act_calib_MultMsg_Idx; struct { osThreadId_t id; diff --git a/MODULES/HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.c b/MODULES/HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.c index 06bd710..aad5503 100644 --- a/MODULES/HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.c +++ b/MODULES/HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.c @@ -73,7 +73,7 @@ uint32_t Pack_dbg_Sen_Incar_candb_dbg2(dbg_Sen_Incar_t* _m, uint8_t* _d, uint8_t -uint32_t Pack_dbg_Stat_PID_candb_dbg2(dbg_Stat_PID_t *_m, uint8_t dbg_PID_MultMsg_Idx, uint8_t *_d, uint8_t *_len, +uint32_t Pack_dbg_Stat_PID_candb_dbg2(dbg_PID_tune_t *_m, uint8_t dbg_PID_MultMsg_Idx, uint8_t *_d, uint8_t *_len, uint8_t *_ide) { uint8_t i; for (i = 0u; i < 8; @@ -81,47 +81,49 @@ uint32_t Pack_dbg_Stat_PID_candb_dbg2(dbg_Stat_PID_t *_m, uint8_t dbg_PID_MultMs dbg_Stat_PID_Frame0_t *dbg_Stat_PID_Frame0 = (dbg_Stat_PID_Frame0_t *) _d; + + switch (dbg_PID_MultMsg_Idx) { case 0: dbg_Stat_PID_Frame0->dbg_PID_MultMsg_Idx = dbg_PID_MultMsg_Idx; - dbg_Stat_PID_Frame0->dbg_P = _m->P_FUL; - dbg_Stat_PID_Frame0->dbg_I = _m->I_FUL; - dbg_Stat_PID_Frame0->dbg_D = _m->D_FUL; + dbg_Stat_PID_Frame0->dbg_P = _m->PID_Temp_FLU_P_ro;//_m->P_FUL; + dbg_Stat_PID_Frame0->dbg_I = _m->PID_Temp_FLU_I_ro; + dbg_Stat_PID_Frame0->dbg_D = _m->PID_Temp_FLU_D_ro; break; case 1: dbg_Stat_PID_Frame0->dbg_PID_MultMsg_Idx = dbg_PID_MultMsg_Idx; - dbg_Stat_PID_Frame0->dbg_P = _m->P_FUR; - dbg_Stat_PID_Frame0->dbg_I = _m->I_FUR; - dbg_Stat_PID_Frame0->dbg_D = _m->D_FUR; + dbg_Stat_PID_Frame0->dbg_P = _m->PID_Temp_FRU_P_ro;//_m->P_FUR; + dbg_Stat_PID_Frame0->dbg_I = _m->PID_Temp_FRU_I_ro;; + dbg_Stat_PID_Frame0->dbg_D = _m->PID_Temp_FRU_D_ro;; break; case 2: dbg_Stat_PID_Frame0->dbg_PID_MultMsg_Idx = dbg_PID_MultMsg_Idx; - dbg_Stat_PID_Frame0->dbg_P = _m->P_FLL; - dbg_Stat_PID_Frame0->dbg_I = _m->I_FLL; - dbg_Stat_PID_Frame0->dbg_D = _m->D_FLL; + dbg_Stat_PID_Frame0->dbg_P = _m->PID_Temp_FLL_P_ro;//_m->P_FLL; + dbg_Stat_PID_Frame0->dbg_I = _m->PID_Temp_FLL_I_ro;//_m->I_FLL; + dbg_Stat_PID_Frame0->dbg_D = _m->PID_Temp_FLL_D_ro;//_m->D_FLL; break; case 3: dbg_Stat_PID_Frame0->dbg_PID_MultMsg_Idx = dbg_PID_MultMsg_Idx; - dbg_Stat_PID_Frame0->dbg_P = _m->P_FRL; - dbg_Stat_PID_Frame0->dbg_I = _m->I_FRL; - dbg_Stat_PID_Frame0->dbg_D = _m->D_FRL; + dbg_Stat_PID_Frame0->dbg_P = _m->PID_Temp_FRL_P_ro;//_m->P_FRL; + dbg_Stat_PID_Frame0->dbg_I = _m->PID_Temp_FRL_I_ro;//_m->I_FRL; + dbg_Stat_PID_Frame0->dbg_D = _m->PID_Temp_FRL_D_ro;//_m->D_FRL; break; case 4: dbg_Stat_PID_Frame0->dbg_PID_MultMsg_Idx = dbg_PID_MultMsg_Idx; - dbg_Stat_PID_Frame0->dbg_P = _m->P_RL; - dbg_Stat_PID_Frame0->dbg_I = _m->I_RL; - dbg_Stat_PID_Frame0->dbg_D = _m->D_RL; + dbg_Stat_PID_Frame0->dbg_P = _m->PID_Temp_RL_P_ro;//_m->P_RL; + dbg_Stat_PID_Frame0->dbg_I = _m->PID_Temp_RL_I_ro;//_m->I_RL; + dbg_Stat_PID_Frame0->dbg_D = _m->PID_Temp_RL_D_ro; break; case 5: dbg_Stat_PID_Frame0->dbg_PID_MultMsg_Idx = dbg_PID_MultMsg_Idx; - dbg_Stat_PID_Frame0->dbg_P = _m->P_RR; - dbg_Stat_PID_Frame0->dbg_I = _m->I_RR; - dbg_Stat_PID_Frame0->dbg_D = _m->D_RR; + dbg_Stat_PID_Frame0->dbg_P = _m->PID_Temp_RR_P_ro;//_m->P_RR; + dbg_Stat_PID_Frame0->dbg_I = _m->PID_Temp_RR_I_ro;; + dbg_Stat_PID_Frame0->dbg_D = _m->PID_Temp_RR_D_ro;; break; } @@ -129,9 +131,83 @@ uint32_t Pack_dbg_Stat_PID_candb_dbg2(dbg_Stat_PID_t *_m, uint8_t dbg_PID_MultMs *_len = 8; *_ide = 0; - return (0x3f7U); + return (dbg_PID_tune_CANID); } +uint32_t Pack_dbg_Act_calibration_candb_dbg2(dbg_Act_calibration_t *_m, uint8_t dbg_Act_calibration_Idx, uint8_t *_d, uint8_t *_len, + uint8_t *_ide) { + uint8_t i; + for (i = 0u; i < 8; + _d[i++] = CANDB_DBG_INITIAL_BYTE_VALUE); + + dbg_Act_calibration_Frame0_t *dbg_Act_calibration_Frame0 = (dbg_Act_calibration_Frame0_t *) _d; + + switch (dbg_Act_calibration_Idx) { + case 0: + dbg_Act_calibration_Frame0->dbg_Act_calib_MultMsg_Idx = dbg_Act_calibration_Idx; + dbg_Act_calibration_Frame0->dbg_Act0 = _m->dbg_Act_calib_00_Def; + dbg_Act_calibration_Frame0->dbg_Act1 = _m->dbg_Act_calib_01_Vent_SFL; + dbg_Act_calibration_Frame0->dbg_Act2 = _m->dbg_Act_calib_02_Vent_CFL; + break; + + case 1: + dbg_Act_calibration_Frame0->dbg_Act_calib_MultMsg_Idx = dbg_Act_calibration_Idx; + dbg_Act_calibration_Frame0->dbg_Act0 = _m->dbg_Act_calib_03_Foot_1FL; + dbg_Act_calibration_Frame0->dbg_Act1 = _m->dbg_Act_calib_04_Foot_2FL; + dbg_Act_calibration_Frame0->dbg_Act2 = _m->dbg_Act_calib_05_Vent_CFR; + break; + + case 2: + dbg_Act_calibration_Frame0->dbg_Act_calib_MultMsg_Idx = dbg_Act_calibration_Idx; + dbg_Act_calibration_Frame0->dbg_Act0 = _m->dbg_Act_calib_06_Vent_SFR; + dbg_Act_calibration_Frame0->dbg_Act1 = _m->dbg_Act_calib_07_Foot_1FR; + dbg_Act_calibration_Frame0->dbg_Act2 = _m->dbg_Act_calib_08_Foot_2FR; + break; + + case 3: + dbg_Act_calibration_Frame0->dbg_Act_calib_MultMsg_Idx = dbg_Act_calibration_Idx; + dbg_Act_calibration_Frame0->dbg_Act0 = _m->dbg_Act_calib_09_Vent_SRL; + dbg_Act_calibration_Frame0->dbg_Act1 = _m->dbg_Act_calib_10_Vent_CRL; + dbg_Act_calibration_Frame0->dbg_Act2 = _m->dbg_Act_calib_11_Foot_RL; + break; + + case 4: + dbg_Act_calibration_Frame0->dbg_Act_calib_MultMsg_Idx = dbg_Act_calibration_Idx; + dbg_Act_calibration_Frame0->dbg_Act0 = _m->dbg_Act_calib_12_Vent_CRR; + dbg_Act_calibration_Frame0->dbg_Act1 = _m->dbg_Act_calib_13_Vent_SRR; + dbg_Act_calibration_Frame0->dbg_Act2 = _m->dbg_Act_calib_14_Foot_RR; + break; + + case 5: + dbg_Act_calibration_Frame0->dbg_Act_calib_MultMsg_Idx = dbg_Act_calibration_Idx; + dbg_Act_calibration_Frame0->dbg_Act0 = _m->dbg_Act_calib_15_TempU_FL; + dbg_Act_calibration_Frame0->dbg_Act1 = _m->dbg_Act_calib_16_TempL_FL;; + dbg_Act_calibration_Frame0->dbg_Act2 = _m->dbg_Act_calib_17_TempU_FR;; + break; + + case 6: + dbg_Act_calibration_Frame0->dbg_Act_calib_MultMsg_Idx = dbg_Act_calibration_Idx; + dbg_Act_calibration_Frame0->dbg_Act0 = _m->dbg_Act_calib_18_TempL_FR; + dbg_Act_calibration_Frame0->dbg_Act1 = _m->dbg_Act_calib_19_Temp_RL;; + dbg_Act_calibration_Frame0->dbg_Act2 = _m->dbg_Act_calib_20_Temp_RR;; + break; + + case 7: + dbg_Act_calibration_Frame0->dbg_Act_calib_MultMsg_Idx = dbg_Act_calibration_Idx; + dbg_Act_calibration_Frame0->dbg_Act0 = _m->dbg_Act_calib_21_Rec; + dbg_Act_calibration_Frame0->dbg_Act1 = _m->dbg_Act_calib_22_OSA;; + dbg_Act_calibration_Frame0->dbg_Act2 = _m->dbg_Act_calib_23_SealingValve;; + break; + } + + + *_len = 8; + *_ide = 0; + + return (dbg_Act_calibration_CANID); +} + + uint32_t Pack_dbg_Sen_Incar_candb_dbg2(dbg_Sen_Incar_t *_m, uint8_t *_d, uint8_t *_len, uint8_t *_ide) { uint8_t i; for (i = 0u; i < CANDB_DBG_VALIDATE_DLC(dbg_Sen_Incar_DLC); diff --git a/MODULES/HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.h b/MODULES/HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.h index 27a8277..e07b46b 100644 --- a/MODULES/HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.h +++ b/MODULES/HVAC_M7_CAN_DEBUG_SPAM/candb_dbg_fixed.h @@ -89,6 +89,15 @@ typedef struct { uint32_t reserved0: 24; } __attribute__((packed)) dbg_Stat_PID_Frame0_t; +typedef struct { + uint8_t dbg_Act_calib_MultMsg_Idx; + uint16_t dbg_Act0; + uint16_t dbg_Act1; + uint16_t dbg_Act2; + uint8_t reserved0; +} __attribute__((packed)) dbg_Act_calibration_Frame0_t; + + /** * @brief Упаковка данных датчиков салона (исправленная версия) * @param _m Указатель на структуру с данными @@ -156,8 +165,10 @@ uint32_t Pack_dbg_Auto_Duct_candb_dbg2(dbg_Auto_Duct_t *_m, uint8_t *_d, uint8_t uint32_t Pack_dbg_Auto_AF_candb_dbg2(dbg_Auto_AF_t *_m, uint8_t *_d, uint8_t *_len, uint8_t *_ide); -uint32_t Pack_dbg_Stat_PID_candb_dbg2(dbg_Stat_PID_t *_m, uint8_t dbg_PID_MultMsg_Idx, uint8_t *_d, uint8_t *_len, uint8_t *_ide); +uint32_t Pack_dbg_Stat_PID_candb_dbg2(dbg_PID_tune_t *_m, uint8_t dbg_PID_MultMsg_Idx, uint8_t *_d, uint8_t *_len, uint8_t *_ide); +uint32_t Pack_dbg_Act_calibration_candb_dbg2(dbg_Act_calibration_t *_m, uint8_t dbg_Act_calibration_Idx, uint8_t *_d, uint8_t *_len, + uint8_t *_ide); #ifdef __cplusplus } #endif diff --git a/MODULES/HVAC_M7_MODEL/Model_Task.c b/MODULES/HVAC_M7_MODEL/Model_Task.c index 990e4a8..6977d9e 100644 --- a/MODULES/HVAC_M7_MODEL/Model_Task.c +++ b/MODULES/HVAC_M7_MODEL/Model_Task.c @@ -1020,7 +1020,7 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) { memcpy(&env->ccu_candb_dbg_tx.dbg_LIN_Aroma_Stat, &rtY.dbg_LIN_Aroma_Stat_t_model, sizeof(env->ccu_candb_dbg_tx.dbg_LIN_Aroma_Stat)); memcpy(&env->ccu_candb_dbg_tx.dbg_Sen_Demist, &rtY.dbg_Sen_Demist_model_out, sizeof(env->ccu_candb_dbg_tx.dbg_Sen_Demist)); - memcpy(&env->ccu_candb_dbg_tx.dbg_stat_PID, &rtY.dbg_PID_valve_model_out, sizeof(env->ccu_candb_dbg_tx.dbg_stat_PID)); + memcpy(&env->ccu_candb_dbg_tx.dbg_PID_tune, &rtY.dbg_PID_valve_model_out, sizeof(env->ccu_candb_dbg_tx.dbg_PID_tune)); //конец--------------------------------------------------ВЫХОД МОДЕЛИ ДЛЯ CAN-------------------------------------------