Skip to content

H
haoJin750TFT
Commit aec14d44 authored by 王雅楠's avatar 王雅楠
Browse files
Options

Merge branch 'wangyanan' into 'dev' 

Wangyanan

See merge request !44
parents e81dbe30 5841c36a
Show whitespace changes
Inline Side-by-side
Showing with 229 additions and 35 deletions
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @ aec14d44
......@@ -69,6 +69,7 @@ void AMT630H_GUI_Fault_Information(void)
{
if(g_u8Display_Mode == ModeDAY)
{
if(g_u8Language == CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0163_27_396);
......@@ -105,6 +106,8 @@ void AMT630H_GUI_Fault_Information(void)
}
else if(g_u8Display_Mode == ModeNIGHT)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0900_610_229);//夜间 历史故障P
SetPagePic(GRAPHICS_PAGE_0, Pic_0900_610_164);//夜间 当前故障P
if(g_u8Language == CH)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0350_27_396);
......@@ -182,8 +185,8 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight
{
if(g_u8Display_Mode == ModeDAY)
{
//SetPagePicFree(GRAPHICS_PAGE_0, Pic_0876_639_293, 610, 164);//当前故障码的P
//SetPagePicFree(GRAPHICS_PAGE_0, Pic_0876_639_293, 610, 229);//历史故障码的P
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0876_639_293, 610, 164);//当前故障码的P
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0876_639_293, 610, 229);//历史故障码的P
/*当前故障码前两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_day;
DisplayNumPara.x = 639;
......@@ -219,8 +222,8 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight
}
else if(g_u8Display_Mode == ModeNIGHT)
{
//SetPagePicFree(GRAPHICS_PAGE_0, Pic_0912_639_293, 610, 175);//当前故障码的P
//SetPagePicFree(GRAPHICS_PAGE_0, Pic_0912_639_293, 610, 240);//历史故障码的P
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0912_639_293, 610, 175);//当前故障码的P
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0912_639_293, 610, 240);//历史故障码的P
/*当前故障码前两位显示*/
DisplayNumPara.NumList = NumbeList_FaultCode_night;
DisplayNumPara.x = 639;
......@@ -257,7 +260,20 @@ static void AMT630H_GUI_FaultCode(uint8_t FaultCodevalid,uint8_t FaultCode_hight
}
else
{
/*显示-----*/;
if(g_u8Display_Mode == ModeDAY)
{
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0926_619_240, 610, 175);
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0926_619_240, 610, 240);
}
else if(g_u8Display_Mode == ModeNIGHT)
{
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0927_619_175, 610, 175);
SetPagePicFree(GRAPHICS_PAGE_0, Pic_0927_619_175, 610, 240);
}
else
{
;
}
}
}
/**
......@@ -527,11 +543,11 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON
if (Connect_ON == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0141_584_226);
SetPagePic(GRAPHICS_PAGE_0, Pic_0140_584_226);
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0140_584_226);
SetPagePic(GRAPHICS_PAGE_0, Pic_0141_584_226);
}
DISPLAY_NUM_ST DisplayNumPara;
uint8_t sync_contactsNumber;
......@@ -570,11 +586,11 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON
SetPagePic(GRAPHICS_PAGE_0, Pic_0056_377_166);
if (Connect_ON == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0052_574_226);
SetPagePic(GRAPHICS_PAGE_0, Pic_0053_573_226);
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0053_573_226);
SetPagePic(GRAPHICS_PAGE_0, Pic_0052_574_226);
}
DISPLAY_NUM_ST DisplayNumPara;
uint8_t sync_contactsNumber;
......@@ -616,11 +632,11 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON
SetPagePic(GRAPHICS_PAGE_0, Pic_0330_367_163);
if (Connect_ON == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0328_584_226);
SetPagePic(GRAPHICS_PAGE_0, Pic_0327_584_226);
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0327_584_226);
SetPagePic(GRAPHICS_PAGE_0, Pic_0328_584_226);
}
DISPLAY_NUM_ST DisplayNumPara;
uint8_t sync_contactsNumber;
......@@ -660,11 +676,11 @@ void AMT630H_GUI_Bluetooth_Information(uint8_t sync_contacts, uint8_t Connect_ON
if (Connect_ON == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0238_574_226);
SetPagePic(GRAPHICS_PAGE_0, Pic_0239_573_226);
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0239_573_226);
SetPagePic(GRAPHICS_PAGE_0, Pic_0238_574_226);
}
DISPLAY_NUM_ST DisplayNumPara;
uint8_t sync_contactsNumber;
......@@ -1935,11 +1951,11 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
/*蓝牙开关*/
if (Connect_ON == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0141_584_226);
SetPagePic(GRAPHICS_PAGE_0, Pic_0140_584_226);
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0140_584_226);
SetPagePic(GRAPHICS_PAGE_0, Pic_0141_584_226);
}
/*同步联系人*/
......@@ -1996,11 +2012,11 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
/*蓝牙连接*/
if (Connect_ON == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0052_574_226);
SetPagePic(GRAPHICS_PAGE_0, Pic_0053_573_226);
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0053_573_226);
SetPagePic(GRAPHICS_PAGE_0, Pic_0052_574_226);
}
/*蓝牙联系人*/
......@@ -2059,11 +2075,11 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
/*蓝牙连接*/
if (Connect_ON == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0328_584_226);
SetPagePic(GRAPHICS_PAGE_0, Pic_0327_584_226);
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0327_584_226);
SetPagePic(GRAPHICS_PAGE_0, Pic_0328_584_226);
}
/*蓝牙联系人选择*/
......@@ -2120,11 +2136,11 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t sync_c
/*蓝牙连接*/
if (Connect_ON == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0238_574_226);
SetPagePic(GRAPHICS_PAGE_0, Pic_0239_573_226);
}
else
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0239_573_226);
SetPagePic(GRAPHICS_PAGE_0, Pic_0238_574_226);
}
/*蓝牙联系人选择*/
......@@ -3484,11 +3500,11 @@ static void AMT630H_GUI_VSpeed(uint16_t VSpeed,uint8_t Unit)
SetPagePic(GRAPHICS_PAGE_0, Pic_0592_617_271);
if(Unit == 0)
{
SetPagePic(GRAPHICS_PAGE_0, Pic_0593_889_310);/*单位 km/h */
SetPagePic(GRAPHICS_PAGE_0, Pic_0593_889_310);/*单位 km*/
}
else
{
;/*单位 mile/h */
SetPagePic(GRAPHICS_PAGE_0, Pic_0928_894_310);/*单位 mph */
}
/*数据处理*/
......@@ -3547,7 +3563,7 @@ static void AMT630H_GUI_VSpeed(uint16_t VSpeed,uint8_t Unit)
}
else
{
;/*单位 mile/h */
SetPagePic(GRAPHICS_PAGE_0, Pic_0929_894_310);/*单位 mile/h */
}
/*数据处理*/
......@@ -4016,19 +4032,19 @@ void AMT630H_GUI_ReadPosittion_Display(void)
case MENU_ITEM_BLUETOOTH_CONNECT: /*03 蓝牙连接*/
AMT630H_GUI_SETTING();
AMT630H_GUI_Bluetooth_Information(8, Get_Dis_Bluetooth_Open_Close());/*蓝牙开关和联系人接口没给*/
AMT630H_GUI_Bluetooth_Information(8, Get_Dis_Bluetooth_Open_Close());
break;
case MENU_ITEM_BLUETOOTH_OPEN_CLOSE: /*12 蓝牙_开*/
AMT630H_GUI_SETTING();
AMT630H_GUI_Bluetooth_Connect_Setting(MENU_ITEM_BLUETOOTH_OPEN_CLOSE, 8, Get_Dis_Bluetooth_Open_Close());/*蓝牙开关和联系人接口没给*/
AMT630H_GUI_Bluetooth_Connect_Setting(MENU_ITEM_BLUETOOTH_OPEN_CLOSE, 8, Get_Dis_Bluetooth_Open_Close());
break;
case MENU_ITEM_BLUETOOTH_SYNC: /*13 蓝牙同步联系人*/
AMT630H_GUI_SETTING();
AMT630H_GUI_Bluetooth_Connect_Setting(MENU_ITEM_BLUETOOTH_SYNC, 8, Get_Dis_Bluetooth_Open_Close());/*蓝牙开关和联系人接口没给*/
AMT630H_GUI_Bluetooth_Connect_Setting(MENU_ITEM_BLUETOOTH_SYNC, 8, Get_Dis_Bluetooth_Open_Close());
break;
case MENU_ITEM_BLUETOOTH_BACK: /*14 蓝牙返回*/
AMT630H_GUI_SETTING();
AMT630H_GUI_Bluetooth_Connect_Setting(MENU_ITEM_BLUETOOTH_BACK, 8, Get_Dis_Bluetooth_Open_Close());/*蓝牙开关和联系人接口没给*/
AMT630H_GUI_Bluetooth_Connect_Setting(MENU_ITEM_BLUETOOTH_BACK, 8, Get_Dis_Bluetooth_Open_Close());
break;
case MENU_ITEM_CLOCK_SETTING: /*15 时钟设置*/
AMT630H_GUI_SETTING();
......
Firmware/Source/Component/AMT630H/PicBin.c
View file @ aec14d44
......@@ -108,7 +108,16 @@ static const uint16_t PicIndexData[] = {
Pic_0842, 1024, 0, 0, Pic_0843, 1024, 0, 0, Pic_0844, 1024, 0, 0, Pic_0845, 1024, 0, 0, Pic_0846, 1024, 0, 0, Pic_0847, 1024, 0, 0, Pic_0848, 1024, 0, 0, Pic_0849, 1024, 0, 0, Pic_0850, 1024, 0, 0, Pic_0851, 1024, 0, 0,
Pic_0852, 1024, 0, 0, Pic_0853, 1024, 0, 0, Pic_0854, 1024, 0, 0, Pic_0855, 1024, 0, 0, Pic_0856, 1024, 0, 0, Pic_0857, 1024, 0, 0, Pic_0858, 1024, 0, 0, Pic_0859, 1024, 0, 0, Pic_0860, 1024, 0, 0, Pic_0861, 73, 211, 324,
Pic_0861, 73, 187, 324, Pic_0861, 73, 163, 324, Pic_0861, 73, 139, 324, Pic_0861, 73, 115, 324, Pic_0861, 73, 91, 324, Pic_0862, 53, 54, 297, Pic_0863, 73, 211, 324, Pic_0863, 73, 187, 324, Pic_0863, 73, 163, 324, Pic_0863, 73, 139, 324,
Pic_0863, 73, 115, 324, Pic_0863, 73, 91, 324, Pic_0864, 53, 54, 297,
Pic_0863, 73, 115, 324, Pic_0863, 73, 91, 324, Pic_0864, 53, 54, 297, Pic_0865, 52, 923, 407, Pic_0866, 13, 638, 293, Pic_0867, 15, 637, 293, Pic_0868, 15, 637, 293, Pic_0869, 21, 634, 293, Pic_0870, 15, 637, 293, Pic_0871, 14, 637, 293,
Pic_0872, 15, 637, 293, Pic_0873, 13, 638, 292, Pic_0874, 13, 639, 293, Pic_0875, 17, 636, 292, Pic_0876, 13, 639, 293, Pic_0877, 17, 636, 292, Pic_0878, 13, 638, 293, Pic_0879, 16, 636, 293, Pic_0880, 11, 640, 293, Pic_0881, 14, 639, 293,
Pic_0882, 11, 638, 293, Pic_0883, 3, 643, 293, Pic_0884, 14, 637, 293, Pic_0885, 15, 637, 292, Pic_0886, 11, 640, 293, Pic_0887, 12, 639, 293, Pic_0888, 14, 638, 293, Pic_0889, 14, 638, 292, Pic_0890, 14, 638, 293, Pic_0891, 15, 637, 293,
Pic_0892, 13, 567, 356, Pic_0893, 13, 581, 356, Pic_0892, 13, 595, 356, Pic_0894, 12, 609, 356, Pic_0895, 11, 624, 357, Pic_0892, 13, 636, 356, Pic_0893, 13, 650, 356, Pic_0895, 11, 665, 357, Pic_0896, 4, 679, 372, Pic_0895, 11, 686, 357,
Pic_0896, 4, 699, 372, Pic_0897, 15, 706, 356, Pic_0892, 13, 574, 292, Pic_0893, 13, 588, 292, Pic_0892, 13, 602, 292, Pic_0894, 12, 615, 292, Pic_0895, 11, 630, 293, Pic_0892, 13, 643, 292, Pic_0893, 13, 657, 292, Pic_0895, 11, 672, 293,
Pic_0898, 14, 686, 293, Pic_0899, 11, 703, 293, Pic_0900, 13, 610, 229, Pic_0901, 12, 625, 229, Pic_0901, 12, 639, 229, Pic_0901, 12, 653, 229, Pic_0901, 12, 667, 229, Pic_0900, 13, 610, 164, Pic_0901, 12, 625, 164, Pic_0901, 12, 639, 164,
Pic_0901, 12, 653, 164, Pic_0901, 12, 667, 164, Pic_0902, 13, 638, 293, Pic_0903, 15, 637, 293, Pic_0904, 15, 637, 293, Pic_0905, 21, 634, 293, Pic_0906, 15, 637, 293, Pic_0907, 14, 637, 293, Pic_0908, 15, 637, 293, Pic_0909, 13, 638, 292,
Pic_0910, 13, 639, 293, Pic_0911, 17, 636, 292, Pic_0912, 13, 639, 293, Pic_0913, 17, 636, 292, Pic_0914, 13, 638, 293, Pic_0915, 16, 636, 293, Pic_0916, 11, 640, 293, Pic_0917, 14, 639, 293, Pic_0899, 11, 638, 293, Pic_0918, 3, 643, 293,
Pic_0898, 14, 637, 293, Pic_0897, 15, 637, 292, Pic_0919, 11, 640, 293, Pic_0920, 12, 639, 293, Pic_0921, 14, 638, 293, Pic_0922, 14, 638, 292, Pic_0923, 14, 638, 293, Pic_0924, 15, 637, 293, Pic_0925, 221, 501, 160, Pic_0926, 50, 619, 240,
Pic_0926, 50, 619, 175, Pic_0927, 50, 619, 240, Pic_0927, 50, 619, 175, Pic_0928, 75, 894, 310, Pic_0929, 75, 894, 310,
};
#define PicIndexData_LEN 14888
//uint32_t PicIndexDataLEN = 0;
......
Firmware/Source/Component/AMT630H/PicBin.h
View file @ aec14d44
#ifndef PICBIN_H
#define PICBIN_H
/* Flash Bin Version:20240806 2024-08-06 14:50:45 Compression ratio:70.00% */
/* Flash Bin Version:20240817 2024-08-17 11:18:35 Compression ratio:70.00% */
#define Pic_0001 1
#define Pic_0002 2
#define Pic_0003 3
......@@ -866,6 +866,71 @@
#define Pic_0862 862
#define Pic_0863 863
#define Pic_0864 864
#define Pic_0865 865
#define Pic_0866 866
#define Pic_0867 867
#define Pic_0868 868
#define Pic_0869 869
#define Pic_0870 870
#define Pic_0871 871
#define Pic_0872 872
#define Pic_0873 873
#define Pic_0874 874
#define Pic_0875 875
#define Pic_0876 876
#define Pic_0877 877
#define Pic_0878 878
#define Pic_0879 879
#define Pic_0880 880
#define Pic_0881 881
#define Pic_0882 882
#define Pic_0883 883
#define Pic_0884 884
#define Pic_0885 885
#define Pic_0886 886
#define Pic_0887 887
#define Pic_0888 888
#define Pic_0889 889
#define Pic_0890 890
#define Pic_0891 891
#define Pic_0892 892
#define Pic_0893 893
#define Pic_0894 894
#define Pic_0895 895
#define Pic_0896 896
#define Pic_0897 897
#define Pic_0898 898
#define Pic_0899 899
#define Pic_0900 900
#define Pic_0901 901
#define Pic_0902 902
#define Pic_0903 903
#define Pic_0904 904
#define Pic_0905 905
#define Pic_0906 906
#define Pic_0907 907
#define Pic_0908 908
#define Pic_0909 909
#define Pic_0910 910
#define Pic_0911 911
#define Pic_0912 912
#define Pic_0913 913
#define Pic_0914 914
#define Pic_0915 915
#define Pic_0916 916
#define Pic_0917 917
#define Pic_0918 918
#define Pic_0919 919
#define Pic_0920 920
#define Pic_0921 921
#define Pic_0922 922
#define Pic_0923 923
#define Pic_0924 924
#define Pic_0925 925
#define Pic_0926 926
#define Pic_0927 927
#define Pic_0928 928
#define Pic_0929 929
enum {
Pic_0001_0_0 = 0,
......@@ -1946,9 +2011,101 @@ enum {
Pic_0863_115_324,
Pic_0863_91_324,
Pic_0864_54_297,
Pic_0865_923_407,
Pic_0866_638_293,
Pic_0867_637_293,
Pic_0868_637_293,
Pic_0869_634_293,
Pic_0870_637_293,
Pic_0871_637_293,
Pic_0872_637_293,
Pic_0873_638_292,
Pic_0874_639_293,
Pic_0875_636_292,
Pic_0876_639_293,
Pic_0877_636_292,
Pic_0878_638_293,
Pic_0879_636_293,
Pic_0880_640_293,
Pic_0881_639_293,
Pic_0882_638_293,
Pic_0883_643_293,
Pic_0884_637_293,
Pic_0885_637_292,
Pic_0886_640_293,
Pic_0887_639_293,
Pic_0888_638_293,
Pic_0889_638_292,
Pic_0890_638_293,
Pic_0891_637_293,
Pic_0892_567_356,
Pic_0893_581_356,
Pic_0892_595_356,
Pic_0894_609_356,
Pic_0895_624_357,
Pic_0892_636_356,
Pic_0893_650_356,
Pic_0895_665_357,
Pic_0896_679_372,
Pic_0895_686_357,
Pic_0896_699_372,
Pic_0897_706_356,
Pic_0892_574_292,
Pic_0893_588_292,
Pic_0892_602_292,
Pic_0894_615_292,
Pic_0895_630_293,
Pic_0892_643_292,
Pic_0893_657_292,
Pic_0895_672_293,
Pic_0898_686_293,
Pic_0899_703_293,
Pic_0900_610_229,
Pic_0901_625_229,
Pic_0901_639_229,
Pic_0901_653_229,
Pic_0901_667_229,
Pic_0900_610_164,
Pic_0901_625_164,
Pic_0901_639_164,
Pic_0901_653_164,
Pic_0901_667_164,
Pic_0902_638_293,
Pic_0903_637_293,
Pic_0904_637_293,
Pic_0905_634_293,
Pic_0906_637_293,
Pic_0907_637_293,
Pic_0908_637_293,
Pic_0909_638_292,
Pic_0910_639_293,
Pic_0911_636_292,
Pic_0912_639_293,
Pic_0913_636_292,
Pic_0914_638_293,
Pic_0915_636_293,
Pic_0916_640_293,
Pic_0917_639_293,
Pic_0899_638_293,
Pic_0918_643_293,
Pic_0898_637_293,
Pic_0897_637_292,
Pic_0919_640_293,
Pic_0920_639_293,
Pic_0921_638_293,
Pic_0922_638_292,
Pic_0923_638_293,
Pic_0924_637_293,
Pic_0925_501_160,
Pic_0926_619_240,
Pic_0926_619_175,
Pic_0927_619_240,
Pic_0927_619_175,
Pic_0928_894_310,
Pic_0929_894_310,
};
#define PIC_INDEX_DATA_CRC 0xD98F6E13
#define PIC_INDEX_DATA_CRC 0xDE5B7F88
extern void User_PicIndexDataInit(void);
#endif
Firmware/Source/Component/Telltales/Telltales_user.c
View file @ aec14d44
......@@ -234,21 +234,33 @@ static Tellib_uint16_t LED_TCS_Judgement(void)
{
LED_STATE = 1u;/*TCS灯亮*/
}
else
else if(Get_CAN_CH0_ID_37B_Sig_TCS_Warning_Lamp() == 0x0)
{
LED_STATE = 0u;/*都不亮*/
}
}
else
{
LED_STATE = 0u;
}
}
else if(Get_CAN_CH0_ID_37B_Sig_TCS_Work_Mode == 0x0)
{
if(Get_CAN_CH0_ID_37B_Sig_TCS_Warning_Lamp() == 0x1)
{
LED_STATE = 2u;/*TCS/亮*/
}
else if(Get_CAN_CH0_ID_37B_Sig_TCS_Warning_Lamp() == 0x0)
{
LED_STATE = 0u;
}
else
{
;
LED_STATE = 0u;
}
}
else
{
;
}
}
return LED_STATE;
......
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