Merge branch 'jinshuo' into 'dev'

Jinshuo

See merge request !76

Firmware/Source/Application/BackLight.c

@@ -104,11 +104,11 @@ void Data_Light_Res_service(Light_uint8_t deltaTime)//获取光感阻值，并
                     LightRes += 5;
                 }
             }
-            timeCount += deltaTime;
-            if(LightADCompleteFlg)
+            else
             {
                 LightRes = 32000;
             }
+
             /*由小到大插入数据*/
             for (i = 0; i < NtcDataCount; i++)
             {

Firmware/Source/Application/BlueTooth.c

@@ -10,13 +10,13 @@ uint8_t SetUUIDTimes = 0;
 _PICID_Struct PicObj;
 _QRCODE_RECT QRCode_Rect;
 const uint8_t HJBlueToothName[9]= {"HJ750"};
-uint8_t UUIDConfigBuf[22] = {"800082024071700000001"};
-// 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00
+uint8_t UUIDConfigBuf[22] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00};
+//"600032023120100000995" 
 
 
 void TextService(void);
 
-void BlueToothService()
+void BlueToothService(void)
 {
     // SetUUIDTimes++;
     if(Get_Dis_Bluetooth_Open_Close() == 0)

Firmware/Source/Component/AMT630H/AMT630H.c

@@ -298,8 +298,8 @@ void Amt630hInit(void)
     AMT630H_InitTime = 0;
 
     AMT630H_Animation_Start = 0;
-    AMT630H_Animation_Finish = 0;
-    AMT630H_Animation_DispPic = 0;
+    // AMT630H_Animation_Finish = 0;
+    // AMT630H_Animation_DispPic = 0;
     AMT630H_Animation_RefreshTime = 0;
     AMT630H_Animation_RefreshTime_default = AMT630H_ANIMATION_REFRESHTIME_DEF(0);
 
@@ -476,4 +476,22 @@ unsigned char AMT630H_isInitFinish(void)
     {
         return 0;
     }
-}
\ No newline at end of file
+}
+
+void AMT630H_Animation_IGON(void)
+{
+    AMT630H_Animation_Finish = 0;
+    AMT630H_Animation_DispPic = 0;
+}
+unsigned char AMT630H_Animation_Finish_Flage(void)
+{
+    if(AMT630H_Animation_Finish == 1)
+    {
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
+    
+}

Firmware/Source/Component/AMT630H/AMT630H.h

@@ -37,6 +37,7 @@ void AMT630H_Sleep(void);
 static void AMT630H_AliveCounterMonitor(void);
 void AMT630H_Main(void);
 unsigned char AMT630H_isInitFinish(void);
-extern uint32_t Amt630hInitTimerCnts ;
+unsigned char AMT630H_Animation_Finish_Flage(void);
+void AMT630H_Animation_IGON(void);
 
 #endif

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -4348,7 +4348,6 @@ void AMT630H_GUI_BACKGRAND_SelfCheck()
     SetPagePic(GRAPHICS_PAGE_0, Pic_0740_682_21);/*蓝牙*/
     SetPagePic(GRAPHICS_PAGE_0, Pic_0748_194_26);/*E*/
     
-    AMT630H_GUI_Telephone();
     AMT630H_GUI_TIME(Get_Dis_Hour_Time(), Get_Dis_Minute_Time());
     if(KL30_VOLTAGE_time < 10)
     {

Firmware/Source/Component/PowerManagement/PowerManag_user.c

@@ -134,7 +134,8 @@ static void Power_IG_ON_Init(void)
    Fuel_KL15_Init();
    //RTE_GPIO_Set_Level(Blacklight_PWM, 1);
    FaultCode_Init();
-   Amt630hInit();
+   AMT630H_Animation_IGON();
+//    Amt630hInit();
    AMT630H_GUI_SELFCHECK_STS_INIT();
    Menu_Service(MENU_KEY_TIMEOUT); /* 菜单回到初始界面 */
 }

Firmware/Source/UDS/UDS_ISO14229_Services.h

@@ -30,8 +30,8 @@
     program version
 *******************************************************************************/
 #define SWV 0x104 // 0x100 = 1.00 software version 软件版本号
-#define HWV 0x100 // 0x100 = 1.00 hardware version 硬件版本号
-#define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
+#define HWV 0x110 // 0x100 = 1.00 hardware version 硬件版本号
+#define BTV 0x104 // 0x100 = 1.00 bootloader version boot程序版本号
 
 #define internal_version (105UL) /* 内部版本号 105 -> 1.05 */
 #define internal_date    (20240805UL) /* 内部版本日期 20240805 -> 2024.08.05 */