Merge branch 'jinshuo' into 'dev'

Jinshuo

See merge request !46

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>
@@ -361,7 +361,7 @@
             </VariousControls>
           </Aads>
           <LDads>
-            <umfTarg>1</umfTarg>
+            <umfTarg>0</umfTarg>
             <Ropi>0</Ropi>
             <Rwpi>0</Rwpi>
             <noStLib>0</noStLib>
@@ -728,6 +728,16 @@
               <FileType>5</FileType>
               <FilePath>..\..\..\..\Source\Application\FaultCode.h</FilePath>
             </File>
+            <File>
+              <FileName>BlueTooth.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\Source\Application\BlueTooth.c</FilePath>
+            </File>
+            <File>
+              <FileName>BlueTooth.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\..\..\..\Source\Application\BlueTooth.h</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -969,9 +979,9 @@
               <FilePath>..\..\..\..\Source\Component\AMT630H\PicBin.h</FilePath>
             </File>
             <File>
-              <FileName>UartProtocol_V1.32_BAT32A239.lib</FileName>
+              <FileName>kei_S1.0.4_20240818.lib</FileName>
               <FileType>4</FileType>
-              <FilePath>..\..\..\..\Source\Component\AMT630H\UartProtocol_V1.32_BAT32A239.lib</FilePath>
+              <FilePath>..\..\..\..\Source\Component\AMT630H\kei_S1.0.4_20240818.lib</FilePath>
             </File>
             <File>
               <FileName>UartProtocol.h</FileName>

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

+#include "Components.h"
+   
+const uint8_t HJBlueToothName[9]= {"HJ_750TFT"};
+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};
+void BlueToothService()
+{
+    // _PICID_Struct PicObj;
+    // PicObj.qr_logo_id = Pic_0020;
+    // PicObj.qr_pic_id = Pic_0002;
+    // PicObj.update_pic_id = 0;
+    // PicObj.second_menu = 0;
+    // PicObj.navigation_task_id = 0;
+    // PackedTransfer_DisplayPhoneMirrorQRcode(1, PicObj);
+    SetBlueToothName((uint8_t *)HJBlueToothName, sizeof(HJBlueToothName));
+    SetUUIDData((char *)UUIDConfigBuf, 22);
+    // _QRCODE_RECT QRCode_Rect;
+    // QRCode_Rect.x = QRCode_X;
+    // QRCode_Rect.y = QRCode_Y;
+    // QRCode_Rect.height = QRCode_HEIGHT;
+    // QRCode_Rect.width = QRCode_WIDTH;
+    // SetScreenType(QRCode_TYPE, QRCode_Rect);
+}
\ No newline at end of file

Firmware/Source/Application/BlueTooth.h

+#ifndef _BLUETOOTH_H
+#define _BLUETOOTH_H
+
+/*QRCode X Y height Width*/
+#define QRCode_X 457
+#define QRCode_Y 134
+#define QRCode_HEIGHT 240
+#define QRCode_WIDTH 240
+#define QRCode_TYPE Square_Instrument
+
+
+extern void BlueToothService(void);
+
+#endif
\ No newline at end of file

Firmware/Source/Component/Components.h

@@ -35,6 +35,7 @@
 #include "CAN_CH0_CAN_Communication_Matrix.h"
 #include "Telltales\Telltales_user.h"
 #include "Telltales\Telltales_Lib.h"
+#include "Application\BlueTooth.h"
 
 #endif
 

Firmware/Source/System/Sys_Task_List.c

@@ -52,6 +52,7 @@ void Sys_20ms_Tasks(void)
 
 void Sys_50ms_Tasks(void)
 {
+    // BlueToothService();
     Telltales_Management();
     g_u8Cursor_Posittion = Menu_Get_Current_Cursor_Information();
 

Firmware/utility/诊断工具/Option/Option.properties

 #new Option
-#Tue Aug 13 23:16:37 CST 2024
+#Sun Aug 18 11:51:19 CST 2024
 IsSort=true
 MergeFlashIsCompression=false
 ChangeAppFilePath=
 MergeCanXLSPath=
 RH850_D1M1AGPIOJSONpath=
 DBFFilePath=
-MergeCrcTtpe=29
-MergeBootFilePath=C\:\\Users\\Lenovo\\Desktop\\haojin750_TFT\\haojin750tft\\Firmware\\utility\\Boot_Release\\HaoJin_750TFT_HJYB-7500TFT_BV1.01_20240808.hex
+MergeCrcTtpe=21
+MergeBootFilePath=D\:\\git\\haojin750tft\\Firmware\\utility\\Boot_Release\\HaoJin_750TFT_HJYB-7500TFT_BV1.03_20240816.hex
 IsMergeChangeAddress=false
 MergeFlashOutPutFilePath=
 GPIOOutPutPath=
@@ -26,11 +26,11 @@ MergeLineInOutPutPath=
 Leave2ID=17
 PHYID=781
 BaudRate=500K
-AppUpdateFilePath=C\:\\Users\\Lenovo\\Desktop\\haojin750tft_2024-8-13\\APP_20240813230755344371.srec
+AppUpdateFilePath=
 FUNID=7DF
 IsMergeCreateBin=false
 IsOverWrite=true
-DllFilePath=C\:\\Users\\Lenovo\\Desktop\\haojin750_TFT\\haojin750tft\\Firmware\\utility\\\u8BCA\u65AD\u5DE5\u5177\\\u89E3\u9501\u6587\u4EF6\\default_64.dll
+DllFilePath=
 MergeAudioOutPutPath=
 MergeCanOutPutPath=
 ChangeOutPutFilePath=
@@ -42,12 +42,12 @@ UpdateProcess=\u9ED8\u8BA4
 Driver=Kvaser
 MergeFlashImageFormat=
 RH850_F1KMGPIOJSONpath=
-DriverFilePath=C\:\\Users\\Lenovo\\Desktop\\haojin750_TFT\\haojin750tft\\Firmware\\utility\\\u8BCA\u65AD\u5DE5\u5177\\FlashDriver\\R5_FlashDriver.srec
+DriverFilePath=
 IsMergeCreateHex=false
 MergeFlashIsCreateREC=false
 TTFExtractTTFpath=
 MergeImageFilePath=
-IsMergeCreateUpdateBin=false
+IsMergeCreateUpdateBin=true
 MergeImageSize=128M
 CRCFilePath=
 MergeFlashCompressionFormat=
@@ -56,8 +56,8 @@ IsHexDisplay=true
 MergeLineInXLSPath=
 MergeFlashInPutFilePath=
 MergeFlashIsInternal=false
-MergeOutPutFilePath=C\:\\Users\\Lenovo\\Desktop\\haojin750tft_2024-8-13
-MergeAppFilePath=C\:\\Users\\Lenovo\\Desktop\\haojin750tft_2024-8-13\\HaoJin750TFT.hex
+MergeOutPutFilePath=D\:\\\u9879\u76EE\\\u8C6A\u8FDB\\haojin750TFT\\srec
+MergeAppFilePath=D\:\\git\\haojin750tft\\Firmware\\Project\\Cmsemicon\\BAT32A279\\MDK_ARM\\Objects\\HaoJin750TFT.hex
 MergeTelltalesXLSPath=
 FillingByte=-86
 ImageVersion=0