Merge branch 'jinshuo' into 'dev'

Jinshuo

See merge request !72

Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/HaoJin750TFT.uvprojx

@@ -275,7 +275,7 @@
               </OCR_RVCT3>
               <OCR_RVCT4>
                 <Type>1</Type>
-                <StartAddress>0x0</StartAddress>
+                <StartAddress>0xc400</StartAddress>
                 <Size>0x73c00</Size>
               </OCR_RVCT4>
               <OCR_RVCT5>
@@ -978,6 +978,11 @@
               <FileType>5</FileType>
               <FilePath>..\..\..\..\Source\Component\AMT630H\PicBin.h</FilePath>
             </File>
+            <File>
+              <FileName>kei_S1.0.6_20240827.lib</FileName>
+              <FileType>4</FileType>
+              <FilePath>..\..\..\..\Source\Component\AMT630H\kei_S1.0.6_20240827.lib</FilePath>
+            </File>
             <File>
               <FileName>UartProtocol.h</FileName>
               <FileType>5</FileType>
@@ -1013,16 +1018,6 @@
               <FileType>5</FileType>
               <FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor_User.h</FilePath>
             </File>
-            <File>
-              <FileName>System_Monitor.lib</FileName>
-              <FileType>4</FileType>
-              <FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor.lib</FilePath>
-            </File>
-            <File>
-              <FileName>kei_S1.0.6_20240827.lib</FileName>
-              <FileType>4</FileType>
-              <FilePath>..\..\..\..\Source\Component\AMT630H\kei_S1.0.6_20240827.lib</FilePath>
-            </File>
           </Files>
         </Group>
         <Group>

Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/Objects/HaoJin750TFT.sct

@@ -2,8 +2,8 @@
 ; *** Scatter-Loading Description File generated by uVision ***
 ; *************************************************************
 
-LR_IROM1 0x00000000 0x00073C00  {    ; load region size_region
-  ER_IROM1 0x00000000 0x00073C00  {  ; load address = execution address
+LR_IROM1 0x0000C400 0x00073C00  {    ; load region size_region
+  ER_IROM1 0x0000C400 0x00073C00  {  ; load address = execution address
    *.o (RESET, +First)
    *(InRoot$$Sections)
    .ANY (+RO)

Firmware/Project/Cmsemicon/BAT32A279/MDK_ARM/RTE/Device/BAT32A279KM64FB/userdefine.h

@@ -20,7 +20,7 @@ User definitions
 
 typedef unsigned short 	MD_STATUS;
 
-#define HAS_BOOTLOADER (0u) // 仅仿真App时设置为0
+#define HAS_BOOTLOADER (1u) // 仅仿真App时设置为0
 #define APP_BASE (0x0000C400ul)
 
 /* Status list definition */

Firmware/Source/Application/BlueTooth.c

@@ -10,12 +10,9 @@ uint8_t SetUUIDTimes = 0;
 _PICID_Struct PicObj;
 _QRCODE_RECT QRCode_Rect;
 const uint8_t HJBlueToothName[9]= {"HJ750"};
-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};
+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 sjhja[20] = {0};
-// uint8_t PhoneName[100] = {0};
-// uint8_t BlueConnectStatus;
-// ee_uint16_t juasfha;
 
 void TextService(void);
 
@@ -54,9 +51,18 @@ void BlueToothService()
         Menu_Change_Branch_To_Item(MENU_BRANCH_ANIMATION,MENU_ITEM_MAIN_ITEM);
     }
     SetUUIDData((char *)UUIDConfigBuf, 22);
-   
-    QRCode_Rect.x = 650;
-    QRCode_Rect.y = 210;
+    if (OTA_Update_Flag == 1) 
+    {
+        QRCode_Rect.x = 650;
+        QRCode_Rect.y = 210;
+    }
+    else 
+    {
+        QRCode_Rect.x = QRCode_X;
+        QRCode_Rect.y = QRCode_Y;
+    }
+    // QRCode_Rect.x = 650;
+    // QRCode_Rect.y = 210;
     QRCode_Rect.height = 240;
     QRCode_Rect.width = 240;
     SetScreenType(QRCode_TYPE, QRCode_Rect);
@@ -82,7 +88,7 @@ void BlueToothService()
         } 
         OTA_Update_Count_Open=0;
     }
