diff --git a/GW/src/can.c b/GW/src/can.c index c16ecb6a..3fa4c926 100644 --- a/GW/src/can.c +++ b/GW/src/can.c @@ -915,14 +915,7 @@ void Receive_MCU_VCU_Signals2_CH0_0x301(void) void Receive_RC_VCU_Signal1_CH0_0x040(void) { -// struct{ -// -// signed int RWA_RackAngleCommand : 16; -// }CH0_RC1_0x040_temp; -// -// -// CH0_RC1_0x040_temp.RWA_RackAngleCommand = (((CAN_ch[0].rx.buf[2] >> shift0) -// + (CAN_ch[0].rx.buf[3] << shift8)) & _16bit); + ECU3.RX.CH0_RC_VCU_Signal1_0x040.RC_BrakeTorqueCommand = (((CAN_ch[0].rx.buf[0] >> shift0) | (CAN_ch[0].rx.buf[1] << shift8)) & _16bit) * Factor_0_1; @@ -930,8 +923,6 @@ void Receive_RC_VCU_Signal1_CH0_0x040(void) ECU3.RX.CH0_RC_VCU_Signal1_0x040.RC_RWA_RackAngleCommand = ((((CAN_ch[0].rx.buf[2] >> shift0) | (CAN_ch[0].rx.buf[3] << shift8)) & _16bit) * Factor_0_02) + Offset_m_665; -// ECU3.RX.CH0_RC_VCU_Signal1_0x040.RC_RWA_RackAngleCommand = (CH0_RC1_0x040_temp.RWA_RackAngleCommand * Factor_0_02) + Offset_m_655; - ECU3.RX.CH0_RC_VCU_Signal1_0x040.RC_Drive_ACC_Cmd = (((CAN_ch[0].rx.buf[4] >> shift0) | (CAN_ch[0].rx.buf[5] << shift8)) & _16bit) * Factor_0_1e05; ECU3.RX.CH0_RC_VCU_Signal1_0x040.RC_Vx_Command = (CAN_ch[0].rx.buf[6] >> shift0) & _8bit; @@ -941,14 +932,7 @@ void Receive_RC_VCU_Signal1_CH0_0x040(void) void Receive_Debugging_CH0_0x777(void) { -// struct{ -// -// signed int RWA_RackAngleCommand : 16; -// }CH0_RC1_0x040_temp; -// -// -// CH0_RC1_0x040_temp.RWA_RackAngleCommand = (((CAN_ch[0].rx.buf[2] >> shift0) -// + (CAN_ch[0].rx.buf[3] << shift8)) & _16bit); + ECU3.RX.CH0_Receive_Debugging_0x777.Logic_BrakeTorqueCommand = (((CAN_ch[0].rx.buf[0] >> shift0) | (CAN_ch[0].rx.buf[1] << shift8)) & _16bit) * Factor_0_1; @@ -965,12 +949,6 @@ void Receive_RC_VCU_Signal2_CH0_0x041(void) ECU3.RX.CH0_RC_VCU_Signal2_0x041.RC_VCU_long_Ctl_mode = (CAN_ch[0].rx.buf[1] >> shift1) & _2bit; ECU3.RX.CH0_RC_VCU_Signal2_0x041.RC_VX_Limit = (CAN_ch[0].rx.buf[2] >> shift0) & _8bit; ECU3.RX.CH0_RC_VCU_Signal2_0x041.RC_VCU_ARC = (CAN_ch[0].rx.buf[3] >> shift0) & _8bit; -// ECU3.RX.CH0_RC_VCU_Signal2_0x041.RC_VCU_CRC2 = (CAN_ch[0].rx.buf[7] >> shift4) & _4bit; - - -// if(ECU3.RX.CH0_RC_VCU_Signal2_0x041.RC_Drive_Mode == 1){ -// GV_dirve_mode = 1; -// } } @@ -1622,10 +1600,7 @@ void Input_Data_Set_BCM_VCU_Signal1_CH0_0x570(void) GV_VCU_Ignition = ECU3.RX.CH0_BCM_VCU_Signal1_0x570.BCM_MAINSW_STA ; GV_Battery_Voltage = ECU3.RX.CH0_BCM_VCU_Signal1_0x570.Battery_Voltage / Factor_0_1 ; GV_Status_Wiper_STA = ECU3.RX.CH0_BCM_VCU_Signal1_0x570.Status_Wiper ; - // = ECU3.RX.CH0_BCM_VCU_Signal1_0x570.Lamp_DRL ; - // = ECU3.RX.CH0_BCM_VCU_Signal1_0x570.Lamp_Position ; - // = ECU3.RX.CH0_BCM_VCU_Signal1_0x570.BCM_VCU_counter1 ; - // = ECU3.RX.CH0_BCM_VCU_Signal1_0x570.BCM_VCU_CRC1 ; + } @@ -1648,25 +1623,18 @@ void Input_Data_Set_BCM_VCU_Signal2_CH0_0x580(void) GV_BMS_SOC_INV = ECU3.RX.CH0_BCM_VCU_Signal2_0x580.BMS_SOC_INV ; GV_Bms_Soc_Wrng = ECU3.RX.CH0_BCM_VCU_Signal2_0x580.Bms_Soc_Wrng ; GV_Bms_SoH_Wrng = ECU3.RX.CH0_BCM_VCU_Signal2_0x580.Bms_SoH_Wrng ; -// GV_BCM_VCU_counter2 = ECU3.RX.CH0_BCM_VCU_Signal2_0x580.BCM_VCU_counter2 ; -// GV_BCM_VCU_CRC2 = ECU3.RX.CH0_BCM_VCU_Signal2_0x580.BCM_VCU_CRC2 ; + } void Input_Data_Set_BCM_VCU_Signal3_CH0_0x590(void) { - //----바이패스 함수로 대체됨 ---// - // = ECU3.RX.CH0_BCM_VCU_Signal3_0x590.Bms_PackVolt ; -// GV_Bms_PackCur = ECU3.RX.CH0_BCM_VCU_Signal3_0x590.Bms_PackCur/ 0.1 ; - // = ECU3.RX.CH0_BCM_VCU_Signal3_0x590.Bms_PackPwr ; - // = ECU3.RX.CH0_BCM_VCU_Signal3_0x590.BCM_VCU_counter3 ; - // = ECU3.RX.CH0_BCM_VCU_Signal3_0x590.BCM_VCU_CRC3 ; + } void Input_Data_Set_BCM_VCU_Signal4_CH0_0x595(void) { - // = ECU3.RX.CH0_BCM_VCU_Signal4_0x595.LDC_ACTL_CUR ; - // = ECU3.RX.CH0_BCM_VCU_Signal4_0x595.BCM_VCU_counter4 ; + GV_LDC_ACTL_VOLT = ECU3.RX.CH0_BCM_VCU_Signal4_0x595.LDC_ACTL_VOLT ; } @@ -1679,8 +1647,6 @@ void Input_Data_Set_BCM_VCU_Signal5_CH0_0x585(void) GV_BMS_TEMP_FAULT = ECU3.RX.CH0_BCM_VCU_Signal5_0x585.BMS_TEMP_FAULT ; GV_LDC_TEMP_FAULT = ECU3.RX.CH0_BCM_VCU_Signal5_0x585.LDC_TEMP_FAULT ; // = ECU3.RX.CH0_BCM_VCU_Signal5_0x585.OBC_TEMP_FAULT ; - // = ECU3.RX.CH0_BCM_VCU_Signal5_0x585.BCM_VCU_counter5 ; - // = ECU3.RX.CH0_BCM_VCU_Signal5_0x585.BCM_VCU_CRC5 ; GV_TMS_FltSta = ECU3.RX.CH0_BCM_VCU_Signal5_0x585.TMS_FltSta ; GV_OBC_TEMP = ECU3.RX.CH0_BCM_VCU_Signal5_0x585.OBC_TEMP ; GV_LDC_TEMP = ECU3.RX.CH0_BCM_VCU_Signal5_0x585.LDC_TEMP ; @@ -1769,13 +1735,13 @@ void Input_Data_Set_RC_VCU_Signal1_CH0_0x040(void) void Input_Data_Set_RC_VCU_Signal2_CH0_0x041(void) { - GV_RC_Drive_Mode = ECU3.RX.CH0_RC_VCU_Signal2_0x041.RC_Drive_Mode; - GV_RC_GearSelStat = ECU3.RX.CH0_RC_VCU_Signal2_0x041.RC_GearSelStat; - GV_RC_ParkBrake_Cmd =ECU3.RX.CH0_RC_VCU_Signal2_0x041.RC_ParkBrake_Cmd; + GV_RC_Drive_Mode = ECU3.RX.CH0_RC_VCU_Signal2_0x041.RC_Drive_Mode; + GV_RC_GearSelStat = ECU3.RX.CH0_RC_VCU_Signal2_0x041.RC_GearSelStat; + GV_RC_ParkBrake_Cmd = ECU3.RX.CH0_RC_VCU_Signal2_0x041.RC_ParkBrake_Cmd; GV_RC_VCU_long_Ctl_mode = ECU3.RX.CH0_RC_VCU_Signal2_0x041.RC_VCU_long_Ctl_mode; - GV_RC_Emergency_Stop = ECU3.RX.CH0_RC_VCU_Signal2_0x041.RC_Emergency_Stop; - GV_RC_VX_Limit = ECU3.RX.CH0_RC_VCU_Signal2_0x041.RC_VX_Limit; - GV_RC_VCU_ARC = ECU3.RX.CH0_RC_VCU_Signal2_0x041.RC_VCU_ARC; + GV_RC_Emergency_Stop = ECU3.RX.CH0_RC_VCU_Signal2_0x041.RC_Emergency_Stop; + GV_RC_VX_Limit = ECU3.RX.CH0_RC_VCU_Signal2_0x041.RC_VX_Limit; + GV_RC_VCU_ARC = ECU3.RX.CH0_RC_VCU_Signal2_0x041.RC_VCU_ARC; } @@ -1827,7 +1793,6 @@ void Input_Data_Set_IMU_TX1_CH0_0x17C(void) void Input_Data_Set_CH0_CAR_STAT_CH0_0x012(void) { -// GV_CAR_RX_Arc = ECU3.RX.CH0_CAR_STAT_CH0_0x012.CAR_ARC; } void Input_Data_Set_RC_VCU_BCM_Signal_1_CH0_0x155(void)//240227 異뷂옙? @@ -1837,7 +1802,7 @@ GV_RC_Lamp_Hazard_CMD = ECU3.RX.CH0_RC_VCU_BCM_Signal_1_CH0_0x155.Lamp_Hazard_C GV_RC_Lamp_HBEAM_CMD = ECU3.RX.CH0_RC_VCU_BCM_Signal_1_CH0_0x155.Lamp_HBEAM_CMD ; GV_RC_Lamp_Head_CMD = ECU3.RX.CH0_RC_VCU_BCM_Signal_1_CH0_0x155.Lamp_Head_CMD ; GV_RC_Lamp_LTRN_CMD = ECU3.RX.CH0_RC_VCU_BCM_Signal_1_CH0_0x155.Lamp_LTRN_CMD ; -GV_RC_Lamp_Reverse_CMD = ECU3.RX.CH0_RC_VCU_BCM_Signal_1_CH0_0x155.Lamp_Reverse_CMD ; // -1 나중에 없애야 함 +GV_RC_Lamp_Reverse_CMD = ECU3.RX.CH0_RC_VCU_BCM_Signal_1_CH0_0x155.Lamp_Reverse_CMD ; GV_RC_Lamp_RTRN_CMD = ECU3.RX.CH0_RC_VCU_BCM_Signal_1_CH0_0x155.Lamp_RTRN_CMD ; GV_RC_Lamp_Position_CMD = ECU3.RX.CH0_RC_VCU_BCM_Signal_1_CH0_0x155.Lamp_Position_CMD ; GV_RC_Lamp_DRL_CMD = ECU3.RX.CH0_RC_VCU_BCM_Signal_1_CH0_0x155.Lamp_DRL_CMD ; @@ -1853,11 +1818,11 @@ void Input_Data_Set_ACU_VCU_Signal1_CH1_0x091(void) - GV_ACU_Vx_Command = ECU3.RX.CH1_ACU_VCU_Signal1_0x091.ACU_Vx_Command ; + GV_ACU_Vx_Command = ECU3.RX.CH1_ACU_VCU_Signal1_0x091.ACU_Vx_Command ; GV_ACU_Drive_ACC_Cmd = ECU3.RX.CH1_ACU_VCU_Signal1_0x091.ACU_Drive_ACC_Cmd ; - GV_ACU_BrakeTorqueCommand = ECU3.RX.CH1_ACU_VCU_Signal1_0x091.ACU_BrakeTorqueCommand ; - GV_ACU_VCU_counter1 = ECU3.RX.CH1_ACU_VCU_Signal1_0x091.ACU_VCU_counter1 ; - GV_ACU_VCU_CRC1 = ECU3.RX.CH1_ACU_VCU_Signal1_0x091.ACU_VCU_CRC1 ; + GV_ACU_BrakeTorqueCommand = ECU3.RX.CH1_ACU_VCU_Signal1_0x091.ACU_BrakeTorqueCommand ; + GV_ACU_VCU_counter1 = ECU3.RX.CH1_ACU_VCU_Signal1_0x091.ACU_VCU_counter1 ; + GV_ACU_VCU_CRC1 = ECU3.RX.CH1_ACU_VCU_Signal1_0x091.ACU_VCU_CRC1 ; } @@ -1866,7 +1831,7 @@ void Input_Data_Set_ACU_VCU_Signal2_CH1_0x092(void) GV_ACU_RWA_cmd_deg = ECU3.RX.CH1_ACU_VCU_Signal2_0x092.ACU_RWA_cmd_deg ; GV_ACU_RWS_cmd_deg = ECU3.RX.CH1_ACU_VCU_Signal2_0x092.ACU_RWS_cmd_deg ; GV_ACU_VCU_counter2 = ECU3.RX.CH1_ACU_VCU_Signal2_0x092.ACU_VCU_counter2 ; - GV_ACU_VCU_CRC2 = ECU3.RX.CH1_ACU_VCU_Signal2_0x092.ACU_VCU_CRC2 ; + GV_ACU_VCU_CRC2 = ECU3.RX.CH1_ACU_VCU_Signal2_0x092.ACU_VCU_CRC2 ; } @@ -1884,7 +1849,7 @@ void Input_Data_Set_ACU_VCU_Signal3_CH1_0x093(void) } -void Input_Data_Set_ACU_BCM_Signal_1_CH1_0x150(void)//240227 異뷂옙? +void Input_Data_Set_ACU_BCM_Signal_1_CH1_0x150(void) { @@ -2185,6 +2150,7 @@ void Output_Data_Set_VCU_RC_Signals1_CH0_0x010(void) ECU3.TX.CH0_VCU_RC_Signals1_0x010.VCU_MCU_EstTrq = (int)((GV_VCU_MCU_EstTrq - Offset_m_200) / Factor_0_1) & _16bit; ECU3.TX.CH0_VCU_RC_Signals1_0x010.VCU_RWA_Rack_Fbk = (int)((GV_VCU_RWA_Rack_Fbk - Offset_m_655) / Factor_0_02) & _16bit; ECU3.TX.CH0_VCU_RC_Signals1_0x010.VCU_Brk_Pressure_Fbk = (int)(GV_VCU_Brk_Pressure_Fbk) & _16bit; + ECU3.TX.CH0_VCU_RC_Signals1_0x010.VCU_Vx_Fbk = (int)(GV_VCU_Vx_Fbk) & _8bit; ECU3.TX.CH0_VCU_RC_Signals1_0x010.VCU_Vx_Limit = (int)(GV_VCU_Vx_Limit) & _8bit; @@ -2201,15 +2167,14 @@ void Output_Data_Set_VCU_RC_Signals2_CH0_0x011(void) ECU3.TX.CH0_VCU_RC_Signals1_0x011.VCU_ParkBrake_Fbk = (int)(GV_VCU_ParkBrake_Fbk ) & _2bit; ECU3.TX.CH0_VCU_RC_Signals1_0x011.VCU_Acc_Limit = (int)(GV_VCU_Acc_Limit ) & _16bit; ECU3.TX.CH0_VCU_RC_Signals1_0x011.VCU_Acc_Fbk = (int)(GV_VCU_Acc_Fbk ) & _16bit; - ECU3.TX.CH0_VCU_RC_Signals1_0x011.CAR_ChargingStatus = (int)(GV_ChargingStatus ) & _3bit; - ECU3.TX.CH0_VCU_RC_Signals1_0x011.CAR_BMS_HVOn_STA = (int)(GV_BMS_HVOn_STA ) & _1bit; + ECU3.TX.CH0_VCU_RC_Signals1_0x011.CAR_BMS_HVOn_STA = (int)(GV_BMS_HVOn_STA ) & _1bit; } -void Output_Data_Set_VCU_EPAM_CH0_0x220(void)//240227 異뷂옙? +void Output_Data_Set_VCU_EPAM_CH0_0x220(void) { ECU3.TX.CH0_VCU_EPAM_0x220.Park_Request_to_EPC = (int)(GV_VCU_EPAM_Park_Request_to_EPC ) & _8bit; ECU3.TX.CH0_VCU_EPAM_0x220.EPAM_ErrClear_State = (int)(GV_VCU_EPAM_ErrClear_State ) & _8bit; @@ -2237,7 +2202,7 @@ void Output_Data_Set_CAR_STAT_CH0_0x012(void) ECU3.TX.CH0_CAR_STAT_CH0_0x012.CAR_LDC_ACTL_VOLT = (int)(GV_LDC_ACTL_VOLT ) & _8bit; // ECU3.TX.CH0_CAR_STAT_CH0_0x012.CAR_ChargingStatus = (int)(GV_ChargingStatus ) & _3bit; // ECU3.TX.CH0_CAR_STAT_CH0_0x012.CAR_BMS_HVOn_STA = (int)(GV_BMS_HVOn_STA ) & _1bit; -// ECU3.TX.CH0_CAR_STAT_CH0_0x012.CAR_ARC = (int)(GV_CAR_ARC ) & _8bit; + } @@ -2376,16 +2341,16 @@ void Output_Data_Set_VCU_ACU_Signal2_CH1_0x014(void) { - ECU3.TX.CH1_VCU_ACU_Signal2_0x014.RWA_Flt = (int)(GV_RWA_Flt ) & _4bit; - ECU3.TX.CH1_VCU_ACU_Signal2_0x014.RWS_Flt = (int)(GV_RWS_Flt ) & _4bit; - ECU3.TX.CH1_VCU_ACU_Signal2_0x014.IDB_Flt = (int)(GV_IDB_Flt ) & _4bit; - ECU3.TX.CH1_VCU_ACU_Signal2_0x014.MCU_Flt = (int)(GV_MCU_Flt ) & _1bit; - ECU3.TX.CH1_VCU_ACU_Signal2_0x014.Drive_Mode = (int)(GV_VCU_Drive_Mode ) & _2bit; - ECU3.TX.CH1_VCU_ACU_Signal2_0x014.VCU_IGN_SIG = (int)(GV_VCU_IGN_SIG ) & _2bit; - ECU3.TX.CH1_VCU_ACU_Signal2_0x014.VCU_ACU_RC_BMS_SOC= (int)(GV_BMS_SOC ) & _8bit; - ECU3.TX.CH1_VCU_ACU_Signal2_0x014.VCU_ACU_MCU_EstSpd= (int)(GV_MCU_RPM ) & _16bit; - ECU3.TX.CH1_VCU_ACU_Signal2_0x014.VCU_ACU_counter2 = (int)(GV_VCU_ACU_counter2) & _4bit; - ECU3.TX.CH1_VCU_ACU_Signal2_0x014.VCU_ACU_CRC2 = (int)(GV_VCU_ACU_CRC2 ) & _4bit; + ECU3.TX.CH1_VCU_ACU_Signal2_0x014.RWA_Flt = (int)(GV_RWA_Flt ) & _4bit; + ECU3.TX.CH1_VCU_ACU_Signal2_0x014.RWS_Flt = (int)(GV_RWS_Flt ) & _4bit; + ECU3.TX.CH1_VCU_ACU_Signal2_0x014.IDB_Flt = (int)(GV_IDB_Flt ) & _4bit; + ECU3.TX.CH1_VCU_ACU_Signal2_0x014.MCU_Flt = (int)(GV_MCU_Flt ) & _1bit; + ECU3.TX.CH1_VCU_ACU_Signal2_0x014.Drive_Mode = (int)(GV_VCU_Drive_Mode ) & _2bit; + ECU3.TX.CH1_VCU_ACU_Signal2_0x014.VCU_IGN_SIG = (int)(GV_VCU_IGN_SIG ) & _2bit; + ECU3.TX.CH1_VCU_ACU_Signal2_0x014.VCU_ACU_RC_BMS_SOC = (int)(GV_BMS_SOC ) & _8bit; + ECU3.TX.CH1_VCU_ACU_Signal2_0x014.VCU_ACU_MCU_EstSpd = (int)(GV_MCU_RPM ) & _16bit; + ECU3.TX.CH1_VCU_ACU_Signal2_0x014.VCU_ACU_counter2 = (int)(GV_VCU_ACU_counter2) & _4bit; + ECU3.TX.CH1_VCU_ACU_Signal2_0x014.VCU_ACU_CRC2 = (int)(GV_VCU_ACU_CRC2 ) & _4bit; } void Output_Data_Set_VCU_ACU_Signal3_CH1_0x015(void) @@ -2410,7 +2375,6 @@ void Output_Data_Set_CH1_IMU_TX1_CH1_0x174(void) ECU3.TX.CH1_IMU_TX1_CH1_0x174.IMU_AY_STAT = (int)(GV_IMU_AY_STAT ) & _4bit; ECU3.TX.CH1_IMU_TX1_CH1_0x174.IMU_TX1_CRC = (int)(GV_IMU_TX1_CRC ) & _8bit; - } void Output_Data_Set_CH1_IMU_TX2_CH1_0x178(void) @@ -2535,8 +2499,6 @@ void Output_Data_Set_BSC_RWA_RackCommand_CH2_0x040(void) ECU3.TX.CH2_BSC_RWA_RackCommand_0x040.Arc = (int)(GV_RWA_040_Arc) & _8bit; ECU3.TX.CH2_BSC_RWA_RackCommand_0x040.Crc = (int)(GV_RWA_040_Crc) & _8bit; -// ECU3.TX.CH2_BSC_RWA_RackCommand_0x040.RackAngleCmd = (int)round((ECU3.RX.CH0_RC_VCU_Signal1_0x040.RC_RWA_RackAngleCommand - Offset_m_655) / Factor_0_02) & _16bit; - ECU3.TX.CH2_BSC_RWA_RackCommand_0x040.RackAngleCmd = (int)round((GV_RWA_040_RackAngleCmd- Offset_m_655) / Factor_0_02) & _16bit; ECU3.TX.CH2_BSC_RWA_RackCommand_0x040.RackAngleCmdValid = (int)(GV_RWA_040_RackAngleCmdValid) & _1bit; } @@ -2630,7 +2592,6 @@ void Output_Data_Set_BSC_RWA_RackCommand_CH3_0x040(void) ECU3.TX.CH3_BSC_RWA_RackCommand_0x040.Arc = (int)(GV_RWA2_040_Arc) & _8bit; ECU3.TX.CH3_BSC_RWA_RackCommand_0x040.Crc = (int)(GV_RWA2_040_Crc) & _8bit; -// ECU3.TX.CH3_BSC_RWA_RackCommand_0x040.RackAngleCmd = (int)round((ECU3.RX.CH0_RC_VCU_Signal1_0x040.RC_RWA_RackAngleCommand - Offset_m_655) / Factor_0_02) & _16bit; ECU3.TX.CH3_BSC_RWA_RackCommand_0x040.RackAngleCmdValid = (int)(GV_RWA2_040_RackAngleCmdValid) & _1bit; ECU3.TX.CH3_BSC_RWA_RackCommand_0x040.RackAngleCmd = (int)round((GV_RWA2_040_RackAngleCmd - Offset_m_655) / Factor_0_02) & _16bit; @@ -2726,7 +2687,7 @@ void Output_Data_Set_VCU_RWS_Rack_Cmd_CH4_0x040(void) ECU3.TX.CH4_VCU_RWS_Rack_Cmd_0x040.Crc = (int)(GV_RWS1_040_Crc) & _8bit; ECU3.TX.CH4_VCU_RWS_Rack_Cmd_0x040.RackAngleCmd1 = (int)round((GV_RWS1_040_RackAngleCmd- Offset_m_655) / Factor_0_02) & _16bit; ECU3.TX.CH4_VCU_RWS_Rack_Cmd_0x040.RackAngleCmdValid1 = (int)(GV_RWS1_040_RackAngleCmdValid ) & _1bit; -// ECU3.TX.CH4_VCU_RWS_Rack_Cmd_0x040.RackAngleCmd1 = (int)round(( GV_RWS1_040_RackAngleCmd- Offset_m_655) / Factor_0_02) & _16bit; + } @@ -2756,7 +2717,6 @@ void Output_Data_Set_VCU_RWS_Rack_Cmd_CH5_0x040(void) ECU3.TX.CH5_VCU_RWS_Rack_Cmd_0x040.Arc = (int)(GV_RWS2_040_Arc) & _8bit; ECU3.TX.CH5_VCU_RWS_Rack_Cmd_0x040.Crc = (int)(GV_RWS2_040_Crc) & _8bit; ECU3.TX.CH5_VCU_RWS_Rack_Cmd_0x040.RackAngleCmd2 = (int)round((GV_RWS2_040_RackAngleCmd - Offset_m_655) / Factor_0_02) & _16bit; -// ECU3.TX.CH5_VCU_RWS_Rack_Cmd_0x040.RackAngleCmd2 = (int)round((GV_RWS2_040_RackAngleCmdValid - Offset_m_655) / Factor_0_02) & _16bit; ECU3.TX.CH5_VCU_RWS_Rack_Cmd_0x040.RackAngleCmdValid2 = (int)(GV_RWS2_040_RackAngleCmdValid) & _1bit; } @@ -2783,27 +2743,7 @@ void Output_Data_Set_VCU_RWS_Sister_CH5_0x350(void){ /* 4-1 C-A-G Bypass*/ void Bypass_Data_Set_BCM_VCU_Signal1_0x570_CH0_to_CH1(void) -{/* - ECU3.TX.CH1_BCM_VCU_ACU_Signal1_0x570.Lamp_RTRN = (int)round(ECU3.RX.CH0_BCM_VCU_Signal1_0x570.Lamp_RTRN ) & _2bit; - ECU3.TX.CH1_BCM_VCU_ACU_Signal1_0x570.Lamp_Reverse = (int)round(ECU3.RX.CH0_BCM_VCU_Signal1_0x570.Lamp_Reverse ) & _2bit; - ECU3.TX.CH1_BCM_VCU_ACU_Signal1_0x570.Lamp_LTRN = (int)round(ECU3.RX.CH0_BCM_VCU_Signal1_0x570.Lamp_LTRN ) & _2bit; - ECU3.TX.CH1_BCM_VCU_ACU_Signal1_0x570.Lamp_Head = (int)round(ECU3.RX.CH0_BCM_VCU_Signal1_0x570.Lamp_Head ) & _2bit; - ECU3.TX.CH1_BCM_VCU_ACU_Signal1_0x570.Lamp_HBEAM = (int)round(ECU3.RX.CH0_BCM_VCU_Signal1_0x570.Lamp_HBEAM ) & _2bit; - ECU3.TX.CH1_BCM_VCU_ACU_Signal1_0x570.Lamp_Hazard = (int)round(ECU3.RX.CH0_BCM_VCU_Signal1_0x570.Lamp_Hazard ) & _2bit; - ECU3.TX.CH1_BCM_VCU_ACU_Signal1_0x570.Lamp_BRAKE = (int)round(ECU3.RX.CH0_BCM_VCU_Signal1_0x570.Lamp_BRAKE ) & _2bit; - ECU3.TX.CH1_BCM_VCU_ACU_Signal1_0x570.Status_Wiper = (int)round(ECU3.RX.CH0_BCM_VCU_Signal1_0x570.Status_Wiper ) & _2bit; - ECU3.TX.CH1_BCM_VCU_ACU_Signal1_0x570.BCM_CE1_STA = (int)round(ECU3.RX.CH0_BCM_VCU_Signal1_0x570.BCM_CE1_STA ) & _2bit; - ECU3.TX.CH1_BCM_VCU_ACU_Signal1_0x570.BCM_CE2_STA = (int)round(ECU3.RX.CH0_BCM_VCU_Signal1_0x570.BCM_CE2_STA ) & _2bit; - ECU3.TX.CH1_BCM_VCU_ACU_Signal1_0x570.BCM_CE3_STA = (int)round(ECU3.RX.CH0_BCM_VCU_Signal1_0x570.BCM_CE3_STA ) & _2bit; - ECU3.TX.CH1_BCM_VCU_ACU_Signal1_0x570.BCM_CE4_STA = (int)round(ECU3.RX.CH0_BCM_VCU_Signal1_0x570.BCM_CE4_STA ) & _2bit; - ECU3.TX.CH1_BCM_VCU_ACU_Signal1_0x570.BCM_CE5_STA = (int)round(ECU3.RX.CH0_BCM_VCU_Signal1_0x570.BCM_CE5_STA ) & _2bit; - ECU3.TX.CH1_BCM_VCU_ACU_Signal1_0x570.BCM_MAINSW_STA = (int)round(ECU3.RX.CH0_BCM_VCU_Signal1_0x570.BCM_MAINSW_STA ) & _2bit; - ECU3.TX.CH1_BCM_VCU_ACU_Signal1_0x570.Battery_Voltage = (int)round(ECU3.RX.CH0_BCM_VCU_Signal1_0x570.Battery_Voltage / Factor_0_1) & _8bit; - ECU3.TX.CH1_BCM_VCU_ACU_Signal1_0x570.Lamp_DRL = (int)round(ECU3.RX.CH0_BCM_VCU_Signal1_0x570.Lamp_DRL ) & _2bit; - ECU3.TX.CH1_BCM_VCU_ACU_Signal1_0x570.Lamp_Position = (int)round(ECU3.RX.CH0_BCM_VCU_Signal1_0x570.Lamp_Position ) & _2bit; - ECU3.TX.CH1_BCM_VCU_ACU_Signal1_0x570.BCM_VCU_counter1 = (int)round(ECU3.RX.CH0_BCM_VCU_Signal1_0x570.BCM_VCU_counter1 ) & _4bit; - ECU3.TX.CH1_BCM_VCU_ACU_Signal1_0x570.BCM_VCU_CRC1 = (int)round(ECU3.RX.CH0_BCM_VCU_Signal1_0x570.BCM_VCU_CRC1 ) & _4bit; -*/ +{ } /* 4-1 C-A-G Bypass*/ @@ -2832,8 +2772,7 @@ void Bypass_Data_Set_BCM_VCU_Signal5_0x585_CH0_to_CH1(void) ECU3.TX.CH1_BCM_VCU_ACU_Signal5_0x585.BMS_TEMP_FAULT = (int)round(ECU3.RX.CH0_BCM_VCU_Signal5_0x585.BMS_TEMP_FAULT ) & _2bit; ECU3.TX.CH1_BCM_VCU_ACU_Signal5_0x585.LDC_TEMP_FAULT = (int)round(ECU3.RX.CH0_BCM_VCU_Signal5_0x585.LDC_TEMP_FAULT ) & _2bit; ECU3.TX.CH1_BCM_VCU_ACU_Signal5_0x585.OBC_TEMP_FAULT = (int)round(ECU3.RX.CH0_BCM_VCU_Signal5_0x585.OBC_TEMP_FAULT ) & _2bit; -// ECU3.TX.CH1_BCM_VCU_ACU_Signal5_0x585.BCM_VCU_counter5 = (int)round(ECU3.RX.CH0_BCM_VCU_Signal5_0x585.BCM_VCU_counter5) & _4bit; -// ECU3.TX.CH1_BCM_VCU_ACU_Signal5_0x585.BCM_VCU_CRC5 = (int)round(ECU3.RX.CH0_BCM_VCU_Signal5_0x585.BCM_VCU_CRC5 ) & _4bit; + } /* 4-2 H,I-A-G Bypass*/ void Bypass_Data_Set_RWA_VCU_ACU_Signal1_CH3_to_CH1_0x050(void) @@ -2893,21 +2832,21 @@ void Bypass_Data_Set_BSC_RWA_RackCommand_CH3_0x040(void) /* 4-7 F-A-H,I Bypass*/ /*Steer Angle Saturation*/ - if(GV_RWA2_040_RackAngleCmd > 430) + if(GV_RWA2_040_RackAngleCmd > 400) { - GV_RWA2_040_RackAngleCmd = 430; + GV_RWA2_040_RackAngleCmd = 400; } - if(GV_RWA2_040_RackAngleCmd < -430) + if(GV_RWA2_040_RackAngleCmd < -400) { - GV_RWA2_040_RackAngleCmd = -430; + GV_RWA2_040_RackAngleCmd = -400; } ECU3.TX.CH3_BSC_RWA_RackCommand_0x040.Arc = (int)(GV_RWA2_040_Arc) & _8bit; ECU3.TX.CH3_BSC_RWA_RackCommand_0x040.Crc = (int)(GV_RWA2_040_Crc) & _8bit; - ECU3.TX.CH3_BSC_RWA_RackCommand_0x040.RackAngleCmd = (int)round((ECU3.RX.CH0_RC_VCU_Signal1_0x040.RC_RWA_RackAngleCommand - Offset_m_655) / Factor_0_02) & _16bit; + ECU3.TX.CH3_BSC_RWA_RackCommand_0x040.RackAngleCmd = (int)round((GV_RWA2_040_RackAngleCmd - Offset_m_655) / Factor_0_02) & _16bit; ECU3.TX.CH3_BSC_RWA_RackCommand_0x040.RackAngleCmdValid = (int)(GV_RWA2_040_RackAngleCmdValid) & _1bit; -// ECU3.TX.CH3_BSC_RWA_RackCommand_0x040.RackAngleCmd = (int)round((GV_RWA2_040_RackAngleCmd - Offset_m_655) / Factor_0_02) & _16bit; + } @@ -2927,7 +2866,6 @@ void Bypass_Data_Set_BSC_RWA_RackCommand_CH2_0x040(void) ECU3.TX.CH2_BSC_RWA_RackCommand_0x040.Arc = (int)(GV_RWA_040_Arc) & _8bit; ECU3.TX.CH2_BSC_RWA_RackCommand_0x040.Crc = (int)(GV_RWA_040_Crc) & _8bit; - //ECU3.TX.CH2_BSC_RWA_RackCommand_0x040.RackAngleCmd = (int)round((ECU3.RX.CH0_RC_VCU_Signal1_0x040.RC_RWA_RackAngleCommand - Offset_m_655) / Factor_0_02) & _16bit; ECU3.TX.CH2_BSC_RWA_RackCommand_0x040.RackAngleCmd = (int)round((GV_RWA_040_RackAngleCmd - Offset_m_655) / Factor_0_02) & _16bit; ECU3.TX.CH2_BSC_RWA_RackCommand_0x040.RackAngleCmdValid = (int)(GV_RWA_040_RackAngleCmdValid) & _1bit; } @@ -3078,6 +3016,8 @@ void Transmit_VCU_MCU_Signals1_CH0_0x250(void) can_send_config(CAN_INST_0,g_messageObjectConf_ECU3_0ch_TX[ECU3_CH0_TX_VCU_MCU_Signals1_10ms]); + + } void Transmit_VCU_RC_Signals1_CH0_0x010(void) @@ -3147,8 +3087,6 @@ void Transmit_CH0_CAR_STAT_CH0_0x012(void) CAN_ch[0].tx.buf[3] = (ECU3.TX.CH0_CAR_STAT_CH0_0x012.CAR_Bms_PackCur >> shift8) & _8bit; CAN_ch[0].tx.buf[4] = (ECU3.TX.CH0_CAR_STAT_CH0_0x012.CAR_Battery_Voltage >> shift0) & _8bit; CAN_ch[0].tx.buf[5] = (ECU3.TX.CH0_CAR_STAT_CH0_0x012.CAR_LDC_ACTL_VOLT >> shift0) & _8bit; -// CAN_ch[0].tx.buf[6] = ((ECU3.TX.CH0_CAR_STAT_CH0_0x012.CAR_ChargingStatus >> shift0) -// | (ECU3.TX.CH0_CAR_STAT_CH0_0x012.CAR_BMS_HVOn_STA << shift3))& _8bit; can_send_config(CAN_INST_0,g_messageObjectConf_ECU3_0ch_TX[ECU3_CH0_TX_CAR_STAT_10ms]); @@ -3531,14 +3469,6 @@ void Transmit_BSC_IDB_StartupCommand_CH2_0x032(void) void Transmit_BSC_IDB_UdsRequest_CH2_0x796(void) { - // CAN_ch[2].tx.buf[0] = (ECU3.TX.CH2_BIU1_0x797.CH3_B_I_U_Signal_1_1 >> shift56) & _8bit; - // CAN_ch[2].tx.buf[1] = (ECU3.TX.CH2_BIU1_0x797.CH3_B_I_U_Signal_1_1 >> shift48) & _8bit; - // CAN_ch[2].tx.buf[2] = (ECU3.TX.CH2_BIU1_0x797.CH3_B_I_U_Signal_1_1 >> shift40) & _8bit; - // CAN_ch[2].tx.buf[3] = (ECU3.TX.CH2_BIU1_0x797.CH3_B_I_U_Signal_1_1 >> shift32) & _8bit; - // CAN_ch[2].tx.buf[4] = (ECU3.TX.CH2_BIU1_0x797.CH3_B_I_U_Signal_1_1 >> shift24) & _8bit; - // CAN_ch[2].tx.buf[5] = (ECU3.TX.CH2_BIU1_0x797.CH3_B_I_U_Signal_1_1 >> shift16) & _8bit; - // CAN_ch[2].tx.buf[6] = (ECU3.TX.CH2_BIU1_0x797.CH3_B_I_U_Signal_1_1 >> shift8) & _8bit; - // CAN_ch[2].tx.buf[7] = (ECU3.TX.CH2_BIU1_0x797.CH3_B_I_U_Signal_1_1 >> shift0) & _8bit; CAN_ch[2].tx.buf[0] = (ECU3.TX.CH2_BSC_IDB_UdsRequest_0x796.UdsRequest_MSB >> shift24) & _8bit; CAN_ch[2].tx.buf[1] = (ECU3.TX.CH2_BSC_IDB_UdsRequest_0x796.UdsRequest_MSB >> shift16) & _8bit; @@ -3736,15 +3666,6 @@ void Transmit_BSC_RCU_StartupCommand_CH3_0x033(void) void Transmit_BSC_RCU_UdsRequest_CH3_0x797(void) { - // CAN_ch[3].tx.buf[0] = (ECU3.TX.CH3_BRU1_0x798.CH4_B_R_U_Signal_1_1 >> shift56) & _8bit; - // CAN_ch[3].tx.buf[1] = (ECU3.TX.CH3_BRU1_0x798.CH4_B_R_U_Signal_1_1 >> shift48) & _8bit; - // CAN_ch[3].tx.buf[2] = (ECU3.TX.CH3_BRU1_0x798.CH4_B_R_U_Signal_1_1 >> shift40) & _8bit; - // CAN_ch[3].tx.buf[3] = (ECU3.TX.CH3_BRU1_0x798.CH4_B_R_U_Signal_1_1 >> shift32) & _8bit; - // CAN_ch[3].tx.buf[4] = (ECU3.TX.CH3_BRU1_0x798.CH4_B_R_U_Signal_1_1 >> shift24) & _8bit; - // CAN_ch[3].tx.buf[5] = (ECU3.TX.CH3_BRU1_0x798.CH4_B_R_U_Signal_1_1 >> shift16) & _8bit; - // CAN_ch[3].tx.buf[6] = (ECU3.TX.CH3_BRU1_0x798.CH4_B_R_U_Signal_1_1 >> shift8) & _8bit; - // CAN_ch[3].tx.buf[7] = (ECU3.TX.CH3_BRU1_0x798.CH4_B_R_U_Signal_1_1 >> shift0) & _8bit; - CAN_ch[3].tx.buf[0] = (ECU3.TX.CH3_BSC_RCU_UdsRequest_0x797.UdsRequest_MSB >> shift24) & _8bit; CAN_ch[3].tx.buf[1] = (ECU3.TX.CH3_BSC_RCU_UdsRequest_0x797.UdsRequest_MSB >> shift16) & _8bit;