smbae/ADM
1
0
Fork 0
mirror of https://github.com/Dev-KATECH/ADM.git synced 2026-05-17 01:43:59 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

ver 25.10.02.2 (hotfix)

Browse Source 
- Lamp.c 내 Ax 값 부호 수정
- can.c 내 bit 연산 오류 수정
This commit is contained in:
3minbe 2025-10-02 16:22:10 +09:00
parent 85c0edd3ac
commit 3eb9d4613a
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GW/src/Operation_Layer/Lamp/Lamp.c
View File

@ -60,7 +60,7 @@ void PWM_for_dirve_mode(void)
void LampCheck(void)
{
if(GV_IMU_AX_Val >= .7 || GV_RC_BrakeTorqueCommand >= 1.) GV_Lamp_BRAKE_CMD = 1;
if(GV_IMU_AX_Val <= -0.7 || GV_RC_BrakeTorqueCommand >= 1.) GV_Lamp_BRAKE_CMD = 1;
else GV_Lamp_BRAKE_CMD = 0;
if(GV_VCU_GearSelStat == 1) GV_Lamp_Reverse_CMD = 1;

2
GW/src/Operation_Layer/SW_Version/SW_VER.c
View File

@ -8,7 +8,7 @@ void SET_SW_VER(void)
GV_YEAR = 25;
GV_Month = 10;
GV_Day = 02;
GV_Ver = 1;
GV_Ver = 2;
GV_CAR_NUM = 240623;
}

29
GW/src/can.c
View File

@ -2733,19 +2733,18 @@ void Transmit_VCU_MCU_Signals1_CH0_0x250(void)
/*---------------------------------------- CH1 TX ----------------------------------------*/
void Transmit_VCU_ACU_Signal1_CH1_0x013(void)
{
CAN_ch[1].tx.buf[0] = (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_MCU_EstTrq >> shift0) & _8bit;
CAN_ch[1].tx.buf[1] = (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_MCU_EstTrq >> shift8) & _8bit;
CAN_ch[1].tx.buf[2] = (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_RWA_Rack_Fbk >> shift0) & _8bit;
CAN_ch[1].tx.buf[3] = (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_RWA_Rack_Fbk >> shift8) & _8bit;
CAN_ch[1].tx.buf[4] = (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_Brk_Pressure_Fbk >> shift0) & _8bit;
CAN_ch[1].tx.buf[5] = (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_Brk_Pressure_Fbk >> shift8) & _8bit;
CAN_ch[1].tx.buf[6] = ((ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_long_Ctl_mode >> shift0)
| (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_GearPos << shift2)
| (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_ParkBrake_Fbk << shift2)
| (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_Emergency_Stop << shift1)) & _8bit;
CAN_ch[1].tx.buf[7] = ((ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_ARC1 >> shift0)
| (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_CRC1 << shift4)) & _8bit;
CAN_ch[1].tx.buf[0] = (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_MCU_EstTrq >> shift0) & _8bit;
CAN_ch[1].tx.buf[1] = (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_MCU_EstTrq >> shift8) & _8bit;
CAN_ch[1].tx.buf[2] = (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_RWA_Rack_Fbk >> shift0) & _8bit;
CAN_ch[1].tx.buf[3] = (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_RWA_Rack_Fbk >> shift8) & _8bit;
CAN_ch[1].tx.buf[4] = (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_Brk_Pressure_Fbk >> shift0) & _8bit;
CAN_ch[1].tx.buf[5] = (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_Brk_Pressure_Fbk >> shift8) & _8bit;
CAN_ch[1].tx.buf[6] = ((ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_long_Ctl_mode >> shift0)
| (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_GearPos << shift2)
| (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_ParkBrake_Fbk << shift4)
| (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_Emergency_Stop << shift6)) & _8bit;
CAN_ch[1].tx.buf[7] = ((ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_ARC1 >> shift0)
| (ECU3.TX.CH1_VCU_ACU_Signal1_0x013.VCU_ACU_CRC1 << shift4)) & _8bit;
// CRC8_Func_FOR_ACU_4BIT(0x013,8,CAN_ch[1].tx.buf);
@ -2891,7 +2890,7 @@ void Transmit_CH1_IMU_TX1_CH1_0x174(void)
CAN_ch[1].tx.buf[3] = (ECU3.TX.CH1_IMU_TX1_CH1_0x174.IMU_TEMP_RATE >> shift0)& _8bit;
CAN_ch[1].tx.buf[4] = (ECU3.TX.CH1_IMU_TX1_CH1_0x174.IMU_AY_Val >> shift0)& _8bit;
CAN_ch[1].tx.buf[5] = (ECU3.TX.CH1_IMU_TX1_CH1_0x174.IMU_AY_Val >> shift0)& _8bit;
CAN_ch[1].tx.buf[5] = (ECU3.TX.CH1_IMU_TX1_CH1_0x174.IMU_AY_Val >> shift8)& _8bit;
CAN_ch[1].tx.buf[6] = ((ECU3.TX.CH1_IMU_TX1_CH1_0x174.IMU_MSG_TX1_CNT >> shift0)
@ -2912,7 +2911,7 @@ void Transmit_CH1_IMU_TX2_CH1_0x178(void)
CAN_ch[1].tx.buf[3] = (ECU3.TX.CH1_IMU_TX2_CH1_0x178.IMU_CLU_DIAG >> shift0)& _8bit;
CAN_ch[1].tx.buf[4] = (ECU3.TX.CH1_IMU_TX2_CH1_0x178.IMU_AX_Val >> shift0)& _8bit;
CAN_ch[1].tx.buf[5] = (ECU3.TX.CH1_IMU_TX2_CH1_0x178.IMU_AX_Val >> shift0)& _8bit;
CAN_ch[1].tx.buf[5] = (ECU3.TX.CH1_IMU_TX2_CH1_0x178.IMU_AX_Val >> shift8)& _8bit;
CAN_ch[1].tx.buf[6] = ((ECU3.TX.CH1_IMU_TX2_CH1_0x178.IMU_MSG_TX2_CNT >> shift0)