-    // SetTaskbarHeight(150);
+    SetTaskbarHeight(150);
     SetBlueToothName((uint8_t *)HJBlueToothName, sizeof(HJBlueToothName));
     TextService();
     

Firmware/Source/Application/BlueTooth.h

@@ -24,8 +24,8 @@ typedef struct {
 }TEXT_STRUCT;
 
 /*QRCode X Y height Width*/
-#define QRCode_X 457
-#define QRCode_Y 134
+#define QRCode_X 178
+#define QRCode_Y 130
 #define QRCode_HEIGHT 240
 #define QRCode_WIDTH 240
 #define QRCode_TYPE Square_Instrument

Firmware/Source/Component/AMT630H/AMT630H_Datas.c

@@ -4445,7 +4445,6 @@ void AMT630H_GUI_DisplayProc(void)
     PackedTransfer_Page();
 }
 
-
 void AMT630H_GUI_ReadPosittion_Display(void)
 {
     switch (g_u8Cursor_Posittion)
@@ -4615,20 +4614,23 @@ void AMT630H_GUI_ReadPosittion_Display(void)
         AMT630H_GUI_Phone_Connect_Win();
         break;
     case MENU_ITEM_PHONE_CONNECT_APP:
-    // PicObj.qr_logo_id = Pic_0234;//小数字9
-    // PicObj.main_pic_id = Pic_0382; //大白背景图
-    // PicObj.qr_pic_id = Pic_0479;//小数字0
-    // PicObj.update_pic_id = Pic_0233;//小数字8
-    // PicObj.second_menu = 0;
-    // PicObj.navigation_task_id = Pic_0411;//红色小e
-    //     PackedTransfer_DisplayPhoneMirrorQRcode(1, PicObj);
-    //     SetPagePic(GRAPHICS_PAGE_0, Pic_0001_0_0);
-    //     SetPagePic(GRAPHICS_PAGE_0, Pic_0476_0_0);
-    //     SetPagePic(GRAPHICS_PAGE_0, Pic_0477_178_130);
-    //     SetPagePic(GRAPHICS_PAGE_0, Pic_0234_605_289);
-    //     SetPagePic(GRAPHICS_PAGE_0, Pic_0479_242_313);
-    //     SetPagePic(GRAPHICS_PAGE_0, Pic_0411_56_533);
-        SetPagePic(GRAPHICS_PAGE_0, Pic_0382_0_0);/*背景图*/
+        PicObj.qr_logo_id = 0;//Pic_0234 小数字9  EA
+        PicObj.main_pic_id = Pic_0382; //大白背景图  17E
+        PicObj.qr_pic_id = Pic_0479;//小数字0   1DF
+        PicObj.update_pic_id = Pic_0233;//小数字8   E9
+        PicObj.second_menu = 0;
+        PicObj.navigation_task_id = Pic_0411;//红色小e  19B
+        if (GetPhoneMirrorst() == 0) 
+        {   SetPagePic(GRAPHICS_PAGE_0, Pic_0001_0_0);
+            SetPagePic(GRAPHICS_PAGE_0, Pic_0476_0_0);
+            PackedTransfer_DisplayPhoneMirrorQRcode(1, PicObj);
+        }
+        else
+        {
+            PackedTransfer_DisplayPhoneMirrorQRcode(0, PicObj);
+        }
+        SetPagePic(GRAPHICS_PAGE_0, Pic_0479_242_313);
+        // SetPagePic(GRAPHICS_PAGE_0, Pic_0382_0_0);/*背景图*/
         AMT630H_GUI_PhoneConnect_Light();
         AMT630H_GUI_PhoneConnect_TIME(Get_Dis_Hour_Time(), Get_Dis_Minute_Time());
         AMT630H_GUI_PhoneConnect_VSpeed(VechileSpeed);