diff --git a/clusterApp/Makefile_Ubuntu b/clusterApp/Makefile_Ubuntu index ef6c49e..8799d2f 100644 --- a/clusterApp/Makefile_Ubuntu +++ b/clusterApp/Makefile_Ubuntu @@ -42,7 +42,7 @@ CFLAGS += -Iinclude \ -I/home/lst/workspace/zlib/zlib_build/ \ -I/home/lst/workspace/libpng/libpng_build/ \ -I/home/user/zhimin/clusterApp/3psw/source_packages/build_install/ \ - -I/home/huaxu/develop/cluster/clusterAppUbuntu/3psw/lpng1634 \ + -I/home/huaxu/develop/cluster/clusterApp/3psw/lpng1634 \ -I/home/user/zhimin/clusterApp/3psw/source_packages/freetype-2.13.2/ \ -I/home/huaxu/develop/ICM-SOFT/D20/icm-code/cpu/app/insDavi2.0/3psw/freetype-2.9_MinGW/include/freetype2/ \ -I/usr/include/GL/ \ diff --git a/clusterApp/Res/image/ui3_basic_bg_backing.png b/clusterApp/Res/image/ui3_basic_bg_backing.png index b351ec3..4c50cc1 100644 Binary files a/clusterApp/Res/image/ui3_basic_bg_backing.png and b/clusterApp/Res/image/ui3_basic_bg_backing.png differ diff --git a/clusterApp/Res/image/ui3_basic_bg_backing_night.png b/clusterApp/Res/image/ui3_basic_bg_backing_night.png index b351ec3..4c50cc1 100644 Binary files a/clusterApp/Res/image/ui3_basic_bg_backing_night.png and b/clusterApp/Res/image/ui3_basic_bg_backing_night.png differ diff --git a/clusterApp/Res/image/ui3_basic_bg_driving.png b/clusterApp/Res/image/ui3_basic_bg_driving.png index b351ec3..4c50cc1 100644 Binary files a/clusterApp/Res/image/ui3_basic_bg_driving.png and b/clusterApp/Res/image/ui3_basic_bg_driving.png differ diff --git a/clusterApp/Res/image/ui3_basic_bg_driving_night.png b/clusterApp/Res/image/ui3_basic_bg_driving_night.png index b351ec3..4c50cc1 100644 Binary files a/clusterApp/Res/image/ui3_basic_bg_driving_night.png and b/clusterApp/Res/image/ui3_basic_bg_driving_night.png differ diff --git a/clusterApp/bin/clusterApp b/clusterApp/bin/clusterApp index ed417f3..cce4729 100755 Binary files a/clusterApp/bin/clusterApp and b/clusterApp/bin/clusterApp differ diff --git a/clusterApp/include/Protocol/MainBoard_IIC_App.h b/clusterApp/include/Protocol/MainBoard_IIC_App.h index 969e5a6..1fae594 100644 --- a/clusterApp/include/Protocol/MainBoard_IIC_App.h +++ b/clusterApp/include/Protocol/MainBoard_IIC_App.h @@ -182,6 +182,7 @@ enum MENU_LEFT_VOICE_AI, MENU_LEFT_VOICE_PHONE, MENU_LEFT_ACC, + MENU_LEFT_SPEED, MENU_LEFT_NUM, }; @@ -626,4 +627,47 @@ enum FACE_END, /*结束*/ }; +typedef enum +{ + ID_ALARM_NULL = 0, /* [无报警信息] */ + ID_ALARM_CANNOT_AUTO_DRIVE, /* 无法执行自动驾驶 */ + ID_ALARM_TAKE_OVER_VEHICLE, /* 请接管驾驶车辆 */ + ID_ALARM_DRIVER_NOT_TAKE_OVER_STOPPING, /* 驾驶员未接管车辆，停车中 */ + ID_ALARM_AUTO_DRIVE_SYS_FAULT, /* 自动驾驶系统故障 */ + ID_ALARM_CHARGING_DO_NOT_START, /* 充电中，请勿启动车辆 */ + ID_ALARM_BATTERY_SWAP_UNLOCKED_DO_NOT_OPERATE, /* 换电装置未锁止，请勿操作车辆 */ + ID_ALARM_DECELERATION_WARNING_BRAKE, /* 减速预警，请制动 */ + ID_ALARM_COLLISION_WARNING_BRAKE, /* 碰撞预警，请制动 */ + ID_ALARM_ENERGY_RECOVERY_OFF, /* 能量回收关闭 */ + ID_ALARM_BATTERY_PREHEATING_DRIVE_SAFE, /* 电池预热中，请安全行车 */ + ID_ALARM_BATTERY_PREHEATING_DRIVE_SLOW, /* 电池预热中，请缓速慢行 */ + ID_ALARM_BATTERY_TEMP_LOW_WAIT_HEAT_NO_DRIVE, /* 电池温度低，请等待加热，建议不行车 */ + ID_ALARM_SHIFT_N_THEN_IGNITE, /* 请挂N挡再点火 */ + ID_ALARM_COAST_RECOVERY_LEVEL1, /* 滑行能量回收：1级 */ + ID_ALARM_TRANSMISSION_SELF_LEARNING_KEEP_N, /* 变速箱系统自学习中，请保持N档 */ + ID_ALARM_TRANSMISSION_SELF_LEARNING_DONE_RESTART, /* 变速箱系统自学习完成，请重启车辆 */ + ID_ALARM_TRANSMISSION_SELF_LEARNING_FAIL_RESTART, /* 变速箱系统自学习失败，请重启车辆 */ + ID_ALARM_MOTOR_BRAKE_LIMIT_REACHED, /* 电机制动已达上限 */ + ID_ALARM_SPEED_DOWNHILL_ON, /* 定速下坡功能已开启 */ + ID_ALARM_MULTI_GEAR_SHIFT_FAIL_BRAKE_TAKEOVER, /* 多级怀挡调节功能失效，请踩制动踏板接管 */ + ID_ALARM_SPEED_DOWNHILL_OFF, /* 定速下坡功能已关闭 */ + ID_ALARM_VEHICLE_SLIP_USE_DIFF_LOCK, /* 车辆严重打滑，请使用差速锁 */ + ID_ALARM_INSPECTION_SWITCH_ON_4TH_GEAR_FIXED, /* 过检开关开启，第4档固定 */ + ID_ALARM_BRAKE_THEN_START, /* 请踩刹车再启动车辆 */ + ID_ALARM_BRAKE_THEN_SHIFT, /* 请踩刹车再挂挡 */ + ID_ALARM_SPEED_TOO_HIGH_CANNOT_LOCK_SLOW_TO_5KMH, /* 车速过高无法挂锁，请减速至5km/h以下 */ + ID_ALARM_AIR_PRESSURE_SENSOR_FAULT_CONTACT_SERVICE, /* 气压传感器故障，请联系售后 */ + ID_ALARM_DRYER_VALVE_STUCK_CONTACT_SERVICE, /* 干燥器电磁阀卡滞，请联系售后 */ + ID_ALARM_DRYER_VALVE_NO_RESPONSE_CONTACT_SERVICE, /* 干燥器电磁阀无响应，请联系售后 */ + ID_ALARM_BATTERY_SYS_LIMIT_RECOVERY_CONTACT_SERVICE, /* 电池系统已限制回收，请联系售后 */ + ID_ALARM_MOTOR_SYS_LIMIT_RECOVERY_CONTACT_SERVICE, /* 电机系统已限制回收，请联系售后 */ + ID_ALARM_TRANSMISSION_SYS_LIMIT_RECOVERY_CONTACT_SERVICE,/* 变速箱系统已限制回收，请联系售后 */ + ID_ALARM_ABS_LIMIT_RECOVERY_CONTACT_SERVICE, /* 防抱死系统已限制回收，请联系售后 */ + ID_ALARM_MOTOR_OVERSPEED_BRAKE, /* 电机超速，请刹车减速 */ + ID_ALARM_LOW_PRESSURE_FUEL_PUMP_TEST_ACTIVE, /* 低压油泵测试功能已激活 */ + ID_ALARM_CHARGE_PULL_HANDBRAKE, /* 充电请拉手刹 */ + ID_ALARM_BATTERY_FIRE_ALARM_STOP_AND_EVACUATE, /* 电池火灾报警，请立即停车后远离车辆 */ + ID_ALARM_COUNT /* 用于统计告警总数，可选 */ +} Sany_AlarmId; + #endif // MAINBOARD_IIC_APP_H_INCLUDED diff --git a/clusterApp/include/Protocol/MainBoard_IIC_Sys.h b/clusterApp/include/Protocol/MainBoard_IIC_Sys.h index 279617d..191e0ab 100644 --- a/clusterApp/include/Protocol/MainBoard_IIC_Sys.h +++ b/clusterApp/include/Protocol/MainBoard_IIC_Sys.h @@ -184,7 +184,7 @@ MbIicApi Un08 dstDataBuf[ID_FRAME_W_NUM][I2C_FRAMELEN-1]; #define DATA_FORWARD_VEHICLE_6_X srcDataBuf[ID_FRAME_R_0x0A][6].value /*前方车辆_6 位置坐标x*/ #define DATA_FORWARD_VEHICLE_6_Y srcDataBuf[ID_FRAME_R_0x0A][7].value /*前方车辆_6 位置坐标y*/ -#define DATA_MENU_LEFT_ID srcDataBuf[ID_FRAME_R_0x0B][0].sbit35.b02 /*左侧菜单ID*/ +#define DATA_MENU_LEFT_ID MENU_LEFT_SPEED // srcDataBuf[ID_FRAME_R_0x0B][0].sbit35.b02 /*左侧菜单ID*/ #define DATA_MENU_LEFT_VALUE srcDataBuf[ID_FRAME_R_0x0B][0].sbit35.b37 /*左侧菜单数值*/ #define DATA_MCU_BLT_OP_STATE 0 // srcDataBuf[ID_FRAME_R_0x0B][1].sbit02.b01 /*蓝牙电话MCU处理状态*/ #define DATA_MCU_BLT_OP_CURSOR srcDataBuf[ID_FRAME_R_0x0B][1].sbit35.b37 /*蓝牙电话MCU操作光标*/ diff --git a/clusterApp/src/InsRender/Render.c b/clusterApp/src/InsRender/Render.c index 7f45be9..65fa428 100644 --- a/clusterApp/src/InsRender/Render.c +++ b/clusterApp/src/InsRender/Render.c @@ -9447,7 +9447,7 @@ static Bool ShowHintInfo(UInt08 hintID) Recti rect, rect0; static Flt32 modeIconAlpha = 1.0f; static Int32 sumtime = 0; - UInt08 *txt = "鹏友"; + UInt08 *txt = "SANY"; static UInt08 step = 1; static UInt08 prestep = 0; @@ -9509,6 +9509,7 @@ static Bool ShowHintInfo(UInt08 hintID) } } +#if 0 /* OLD HINT INFO */ switch(preHintID) { case ID_HINT_POWER_READY: /* 动力就绪 */ @@ -9786,6 +9787,130 @@ static Bool ShowHintInfo(UInt08 hintID) infoStr[0] = NULL; break; } +#else /* SANY ALARM */ + + switch (preHintID) + { + case ID_ALARM_NONE: /* [无报警信息] */ + infoStr[0] = NULL; + break; + case ID_ALARM_CANNOT_AUTO_DRIVE: /* 无法执行自动驾驶 */ + infoStr[0] = str_cannot_auto_drive_idx; + break; + case ID_ALARM_TAKE_OVER_VEHICLE: /* 请接管驾驶车辆 */ + infoStr[0] = str_take_over_vehicle_idx; + break; + case ID_ALARM_DRIVER_NOT_TAKE_OVER_STOPPING: /* 驾驶员未接管车辆，停车中 */ + infoStr[0] = str_driver_not_take_over_stopping_idx; + break; + case ID_ALARM_AUTO_DRIVE_SYS_FAULT: /* 自动驾驶系统故障 */ + infoStr[0] = str_auto_drive_sys_fault_idx; + break; + case ID_ALARM_CHARGING_DO_NOT_START: /* 充电中，请勿启动车辆 */ + infoStr[0] = str_charging_do_not_start_idx; + break; + case ID_ALARM_BATTERY_SWAP_UNLOCKED_DO_NOT_OPERATE: /* 换电装置未锁止，请勿操作车辆 */ + infoStr[0] = str_battery_swap_unlocked_do_not_operate_idx; + break; + case ID_ALARM_DECELERATION_WARNING_BRAKE: /* 减速预警，请制动 */ + infoStr[0] = str_deceleration_warning_brake_idx; + break; + case ID_ALARM_COLLISION_WARNING_BRAKE: /* 碰撞预警，请制动 */ + infoStr[0] = str_collision_warning_brake_idx; + break; + case ID_ALARM_ENERGY_RECOVERY_OFF: /* 能量回收关闭 */ + infoStr[0] = str_energy_recovery_off_idx; + break; + case ID_ALARM_BATTERY_PREHEATING_DRIVE_SAFE: /* 电池预热中，请安全行车 */ + infoStr[0] = str_battery_preheating_drive_safe_idx; + break; + case ID_ALARM_BATTERY_PREHEATING_DRIVE_SLOW: /* 电池预热中，请缓速慢行 */ + infoStr[0] = str_battery_preheating_drive_slow_idx; + break; + case ID_ALARM_BATTERY_TEMP_LOW_WAIT_HEAT_NO_DRIVE: /* 电池温度低，请等待加热，建议不行车 */ + infoStr[0] = str_battery_temp_low_wait_heat_no_drive_idx; + break; + case ID_ALARM_SHIFT_N_THEN_IGNITE: /* 请挂N挡再点火 */ + infoStr[0] = str_shift_N_then_ignite_idx; + break; + case ID_ALARM_COAST_RECOVERY_LEVEL1: /* 滑行能量回收：1级 */ + infoStr[0] = str_coast_recovery_level1_idx; + break; + case ID_ALARM_TRANSMISSION_SELF_LEARNING_KEEP_N: /* 变速箱系统自学习中，请保持N档 */ + infoStr[0] = str_transmission_self_learning_keep_N_idx; + break; + case ID_ALARM_TRANSMISSION_SELF_LEARNING_DONE_RESTART: /* 变速箱系统自学习完成，请重启车辆 */ + infoStr[0] = str_transmission_self_learning_done_restart_idx; + break; + case ID_ALARM_TRANSMISSION_SELF_LEARNING_FAIL_RESTART: /* 变速箱系统自学习失败，请重启车辆 */ + infoStr[0] = str_transmission_self_learning_fail_restart_idx; + break; + case ID_ALARM_MOTOR_BRAKE_LIMIT_REACHED: /* 电机制动已达上限 */ + infoStr[0] = str_motor_brake_limit_reached_idx; + break; + case ID_ALARM_SPEED_DOWNHILL_ON: /* 定速下坡功能已开启 */ + infoStr[0] = str_speed_downhill_on_idx; + break; + case ID_ALARM_MULTI_GEAR_SHIFT_FAIL_BRAKE_TAKEOVER: /* 多级怀挡调节功能失效，请踩制动踏板接管 */ + infoStr[0] = str_multi_gear_shift_fail_brake_takeover_idx; + break; + case ID_ALARM_SPEED_DOWNHILL_OFF: /* 定速下坡功能已关闭 */ + infoStr[0] = str_speed_downhill_off_idx; + break; + case ID_ALARM_VEHICLE_SLIP_USE_DIFF_LOCK: /* 车辆严重打滑，请使用差速锁 */ + infoStr[0] = str_vehicle_slip_use_diff_lock_idx; + break; + case ID_ALARM_INSPECTION_SWITCH_ON_4TH_GEAR_FIXED: /* 过检开关开启，第4档固定 */ + infoStr[0] = str_inspection_switch_on_4th_gear_fixed_idx; + break; + case ID_ALARM_BRAKE_THEN_START: /* 请踩刹车再启动车辆 */ + infoStr[0] = str_brake_then_start_idx; + break; + case ID_ALARM_BRAKE_THEN_SHIFT: /* 请踩刹车再挂挡 */ + infoStr[0] = str_brake_then_shift_idx; + break; + case ID_ALARM_SPEED_TOO_HIGH_CANNOT_LOCK_SLOW_TO_5KMH: /* 车速过高无法挂锁，请减速至5km/h以下 */ + infoStr[0] = str_speed_too_high_cannot_lock_slow_to_5kmh_idx; + break; + case ID_ALARM_AIR_PRESSURE_SENSOR_FAULT_CONTACT_SERVICE: /* 气压传感器故障，请联系售后 */ + infoStr[0] = str_air_pressure_sensor_fault_contact_service_idx; + break; + case ID_ALARM_DRYER_VALVE_STUCK_CONTACT_SERVICE: /* 干燥器电磁阀卡滞，请联系售后 */ + infoStr[0] = str_dryer_valve_stuck_contact_service_idx; + break; + case ID_ALARM_DRYER_VALVE_NO_RESPONSE_CONTACT_SERVICE: /* 干燥器电磁阀无响应，请联系售后 */ + infoStr[0] = str_dryer_valve_no_response_contact_service_idx; + break; + case ID_ALARM_BATTERY_SYS_LIMIT_RECOVERY_CONTACT_SERVICE:/* 电池系统已限制回收，请联系售后 */ + infoStr[0] = str_battery_sys_limit_recovery_contact_service_idx; + break; + case ID_ALARM_MOTOR_SYS_LIMIT_RECOVERY_CONTACT_SERVICE: /* 电机系统已限制回收，请联系售后 */ + infoStr[0] = str_motor_sys_limit_recovery_contact_service_idx; + break; + case ID_ALARM_TRANSMISSION_SYS_LIMIT_RECOVERY_CONTACT_SERVICE: /* 变速箱系统已限制回收，请联系售后 */ + infoStr[0] = str_transmission_sys_limit_recovery_contact_service_idx; + break; + case ID_ALARM_ABS_LIMIT_RECOVERY_CONTACT_SERVICE: /* 防抱死系统已限制回收，请联系售后 */ + infoStr[0] = str_abs_limit_recovery_contact_service_idx; + break; + case ID_ALARM_MOTOR_OVERSPEED_BRAKE: /* 电机超速，请刹车减速 */ + infoStr[0] = str_motor_overspeed_brake_idx; + break; + case ID_ALARM_LOW_PRESSURE_FUEL_PUMP_TEST_ACTIVE: /* 低压油泵测试功能已激活 */ + infoStr[0] = str_low_pressure_fuel_pump_test_active_idx; + break; + case ID_ALARM_CHARGE_PULL_HANDBRAKE: /* 充电请拉手刹 */ + infoStr[0] = str_charge_pull_handbrake_idx; + break; + case ID_ALARM_BATTERY_FIRE_ALARM_STOP_AND_EVACUATE: /* 电池火灾报警，请立即停车后远离车辆 */ + infoStr[0] = str_battery_fire_alarm_stop_and_evacuate_idx; + break; + default: + infoStr[0] = NULL; + break; + } + +#endif /* SANY ALARM */ if(IicComStatus == IIC_COM_EXCEPTION) { @@ -9815,7 +9940,7 @@ static Bool ShowHintInfo(UInt08 hintID) { for(accum = 0; accum < 6 ; accum++) { - ucs[accum] = HintAlarm_FONT_CODE[infoStr[i][accum]]; + ucs[accum] = HintAlarm_FONT_CODE_SANY[infoStr[i][accum]]; } if(AccountInfo.CurrUsrName[0]==0) { @@ -9837,7 +9962,7 @@ static Bool ShowHintInfo(UInt08 hintID) { for(accum = 0; accum < TXT_HINT_LENGTH-1 && infoStr[i][accum] != 0; accum++) { - ucs[accum] = HintAlarm_FONT_CODE[infoStr[i][accum]]; + ucs[accum] = HintAlarm_FONT_CODE_SANY[infoStr[i][accum]]; } ucs[accum] = 0; } @@ -16404,7 +16529,7 @@ static void Render_PwrOnState() PhoneStatus = PHONE_InCall; } } - +#ifndef SHOW_MENULEFT if(RadarAlarm == 0 || (pageType != GEAR_R && pageType != GEAR_N && pageType != GEAR_D)) /*只有在非倒车界面才显示左侧菜单,左侧模块*/ { if(ShowMenuLeft(MenuLeftId) == INS_TRUE) @@ -16480,6 +16605,7 @@ static void Render_PwrOnState() ShowModuleMedia(0, 0xFF); ShowModuleWeather(0, 0xFF); } +#endif if(PhoneStatus == PHONE_InCall || PhoneStatus == PHONE_OutCall diff --git a/clusterApp/src/InsRender/Res_TxtHintAlarm.c b/clusterApp/src/InsRender/Res_TxtHintAlarm.c index 9025334..9dad81d 100644 --- a/clusterApp/src/InsRender/Res_TxtHintAlarm.c +++ b/clusterApp/src/InsRender/Res_TxtHintAlarm.c @@ -1263,3 +1263,71 @@ const unsigned int str_module_phone_unknown_idx[] = 249, 37, 0 }; +/* AUTO-GENERATED FILE. DO NOT MODIFY. + * + * This file was generated from "告警文字.txt". + * It should not be modified by hand. + */ + +const unsigned int HintAlarm_FONT_CODE_SANY[] = +{ + 0x65E0, 0x6CD5, 0x6267, 0x884C, 0x81EA, 0x52A8, 0x9A7E, 0x9A76, + 0x8BF7, 0x63A5, 0x7BA1, 0x8F66, 0x8F86, 0x5458, 0x672A, 0xFF0C, + 0x505C, 0x4E2D, 0x7CFB, 0x7EDF, 0x6545, 0x969C, 0x5145, 0x7535, + 0x52FF, 0x542F, 0x6362, 0x88C5, 0x7F6E, 0x9501, 0x6B62, 0x64CD, + 0x4F5C, 0x51CF, 0x901F, 0x9884, 0x8B66, 0x5236, 0x78B0, 0x649E, + 0x80FD, 0x91CF, 0x56DE, 0x6536, 0x5173, 0x95ED, 0x6C60, 0x70ED, + 0x5B89, 0x5168, 0x7F13, 0x6162, 0x6E29, 0x5EA6, 0x4F4E, 0x7B49, + 0x5F85, 0x52A0, 0x5EFA, 0x8BAE, 0x4E0D, 0x6302, 0x004E, 0x6321, + 0x518D, 0x70B9, 0x706B, 0x6ED1, 0xFF1A, 0x0031, 0x7EA7, 0x53D8, + 0x7BB1, 0x5B66, 0x4E60, 0x4FDD, 0x6301, 0x6863, 0x5B8C, 0x6210, + 0x91CD, 0x5931, 0x8D25, 0x673A, 0x5DF2, 0x8FBE, 0x4E0A, 0x9650, + 0x5B9A, 0x4E0B, 0x5761, 0x529F, 0x5F00, 0x591A, 0x6000, 0x8C03, + 0x8282, 0x8E29, 0x8E0F, 0x677F, 0x6548, 0x4E25, 0x6253, 0x4F7F, + 0x7528, 0x5DEE, 0x8FC7, 0x68C0, 0x7B2C, 0x0034, 0x56FA, 0x5239, + 0x9AD8, 0x81F3, 0x4EE5, 0x0035, 0x006B, 0x006D, 0x002F, 0x0068, + 0x6C14, 0x538B, 0x4F20, 0x611F, 0x5668, 0x8054, 0x552E, 0x540E, + 0x5E72, 0x71E5, 0x78C1, 0x9600, 0x5361, 0x6EDE, 0x54CD, 0x5E94, + 0x9632, 0x62B1, 0x6B7B, 0x8D85, 0x6CB9, 0x6CF5, 0x6D4B, 0x8BD5, + 0x6FC0, 0x6D3B, 0x62C9, 0x624B, 0x707E, 0x62A5, 0x7ACB, 0x5373, + 0x8FDC, 0x79BB +}; + +/* 索引数组，每个以0结尾 */ +const unsigned int str_cannot_auto_drive_idx[] = { 0, 1, 2, 3, 4, 5, 6, 7, 0 }; +const unsigned int str_take_over_vehicle_idx[] = { 8, 9, 10, 6, 7, 11, 12, 0 }; +const unsigned int str_driver_not_take_over_stopping_idx[] = { 6, 7, 13, 14, 9, 10, 11, 12, 15, 16, 11, 17, 0 }; +const unsigned int str_auto_drive_sys_fault_idx[] = { 4, 5, 6, 7, 18, 19, 20, 21, 0 }; +const unsigned int str_charging_do_not_start_idx[] = { 22, 23, 17, 15, 8, 24, 25, 5, 11, 12, 0 }; +const unsigned int str_battery_swap_unlocked_do_not_operate_idx[] = { 26, 23, 27, 28, 14, 29, 30, 15, 8, 24, 31, 32, 11, 12, 0 }; +const unsigned int str_deceleration_warning_brake_idx[] = { 33, 34, 35, 36, 15, 8, 37, 5, 0 }; +const unsigned int str_collision_warning_brake_idx[] = { 38, 39, 35, 36, 15, 8, 37, 5, 0 }; +const unsigned int str_energy_recovery_off_idx[] = { 40, 41, 42, 43, 44, 45, 0 }; +const unsigned int str_battery_preheating_drive_safe_idx[] = { 23, 46, 35, 47, 17, 15, 8, 48, 49, 3, 11, 0 }; +const unsigned int str_battery_preheating_drive_slow_idx[] = { 23, 46, 35, 47, 17, 15, 8, 50, 34, 51, 3, 0 }; +const unsigned int str_battery_temp_low_wait_heat_no_drive_idx[] = { 23, 46, 52, 53, 54, 15, 8, 55, 56, 57, 47, 15, 58, 59, 60, 3, 11, 0 }; +const unsigned int str_shift_N_then_ignite_idx[] = { 8, 61, 62, 63, 64, 65, 66, 0 }; +const unsigned int str_coast_recovery_level1_idx[] = { 67, 3, 40, 41, 42, 43, 68, 69, 70, 0 }; +const unsigned int str_transmission_self_learning_keep_N_idx[] = { 71, 34, 72, 18, 19, 4, 73, 74, 17, 15, 8, 75, 76, 62, 77, 0 }; +const unsigned int str_transmission_self_learning_done_restart_idx[] = { 71, 34, 72, 18, 19, 4, 73, 74, 78, 79, 15, 8, 80, 25, 11, 12, 0 }; +const unsigned int str_transmission_self_learning_fail_restart_idx[] = { 71, 34, 72, 18, 19, 4, 73, 74, 81, 82, 15, 8, 80, 25, 11, 12, 0 }; +const unsigned int str_motor_brake_limit_reached_idx[] = { 83, 37, 5, 84, 85, 86, 87, 0 }; +const unsigned int str_speed_downhill_on_idx[] = { 88, 34, 89, 90, 91, 92, 84, 93, 25, 0 }; +const unsigned int str_multi_gear_shift_fail_brake_takeover_idx[] = { 94, 70, 95, 63, 96, 97, 91, 92, 81, 101, 15, 8, 98, 37, 5, 99, 100, 9, 10, 0 }; +const unsigned int str_speed_downhill_off_idx[] = { 88, 34, 89, 90, 91, 92, 84, 44, 45, 0 }; +const unsigned int str_vehicle_slip_use_diff_lock_idx[] = { 11, 12, 102, 103, 104, 67, 15, 8, 105, 106, 106, 34, 29, 0 }; /* 注意“差速锁”中“差”“速”“锁” */ +const unsigned int str_inspection_switch_on_4th_gear_fixed_idx[] = { 107, 108, 93, 44, 93, 25, 15, 109, 110, 77, 111, 88, 0 }; +const unsigned int str_brake_then_start_idx[] = { 8, 98, 112, 11, 64, 25, 5, 11, 12, 0 }; +const unsigned int str_brake_then_shift_idx[] = { 8, 98, 112, 11, 64, 61, 63, 0 }; +const unsigned int str_speed_too_high_cannot_lock_slow_to_5kmh_idx[] = { 11, 34, 107, 113, 60, 1, 61, 29, 15, 8, 33, 34, 114, 116, 117, 118, 119, 120, 115, 89, 0 }; +const unsigned int str_air_pressure_sensor_fault_contact_service_idx[] = { 121, 122, 123, 124, 125, 20, 21, 15, 8, 126, 18, 127, 128, 0 }; +const unsigned int str_dryer_valve_stuck_contact_service_idx[] = { 129, 130, 125, 23, 131, 132, 133, 134, 15, 8, 126, 18, 127, 128, 0 }; +const unsigned int str_dryer_valve_no_response_contact_service_idx[] = { 129, 130, 125, 23, 131, 132, 60, 135, 136, 15, 8, 126, 18, 127, 128, 0 }; +const unsigned int str_battery_sys_limit_recovery_contact_service_idx[] = { 23, 46, 18, 19, 84, 87, 37, 42, 43, 15, 8, 126, 18, 127, 128, 0 }; +const unsigned int str_motor_sys_limit_recovery_contact_service_idx[] = { 83, 18, 19, 84, 87, 37, 42, 43, 15, 8, 126, 18, 127, 128, 0 }; +const unsigned int str_transmission_sys_limit_recovery_contact_service_idx[] = { 71, 34, 72, 18, 19, 84, 87, 37, 42, 43, 15, 8, 126, 18, 127, 128, 0 }; +const unsigned int str_abs_limit_recovery_contact_service_idx[] = { 137, 138, 139, 18, 19, 84, 87, 37, 42, 43, 15, 8, 126, 18, 127, 128, 0 }; +const unsigned int str_motor_overspeed_brake_idx[] = { 83, 140, 34, 15, 8, 112, 11, 33, 34, 0 }; +const unsigned int str_low_pressure_fuel_pump_test_active_idx[] = { 54, 122, 141, 142, 143, 144, 91, 92, 84, 145, 146, 0 }; +const unsigned int str_charge_pull_handbrake_idx[] = { 22, 23, 8, 147, 148, 112, 0 }; +const unsigned int str_battery_fire_alarm_stop_and_evacuate_idx[] = { 23, 46, 149, 150, 36, 15, 8, 151, 152, 16, 11, 128, 153, 154, 11, 12, 0 }; \ No newline at end of file diff --git a/clusterApp/src/InsRender/Res_TxtHintAlarm.h b/clusterApp/src/InsRender/Res_TxtHintAlarm.h index 016d45b..66f3072 100644 --- a/clusterApp/src/InsRender/Res_TxtHintAlarm.h +++ b/clusterApp/src/InsRender/Res_TxtHintAlarm.h @@ -483,4 +483,49 @@ extern const unsigned int str_module_phone_unknown_idx[]; #define HintAlarm_MAX_STRING_LEN 20 +/* SANY ALARM */ +extern const unsigned int HintAlarm_FONT_CODE_SANY[]; +#define HintAlarm_FONT_CODE_SANY_SIZE 154 + +/* 字符串索引数组声明 */ +extern const unsigned int str_cannot_auto_drive_idx[]; +extern const unsigned int str_take_over_vehicle_idx[]; +extern const unsigned int str_driver_not_take_over_stopping_idx[]; +extern const unsigned int str_auto_drive_sys_fault_idx[]; +extern const unsigned int str_charging_do_not_start_idx[]; +extern const unsigned int str_battery_swap_unlocked_do_not_operate_idx[]; +extern const unsigned int str_deceleration_warning_brake_idx[]; +extern const unsigned int str_collision_warning_brake_idx[]; +extern const unsigned int str_energy_recovery_off_idx[]; +extern const unsigned int str_battery_preheating_drive_safe_idx[]; +extern const unsigned int str_battery_preheating_drive_slow_idx[]; +extern const unsigned int str_battery_temp_low_wait_heat_no_drive_idx[]; +extern const unsigned int str_shift_N_then_ignite_idx[]; +extern const unsigned int str_coast_recovery_level1_idx[]; +extern const unsigned int str_transmission_self_learning_keep_N_idx[]; +extern const unsigned int str_transmission_self_learning_done_restart_idx[]; +extern const unsigned int str_transmission_self_learning_fail_restart_idx[]; +extern const unsigned int str_motor_brake_limit_reached_idx[]; +extern const unsigned int str_speed_downhill_on_idx[]; +extern const unsigned int str_multi_gear_shift_fail_brake_takeover_idx[]; +extern const unsigned int str_speed_downhill_off_idx[]; +extern const unsigned int str_vehicle_slip_use_diff_lock_idx[]; +extern const unsigned int str_inspection_switch_on_4th_gear_fixed_idx[]; +extern const unsigned int str_brake_then_start_idx[]; +extern const unsigned int str_brake_then_shift_idx[]; +extern const unsigned int str_speed_too_high_cannot_lock_slow_to_5kmh_idx[]; +extern const unsigned int str_air_pressure_sensor_fault_contact_service_idx[]; +extern const unsigned int str_dryer_valve_stuck_contact_service_idx[]; +extern const unsigned int str_dryer_valve_no_response_contact_service_idx[]; +extern const unsigned int str_battery_sys_limit_recovery_contact_service_idx[]; +extern const unsigned int str_motor_sys_limit_recovery_contact_service_idx[]; +extern const unsigned int str_transmission_sys_limit_recovery_contact_service_idx[]; +extern const unsigned int str_abs_limit_recovery_contact_service_idx[]; +extern const unsigned int str_motor_overspeed_brake_idx[]; +extern const unsigned int str_low_pressure_fuel_pump_test_active_idx[]; +extern const unsigned int str_low_pressure_fuel_pump_test_active_2_idx[]; +extern const unsigned int str_charge_pull_handbrake_idx[]; +extern const unsigned int str_battery_fire_alarm_stop_and_evacuate_idx[]; + + #endif//___SRC_INSRENDER_RES_TXTHINTALARM_H_INCLUDE_ diff --git a/clusterApp/src/Protocol/MainBoard_IIC.c b/clusterApp/src/Protocol/MainBoard_IIC.c index bb76ba3..ef6fee8 100644 --- a/clusterApp/src/Protocol/MainBoard_IIC.c +++ b/clusterApp/src/Protocol/MainBoard_IIC.c @@ -840,7 +840,7 @@ static inline void Decode_0x0B() RadarDistance = DATA_RADAR_DISTANCE; - VehicleColorCfg = 0; + VehicleColorCfg = DATA_VEHICLE_COLOR_CFG; tmp08 = DATA_ENGCOST_P100M; if(tmp08 != 0xFF && preCost == 0xFF)