Merge branch 'CJL' into 'dev'

Cjl

See merge request !125

Firmware/Source/Application/GUI_Display/GUI_Display.c

@@ -74,7 +74,9 @@ void Gauge_Service(void)
             Check_SEG_Display();    
             for(k = 0; k < LampCh0_MAX; k ++)     
             {
-                if (k == LampCh0_24_Keys || k == LampCh0_21_Fuel_W || k == LampCh0_13_Temp_AlarmW || k == LampCh0_26_Tire_PressureW)
+                if (k == LampCh0_24_Keys || k == LampCh0_21_Fuel_W \
+                    || k == LampCh0_13_Temp_AlarmW || k == LampCh0_26_Tire_PressureW \
+                    || k == LampCh0_23_Bluetooth)
                 {
                     ;
                 }
@@ -84,6 +86,13 @@ void Gauge_Service(void)
                 }
                 
             }
+            LED_Driver_Channel_Set(LampChannel_0, LampCh0_10_Navigator1, LED_OFF);
+            LED_Driver_Channel_Set(LampChannel_0, LampCh0_19_Navigator2, LED_OFF);
+            LED_Driver_Channel_Set(LampChannel_0, LampCh0_17_Length2, LED_OFF);
+            LED_Driver_Channel_Set(LampChannel_0, LampCh0_18_Length1, LED_OFF);
+            LED_Driver_Channel_Set(LampChannel_0, LampCh0_14_ARRIVED_SERVICE_AREA, LED_OFF);
+            LED_Driver_Channel_Set(LampChannel_0, LampCh0_15_ARRIVED_TOLLGATE, LED_OFF);
+            LED_Driver_Channel_Set(LampChannel_0, LampCh0_16_ARRIVED_TUNNEL, LED_OFF);
         }
         else
         {

Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.c

@@ -4504,10 +4504,12 @@ void Check_SEG_Display(void)
 #endif
     SEG_SET_Voltage_NUM(1, a * 111);
     //SEG_SET_Navigation_STS(0, 0, 0);
+    
 
     for (i = 0; i < SEG_LED_MAX; i++)
     {
-        SEG_SET_LED_STS(i, 1);
+        if(i != em_SEG_Bluetooth)
+            SEG_SET_LED_STS(i, 1);
     }
 
     SEG_Scan_SET_Fuel_Coolant_Dial((a * 11) + 100);

Firmware/Source/UDS/UDS_ISO14229_Services.h

@@ -312,13 +312,13 @@
 #define CheckSumErr       7    // Checksum Error
 #define UnknownPartID     8    // Unknown Part ID
 
-#define SWV 0x129 // 0x100 = 1.00 software version 软件版本号
+#define SWV 0x130 // 0x100 = 1.00 software version 软件版本号
 #define HWV 0x103 // 0x100 = 1.00 hardware version 硬件版本号
 #define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
-#define INTLV 0x129 // 0x100 = 1.00 internal version 内部版本号
+#define INTLV 0x130 // 0x100 = 1.00 internal version 内部版本号
 #define PROG_Y 0x25 // 0x24 = 2024年, program year
 #define PROG_M 0x01 // 0x03 = 3月, program month
-#define PROG_D 0x02 // 0x19 = 19日, program day
+#define PROG_D 0x07 // 0x19 = 19日, program day
 
 /******************************************************************************
  Bootloader Variable