Merge branch 'dev' of http://tyw-server.synology.me:12345/shihao/haojin750tft into shihao

Firmware/Source/Component/AMT630H/AMT630H.c

@@ -45,7 +45,116 @@ static uint16_t AMT630H_Animation_DispPic = 0;
 static uint16_t AMT630H_Animation_RefreshTime = 0;
 static uint16_t AMT630H_Animation_RefreshTime_default = 0;
 static const uint16_t BootAnimationList[AMT630H_ANIMATION_PIC_NUM] = {
-    0,
+    Pic_0860_0_0,
+    Pic_0860_0_0,
+    Pic_0860_0_0,
+    Pic_0860_0_0,
+    Pic_0859_0_0,
+    Pic_0859_0_0,
+    Pic_0859_0_0,
+    Pic_0859_0_0,
+    Pic_0858_0_0,
+    Pic_0857_0_0,
+    Pic_0856_0_0,
+    Pic_0855_0_0,
+    Pic_0854_0_0,
+    Pic_0853_0_0,
+    Pic_0852_0_0,
+    Pic_0851_0_0,
+    Pic_0850_0_0,
+    Pic_0849_0_0,
+    Pic_0848_0_0,
+    Pic_0847_0_0,
+    Pic_0846_0_0,
+    Pic_0845_0_0,
+    Pic_0844_0_0,
+    Pic_0843_0_0,
+    Pic_0842_0_0,
+    Pic_0841_0_0,
+    Pic_0840_0_0,
+    Pic_0839_0_0,
+    Pic_0838_0_0,
+    Pic_0837_0_0,
+    Pic_0836_0_0,
+    Pic_0835_0_0,
+    Pic_0834_0_0,
+    Pic_0833_0_0,
+    Pic_0832_0_0,
+    Pic_0831_0_0,
+    Pic_0830_0_0,
+    Pic_0829_0_0,
+    Pic_0828_0_0,
+    Pic_0827_0_0,
+    Pic_0826_0_0,
+    Pic_0825_0_0,
+    Pic_0824_0_0,
+    Pic_0823_0_0,
+    Pic_0822_0_0,
+    Pic_0821_0_0,
+    Pic_0820_0_0,
+    Pic_0819_0_0,
+    Pic_0818_0_0,
+    Pic_0817_0_0,
+    Pic_0816_0_0,
+    Pic_0815_0_0,
+    Pic_0814_0_0,
+    Pic_0813_0_0,
+    Pic_0812_0_0,
+    Pic_0811_0_0,
+    Pic_0810_0_0,
+    Pic_0809_0_0,
+    Pic_0808_0_0,
+    Pic_0807_0_0,
+    Pic_0806_0_0,
+    Pic_0805_0_0,
+    Pic_0804_0_0,
+    Pic_0803_0_0,
+    Pic_0802_0_0,
+    Pic_0801_0_0,
+    Pic_0800_0_0,
+    Pic_0799_0_0,
+    Pic_0798_0_0,
+    Pic_0797_0_0,
+    Pic_0796_0_0,
+    Pic_0795_0_0,
+    Pic_0794_0_0,
+    Pic_0793_0_0,
+    Pic_0792_0_0,
+    Pic_0791_0_0,
+    Pic_0790_0_0,
+    Pic_0789_0_0,
+    Pic_0788_0_0,
+    Pic_0787_0_0,
+    Pic_0786_0_0,
+    Pic_0785_0_0,
+    Pic_0784_0_0,
+    Pic_0783_0_0,
+    Pic_0782_0_0,
+    Pic_0781_0_0,
+    Pic_0780_0_0,
+    Pic_0779_0_0,
+    Pic_0778_0_0,
+    Pic_0777_0_0,
+    Pic_0776_0_0,
+    Pic_0775_0_0,
+    Pic_0774_0_0,
+    Pic_0773_0_0,
+    Pic_0772_0_0,
+    Pic_0771_0_0,
+    Pic_0770_0_0,
+    Pic_0769_0_0,
+    Pic_0768_0_0,
+    Pic_0767_0_0,
+    Pic_0766_0_0,
+    Pic_0765_0_0,
+    Pic_0764_0_0,
+    Pic_0763_0_0,
+    Pic_0762_0_0,
+    Pic_0761_0_0,
+    Pic_0760_0_0,
+    Pic_0759_0_0,
+    Pic_0758_0_0,
+    Pic_0001_0_0
 };
 void AMT630H_Animation_PlayProc(uint16_t PicIndex)
 {
@@ -302,7 +411,7 @@ void AMT630H_Main(void)
     // }
     if (SYS_OPR_STAT_IGN_ON)
     {
-        if(1)
+        if(AMT630H_Animation_Finish == 1)
         {
             AMT630H_Animation_RefreshTime = 0;
             if(AMT630H_RefreshTime >= AMT630H_REFRESH_TIME)
@@ -321,22 +430,22 @@ void AMT630H_Main(void)
         }
         else
         {
-            // AMT630H_RefreshTime = 0;
-            // if(AMT630H_Animation_Start == 0)
-            // {
-            //     AMT630H_Animation_Start = 1;                
-            //     AMT630H_Animation_RefreshTime_default = AMT630H_ANIMATION_REFRESHTIME_DEF(0);
-            // }
-            // if(AMT630H_Animation_RefreshTime >= AMT630H_Animation_RefreshTime_default)
-            // {
-            //     AMT630H_Animation_RefreshTime = 0;
-            //     AMT630H_Animation_PlayProc(BootAnimationList[AMT630H_Animation_DispPic]);
-            //     AMT630H_Animation_DispPic++;
-            //     if(AMT630H_Animation_DispPic >= AMT630H_ANIMATION_PIC_NUM)
-            //     {
-            //         AMT630H_Animation_Finish = 1;
-            //     }
-            // }
+            AMT630H_RefreshTime = 0;
+            if(AMT630H_Animation_Start == 0)
+            {
+                AMT630H_Animation_Start = 1;                
+                AMT630H_Animation_RefreshTime_default = AMT630H_ANIMATION_REFRESHTIME_DEF(0);
+            }
+            if(AMT630H_Animation_RefreshTime >= AMT630H_Animation_RefreshTime_default)
+            {
+                AMT630H_Animation_RefreshTime = 0;
+                AMT630H_Animation_PlayProc(BootAnimationList[AMT630H_Animation_DispPic]);
+                AMT630H_Animation_DispPic++;
+                if(AMT630H_Animation_DispPic >= AMT630H_ANIMATION_PIC_NUM)
+                {
+                    AMT630H_Animation_Finish = 1;
+                }
+            }
         } 
         
 

Firmware/Source/Component/AMT630H/AMT630H.h

@@ -21,7 +21,7 @@ typedef struct
 #define AMT630H_REFRESH_TIME        25U
 
 #define AMT630H_ANIMATION_TIME                  3000U   //ms
-#define AMT630H_ANIMATION_PIC_NUM               146U
+#define AMT630H_ANIMATION_PIC_NUM               110U
 #define AMT630H_ANIMATION_REFRESHTIME_DEF(x)    ((AMT630H_ANIMATION_TIME > x) ? \
                                                 (((AMT630H_ANIMATION_TIME - x) / AMT630H_ANIMATION_PIC_NUM) - 5) : \
                                                 (((AMT630H_ANIMATION_TIME) / AMT630H_ANIMATION_PIC_NUM) - 5)) 

Firmware/Source/Component/AMT630H/PicBin.c

@@ -96,7 +96,19 @@ static const uint16_t PicIndexData[] = {
     Pic_0722, 423, 94, 114, Pic_0723, 85, 379, 149, Pic_0724, 119, 292, 128, Pic_0725, 165, 191, 110, Pic_0726, 198, 138, 111, Pic_0727, 153, 94, 123, Pic_0728, 20, 56, 165, Pic_0729, 7, 118, 95, Pic_0730, 19, 178, 81, Pic_0731, 18, 268, 89, 
     Pic_0732, 21, 350, 114, Pic_0733, 19, 422, 114, Pic_0734, 18, 498, 114, Pic_0735, 21, 570, 114, Pic_0736, 56, 941, 13, Pic_0737, 44, 875, 23, Pic_0738, 61, 792, 25, Pic_0739, 39, 731, 19, Pic_0740, 28, 682, 21, Pic_0741, 44, 616, 20, 
     Pic_0742, 50, 544, 22, Pic_0743, 47, 476, 20, Pic_0744, 53, 402, 21, Pic_0745, 39, 341, 21, Pic_0746, 86, 233, 26, Pic_0747, 64, 244, 26, Pic_0748, 16, 194, 26, Pic_0749, 19, 192, 26, Pic_0750, 65, 106, 26, Pic_0751, 56, 111, 30, 
-    Pic_0752, 56, 28, 13, Pic_0753, 809, 109, 331, Pic_0754, 809, 109, 347, Pic_0755, 1024, 0, 0, Pic_0756, 1024, 0, 0, Pic_0757, 1024, 0, 0, 
+    Pic_0752, 56, 28, 13, Pic_0753, 809, 109, 331, Pic_0754, 809, 109, 347, Pic_0755, 1024, 0, 0, Pic_0756, 1024, 0, 0, Pic_0757, 1024, 0, 0, Pic_0758, 1024, 0, 0, Pic_0759, 1024, 0, 0, Pic_0760, 1024, 0, 0, Pic_0761, 1024, 0, 0, 
+    Pic_0762, 1024, 0, 0, Pic_0763, 1024, 0, 0, Pic_0764, 1024, 0, 0, Pic_0765, 1024, 0, 0, Pic_0766, 1024, 0, 0, Pic_0767, 1024, 0, 0, Pic_0768, 1024, 0, 0, Pic_0769, 1024, 0, 0, Pic_0770, 1024, 0, 0, Pic_0771, 1024, 0, 0, 
+    Pic_0772, 1024, 0, 0, Pic_0773, 1024, 0, 0, Pic_0774, 1024, 0, 0, Pic_0775, 1024, 0, 0, Pic_0776, 1024, 0, 0, Pic_0777, 1024, 0, 0, Pic_0778, 1024, 0, 0, Pic_0779, 1024, 0, 0, Pic_0780, 1024, 0, 0, Pic_0781, 1024, 0, 0, 
+    Pic_0782, 1024, 0, 0, Pic_0783, 1024, 0, 0, Pic_0784, 1024, 0, 0, Pic_0785, 1024, 0, 0, Pic_0786, 1024, 0, 0, Pic_0787, 1024, 0, 0, Pic_0788, 1024, 0, 0, Pic_0789, 1024, 0, 0, Pic_0790, 1024, 0, 0, Pic_0791, 1024, 0, 0, 
+    Pic_0792, 1024, 0, 0, Pic_0793, 1024, 0, 0, Pic_0794, 1024, 0, 0, Pic_0795, 1024, 0, 0, Pic_0796, 1024, 0, 0, Pic_0797, 1024, 0, 0, Pic_0798, 1024, 0, 0, Pic_0799, 1024, 0, 0, Pic_0800, 1024, 0, 0, Pic_0801, 1024, 0, 0, 
+    Pic_0802, 1024, 0, 0, Pic_0803, 1024, 0, 0, Pic_0804, 1024, 0, 0, Pic_0805, 1024, 0, 0, Pic_0806, 1024, 0, 0, Pic_0807, 1024, 0, 0, Pic_0808, 1024, 0, 0, Pic_0809, 1024, 0, 0, Pic_0810, 1024, 0, 0, Pic_0811, 1024, 0, 0, 
+    Pic_0812, 1024, 0, 0, Pic_0813, 1024, 0, 0, Pic_0814, 1024, 0, 0, Pic_0815, 1024, 0, 0, Pic_0816, 1024, 0, 0, Pic_0817, 1024, 0, 0, Pic_0818, 1024, 0, 0, Pic_0819, 1024, 0, 0, Pic_0820, 1024, 0, 0, Pic_0821, 1024, 0, 0, 
+    Pic_0822, 1024, 0, 0, Pic_0823, 1024, 0, 0, Pic_0824, 1024, 0, 0, Pic_0825, 1024, 0, 0, Pic_0826, 1024, 0, 0, Pic_0827, 1024, 0, 0, Pic_0828, 1024, 0, 0, Pic_0829, 1024, 0, 0, Pic_0830, 1024, 0, 0, Pic_0831, 1024, 0, 0, 
+    Pic_0832, 1024, 0, 0, Pic_0833, 1024, 0, 0, Pic_0834, 1024, 0, 0, Pic_0835, 1024, 0, 0, Pic_0836, 1024, 0, 0, Pic_0837, 1024, 0, 0, Pic_0838, 1024, 0, 0, Pic_0839, 1024, 0, 0, Pic_0840, 1024, 0, 0, Pic_0841, 1024, 0, 0, 
+    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, 
 };
 #define PicIndexData_LEN   14888
 //uint32_t PicIndexDataLEN = 0;

Firmware/Source/Component/AMT630H/PicBin.h

 #ifndef PICBIN_H
 #define PICBIN_H
 
-/* Flash Bin Version:20240729 2024-07-29 10:18:50 Compression ratio:70.00% */
+/* Flash Bin Version:20240806 2024-08-06 14:50:45 Compression ratio:70.00% */
 #define Pic_0001 1
 #define Pic_0002 2
 #define Pic_0003 3
@@ -759,6 +759,113 @@
 #define Pic_0755 755
 #define Pic_0756 756
 #define Pic_0757 757
+#define Pic_0758 758
+#define Pic_0759 759
+#define Pic_0760 760
+#define Pic_0761 761
+#define Pic_0762 762
+#define Pic_0763 763
+#define Pic_0764 764
+#define Pic_0765 765
+#define Pic_0766 766
+#define Pic_0767 767
+#define Pic_0768 768
+#define Pic_0769 769
+#define Pic_0770 770
+#define Pic_0771 771
+#define Pic_0772 772
+#define Pic_0773 773
+#define Pic_0774 774
+#define Pic_0775 775
+#define Pic_0776 776
+#define Pic_0777 777
+#define Pic_0778 778
+#define Pic_0779 779
+#define Pic_0780 780
+#define Pic_0781 781
+#define Pic_0782 782
+#define Pic_0783 783
+#define Pic_0784 784
+#define Pic_0785 785
+#define Pic_0786 786
+#define Pic_0787 787
+#define Pic_0788 788
+#define Pic_0789 789
+#define Pic_0790 790
+#define Pic_0791 791
+#define Pic_0792 792
+#define Pic_0793 793
+#define Pic_0794 794
+#define Pic_0795 795
+#define Pic_0796 796
+#define Pic_0797 797
+#define Pic_0798 798
+#define Pic_0799 799
+#define Pic_0800 800
+#define Pic_0801 801
+#define Pic_0802 802
+#define Pic_0803 803
+#define Pic_0804 804
+#define Pic_0805 805
+#define Pic_0806 806
+#define Pic_0807 807
+#define Pic_0808 808
+#define Pic_0809 809
+#define Pic_0810 810
+#define Pic_0811 811
+#define Pic_0812 812
+#define Pic_0813 813
+#define Pic_0814 814
+#define Pic_0815 815
+#define Pic_0816 816
+#define Pic_0817 817
+#define Pic_0818 818
+#define Pic_0819 819
+#define Pic_0820 820
+#define Pic_0821 821
+#define Pic_0822 822
+#define Pic_0823 823
+#define Pic_0824 824
+#define Pic_0825 825
+#define Pic_0826 826
+#define Pic_0827 827
+#define Pic_0828 828
+#define Pic_0829 829
+#define Pic_0830 830
+#define Pic_0831 831
+#define Pic_0832 832
+#define Pic_0833 833
+#define Pic_0834 834
+#define Pic_0835 835
+#define Pic_0836 836
+#define Pic_0837 837
+#define Pic_0838 838
+#define Pic_0839 839
+#define Pic_0840 840
+#define Pic_0841 841
+#define Pic_0842 842
+#define Pic_0843 843
+#define Pic_0844 844
+#define Pic_0845 845
+#define Pic_0846 846
+#define Pic_0847 847
+#define Pic_0848 848
+#define Pic_0849 849
+#define Pic_0850 850
+#define Pic_0851 851
+#define Pic_0852 852
+#define Pic_0853 853
+#define Pic_0854 854
+#define Pic_0855 855
+#define Pic_0856 856
+#define Pic_0857 857
+#define Pic_0858 858
+#define Pic_0859 859
+#define Pic_0860 860
+#define Pic_0861 861
+#define Pic_0862 862
+#define Pic_0863 863
+#define Pic_0864 864
 
 enum {
     Pic_0001_0_0 = 0,
@@ -1719,8 +1826,129 @@ enum {
     Pic_0755_0_0,
     Pic_0756_0_0,
     Pic_0757_0_0,
+    Pic_0758_0_0,
+    Pic_0759_0_0,
+    Pic_0760_0_0,
+    Pic_0761_0_0,
+    Pic_0762_0_0,
+    Pic_0763_0_0,
+    Pic_0764_0_0,
+    Pic_0765_0_0,
+    Pic_0766_0_0,
+    Pic_0767_0_0,
+    Pic_0768_0_0,
+    Pic_0769_0_0,
+    Pic_0770_0_0,
+    Pic_0771_0_0,
+    Pic_0772_0_0,
+    Pic_0773_0_0,
+    Pic_0774_0_0,
+    Pic_0775_0_0,
+    Pic_0776_0_0,
+    Pic_0777_0_0,
+    Pic_0778_0_0,
+    Pic_0779_0_0,
+    Pic_0780_0_0,
+    Pic_0781_0_0,
+    Pic_0782_0_0,
+    Pic_0783_0_0,
+    Pic_0784_0_0,
+    Pic_0785_0_0,
+    Pic_0786_0_0,
+    Pic_0787_0_0,
+    Pic_0788_0_0,
+    Pic_0789_0_0,
+    Pic_0790_0_0,
+    Pic_0791_0_0,
+    Pic_0792_0_0,
+    Pic_0793_0_0,
+    Pic_0794_0_0,
+    Pic_0795_0_0,
+    Pic_0796_0_0,
+    Pic_0797_0_0,
+    Pic_0798_0_0,
+    Pic_0799_0_0,
+    Pic_0800_0_0,
+    Pic_0801_0_0,
+    Pic_0802_0_0,
+    Pic_0803_0_0,
+    Pic_0804_0_0,
+    Pic_0805_0_0,
+    Pic_0806_0_0,
+    Pic_0807_0_0,
+    Pic_0808_0_0,
+    Pic_0809_0_0,
+    Pic_0810_0_0,
+    Pic_0811_0_0,
 };
-#define PIC_INDEX_DATA_CRC 0x6A630F71
+
+enum {
+    Pic_0812_0_0 = 1000,
+    Pic_0813_0_0,
+    Pic_0814_0_0,
+    Pic_0815_0_0,
+    Pic_0816_0_0,
+    Pic_0817_0_0,
+    Pic_0818_0_0,
+    Pic_0819_0_0,
+    Pic_0820_0_0,
+    Pic_0821_0_0,
+    Pic_0822_0_0,
+    Pic_0823_0_0,
+    Pic_0824_0_0,
+    Pic_0825_0_0,
+    Pic_0826_0_0,
+    Pic_0827_0_0,
+    Pic_0828_0_0,
+    Pic_0829_0_0,
+    Pic_0830_0_0,
+    Pic_0831_0_0,
+    Pic_0832_0_0,
+    Pic_0833_0_0,
+    Pic_0834_0_0,
+    Pic_0835_0_0,
+    Pic_0836_0_0,
+    Pic_0837_0_0,
+    Pic_0838_0_0,
+    Pic_0839_0_0,
+    Pic_0840_0_0,
+    Pic_0841_0_0,
+    Pic_0842_0_0,
+    Pic_0843_0_0,
+    Pic_0844_0_0,
+    Pic_0845_0_0,
+    Pic_0846_0_0,
+    Pic_0847_0_0,
+    Pic_0848_0_0,
+    Pic_0849_0_0,
+    Pic_0850_0_0,
+    Pic_0851_0_0,
+    Pic_0852_0_0,
+    Pic_0853_0_0,
+    Pic_0854_0_0,
+    Pic_0855_0_0,
+    Pic_0856_0_0,
+    Pic_0857_0_0,
+    Pic_0858_0_0,
+    Pic_0859_0_0,
+    Pic_0860_0_0,
+    Pic_0861_211_324,
+    Pic_0861_187_324,
+    Pic_0861_163_324,
+    Pic_0861_139_324,
+    Pic_0861_115_324,
+    Pic_0861_91_324,
+    Pic_0862_54_297,
+    Pic_0863_211_324,
+    Pic_0863_187_324,
+    Pic_0863_163_324,
+    Pic_0863_139_324,
+    Pic_0863_115_324,
+    Pic_0863_91_324,
+    Pic_0864_54_297,
+};
+
+#define PIC_INDEX_DATA_CRC 0xD98F6E13
 
 extern void User_PicIndexDataInit(void);
 #endif

Firmware/Source/Component/Line_In/Line_In_user.c

@@ -8,14 +8,13 @@ const Line_In_Attribute_st g_stLineInAttribute[LINE_IN_MAX] =
     {LEVEL_LOW,   LEVEL_HIGH,    LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_Turn_Left,        },
     {LEVEL_LOW,   LEVEL_HIGH,    LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_Turn_Right,       },
     {LEVEL_LOW,   LEVEL_HIGH,    LINE_IN_IG_ON,     60U,  20U,  Get_LINE_IN_High_Beam,        },
-    {LEVEL_HIGH,    LEVEL_LOW,   LINE_IN_IG_ON,     100U, 20U,  Get_LINE_IN_Efi_Fault,        },
-    {LEVEL_LOW,    LEVEL_HIGH,    LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_ABS,              },
+    {LEVEL_HIGH,  LEVEL_LOW,     LINE_IN_IG_ON,     100U, 20U,  Get_LINE_IN_Efi_Fault,          },
+    {LEVEL_LOW,    LEVEL_HIGH,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_ABS,              },
     {LEVEL_HIGH,    LEVEL_LOW,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_Auto_Start_Stop,  },
-    {LEVEL_HIGH,    LEVEL_LOW,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_Oil_Pressure_Alert,        },
+    {LEVEL_HIGH,    LEVEL_LOW,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_Oil_Pressure_Alert, },
     {LEVEL_HIGH,    LEVEL_LOW,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_Voltage,          },
     {LEVEL_HIGH,    LEVEL_LOW,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_Fuel_Level_Low,   },
-    {LEVEL_HIGH,    LEVEL_LOW,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_E,                },
-    {LEVEL_HIGH,    LEVEL_LOW,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_S,                },
+    {LEVEL_LOW,    LEVEL_HIGH,   LINE_IN_IG_ON,     20U,  20U,  Get_LINE_IN_Coolant_Temperature },  
 };
 Linelib_uint8_t Get_LINE_IN_Turn_Left(void)
 {
@@ -46,7 +45,7 @@ Linelib_uint8_t Get_LINE_IN_Turn_Right(void)
 Linelib_uint8_t Get_LINE_IN_High_Beam(void)
 {
     Linelib_uint8_t ret = 0U;
-    if (RTE_GPIO_Get_Level(HighBeam_P_In))
+    if (RTE_GPIO_Get_Level(HighBeam_MCU))
     {
         ret = 1u;
     }
@@ -85,7 +84,7 @@ Linelib_uint8_t Get_LINE_IN_ABS(void)
 Linelib_uint8_t Get_LINE_IN_Auto_Start_Stop(void)
 {
     Linelib_uint8_t ret = 0U;
-    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
+    if (RTE_GPIO_Get_Level(Start_stop_MCU))
     {
         ret = 1u;
     }
@@ -98,7 +97,7 @@ Linelib_uint8_t Get_LINE_IN_Auto_Start_Stop(void)
 Linelib_uint8_t Get_LINE_IN_Oil_Pressure_Alert(void)
 {
     Linelib_uint8_t ret = 0U;
-    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
+    if (RTE_GPIO_Get_Level(Gears_N_MCU))
     {
         ret = 1u;
     }
@@ -110,47 +109,34 @@ Linelib_uint8_t Get_LINE_IN_Oil_Pressure_Alert(void)
 }
 Linelib_uint8_t Get_LINE_IN_Voltage(void)
 {
-    Linelib_uint8_t ret = 0U;
-    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
-    {
-        ret = 1u;
-    }
-    else
-    {
-        ret = 0UL;
-    }
-    return ret;
+    // Linelib_uint8_t ret = 0U;
+    // if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))/*没找到电压指示灯*/
+    // {
+    //     ret = 1u;
+    // }
+    // else
+    // {
+    //     ret = 0UL;
+    // }
+    // return ret;
 }
 Linelib_uint8_t Get_LINE_IN_Fuel_Level_Low(void)
 {
-    Linelib_uint8_t ret = 0U;
-    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
-    {
-        ret = 1u;
-    }
-    else
-    {
-        ret = 0UL;
-    }
-    return ret;
-}
-Linelib_uint8_t Get_LINE_IN_E(void)
-{
-    Linelib_uint8_t ret = 0U;
-    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
-    {
-        ret = 1u;
-    }
-    else
-    {
-        ret = 0UL;
-    }
-    return ret;
+    // Linelib_uint8_t ret = 0U;
+    // if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))/*修改指示灯*/
+    // {
+    //     ret = 1u;
+    // }
+    // else
+    // {
+    //     ret = 0UL;
+    // }
+    // return ret;
 }
-Linelib_uint8_t Get_LINE_IN_S(void)
+Linelib_uint8_t Get_LINE_IN_Coolant_Temperature(void)
 {
     Linelib_uint8_t ret = 0U;
-    if (RTE_GPIO_Get_Level(LeftTurn_MUC_OUT))
+    if (RTE_GPIO_Get_Level(A_WaterTemp_IN))
     {
         ret = 1u;
     }
@@ -161,6 +147,8 @@ Linelib_uint8_t Get_LINE_IN_S(void)
     return ret;
 }
 
+
+
 __align(4)
 Linelib_uint8_t LINE_IN_Men[LINE_IN_MAX * LINE_IN_BLOCK_SIZE];
 

Firmware/Source/Component/Line_In/Line_In_user.h

@@ -14,8 +14,8 @@ typedef enum
     LINE_IN_Oil_Pressure_Alert,
     LINE_IN_Voltage,
     LINE_IN_Fuel_Level_Low,
-    LINE_IN_E,
-    LINE_IN_S,
+    LINE_IN_Coolant_Temperature,
+
     LINE_IN_MAX,
 } LINE_IN_Enum_t;
 
@@ -30,6 +30,5 @@ Linelib_uint8_t Get_LINE_IN_Auto_Start_Stop(void);
 Linelib_uint8_t Get_LINE_IN_Oil_Pressure_Alert(void);
 Linelib_uint8_t Get_LINE_IN_Voltage(void);
 Linelib_uint8_t Get_LINE_IN_Fuel_Level_Low(void);
-Linelib_uint8_t Get_LINE_IN_E(void);
-Linelib_uint8_t Get_LINE_IN_S(void);
+Linelib_uint8_t Get_LINE_IN_Coolant_Temperature(void);
 #endif

Firmware/Source/Component/Menu/Menu.h

@@ -58,28 +58,28 @@ typedef enum
 
 	MENU_ITEM_BLUETOOTH_OPEN_CLOSE,         /*19 蓝牙_开*/
 	MENU_ITEM_BLUETOOTH_SYNC,	   	        /*20 蓝牙同步联系人*/
-	MENU_ITEM_BLUETOOTH_BACK,	   			/*30 蓝牙返回*/
+	MENU_ITEM_BLUETOOTH_BACK,	   			/*21 蓝牙返回*/
 
-	MENU_ITEM_CLOCK_HOUR_TENB,	    		/*31 时钟小时十位*/
-	MENU_ITEM_CLOCK_HOUR_BIT,				/*32 时钟小时个位*/
-	MENU_ITEM_CLOCK_MIN_TENB,	  			/*33 时钟分钟十位*/
-	MENU_ITEM_CLOCK_MIN_BIT,	  			/*34 时钟分钟个位*/
-	MENU_ITEM_CLOCK_BACK, 	      			/*35 时钟返回*/
+	MENU_ITEM_CLOCK_HOUR_TENB,	    		/*22 时钟小时十位*/
+	MENU_ITEM_CLOCK_HOUR_BIT,				/*23 时钟小时个位*/
+	MENU_ITEM_CLOCK_MIN_TENB,	  			/*24 时钟分钟十位*/
+	MENU_ITEM_CLOCK_MIN_BIT,	  			/*25 时钟分钟个位*/
+	MENU_ITEM_CLOCK_BACK, 	      			/*26 时钟返回*/
 
-	MENU_ITEM_CLOCK_HOUR_TENB_SET,	    		/*36 时钟小时十位*/
-	MENU_ITEM_CLOCK_HOUR_BIT_SET,				/*37 时钟小时个位*/
-	MENU_ITEM_CLOCK_MIN_TENB_SET,	  			/*38 时钟分钟十位*/
-	MENU_ITEM_CLOCK_MIN_BIT_SET,	  			/*39 时钟分钟个位*/
+	MENU_ITEM_CLOCK_HOUR_TENB_SET,	    		/*27 时钟小时十位*/
+	MENU_ITEM_CLOCK_HOUR_BIT_SET,				/*28 时钟小时个位*/
+	MENU_ITEM_CLOCK_MIN_TENB_SET,	  			/*29 时钟分钟十位*/
+	MENU_ITEM_CLOCK_MIN_BIT_SET,	  			/*30 时钟分钟个位*/
 
-	MENU_ITEM_UNIT_KM,	   					/*40 选中公制*/
-	MENU_ITEM_UNIT_MILE,	   				/*41 选中英制*/
+	MENU_ITEM_UNIT_KM,	   					/*31 选中公制*/
+	MENU_ITEM_UNIT_MILE,	   				/*32 选中英制*/
 		
-	MENU_ITEM_LANGUAGE_CHINESE,   			/*42 选中中文*/
-	MENU_ITEM_LANGUAGE_ENGLISH,	   			/*43 选中英文*/
+	MENU_ITEM_LANGUAGE_CHINESE,   			/*33 选中中文*/
+	MENU_ITEM_LANGUAGE_ENGLISH,	   			/*34 选中英文*/
 
 	MENU_ITEM_PHONE_CONNECT_SET,
 		
-	MENU_ITEM_PHONE_CONNECT_APP,  			/*44 手机互联成功*/
+	MENU_ITEM_PHONE_CONNECT_APP,  			/*35 手机互联成功*/
 		
 	MENU_ITEM_MAX,
 } Menu_Item_en_t;