Skip to content

I
IVECO_NS216
Commit 18ad91c9 authored by 时昊's avatar 时昊
Browse files
Options

将ESP改成ESC灯,声音,弹窗报警同步更改,逻辑不变,

parent 59dc561a
Show whitespace changes
Inline Side-by-side
Showing with 89 additions and 231 deletions
source/Appliciation/APP/InnerPicIndex.h
View file @ 18ad91c9
...@@ -3648,103 +3648,10 @@ const unsigned char __attribute__((aligned(8))) Alarm_CN_03_X24_Y127[4616] = { ...@@ -3648,103 +3648,10 @@ const unsigned char __attribute__((aligned(8))) Alarm_CN_03_X24_Y127[4616] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, }; 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, };
const unsigned char __attribute__((aligned(8))) Alarm_CN_04_X24_Y139[700] = {
0xBA, 0x02, 0xC0, 0x80, 0x18, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA4, 0xFF, 0x00, 0xDF, 0x00, 0x6F,
0x00, 0x7F, 0x85, 0xFF, 0x00, 0x5F, 0x00, 0x4F, 0x00, 0xCF, 0x84, 0xFF, 0x00, 0x7F, 0x00, 0x8F,
0xFF, 0xFF, 0x81, 0xFF, 0x00, 0x9D, 0x89, 0x09, 0x00, 0x6C, 0x82, 0xFF, 0x00, 0x8F, 0x00, 0x1F,
0x00, 0x09, 0x82, 0x06, 0x00, 0x09, 0x00, 0x2F, 0x00, 0x8F, 0x83, 0xFF, 0x86, 0x09, 0x00, 0x0D,
0x00, 0x2F, 0x00, 0x8F, 0x85, 0xFF, 0x00, 0xC3, 0x00, 0x00, 0x00, 0x3B, 0x83, 0xFF, 0x00, 0x4C,
0x00, 0x00, 0x00, 0x92, 0x84, 0xFF, 0x00, 0xFD, 0x00, 0xD4, 0x00, 0x20, 0x00, 0x08, 0x00, 0x9F,
0x00, 0x96, 0x86, 0x60, 0x00, 0x40, 0x00, 0x00, 0x00, 0x66, 0xF4, 0xFF, 0x00, 0x99, 0x81, 0x00,
0x87, 0xF6, 0x00, 0xF9, 0x81, 0xFF, 0x00, 0x49, 0x00, 0x00, 0x00, 0x40, 0x00, 0xF4, 0x00, 0xF8,
0x00, 0xF9, 0x00, 0xF8, 0x00, 0xD2, 0x00, 0x20, 0x00, 0x00, 0x00, 0x4B, 0x82, 0xFF, 0x81, 0x00,
0x84, 0xF6, 0x00, 0xF2, 0x00, 0x50, 0x00, 0x00, 0x00, 0x18, 0x82, 0xFF, 0x00, 0x3B, 0x81, 0x09,
0x00, 0x03, 0x00, 0x04, 0x82, 0x09, 0x00, 0x08, 0x00, 0x00, 0x00, 0x02, 0x81, 0x09, 0x00, 0x3B,
0x82, 0xFF, 0x00, 0x8F, 0x00, 0x3F, 0x00, 0xBC, 0x00, 0xF7, 0x84, 0xFF, 0x00, 0x06, 0x00, 0x38,
0x81, 0xFF, 0x00, 0x99, 0x00, 0x00, 0x00, 0x66, 0xF4, 0xFF, 0x00, 0x99, 0x81, 0x00, 0x8A, 0xFF,
0x00, 0x33, 0x00, 0x00, 0x00, 0x49, 0x00, 0xDF, 0x83, 0xFF, 0x00, 0xD8, 0x00, 0xC0, 0x00, 0xF2,
0x82, 0xFF, 0x81, 0x00, 0x86, 0xFF, 0x81, 0x00, 0x00, 0x99, 0x81, 0xFF, 0x00, 0xF8, 0x84, 0xF6,
0x81, 0x00, 0x84, 0xF6, 0x00, 0xF8, 0x82, 0xFF, 0x00, 0x66, 0x00, 0x00, 0x00, 0x99, 0x00, 0x6F,
0x84, 0x0F, 0x00, 0x00, 0x00, 0x03, 0x81, 0x0F, 0x00, 0x99, 0x00, 0x00, 0x00, 0x66, 0xF4, 0xFF,
0x00, 0x99, 0x81, 0x00, 0x87, 0x0F, 0x82, 0xFF, 0x00, 0xF8, 0x00, 0x90, 0x00, 0x30, 0x00, 0x02,
0x00, 0x05, 0x00, 0x09, 0x00, 0x0F, 0x00, 0x3F, 0x00, 0x8F, 0x00, 0xDF, 0x83, 0xFF, 0x81, 0x00,
0x84, 0x9F, 0x00, 0x5F, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0xFC, 0x00, 0xFF, 0x86, 0x3F,
0x81, 0x00, 0x85, 0x3F, 0x00, 0x5F, 0x81, 0xFF, 0x00, 0x66, 0x00, 0x00, 0x00, 0x99, 0x00, 0xF9,
0x82, 0xF6, 0x00, 0x35, 0x81, 0x00, 0x00, 0x32, 0x81, 0xF6, 0x00, 0x99, 0x00, 0x00, 0x00, 0x66,
0xF4, 0xFF, 0x00, 0x99, 0x81, 0x00, 0x87, 0xF6, 0x85, 0xFF, 0x00, 0xFC, 0x00, 0xF7, 0x00, 0xF4,
0x00, 0xF2, 0x00, 0x90, 0x00, 0x20, 0x00, 0x02, 0x00, 0x1B, 0x00, 0xDF, 0x81, 0xFF, 0x81, 0x00,
0x84, 0x60, 0x00, 0x80, 0x00, 0xB0, 0x00, 0xF3, 0x00, 0xFD, 0x81, 0xFF, 0x85, 0xF0, 0x00, 0x40,
0x81, 0x00, 0x00, 0x40, 0x84, 0xF0, 0x00, 0xF3, 0x81, 0xFF, 0x00, 0x66, 0x00, 0x00, 0x00, 0x99,
0x00, 0xFF, 0x00, 0xDF, 0x00, 0x3F, 0x00, 0x04, 0x00, 0x40, 0x00, 0xF7, 0x00, 0x00, 0x00, 0x33,
0x81, 0xFF, 0x00, 0x99, 0x00, 0x00, 0x00, 0x66, 0xF4, 0xFF, 0x00, 0x99, 0x81, 0x00, 0x89, 0xFF,
0x00, 0x8C, 0x00, 0x07, 0x00, 0x15, 0x00, 0xDF, 0x84, 0xFF, 0x00, 0xFD, 0x00, 0x21, 0x00, 0x00,
0x00, 0x99, 0x81, 0xFF, 0x81, 0x00, 0x8E, 0xFF, 0x00, 0x9F, 0x00, 0x1B, 0x00, 0x00, 0x00, 0x60,
0x00, 0xD4, 0x00, 0x20, 0x00, 0x07, 0x00, 0x7F, 0x85, 0xFF, 0x00, 0x66, 0x00, 0x00, 0x00, 0x89,
0x00, 0x28, 0x00, 0x21, 0x00, 0x90, 0x00, 0xF6, 0x81, 0xFF, 0x00, 0x00, 0x00, 0x33, 0x81, 0xFF,
0x00, 0x99, 0x00, 0x00, 0x00, 0x66, 0xF4, 0xFF, 0x00, 0x99, 0x81, 0x00, 0x87, 0x6F, 0x00, 0x8F,
0x00, 0xFF, 0x00, 0xFD, 0x00, 0x81, 0x00, 0x00, 0x00, 0x04, 0x00, 0x4F, 0x00, 0x8F, 0x81, 0x9F,
0x00, 0x5F, 0x00, 0x19, 0x00, 0x00, 0x00, 0x50, 0x00, 0xFC, 0x81, 0xFF, 0x81, 0x00, 0x8A, 0xFF,
0x00, 0xBF, 0x00, 0x5F, 0x00, 0x1D, 0x00, 0x06, 0x00, 0x10, 0x00, 0x70, 0x00, 0xF4, 0x81, 0xFF,
0x00, 0xFB, 0x00, 0xC1, 0x00, 0x20, 0x00, 0x03, 0x00, 0x0C, 0x00, 0x4F, 0x00, 0x8F, 0x00, 0xDF,
0x00, 0xFF, 0x00, 0x66, 0x00, 0x00, 0x00, 0x99, 0x00, 0xFC, 0x00, 0xFD, 0x00, 0xFF, 0x00, 0x88,
0x81, 0x06, 0x00, 0x20, 0x00, 0x93, 0x81, 0xFF, 0x00, 0x99, 0x00, 0x00, 0x00, 0x66, 0xF4, 0xFF,
0x00, 0xD9, 0x89, 0x90, 0x00, 0xB3, 0x82, 0xFF, 0x00, 0xF8, 0x00, 0xF2, 0x00, 0xB0, 0x83, 0x90,
0x00, 0xF1, 0x00, 0xF6, 0x83, 0xFF, 0x81, 0x90, 0x89, 0xFF, 0x00, 0xFD, 0x00, 0xB2, 0x00, 0x80,
0x00, 0xD1, 0x00, 0xF5, 0x00, 0xFD, 0x86, 0xFF, 0x00, 0xF6, 0x00, 0xF1, 0x00, 0x80, 0x00, 0xC3,
0x81, 0xFF, 0x00, 0x96, 0x00, 0x60, 0x00, 0xC9, 0x87, 0xFF, 0x00, 0xFC, 0x81, 0x60, 0x00, 0x80,
0x00, 0xF8, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xBA, 0xFF, 0x00, 0x00, };
const unsigned char __attribute__((aligned(8))) Alarm_CN_05_X24_Y139[772] = {
0x02, 0x03, 0xC0, 0x80, 0x18, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xA2, 0xFF, 0x00, 0xDF, 0x00, 0xBF,
0x83, 0xFF, 0x00, 0x4F, 0x00, 0x6F, 0x82, 0xFF, 0x00, 0x7F, 0x00, 0x4F, 0x85, 0xFF, 0x00, 0x9F,
0x00, 0xDF, 0x88, 0xFF, 0x00, 0xBF, 0x00, 0x7F, 0x00, 0x9F, 0xF5, 0xFF, 0x00, 0x9D, 0x89, 0x09,
0x00, 0x6C, 0x82, 0xFF, 0x00, 0x8F, 0x00, 0x1F, 0x00, 0x09, 0x82, 0x06, 0x00, 0x09, 0x00, 0x2F,
0x00, 0x8F, 0x83, 0xFF, 0x86, 0x09, 0x00, 0x0D, 0x00, 0x2F, 0x00, 0x8F, 0x82, 0xFF, 0x00, 0xF4,
0x00, 0x40, 0x00, 0x08, 0x00, 0x8F, 0x81, 0x0F, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0F, 0x00, 0x3F,
0x00, 0xFF, 0x00, 0x23, 0x00, 0x63, 0x84, 0xFF, 0x00, 0xF9, 0x00, 0x90, 0x00, 0x21, 0x00, 0x07,
0x00, 0x4F, 0x00, 0x9F, 0x00, 0x0B, 0x00, 0x09, 0x00, 0x07, 0x00, 0x06, 0x00, 0x03, 0x00, 0x21,
0x00, 0x70, 0x00, 0xB0, 0x00, 0xF2, 0x00, 0xFD, 0xF4, 0xFF, 0x00, 0x99, 0x81, 0x00, 0x87, 0xF6,
0x00, 0xF9, 0x81, 0xFF, 0x00, 0x49, 0x00, 0x00, 0x00, 0x40, 0x00, 0xF4, 0x00, 0xF8, 0x00, 0xF9,
0x00, 0xF8, 0x00, 0xD2, 0x00, 0x20, 0x00, 0x00, 0x00, 0x4B, 0x82, 0xFF, 0x81, 0x00, 0x84, 0xF6,
0x00, 0xF2, 0x00, 0x50, 0x00, 0x00, 0x00, 0x18, 0x83, 0xFF, 0x00, 0xF6, 0x00, 0xFD, 0x00, 0x00,
0x00, 0x34, 0x81, 0x69, 0x00, 0x22, 0x00, 0x33, 0x00, 0x8D, 0x00, 0x00, 0x00, 0x03, 0x82, 0x06,
0x00, 0x9C, 0x83, 0xFF, 0x00, 0xF7, 0x00, 0xFD, 0x00, 0xFF, 0x00, 0xF8, 0x00, 0xF9, 0x00, 0xFC,
0x00, 0xFF, 0x00, 0x00, 0x00, 0x66, 0xF8, 0xFF, 0x00, 0x99, 0x81, 0x00, 0x8A, 0xFF, 0x00, 0x33,
0x00, 0x00, 0x00, 0x49, 0x00, 0xDF, 0x83, 0xFF, 0x00, 0xD8, 0x00, 0xC0, 0x00, 0xF2, 0x82, 0xFF,
0x81, 0x00, 0x86, 0xFF, 0x81, 0x00, 0x00, 0x99, 0x00, 0xBF, 0x00, 0x09, 0x00, 0x2F, 0x00, 0xDF,
0x00, 0xFF, 0x00, 0x00, 0x00, 0x62, 0x81, 0xF3, 0x00, 0x31, 0x00, 0x23, 0x00, 0x14, 0x00, 0x02,
0x00, 0xFF, 0x00, 0xBF, 0x00, 0x00, 0x00, 0x98, 0x00, 0xFF, 0x00, 0xCF, 0x00, 0x18, 0x00, 0x0B,
0x00, 0x3F, 0x00, 0xBF, 0x00, 0x9C, 0x84, 0x06, 0x00, 0x00, 0x00, 0x03, 0x83, 0x06, 0xF4, 0xFF,
0x00, 0x99, 0x81, 0x00, 0x87, 0x0F, 0x82, 0xFF, 0x00, 0xF8, 0x00, 0x90, 0x00, 0x30, 0x00, 0x02,
0x00, 0x05, 0x00, 0x09, 0x00, 0x0F, 0x00, 0x3F, 0x00, 0x8F, 0x00, 0xDF, 0x83, 0xFF, 0x81, 0x00,
0x84, 0x9F, 0x00, 0x5F, 0x00, 0x08, 0x00, 0x00, 0x00, 0x30, 0x00, 0xFC, 0x00, 0xFF, 0x00, 0xF8,
0x00, 0xB1, 0x00, 0x92, 0x00, 0xFF, 0x00, 0x90, 0x00, 0x70, 0x00, 0x00, 0x00, 0x80, 0x00, 0x90,
0x00, 0x80, 0x00, 0x20, 0x00, 0x40, 0x00, 0x8B, 0x00, 0x79, 0x00, 0x10, 0x00, 0xFC, 0x81, 0xFF,
0x00, 0xFD, 0x00, 0xF6, 0x00, 0xB0, 0x00, 0xD4, 0x85, 0xFF, 0x00, 0x00, 0x00, 0x66, 0xF8, 0xFF,
0x00, 0x99, 0x81, 0x00, 0x87, 0xF6, 0x85, 0xFF, 0x00, 0xFC, 0x00, 0xF7, 0x00, 0xF4, 0x00, 0xF2,
0x00, 0x90, 0x00, 0x20, 0x00, 0x02, 0x00, 0x1B, 0x00, 0xDF, 0x81, 0xFF, 0x81, 0x00, 0x84, 0x60,
0x00, 0x80, 0x00, 0xB0, 0x00, 0xF3, 0x00, 0xFD, 0x83, 0xFF, 0x00, 0x8F, 0x00, 0x58, 0x00, 0x36,
0x00, 0x05, 0x00, 0x20, 0x00, 0x33, 0x81, 0x36, 0x00, 0xFD, 0x00, 0x96, 0x00, 0x25, 0x00, 0x14,
0x00, 0x63, 0x84, 0xFF, 0x00, 0xDF, 0x00, 0x2D, 0x00, 0x8F, 0x00, 0xFF, 0x83, 0x09, 0x00, 0x00,
0x00, 0x04, 0x82, 0x09, 0xF5, 0xFF, 0x00, 0x99, 0x81, 0x00, 0x89, 0xFF, 0x00, 0x8C, 0x00, 0x07,
0x00, 0x15, 0x00, 0xDF, 0x84, 0xFF, 0x00, 0xFD, 0x00, 0x21, 0x00, 0x00, 0x00, 0x99, 0x81, 0xFF,
0x81, 0x00, 0x8B, 0xFF, 0x00, 0x48, 0x00, 0x20, 0x00, 0xFB, 0x00, 0xCF, 0x00, 0x00, 0x00, 0x04,
0x81, 0x09, 0x00, 0x6C, 0x81, 0xFF, 0x00, 0x41, 0x00, 0x00, 0x00, 0xF9, 0x83, 0xFF, 0x00, 0xCF,
0x00, 0x16, 0x00, 0x20, 0x00, 0xF8, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x64, 0x84, 0xF9, 0x00, 0x64,
0x00, 0x00, 0xF5, 0xFF, 0x00, 0x99, 0x81, 0x00, 0x87, 0x6F, 0x00, 0x8F, 0x00, 0xFF, 0x00, 0xFD,
0x00, 0x81, 0x00, 0x00, 0x00, 0x04, 0x00, 0x4F, 0x00, 0x8F, 0x81, 0x9F, 0x00, 0x5F, 0x00, 0x19,
0x00, 0x00, 0x00, 0x50, 0x00, 0xFC, 0x81, 0xFF, 0x81, 0x00, 0x8A, 0xFF, 0x00, 0x4C, 0x00, 0x10,
0x00, 0xD7, 0x00, 0xDF, 0x00, 0x18, 0x00, 0x30, 0x00, 0xFB, 0x00, 0xCF, 0x00, 0x00, 0x00, 0x96,
0x00, 0xFF, 0x00, 0x4D, 0x00, 0x11, 0x00, 0x30, 0x00, 0x07, 0x00, 0xBF, 0x81, 0xFF, 0x00, 0x8F,
0x00, 0x04, 0x00, 0x30, 0x00, 0xF9, 0x81, 0xFF, 0x00, 0x00, 0x00, 0x36, 0x84, 0x6F, 0x00, 0x36,
0x00, 0x00, 0xF5, 0xFF, 0x00, 0xD9, 0x89, 0x90, 0x00, 0xB3, 0x82, 0xFF, 0x00, 0xF8, 0x00, 0xF2,
0x00, 0xB0, 0x83, 0x90, 0x00, 0xF1, 0x00, 0xF6, 0x83, 0xFF, 0x81, 0x90, 0x89, 0xFF, 0x00, 0xFD,
0x00, 0xC1, 0x00, 0xC4, 0x00, 0xFB, 0x00, 0x52, 0x00, 0xB1, 0x00, 0xFC, 0x00, 0x84, 0x00, 0x62,
0x00, 0x90, 0x00, 0xCC, 0x00, 0x24, 0x00, 0x80, 0x00, 0xF8, 0x00, 0xFD, 0x00, 0xB1, 0x00, 0x31,
0x00, 0xD9, 0x00, 0xFF, 0x00, 0xF4, 0x00, 0x90, 0x00, 0xFC, 0x82, 0xFF, 0x00, 0x30, 0x00, 0x80,
0x84, 0xF0, 0x00, 0x80, 0x00, 0x30, 0xFF, 0xFF, 0xA8, 0xFF, 0x00, 0xFD, 0xFF, 0xFF, 0xFF, 0xFF,
0x91, 0xFF, 0x00, 0x00, };
const unsigned char __attribute__((aligned(8))) Alarm_CN_06_X24_Y139[2312] = { const unsigned char __attribute__((aligned(8))) Alarm_CN_06_X24_Y139[2312] = {
...@@ -5453,54 +5360,7 @@ const unsigned char __attribute__((aligned(8))) Alarm_CN_08_1_X39_Y172[1288] = ...@@ -5453,54 +5360,7 @@ const unsigned char __attribute__((aligned(8))) Alarm_CN_08_1_X39_Y172[1288] =
0x00, 0xF3, 0x00, 0xF8, 0xFF, 0xFF, 0xBF, 0xFF, }; 0x00, 0xF3, 0x00, 0xF8, 0xFF, 0xFF, 0xBF, 0xFF, };
const unsigned char __attribute__((aligned(8))) Alarm_CN_09_1_X39_Y172[748] = {
0xEA, 0x02, 0xA1, 0x80, 0x18, 0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xEC, 0xFF, 0x00, 0xDF, 0x89, 0x9F,
0x00, 0xCF, 0x84, 0xFF, 0x00, 0x9F, 0x82, 0x6F, 0x00, 0x9F, 0x85, 0xFF, 0x86, 0x9F, 0x00, 0xDF,
0x87, 0xFF, 0x00, 0x00, 0x00, 0x33, 0x83, 0xFF, 0x00, 0x26, 0x00, 0x15, 0x00, 0xFD, 0x85, 0xFF,
0x00, 0x3B, 0x83, 0x09, 0x00, 0x3D, 0x00, 0x8F, 0x81, 0x6F, 0x00, 0x49, 0x00, 0x02, 0x00, 0x39,
0x82, 0x6F, 0x00, 0x9F, 0xD5, 0xFF, 0x00, 0x99, 0x81, 0x00, 0x87, 0x60, 0x00, 0x96, 0x81, 0xFF,
0x00, 0x9F, 0x00, 0x08, 0x00, 0x01, 0x00, 0x40, 0x00, 0x80, 0x00, 0x90, 0x00, 0x80, 0x00, 0x20,
0x00, 0x02, 0x00, 0x08, 0x00, 0xBF, 0x82, 0xFF, 0x81, 0x00, 0x84, 0x60, 0x00, 0x20, 0x00, 0x02,
0x00, 0x08, 0x00, 0x8F, 0x00, 0xFF, 0x00, 0xCF, 0x82, 0x6F, 0x00, 0x00, 0x00, 0x23, 0x81, 0x6F,
0x00, 0x8F, 0x00, 0x8D, 0x00, 0x00, 0x00, 0x34, 0x84, 0x6F, 0x00, 0xCF, 0x00, 0xFF, 0x00, 0x33,
0x00, 0x32, 0x00, 0xF9, 0x00, 0x88, 0x00, 0x00, 0x00, 0xC6, 0x00, 0xF5, 0x00, 0xC3, 0x00, 0x01,
0x00, 0x82, 0x81, 0xF3, 0x00, 0x22, 0x00, 0x12, 0x00, 0xD3, 0x00, 0xF8, 0xD5, 0xFF, 0x00, 0x99,
0x81, 0x00, 0x8A, 0xFF, 0x00, 0x34, 0x00, 0x00, 0x00, 0x94, 0x83, 0xFF, 0x00, 0xFD, 0x00, 0x82,
0x00, 0x00, 0x00, 0x24, 0x82, 0xFF, 0x81, 0x00, 0x85, 0xFF, 0x00, 0xF5, 0x00, 0x00, 0x00, 0x01,
0x00, 0x9F, 0x00, 0xF9, 0x82, 0xF0, 0x00, 0x00, 0x00, 0x30, 0x81, 0xF0, 0x00, 0xC3, 0x00, 0x04,
0x00, 0x00, 0x82, 0xF0, 0x81, 0x20, 0x00, 0xF0, 0x00, 0xF9, 0x00, 0xFF, 0x81, 0x33, 0x00, 0xCF,
0x00, 0x03, 0x00, 0x82, 0x00, 0x98, 0x81, 0x63, 0x00, 0x60, 0x00, 0x62, 0x81, 0x63, 0x00, 0x60,
0x00, 0x61, 0x81, 0x63, 0xD5, 0xFF, 0x00, 0x99, 0x81, 0x00, 0x8A, 0xFF, 0x00, 0x83, 0x00, 0x00,
0x00, 0x04, 0x00, 0x2D, 0x00, 0x5F, 0x00, 0x9F, 0x81, 0xFF, 0x00, 0xFD, 0x00, 0xFC, 0x83, 0xFF,
0x81, 0x00, 0x85, 0xFF, 0x00, 0x8F, 0x81, 0x00, 0x00, 0xC9, 0x83, 0xFF, 0x00, 0x00, 0x00, 0x33,
0x00, 0xFF, 0x00, 0x9F, 0x00, 0x04, 0x00, 0x20, 0x00, 0x00, 0x00, 0x7B, 0x00, 0xFF, 0x00, 0x9F,
0x00, 0x00, 0x00, 0x84, 0x82, 0xFF, 0x81, 0x33, 0x00, 0xFB, 0x00, 0x81, 0x00, 0x05, 0x00, 0xCF,
0x00, 0x9C, 0x00, 0x06, 0x00, 0x46, 0x83, 0x66, 0x00, 0x36, 0x00, 0x06, 0xD6, 0xFF, 0x00, 0x99,
0x81, 0x00, 0x87, 0x60, 0x83, 0xFF, 0x00, 0xF9, 0x00, 0xF3, 0x00, 0xC0, 0x00, 0x70, 0x00, 0x40,
0x00, 0x20, 0x00, 0x03, 0x00, 0x08, 0x00, 0x2D, 0x00, 0xBF, 0x82, 0xFF, 0x81, 0x00, 0x84, 0x09,
0x00, 0x05, 0x00, 0x00, 0x00, 0x30, 0x00, 0xD3, 0x81, 0xFF, 0x00, 0x68, 0x00, 0x03, 0x00, 0x33,
0x00, 0x30, 0x00, 0x31, 0x00, 0x23, 0x00, 0x02, 0x00, 0xF2, 0x00, 0xFB, 0x00, 0x52, 0x00, 0x02,
0x00, 0xCF, 0x00, 0x15, 0x00, 0x20, 0x00, 0xFC, 0x82, 0xFF, 0x81, 0x33, 0x81, 0xFF, 0x00, 0x31,
0x00, 0x36, 0x00, 0x99, 0x00, 0x00, 0x00, 0x47, 0x83, 0x69, 0x00, 0x34, 0x00, 0x00, 0xD6, 0xFF,
0x00, 0x99, 0x81, 0x00, 0x89, 0xFF, 0x00, 0xCF, 0x00, 0x7F, 0x00, 0x5F, 0x84, 0xFF, 0x00, 0xF9,
0x00, 0xD2, 0x00, 0x10, 0x00, 0x01, 0x00, 0x9D, 0x81, 0xFF, 0x81, 0x00, 0x84, 0xF6, 0x00, 0xF8,
0x00, 0xFB, 0x83, 0xFF, 0x00, 0x66, 0x00, 0x00, 0x82, 0xFF, 0x00, 0x66, 0x00, 0x00, 0x81, 0xFF,
0x00, 0xFC, 0x00, 0x40, 0x00, 0x02, 0x00, 0x20, 0x00, 0xF8, 0x83, 0xFF, 0x81, 0x33, 0x00, 0x5F,
0x00, 0x0D, 0x00, 0x02, 0x00, 0x84, 0x00, 0xB9, 0x00, 0x30, 0x00, 0x37, 0x00, 0x39, 0x00, 0x09,
0x00, 0x19, 0x00, 0x39, 0x00, 0x34, 0x00, 0x30, 0xD6, 0xFF, 0x00, 0x99, 0x81, 0x00, 0x89, 0xFF,
0x00, 0xD8, 0x00, 0x10, 0x00, 0x01, 0x00, 0x4D, 0x84, 0xFF, 0x00, 0x9F, 0x00, 0x02, 0x00, 0x00,
0x00, 0xC9, 0x81, 0xFF, 0x81, 0x00, 0x8A, 0xFF, 0x00, 0x66, 0x00, 0x00, 0x82, 0x3F, 0x00, 0x26,
0x00, 0x00, 0x00, 0xFF, 0x00, 0xDF, 0x00, 0x2D, 0x00, 0x02, 0x00, 0x20, 0x00, 0x02, 0x00, 0x3D,
0x00, 0xDF, 0x82, 0xFF, 0x81, 0x33, 0x00, 0xFC, 0x00, 0xF9, 0x00, 0xFC, 0x00, 0x6F, 0x83, 0x0F,
0x00, 0x00, 0x00, 0x03, 0x83, 0x0F, 0x00, 0x9F, 0xD4, 0xFF, 0x00, 0x99, 0x81, 0x00, 0x87, 0x06,
0x00, 0x38, 0x81, 0xFF, 0x00, 0xF8, 0x00, 0x80, 0x00, 0x20, 0x00, 0x04, 0x00, 0x08, 0x81, 0x09,
0x00, 0x05, 0x00, 0x11, 0x00, 0x60, 0x00, 0xF5, 0x82, 0xFF, 0x81, 0x00, 0x8A, 0xFF, 0x00, 0x66,
0x00, 0x00, 0x83, 0xF3, 0x00, 0x53, 0x00, 0x07, 0x00, 0x11, 0x00, 0x80, 0x00, 0xF5, 0x00, 0xFF,
0x00, 0xF4, 0x00, 0x40, 0x00, 0x02, 0x00, 0x19, 0x00, 0xCF, 0x00, 0xFF, 0x81, 0x33, 0x82, 0xFF,
0x00, 0xFC, 0x83, 0xF9, 0x00, 0x00, 0x00, 0x32, 0x83, 0xF9, 0x00, 0xFD, 0xD4, 0xFF, 0x00, 0xFD,
0x89, 0xF9, 0x00, 0xFB, 0x84, 0xFF, 0x00, 0xFB, 0x83, 0xF9, 0x85, 0xFF, 0x81, 0xF9, 0x90, 0xFF,
0x00, 0xFD, 0x00, 0xF6, 0x00, 0xFD, 0x84, 0xFF, 0x00, 0xF9, 0x00, 0xF8, 0x81, 0xFF, 0x81, 0xF5,
0x87, 0xFF, 0x00, 0xF3, 0x00, 0xF5, 0xFF, 0xFF, 0xCF, 0xFF, 0x00, 0x00, };
const unsigned char __attribute__((aligned(8))) Alarm_CN_10_1_X39_Y172[1008] = { const unsigned char __attribute__((aligned(8))) Alarm_CN_10_1_X39_Y172[1008] = {
source/Appliciation/Display/GUI.c
View file @ 18ad91c9
...@@ -855,20 +855,20 @@ void GUI_PopAlarm_Display(INT16U PopupAlarmDis) ...@@ -855,20 +855,20 @@ void GUI_PopAlarm_Display(INT16U PopupAlarmDis)
Draw_Image_Local(( uint8_t * )Alarm_CN_10_3_X39_Y172, 39, 172); Draw_Image_Local(( uint8_t * )Alarm_CN_10_3_X39_Y172, 39, 172);
break; break;
} }
case POP_ALARM_ESP_ATCIVE: case POP_ALARM_ESC_ATCIVE:
{ {
Draw_Image_Local(( uint8_t * )Alarm_CN_05_X24_Y139, 24, 139); //Draw_Image_Local(( uint8_t * )Alarm_CN_05_X24_Y139, 24, 139);
break; break;
} }
case POP_ALARM_ESP_CLOSE: case POP_ALARM_ESC_CLOSE:
{ {
Draw_Image_Local(( uint8_t * )Alarm_CN_04_X24_Y139, 24, 139); //Draw_Image_Local(( uint8_t * )Alarm_CN_04_X24_Y139, 24, 139);
break; break;
} }
case POP_ALARM_ESP_FAILURE: case POP_ALARM_ESC_FAILURE:
{ {
Draw_Image_Local(( uint8_t * )Alarm_ICON_09_X94_Y101, 94, 101); Draw_Image_Local(( uint8_t * )Alarm_ICON_09_X94_Y101, 94, 101);
Draw_Image_Local(( uint8_t * )Alarm_CN_09_1_X39_Y172, 39, 172); //Draw_Image_Local(( uint8_t * )Alarm_CN_09_1_X39_Y172, 39, 172);
break; break;
} }
case POP_ALARM_HILL_HOLD_MALF: case POP_ALARM_HILL_HOLD_MALF:
......
source/Appliciation/Popup_Alarm.h
View file @ 18ad91c9
...@@ -41,9 +41,9 @@ typedef enum ...@@ -41,9 +41,9 @@ typedef enum
POP_ALARM_UREA_LOW_ADD, /* 尿素液位低，请添加尿素*/ POP_ALARM_UREA_LOW_ADD, /* 尿素液位低，请添加尿素*/
POP_ALARM_UREA_FAIL_CHANGE, /* 尿素质量不合格， XX时间之后将限制75 ，请更换尿素*/ POP_ALARM_UREA_FAIL_CHANGE, /* 尿素质量不合格， XX时间之后将限制75 ，请更换尿素*/
POP_ALARM_EMISSION_FAIL_SERVICE, /* 排放系统故障，XX时间之后将限制75 ，请至维修站检查*/ POP_ALARM_EMISSION_FAIL_SERVICE, /* 排放系统故障，XX时间之后将限制75 ，请至维修站检查*/
POP_ALARM_ESP_FAILURE, /* ESP故障 */ POP_ALARM_ESC_FAILURE, /* ESP故障 */
POP_ALARM_ESP_ATCIVE, /* ESP激活 */ POP_ALARM_ESC_ATCIVE, /* ESP激活 */
POP_ALARM_ESP_CLOSE, /* ESP关闭 */ POP_ALARM_ESC_CLOSE, /* ESP关闭 */
POP_ALARM_TPMS_CONFIG_ERROR, /* 胎压配置错误*/ POP_ALARM_TPMS_CONFIG_ERROR, /* 胎压配置错误*/
POP_ALARM_TPMS, /* 胎压异常*/ POP_ALARM_TPMS, /* 胎压异常*/
POP_ALARM_TSAFE_BELT, /* 请系安全带*/ POP_ALARM_TSAFE_BELT, /* 请系安全带*/
......
source/Appliciation/Popup_Alarm_Handle.c
View file @ 18ad91c9
...@@ -90,34 +90,34 @@ void Popups_Alarm_Trigger_POSITION_LIGHT(void) ...@@ -90,34 +90,34 @@ void Popups_Alarm_Trigger_POSITION_LIGHT(void)
} }
} }
Pop_uint8_t u8PopAlarmESPFailure = 0; Pop_uint8_t u8PopAlarmESCFailure = 0;
void Popups_Alarm_Trigger_ESP_FAILURE(void) void Popups_Alarm_Trigger_ESC_FAILURE(void)
{ {
if ( (SYS_OPR_STAT_IGN_ON) && (COF_ESP_EXIST) ) if ( (SYS_OPR_STAT_IGN_ON) && (COF_ESP_EXIST) )
{ {
if ( (Get_CAN_CH0_ID_0A18A006_Sig_AsrFail( ) == 1) || (Get_CAN_CH0_ID_0A18A006_Sig_VdcFail( ) == 1) ) if ( (Get_CAN_CH0_ID_0A18A006_Sig_AsrFail( ) == 1) || (Get_CAN_CH0_ID_0A18A006_Sig_VdcFail( ) == 1) )
{ {
Pop_Alarm_Request_Normal(POP_ALARM_ESP_FAILURE); Pop_Alarm_Request_Normal(POP_ALARM_ESC_FAILURE);
u8PopAlarmESPFailure = 1; u8PopAlarmESCFailure = 1;
} }
else else
{ {
Pop_Alarm_Delete_Normal(POP_ALARM_ESP_FAILURE, POP_DELAY_MIN); Pop_Alarm_Delete_Normal(POP_ALARM_ESC_FAILURE, POP_DELAY_MIN);
u8PopAlarmESPFailure = 0; u8PopAlarmESCFailure = 0;
} }
} }
else else
{ {
Pop_Alarm_Delete_Normal(POP_ALARM_ESP_FAILURE, POP_DELAY_MIN); Pop_Alarm_Delete_Normal(POP_ALARM_ESC_FAILURE, POP_DELAY_MIN);
u8PopAlarmESPFailure = 0; u8PopAlarmESCFailure = 0;
} }
} }
Pop_uint8_t u8PopAlarmESPActive = 0; Pop_uint8_t u8PopAlarmESCActive = 0;
Pop_uint8_t u8PopAlarmESPClose = 0; Pop_uint8_t u8PopAlarmESCClose = 0;
Pop_uint8_t u8PopAlarmBsmBtnSts = 0; Pop_uint8_t u8PopAlarmBsmBtnSts = 0;
/*自检时也需要调用，虽不能触发报警*/ /*自检时也需要调用，虽不能触发报警*/
void Popups_Alarm_Trigger_ESP_ATCIVE_CLOSE(void) void Popups_Alarm_Trigger_ESC_ATCIVE_CLOSE(void)
{ {
if ( (SYS_OPR_STAT_IGN_ON) && (COF_ESP_EXIST) ) if ( (SYS_OPR_STAT_IGN_ON) && (COF_ESP_EXIST) )
{ {
...@@ -129,18 +129,18 @@ void Popups_Alarm_Trigger_ESP_ATCIVE_CLOSE(void) ...@@ -129,18 +129,18 @@ void Popups_Alarm_Trigger_ESP_ATCIVE_CLOSE(void)
{ {
if ( (u8PopAlarmBsmBtnStsBuf == 0) && ((u8PopAlarmBsmBtnSts == 1) || (u8PopAlarmBsmBtnSts == 0xAA)) ) if ( (u8PopAlarmBsmBtnStsBuf == 0) && ((u8PopAlarmBsmBtnSts == 1) || (u8PopAlarmBsmBtnSts == 0xAA)) )
{ {
Pop_Alarm_Delete_Normal(POP_ALARM_ESP_CLOSE, POP_DELAY_MIN); Pop_Alarm_Delete_Normal(POP_ALARM_ESC_CLOSE, POP_DELAY_MIN);
Pop_Alarm_Request_Normal(POP_ALARM_ESP_ATCIVE); Pop_Alarm_Request_Normal(POP_ALARM_ESC_ATCIVE);
u8PopAlarmESPActive = 1; u8PopAlarmESCActive = 1;
u8PopAlarmESPClose = 0; u8PopAlarmESCClose = 0;
} }
if ( (u8PopAlarmBsmBtnStsBuf == 1) && ((u8PopAlarmBsmBtnSts == 0) || (u8PopAlarmBsmBtnSts == 0xAA)) ) if ( (u8PopAlarmBsmBtnStsBuf == 1) && ((u8PopAlarmBsmBtnSts == 0) || (u8PopAlarmBsmBtnSts == 0xAA)) )
{ {
Pop_Alarm_Delete_Normal(POP_ALARM_ESP_ATCIVE, POP_DELAY_MIN); Pop_Alarm_Delete_Normal(POP_ALARM_ESC_ATCIVE, POP_DELAY_MIN);
Pop_Alarm_Request_Normal(POP_ALARM_ESP_CLOSE); Pop_Alarm_Request_Normal(POP_ALARM_ESC_CLOSE);
u8PopAlarmESPActive = 0; u8PopAlarmESCActive = 0;
u8PopAlarmESPClose = 1; u8PopAlarmESCClose = 1;
} }
} }
...@@ -150,18 +150,18 @@ void Popups_Alarm_Trigger_ESP_ATCIVE_CLOSE(void) ...@@ -150,18 +150,18 @@ void Popups_Alarm_Trigger_ESP_ATCIVE_CLOSE(void)
{ {
u8PopAlarmBsmBtnSts = 0xAA; u8PopAlarmBsmBtnSts = 0xAA;
Pop_Alarm_Delete_Normal(POP_ALARM_ESP_CLOSE, POP_DELAY_MIN); Pop_Alarm_Delete_Normal(POP_ALARM_ESC_CLOSE, POP_DELAY_MIN);
Pop_Alarm_Delete_Normal(POP_ALARM_ESP_ATCIVE, POP_DELAY_MIN); Pop_Alarm_Delete_Normal(POP_ALARM_ESC_ATCIVE, POP_DELAY_MIN);
u8PopAlarmESPActive = 0; u8PopAlarmESCActive = 0;
u8PopAlarmESPClose = 0; u8PopAlarmESCClose = 0;
} }
} }
else else
{ {
Pop_Alarm_Delete_Normal(POP_ALARM_ESP_CLOSE, POP_DELAY_MIN); Pop_Alarm_Delete_Normal(POP_ALARM_ESC_CLOSE, POP_DELAY_MIN);
Pop_Alarm_Delete_Normal(POP_ALARM_ESP_ATCIVE, POP_DELAY_MIN); Pop_Alarm_Delete_Normal(POP_ALARM_ESC_ATCIVE, POP_DELAY_MIN);
u8PopAlarmESPActive = 0; u8PopAlarmESCActive = 0;
u8PopAlarmESPClose = 0; u8PopAlarmESCClose = 0;
} }
} }
Pop_uint8_t u8PopAlarmGearBoxHighTemp = 0; Pop_uint8_t u8PopAlarmGearBoxHighTemp = 0;
...@@ -1348,13 +1348,13 @@ void Popups_Alarm_Trigger_Service(void) ...@@ -1348,13 +1348,13 @@ void Popups_Alarm_Trigger_Service(void)
{ {
return; return;
} }
Popups_Alarm_Trigger_ESP_ATCIVE_CLOSE( ); Popups_Alarm_Trigger_ESC_ATCIVE_CLOSE( );
if ( ((Common_GetIgnOnTime( ) <= SELF_CHECK_TIME) && (SYS_OPR_STAT_IGN_ON)) ) if ( ((Common_GetIgnOnTime( ) <= SELF_CHECK_TIME) && (SYS_OPR_STAT_IGN_ON)) )
{ {
return; return;
} }
Popups_Alarm_Trigger_ESP_FAILURE( ); Popups_Alarm_Trigger_ESC_FAILURE( );
Popups_Alarm_Trigger_GEARBOX_HIGH_TEMP( ); Popups_Alarm_Trigger_GEARBOX_HIGH_TEMP( );
Popups_Alarm_Trigger_GEARBOX_CAUTION( ); Popups_Alarm_Trigger_GEARBOX_CAUTION( );
......
source/Appliciation/Popup_Alarm_Handle.h
View file @ 18ad91c9
...@@ -27,9 +27,9 @@ extern Pop_uint8_t u8PopAlarmGearBoxCaution; ...@@ -27,9 +27,9 @@ extern Pop_uint8_t u8PopAlarmGearBoxCaution;
extern Pop_uint8_t u8PopAlarmGearBoxFailure; extern Pop_uint8_t u8PopAlarmGearBoxFailure;
extern Pop_uint8_t u8PopAlarmGearBoxHighTemp; extern Pop_uint8_t u8PopAlarmGearBoxHighTemp;
extern Pop_uint8_t u8PopAlarmTBoxDismantle; extern Pop_uint8_t u8PopAlarmTBoxDismantle;
extern Pop_uint8_t u8PopAlarmESPActive; extern Pop_uint8_t u8PopAlarmESCActive;
extern Pop_uint8_t u8PopAlarmESPClose; extern Pop_uint8_t u8PopAlarmESCClose;
extern Pop_uint8_t u8PopAlarmESPFailure; extern Pop_uint8_t u8PopAlarmESCFailure;
extern Pop_uint8_t u8SafeBeltTrigger; extern Pop_uint8_t u8SafeBeltTrigger;
extern Pop_uint8_t u8PopAlarmKEY; extern Pop_uint8_t u8PopAlarmKEY;
extern Pop_uint8_t u8PopAlarmPositionLight; extern Pop_uint8_t u8PopAlarmPositionLight;
......
source/Appliciation/Popup_Alarm_user.c
View file @ 18ad91c9
...@@ -38,9 +38,9 @@ const Popup_Alarm_Attribute_st_t stPopAlarmAttribute [ POP_ALARM_MAX ] = { ...@@ -38,9 +38,9 @@ const Popup_Alarm_Attribute_st_t stPopAlarmAttribute [ POP_ALARM_MAX ] = {
/*POP_ALARM_UREA_LOW_ADD, */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_UREA_LOW_ADD, POP_ALARM_UREA_LOW_ADD + POP_ALARM_MAX, SOUND_ALARM_UREA}, /*POP_ALARM_UREA_LOW_ADD, */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_UREA_LOW_ADD, POP_ALARM_UREA_LOW_ADD + POP_ALARM_MAX, SOUND_ALARM_UREA},
/*POP_ALARM_UREA_FAIL_CHANGE, */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_UREA_FAIL_CHANGE, POP_ALARM_UREA_FAIL_CHANGE + POP_ALARM_MAX, SOUND_ALARM_UREA}, /*POP_ALARM_UREA_FAIL_CHANGE, */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_UREA_FAIL_CHANGE, POP_ALARM_UREA_FAIL_CHANGE + POP_ALARM_MAX, SOUND_ALARM_UREA},
/*POP_ALARM_EMISSION_FAIL_SERVICE, */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_EMISSION_FAIL_SERVICE, POP_ALARM_EMISSION_FAIL_SERVICE + POP_ALARM_MAX, SOUND_ALARM_UREA}, /*POP_ALARM_EMISSION_FAIL_SERVICE, */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_EMISSION_FAIL_SERVICE, POP_ALARM_EMISSION_FAIL_SERVICE + POP_ALARM_MAX, SOUND_ALARM_UREA},
/* POP_ALARM_ESP_FAILURE */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_ESP_FAILURE, POP_ALARM_ESP_FAILURE + POP_ALARM_MAX, SOUND_ALARM_ESP_FAILURE}, /* POP_ALARM_ESC_FAILURE */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_ESC_FAILURE, POP_ALARM_ESC_FAILURE + POP_ALARM_MAX, SOUND_ALARM_ESC_FAILURE},
/* POP_ALARM_ESP_ATCIVE */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_ESP_ATCIVE, POP_ALARM_ESP_ATCIVE + POP_ALARM_MAX, SOUND_ALARM_ESP_ATCIVE}, /* POP_ALARM_ESC_ATCIVE */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_ESC_ATCIVE, POP_ALARM_ESC_ATCIVE + POP_ALARM_MAX, SOUND_ALARM_ESC_ATCIVE},
/* POP_ALARM_ESP_CLOSE */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_ESP_CLOSE, POP_ALARM_ESP_CLOSE + POP_ALARM_MAX, SOUND_ALARM_ESP_CLOSE}, /* POP_ALARM_ESC_CLOSE */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_ESC_CLOSE, POP_ALARM_ESC_CLOSE + POP_ALARM_MAX, SOUND_ALARM_ESC_CLOSE},
/*POP_ALARM_TPMS_CONFIG_ERROR, */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_TPMS_CONFIG_ERROR, POP_ALARM_TPMS_CONFIG_ERROR + POP_ALARM_MAX, SOUND_ALARM_TPMS_CONFIG_ERROR}, /*POP_ALARM_TPMS_CONFIG_ERROR, */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_TPMS_CONFIG_ERROR, POP_ALARM_TPMS_CONFIG_ERROR + POP_ALARM_MAX, SOUND_ALARM_TPMS_CONFIG_ERROR},
/*POP_ALARM_TPMS, */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_TPMS, POP_ALARM_TPMS + POP_ALARM_MAX, SOUND_ALARM_TPMS}, /*POP_ALARM_TPMS, */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_TPMS, POP_ALARM_TPMS + POP_ALARM_MAX, SOUND_ALARM_TPMS},
/*POP_ALARM_TSAFE_BELT, */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_TSAFE_BELT, POP_ALARM_TSAFE_BELT + POP_ALARM_MAX, 0xFFU}, /*POP_ALARM_TSAFE_BELT, */ {POP_GROUP_0, POP_TYPE_0, POP_ALARM_TSAFE_BELT, POP_ALARM_TSAFE_BELT + POP_ALARM_MAX, 0xFFU},
......
source/Appliciation/Sound_Alarm.h
View file @ 18ad91c9
...@@ -107,9 +107,9 @@ typedef enum ...@@ -107,9 +107,9 @@ typedef enum
SOUND_ALARM_BRAKE_TO_SHIFT, /*请踩制动换挡*/ SOUND_ALARM_BRAKE_TO_SHIFT, /*请踩制动换挡*/
SOUND_ALARM_GEARBOX_CAUTION, /*变速箱警示*/ SOUND_ALARM_GEARBOX_CAUTION, /*变速箱警示*/
SOUND_ALARM_TBOX, /* TBOX被拆除 */ SOUND_ALARM_TBOX, /* TBOX被拆除 */
SOUND_ALARM_ESP_FAILURE, /* ESP故障 */ SOUND_ALARM_ESC_FAILURE, /* ESP故障 */
SOUND_ALARM_ESP_ATCIVE, /* ESP激活 */ SOUND_ALARM_ESC_ATCIVE, /* ESP激活 */
SOUND_ALARM_ESP_CLOSE, /* ESP关闭 */ SOUND_ALARM_ESC_CLOSE, /* ESP关闭 */
SOUND_ALARM_HILL_HOLD_MALF, /* 坡道保持故障 */ SOUND_ALARM_HILL_HOLD_MALF, /* 坡道保持故障 */
SOUND_ALARM_UNPLUGGED_KEY, /*钥匙未拔 OFF */ SOUND_ALARM_UNPLUGGED_KEY, /*钥匙未拔 OFF */
......
source/Appliciation/Sound_Alarm_User.c
View file @ 18ad91c9
...@@ -87,9 +87,9 @@ const Sound_Alarm_Attribute_st_t stSoundAlarmAttribute [ SOUND_ALARM_MAX ] = { ...@@ -87,9 +87,9 @@ const Sound_Alarm_Attribute_st_t stSoundAlarmAttribute [ SOUND_ALARM_MAX ] = {
/*SOUND_ALARM_BRAKE_TO_SHIFT*/ {SOUND_VARIETY_1, 1U, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET}, /*SOUND_ALARM_BRAKE_TO_SHIFT*/ {SOUND_VARIETY_1, 1U, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET},
/*SOUND_ALARM_GEARBOX_CAUTION*/ {SOUND_VARIETY_1, 1U, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET}, /*SOUND_ALARM_GEARBOX_CAUTION*/ {SOUND_VARIETY_1, 1U, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET},
/*SOUND_ALARM_TBOX*/ {SOUND_VARIETY_1, 1U, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET}, /*SOUND_ALARM_TBOX*/ {SOUND_VARIETY_1, 1U, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET},
/*SOUND_ALARM_ESP_FAILURE*/ {SOUND_VARIETY_1, 1U, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET}, /*SOUND_ALARM_ESC_FAILURE*/ {SOUND_VARIETY_1, 1U, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET},
/*SOUND_ALARM_ESP_ATCIVE*/ {SOUND_VARIETY_1, 1U, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET}, /*SOUND_ALARM_ESC_ATCIVE*/ {SOUND_VARIETY_1, 1U, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET},
/*SOUND_ALARM_ESP_CLOSE*/ {SOUND_VARIETY_1, 1U, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET}, /*SOUND_ALARM_ESC_CLOSE*/ {SOUND_VARIETY_1, 1U, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET},
/*SOUND_ALARM_HILL_HOLD_MALF*/ {SOUND_VARIETY_1, 1U, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET}, /*SOUND_ALARM_HILL_HOLD_MALF*/ {SOUND_VARIETY_1, 1U, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET},
/*SOUND_ALARM_UNPLUGGED_KEY*/ {SOUND_VARIETY_2, 0XFFU, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_RECOVER_CONTINUE, SOUND_ALARM_NUM_FINISH_RESET}, /*SOUND_ALARM_UNPLUGGED_KEY*/ {SOUND_VARIETY_2, 0XFFU, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_RECOVER_CONTINUE, SOUND_ALARM_NUM_FINISH_RESET},
......
source/Appliciation/Sound_Alarm_handle.c
View file @ 18ad91c9
...@@ -288,37 +288,37 @@ void Sound_Alarm_Trigger_TBox(void) ...@@ -288,37 +288,37 @@ void Sound_Alarm_Trigger_TBox(void)
Sound_Alarm_Delete_Normal(SOUND_ALARM_GEARBOX_CAUTION); Sound_Alarm_Delete_Normal(SOUND_ALARM_GEARBOX_CAUTION);
} }
} }
if ( u8PopAlarmESPActive ) if ( u8PopAlarmESCActive )
{ {
// Sound_Alarm_Request_Normal(SOUND_ALARM_ESP_ATCIVE); // Sound_Alarm_Request_Normal(SOUND_ALARM_ESC_ATCIVE);
} }
else else
{ {
if ( Sound_Alarm_Current_Read( ) != SOUND_ALARM_ESP_ATCIVE ) if ( Sound_Alarm_Current_Read( ) != SOUND_ALARM_ESC_ATCIVE )
{ {
Sound_Alarm_Delete_Normal(SOUND_ALARM_ESP_ATCIVE); Sound_Alarm_Delete_Normal(SOUND_ALARM_ESC_ATCIVE);
} }
} }
if ( u8PopAlarmESPClose ) if ( u8PopAlarmESCClose )
{ {
// Sound_Alarm_Request_Normal(SOUND_ALARM_ESP_CLOSE); // Sound_Alarm_Request_Normal(SOUND_ALARM_ESC_CLOSE);
} }
else else
{ {
if ( Sound_Alarm_Current_Read( ) != SOUND_ALARM_ESP_CLOSE ) if ( Sound_Alarm_Current_Read( ) != SOUND_ALARM_ESC_CLOSE )
{ {
Sound_Alarm_Delete_Normal(SOUND_ALARM_ESP_CLOSE); Sound_Alarm_Delete_Normal(SOUND_ALARM_ESC_CLOSE);
} }
} }
if ( u8PopAlarmESPFailure ) if ( u8PopAlarmESCFailure )
{ {
// Sound_Alarm_Request_Normal(SOUND_ALARM_ESP_FAILURE); // Sound_Alarm_Request_Normal(SOUND_ALARM_ESC_FAILURE);
} }
else else
{ {
if ( Sound_Alarm_Current_Read( ) != SOUND_ALARM_ESP_FAILURE ) if ( Sound_Alarm_Current_Read( ) != SOUND_ALARM_ESC_FAILURE )
{ {
Sound_Alarm_Delete_Normal(SOUND_ALARM_ESP_FAILURE); Sound_Alarm_Delete_Normal(SOUND_ALARM_ESC_FAILURE);
} }
} }
} }
......
source/Appliciation/Telltales_user.c
View file @ 18ad91c9
...@@ -114,8 +114,8 @@ const LED_Attr_st_t LED_Attr [] = { ...@@ -114,8 +114,8 @@ const LED_Attr_st_t LED_Attr [] = {
void LED_Urea_Lamp_Exec(Tellib_uint16_t led_status); void LED_Urea_Lamp_Exec(Tellib_uint16_t led_status);
Tellib_uint16_t LED_TPMS_Lamp_Judge(void); Tellib_uint16_t LED_TPMS_Lamp_Judge(void);
void LED_TPMS_Lamp_Exec(Tellib_uint16_t led_status); void LED_TPMS_Lamp_Exec(Tellib_uint16_t led_status);
Tellib_uint16_t LED_ESP_Lamp_Judge(void); Tellib_uint16_t LED_ESC_Lamp_Judge(void);
void LED_ESP_Lamp_Exec(Tellib_uint16_t led_status); void LED_ESC_Lamp_Exec(Tellib_uint16_t led_status);
Tellib_uint16_t LED_Gearbox_Lamp_Judge(void); Tellib_uint16_t LED_Gearbox_Lamp_Judge(void);
void LED_Gearbox_Lamp_Exec(Tellib_uint16_t led_status); void LED_Gearbox_Lamp_Exec(Tellib_uint16_t led_status);
Tellib_uint16_t LED_Gearbox_Serious_Lamp_Judge(void); Tellib_uint16_t LED_Gearbox_Serious_Lamp_Judge(void);
...@@ -139,7 +139,7 @@ const LED_Attribute_st LED_Attribute [ LED_Max ] = { ...@@ -139,7 +139,7 @@ const LED_Attribute_st LED_Attribute [ LED_Max ] = {
{m_LED_Water_High_Lamp, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0ul, 3000ul, LED_Water_High_Lamp_Judge, LED_Water_High_Lamp_Exec, }, {m_LED_Water_High_Lamp, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0ul, 3000ul, LED_Water_High_Lamp_Judge, LED_Water_High_Lamp_Exec, },
{m_LED_Brake_Lamp, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0ul, 3000ul, LED_Brake_Lamp_Judge, LED_Brake_Lamp_Exec, }, {m_LED_Brake_Lamp, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0ul, 3000ul, LED_Brake_Lamp_Judge, LED_Brake_Lamp_Exec, },
{m_LED_DPF_Lamp, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0ul, 3000ul, LED_DPF_Lamp_Judge, LED_DPF_Lamp_Exec, }, {m_LED_DPF_Lamp, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0ul, 3000ul, LED_DPF_Lamp_Judge, LED_DPF_Lamp_Exec, },
{m_LED_ESP_Lamp, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0ul, 3000ul, LED_ESP_Lamp_Judge, LED_ESP_Lamp_Exec, }, {m_LED_ESC_Lamp, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0ul, 3000ul, LED_ESC_Lamp_Judge, LED_ESC_Lamp_Exec, },
{m_LED_EDC_Lamp, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0ul, 3000ul, LED_EDC_Lamp_Judge, LED_EDC_Lamp_Exec, }, {m_LED_EDC_Lamp, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0ul, 3000ul, LED_EDC_Lamp_Judge, LED_EDC_Lamp_Exec, },
{m_LED_Cruise_Lamp, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0ul, 3000ul, LED_Cruise_Lamp_Judge, LED_Cruise_Lamp_Exec, }, {m_LED_Cruise_Lamp, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0ul, 3000ul, LED_Cruise_Lamp_Judge, LED_Cruise_Lamp_Exec, },
{m_LED_ABS_Lamp, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0ul, 3000ul, LED_ABS_Lamp_Judge, LED_ABS_Lamp_Exec, }, {m_LED_ABS_Lamp, SelfCheck, NoExterNalCheck, LED_IGN_ON, 0ul, 3000ul, LED_ABS_Lamp_Judge, LED_ABS_Lamp_Exec, },
...@@ -1527,12 +1527,10 @@ Tellib_uint16_t Water_High_Res = 0u; ...@@ -1527,12 +1527,10 @@ Tellib_uint16_t Water_High_Res = 0u;
} }
} }
Tellib_uint16_t LED_ESP_Lamp_Judge(void) Tellib_uint16_t LED_ESC_Lamp_Judge(void)
{ {
Tellib_uint16_t res = 0u; Tellib_uint16_t res = 0u;
if(Get_NodeConfig_ESP() == 1) if(Get_NodeConfig_ESP() == 1)
{
{ {
if(( CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_can0A18A006_Msg_Count) == CAN_SIG_LOST )&&(Common_GetIgnOnTime() >= 8000)) if(( CAN_MSG_Status(&CAN_CH0_CanMsgOp, CAN_CH0_ID_can0A18A006_Msg_Count) == CAN_SIG_LOST )&&(Common_GetIgnOnTime() >= 8000))
{ {
...@@ -1560,14 +1558,14 @@ Tellib_uint16_t Water_High_Res = 0u; ...@@ -1560,14 +1558,14 @@ Tellib_uint16_t Water_High_Res = 0u;
} }
} }
} }
}
else else
{ {
res = 0u; res = 0u;
} }
return res; return res;
} }
void LED_ESP_Lamp_Exec(Tellib_uint16_t led_status)
void LED_ESC_Lamp_Exec(Tellib_uint16_t led_status)
{ {
if(Get_NodeConfig_ESP() != 1) if(Get_NodeConfig_ESP() != 1)
{ {
...@@ -1578,20 +1576,20 @@ Tellib_uint16_t Water_High_Res = 0u; ...@@ -1578,20 +1576,20 @@ Tellib_uint16_t Water_High_Res = 0u;
{ {
if(g_LED.LedBlink_1HZ) if(g_LED.LedBlink_1HZ)
{ {
LED_Driver_Channel_Set(LED_Attr[LED_ESP_Lamp].chip, LED_Attr[LED_ESP_Lamp].channel, LED_Attr[LED_ESP_Lamp].brightness); LED_Driver_Channel_Set(LED_Attr[LED_ESC_Lamp].chip, LED_Attr[LED_ESC_Lamp].channel, LED_Attr[LED_ESC_Lamp].brightness);
} }
else else
{ {
LED_Driver_Channel_Set(LED_Attr[LED_ESP_Lamp].chip, LED_Attr[LED_ESP_Lamp].channel, 0); LED_Driver_Channel_Set(LED_Attr[LED_ESC_Lamp].chip, LED_Attr[LED_ESC_Lamp].channel, 0);
} }
} }
else if (led_status == 1u) else if (led_status == 1u)
{ {
LED_Driver_Channel_Set(LED_Attr[LED_ESP_Lamp].chip, LED_Attr[LED_ESP_Lamp].channel, LED_Attr[LED_ESP_Lamp].brightness); LED_Driver_Channel_Set(LED_Attr[LED_ESC_Lamp].chip, LED_Attr[LED_ESC_Lamp].channel, LED_Attr[LED_ESC_Lamp].brightness);
} }
else else
{ {
LED_Driver_Channel_Set(LED_Attr[LED_ESP_Lamp].chip, LED_Attr[LED_ESP_Lamp].channel, 0); LED_Driver_Channel_Set(LED_Attr[LED_ESC_Lamp].chip, LED_Attr[LED_ESC_Lamp].channel, 0);
} }
} }
// if ( (u8DTC0XB9F0E0xx) || (u32RecSA03DTC == 0xB9F0E000) || (u8DTC0XC1F0E0xx) || (u32RecSA03DTC == 0xC1F0E000) ) // if ( (u8DTC0XB9F0E0xx) || (u32RecSA03DTC == 0xB9F0E000) || (u8DTC0XC1F0E0xx) || (u32RecSA03DTC == 0xC1F0E000) )
......
source/Appliciation/Telltales_user.h
View file @ 18ad91c9
...@@ -20,7 +20,7 @@ typedef enum ...@@ -20,7 +20,7 @@ typedef enum
m_LED_Water_High_Lamp, m_LED_Water_High_Lamp,
m_LED_Brake_Lamp, m_LED_Brake_Lamp,
m_LED_DPF_Lamp, m_LED_DPF_Lamp,
m_LED_ESP_Lamp, m_LED_ESC_Lamp,
m_LED_EDC_Lamp, m_LED_EDC_Lamp,
m_LED_Cruise_Lamp, m_LED_Cruise_Lamp,
m_LED_ABS_Lamp, m_LED_ABS_Lamp,
...@@ -62,7 +62,7 @@ typedef enum { ...@@ -62,7 +62,7 @@ typedef enum {
LED_Water_High_Lamp, LED_Water_High_Lamp,
LED_Brake_Lamp, LED_Brake_Lamp,
LED_DPF_Lamp, LED_DPF_Lamp,
LED_ESP_Lamp, LED_ESC_Lamp,
LED_EDC_Lamp, LED_EDC_Lamp,
LED_Cruise_Lamp, LED_Cruise_Lamp,
......
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