Skip to content

W
WZ-EF01
Commit a678befa authored by 王金山's avatar 王金山
Browse files
Options

Merge branch 'dev' into 'master' 

TYW-2025-00899变更

See merge request !18
parents 8219786c 6135c7d8
Hide whitespace changes
Inline Side-by-side
Showing with 5598 additions and 84 deletions
code/Sources/Application/src/BackLight.c
View file @ a678befa
......@@ -88,7 +88,7 @@ void BL_Management_Service(void)
BlTurnOffDelay--;
else
{
if ((DriveDoorSts == 1) || (PsngrDoorSts == 1) || (PositionLightSts == 1) || (HazardLightSts == 1) || ((PepslcuAlarm > 0) && (PepslcuAlarm < 13)) || (PepslcuAlarm == 14) || ((RHTurnSignalSts == 1) && (LHTurnSignalSts == 1))) //20200501 fhl
if ((DriveDoorSts == 1) || (PsngrDoorSts == 1) || (PositionLightSts == 1) || (HazardLightSts == 1) /*|| ((PepslcuAlarm > 0) && (PepslcuAlarm < 13)) || (PepslcuAlarm == 14)*/ || ((RHTurnSignalSts == 1) && (LHTurnSignalSts == 1))) //20200501 fhl
{
if (PositionLightSts == 1)
{
......@@ -115,11 +115,11 @@ void BL_Management_Service(void)
{
BackLight_TFT_Set((BcakLightPOS + 1) * 25);
}
else if (((PepslcuAlarm > 0) && (PepslcuAlarm < 13)) || (PepslcuAlarm == 14))
/*else if (((PepslcuAlarm > 0) && (PepslcuAlarm < 13)) || (PepslcuAlarm == 14))
{
BackLight_TFT_Set((BcakLightPOS + 1) * 25);
PWM_Channel_Set_Duty_Cycle(5, 0); //2020 01 06 WH 修改off下报警大C问题
}
}*/
else
BackLight_TFT_Close(); //屏
}
......
code/Sources/Application/src/Drive_Info.c
View file @ a678befa
......@@ -162,14 +162,14 @@ void Drive_Info_Display_Update_Service(void)
else if (SYS_IGN_OFF_DISP_MODE)
{
TFT_LCD_Clear_Multi_Layer(0, YVC_LYR_NUM_CPU-3);
if (PepslcuAlarm == 11)
/*if (PepslcuAlarm == 11)
{
}
else if (((PepslcuAlarm > 0) && (PepslcuAlarm < 11)) || (PepslcuAlarm == 12) || (PepslcuAlarm == 14))
{
TFT_LCD_Clear_Layer(LAYER_MENU14);
}
else
else*/
TFT_LCD_Clear_Multi_Layer(YVC_LYR_NUM_CPU - 2, YVC_LYR_NUM_CPU - 1);
//�ſ������� KL30 ��������15
......
code/Sources/Application/src/Menus.c
View file @ a678befa
......@@ -50,7 +50,7 @@ void Menu_Processing_Service(void)
// Time_Seting(); //按键信息调用
if (IO_TIME_DISPLAY_ENABLE)
{
if (SetMenu == 0) //设置界面
/*if (SetMenu == 0) //设置界面
{
TFT_LCD_Clear_Multi_Layer(LAYER_MENU01, LAYER_MENU14);
TFT_LCD_Display_Sprite(LAYER_MENU01, SN_menu04_png, 337, 150, 64);
......@@ -79,10 +79,10 @@ void Menu_Processing_Service(void)
break;
}
}
else if (SetMenu == 1) //用户设置
else*/ if (SetMenu == 1) //用户设置
{
TFT_LCD_Clear_Multi_Layer(LAYER_MENU06, LAYER_MENU14);
TFT_LCD_Clear_Layer(LAYER_MENU01);
TFT_LCD_Clear_Multi_Layer(LAYER_MENU01, LAYER_MENU14);
//TFT_LCD_Clear_Layer(LAYER_MENU01);
//TFT_LCD_Display_Sprite(LAYER_MENU01, SN_Set_2_01_png, 337, 150, 64); //时间设置
TFT_LCD_Display_Sprite(LAYER_MENU02, SN_zhaomingliangdu_png, 337, 150/*184*/, 64); //照明亮度
TFT_LCD_Display_Sprite(LAYER_MENU03, SN_Set_2_02_png, 337, 184/*218*/, 64); //小计里程清零
......@@ -222,6 +222,7 @@ void Time_Seting(void)
if (SetMenu == 0)
{
//设置界面短按切换选项
/*
if (IO_CAN_KEY_RIGHT == IO_KEY_PRESS)
{
keytime = 0;
......@@ -257,7 +258,8 @@ void Time_Seting(void)
default :
break;
}
}
}*/
SetMenu = 1;
}
//用户设置
if (SetMenu == 1)
......
code/Sources/Application/src/Popups.c
View file @ a678befa
......@@ -56,6 +56,7 @@ void Popups_Polling(void)
{
if ((IO_DISPLAY_MODE == IO_DISP_MODE_IGN_ON) &&(IO_DISP_TEST_OFF_TIME >= 10) )
{
#if 0
if (PepslcuAlarm == 1) // PEPS 系统异常
{
Popup_Request(POPUP_PEPS_Fault);
......@@ -166,7 +167,7 @@ void Popups_Polling(void)
else
Popup_Clear(POPUP_Lock_WithKeyInCar); // 闭锁时钥匙在车内
*/
#endif
if (Child_Loca_State == 1) // 童锁状态
Popup_Request(POPUP_Child_Loca_State);
else
......@@ -176,7 +177,7 @@ void Popups_Polling(void)
Popup_Request(POPUP_LowPress_ReleaseLimit);
else
Popup_Delete(POPUP_LowPress_ReleaseLimit); //低压释放限制状态
#if 0
if (IO_DISP_TEST_OFF_TIME > 102)
{
if (NVM_CONFIG_TPMS == 0)
......@@ -310,6 +311,7 @@ void Popups_Polling(void)
Popup_Clear(POPUP_TireIDStudy_Right); // 右轮ID未学习
}
}
#endif
}
else // 非IGON
{
......@@ -332,6 +334,7 @@ void Popups_Polling(void)
if (SYS_IGN_OFF_DISP_MODE)
{
#if 0
if (PepslcuAlarm == 1) // PEPS 系统异常
{
Popup_Request(POPUP_PEPS_Fault);
......@@ -432,7 +435,8 @@ void Popups_Polling(void)
else
{
Popup_Delete(POPUP_Running_Err); // 运行状态错误，请下电后重新启动
}
}
#endif
}
else
{
......
code/Sources/Application/src/Telltales.c
View file @ a678befa
......@@ -237,12 +237,14 @@ void Telltales_Management(void)
Sound_Delete(SND_TOCK);
}
*/
#if 0
if (PepslcuAlarm == 13) // 锟斤拷锟斤拷时钥锟斤拷锟节筹拷锟斤拷
{
Sound_Request(SND_LockWithKeyInCar, 1);
}
else
Sound_Delete(SND_LockWithKeyInCar);
#endif
//5 远锟斤拷指示锟斤拷 15 30
if (HighBeamSts == 1)
BD83790A |= BD8379_D8;
......@@ -1031,7 +1033,7 @@ void Telltales_Management(void)
}
}
//-------------------------------------------------------------------//
else if ((NVM_CONFIG_YUN > 0) || (NVM_CONFIG_KANG > 0))
/*else if ((NVM_CONFIG_YUN > 0) || (NVM_CONFIG_KANG > 0))
{
if (DPF_Forbidden_Lamp_YUN == 1)
{
......@@ -1071,7 +1073,7 @@ void Telltales_Management(void)
DPF_Forbidden_Count = 0;
BD83790B &= ~BD8379_D5;
}
}
}*/
/*
else if (NVM_CONFIG_KANG > 0) //锟斤拷锟斤拷锟斤拷删锟斤拷
{
......@@ -2187,13 +2189,14 @@ void Telltales_Management(void)
{
ASTL_Flag = 0;
TelltaleLCDFlag.Telltale = 0x00000000;
#if 0
if (PepslcuAlarm == 13) // 锟斤拷锟斤拷时钥锟斤拷锟节筹拷锟斤拷
{
Sound_Request(SND_LockWithKeyInCar, 1);
}
else
Sound_Delete(SND_LockWithKeyInCar);
Sound_Delete(SND_LockWithKeyInCar);
#endif
Sound_Delete(SND_BreakPressure);
//5 远锟斤拷指示锟斤拷 15 30
if (HighBeamSts == 1)
......
code/Sources/Diagnostic/src/UDS_ISO14229_Services.c
View file @ a678befa
......@@ -1625,7 +1625,7 @@ void UDS_Service_22_Indication ( uint32_t A_TA_type, uint16_t A_Length, uint8_t
UDS_ISO14229_Transfer[ 8] = '0';
UDS_ISO14229_Transfer[ 9] = '.';
UDS_ISO14229_Transfer[10] = '1';
UDS_ISO14229_Transfer[11] = '4';
UDS_ISO14229_Transfer[11] = '5';
UDS_Service_Response ( 0x22, POSITIVE_RSP, DIAG_ID_Tx, 12, UDS_ISO14229_Transfer );
break;
case 0xF191:
......
code/Sources/Implementation/src/GUI.c
View file @ a678befa
......@@ -851,13 +851,13 @@ void Telltale_LCD_Display(void)
TFT_LCD_Display_Sprite(LAYER_LED08, SN_zhishideng_08_png, 355, 9, 64);
else
TFT_LCD_Clear_Layer(LAYER_LED08);
#if 0
// 发动机预热 32
if (TelltaleLCDFlag.Sig.LCD09 == 1)
TFT_LCD_Display_Sprite(LAYER_LED09, SN_zhishideng_09_png, 400, 9, 64);
else
TFT_LCD_Clear_Layer(LAYER_LED09);
#endif
//AEB 灯 44
if (TelltaleLCDFlag.Sig.LCD10 == 1)
TFT_LCD_Display_Sprite(LAYER_LED10, SN_zhishideng_10_png, 445, 9, 64);
......@@ -901,7 +901,10 @@ void Telltale_LCD_Display(void)
TFT_LCD_Clear_Layer(LAYER_LED16);
//EPS故障指示灯 46
if (EPS_Status_signal == 2)
TFT_LCD_Display_Sprite(LAYER_LED09, SN_zhishideng_18_png, 400, 9, 64);
else
TFT_LCD_Clear_Layer(LAYER_LED09);
//近光灯
if (TelltaleLCDFlag.Sig.LCD17 == 1)
TFT_LCD_Display_Sprite(LAYER_LED17, SN_zhishideng_31_png, 129, 103, 64);
......@@ -949,19 +952,19 @@ void Telltale_LCD_Display(void)
TFT_LCD_Display_Sprite(LAYER_LED24, SN_zhishideng_24_png, 625, 149, 64);
else
TFT_LCD_Clear_Layer(LAYER_LED24);
/*
//怠速起停功能开启绿色 40 潍柴:没有；康明斯:有；玉柴:没有
if (TelltaleLCDFlag.Sig.LCD25 == 1)
TFT_LCD_Display_Sprite(LAYER_LED25, SN_zhishideng_25_png, 625, 188, 64);
else
TFT_LCD_Clear_Layer(LAYER_LED25);
//怠速起停功能关闭红色 40 潍柴:没有；康明斯:有；玉柴:没有
if (TelltaleLCDFlag.Sig.LCD26 == 1)
TFT_LCD_Display_Sprite(LAYER_LED26, SN_zhishideng_26_x625_y219_png, 625, 227, 64);
else
TFT_LCD_Clear_Layer(LAYER_LED26);
*/
//PTO 工作指示灯 18
if (TelltaleLCDFlag.Sig.LCD27 == 1)
TFT_LCD_Display_Sprite(LAYER_LED27, SN_zhishideng_27_png, 625, 266, 64);
......@@ -1206,7 +1209,7 @@ void Menu2_4_Display(void) //
TFT_LCD_Display_Sprite(LAYER_MENU02, SN_NB_17_00_png, 373, 199, 64);
TFT_LCD_Display_Sprite(LAYER_MENU03, SN_NB_17_point_png, 391, 199, 64);
TFT_LCD_Display_Sprite(LAYER_MENU04, SN_NB_17_01_png, 409, 199, 64);
TFT_LCD_Display_Sprite(LAYER_MENU05, SN_NB_17_04_png, 427, 199, 64);
TFT_LCD_Display_Sprite(LAYER_MENU05, SN_NB_17_05_png, 427, 199, 64);
}
uint8_t Left_LDW_Count = 0;
......
code/Sources/Implementation/src/IO_Manager.c
View file @ a678befa
......@@ -201,13 +201,13 @@ void IO_Management_Service(void)
SetMenu = 3;
}
#endif
if ((IO_DRIVE_INFO_DISPLAY_ENABLE) && (!IO_POPUP_DISPLAY_ENABLE) && (IO_CAN_KEY_RIGHT == IO_KEY_LONG))
/*if ((IO_DRIVE_INFO_DISPLAY_ENABLE) && (!IO_POPUP_DISPLAY_ENABLE) && (IO_CAN_KEY_RIGHT == IO_KEY_LONG))
{
IO_CAN_KEY_RIGHT = IO_KEY_IDLE;
IOTFTLCDAccessRight = 0x00;
IOTFTLCDAccessRight = (IO_TIME_BIT | IO_BG_INFO_BIT);
SetMenu = 2;
}
}*/
if (IO_BG_INFO_DISPLAY_ENABLE)
{
Time_Seting(); //按键信息调用
......@@ -234,6 +234,7 @@ void IO_Management_Service(void)
ClockPOS = 0;
SetMenupage = 0;
SetMenu = 0;
TFT_LCD_Clear_Multi_Layer(LAYER_MENU01, LAYER_MENU14);
IODispFuncSwitch = 1;
IOTFTLCDAccessRight = 0x00;
IOTFTLCDAccessRight |= (IO_BG_INFO_BIT | IO_TELLTALE_BIT | IO_DRIVE_INFO_BIT);
......
code/Sources/Protocol/inc/CAN_Communication_Matrix.h
View file @ a678befa
......@@ -2412,7 +2412,7 @@ static const CANMsgAttrStruct CANMsgAttrTable[] =
{ EBC3, CANMsg18FE4F0B.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 2000, 0, &CANMsg18FE4F0BStatus, CANMsg18FE4F0BInit, CANMsg18FE4F0BTimeout, CANMsg18FE4F0BMask,},
{ AEBS1, CANMsg0CF02F2A.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 500, 0, &CANMsg0CF02F2AStatus, CANMsg0CF02F2AInit, CANMsg0CF02F2ATimeout, CANMsg0CF02F2AMask,},
{ EEPBS1, CANMsg18FE1264.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 1000, 0, &CANMsg18FE1264Status, CANMsg18FE1264Init, CANMsg18FE1264Timeout, CANMsg18FE1264Mask,},
{ EPS_Status, CANMsg18FF0113.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 2000, 0, &CANMsg18FF0113Status, CANMsg18FF0113Init, CANMsg18FF0113Timeout, CANMsg18FF0113Mask,},
{ EPS_Status, CANMsg18FF0113.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 1000, 0, &CANMsg18FF0113Status, CANMsg18FF0113Init, CANMsg18FF0113Timeout, CANMsg18FF0113Mask,},
{ EGSM_1, CANMsg1802BFD0.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 2000, 0, &CANMsg1802BFD0Status, CANMsg1802BFD0Init, CANMsg1802BFD0Timeout, CANMsg1802BFD0Mask,},
{ AMB, CANMsg18FEF500.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 10000, 0, &CANMsg18FEF500Status, CANMsg18FEF500Init, CANMsg18FEF500Timeout, CANMsg18FEF500Mask,},
{ GPS_SYSTime, CANMsg18FEE6EE.Msg, 8, 8, CAN_MSG_Rx, CAN_MSG_CYCLE, 3000, 0, &CANMsg18FEE6EEStatus, CANMsg18FEE6EEInit, CANMsg18FEE6EETimeout, CANMsg18FEE6EEMask,},
......
code/cmd/TBDML_Erase_unsecure_hcs12xe.cmd deleted 100644 → 0
View file @ 8219786c
// ver 0.2 (28-Mar-06)
// HCS12XE Core erasing + unsecuring command file:
// These commands mass erase the chip then program the security byte to 0xFE (unsecured state).
DEFINEVALUEDLG "Information required to unsecure the device" "FCLKDIV" 17 "To unsecure the device, the command script needs \nthe correct value for the FCLKDIV onchip register.\n\nDatasheet proposed values:\n\noscillator frequency\tFCLKDIV value (decimal)\n\n 16 \tMHz\t\t17\n 12 \tMHz\t\t13\n 8 \tMHz\t\t9\n 4 \tMHz\t\t5\n"
FLASH RELEASE
reset
wb 0x03c 0x00 //disable cop
wait 20
WB 0x100 FCLKDIV // clock divider
WB 0x106 0x30 // clear any error flags
WB 0x102 0x00 // CCOBIX = 0
WB 0x10A 0x08 // load erase all blocks command
WB 0x106 0x80 // launch command
WAIT 10
reset
WB 0x100 FCLKDIV // clock divider
WB 0x106 0x30 // clear any error flags
WB 0x102 0x00 // CCOBIX = 0
WB 0x10A 0x06 // load program command
WB 0x10B 0x7F // load GPAGE
WB 0x102 0x01 // CCOBIX = 1
WB 0x10A 0xFF // load addr hi
WB 0x10B 0x08 // load addr lo
WB 0x102 0x02 // CCOBIX = 2
WB 0x10A 0xFF // load data
WB 0x10B 0xFF // load data
WB 0x102 0x03 // CCOBIX = 3
WB 0x10A 0xFF // load data
WB 0x10B 0xFF // load data
WB 0x102 0x04 // CCOBIX = 4
WB 0x10A 0xFF // load data
WB 0x10B 0xFF // load data
WB 0x102 0x05 // CCOBIX = 5
WB 0x10A 0xFF // load data
WB 0x10B 0xFE // load data
WB 0x106 0x80 // launch command
WAIT 1
undef FCLKDIV // undefine variable
code/cmd/TBDML_Postload.cmd deleted 100644 → 0
View file @ 8219786c
// After load the commands written below will be executed
code/cmd/TBDML_Preload.cmd deleted 100644 → 0
View file @ 8219786c
// Before load the commands written below will be executed
code/cmd/TBDML_Reset.cmd deleted 100644 → 0
View file @ 8219786c
// After reset the commands written below will be executed
code/cmd/TBDML_Startup.cmd deleted 100644 → 0
View file @ 8219786c
// At startup the commands written below will be executed
code/cmd/TBDML_Vppoff.cmd deleted 100644 → 0
View file @ 8219786c
// After programming the flash, the commands written below will be executed
code/cmd/TBDML_Vppon.cmd deleted 100644 → 0
View file @ 8219786c
// Before programming the flash, the commands written below will be executed
s19/释放软件说明.txt
View file @ a678befa
1、完整版：WZ_EF01_BootApp_S00.14_FV0.08_250731.s19
2、升级版：WZ_EF01_UpdateApp_S00.14_F0.08_250731.s19
1、完整版：WZ-EF01_BootApp_S00.15_FV0.08_250926.s19
2、升级版：WZ-EF01_UpdateApp_S00.15_F0.08_250926.s19
3、FLASH： WZ_EF01_Flash_F0.08_FullBin_231117.bin
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment