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/AMT630H/UartProtocol.h

 #ifndef UART_PROTOCOL_H
 #define UART_PROTOCOL_H
 
-#include <stdint.h>
 typedef unsigned int uint32_t;
 typedef int int32_t;
 typedef unsigned short uint16_t;
 typedef short int16_t;
 typedef unsigned char uint8_t;
+
+
 #define UART_UPDATE_ACK_NONE 0
 #define UART_UPDATE_ACK_OK 1
 #define UART_UPDATE_ACK_WAIT 2
@@ -30,9 +31,7 @@ extern uint8_t GetAliveCounter(ALIVE_COUNTER_TYPE n); /* 0:ALIVE_COUNTER_COMM, 1
 extern uint32_t GetCrcErrCnts(void);
 extern uint32_t GetRecvLenErrCnts(void);
 extern uint8_t GetLcdInitSt(void);
-extern uint8_t GetCameraSignalSt(void);
-extern uint8_t GetVideoCaptureSt(void);
-extern uint8_t GetAmt630InBoot(void); 
+extern uint8_t GetLcdInitStB(void);
 extern uint8_t *GetUartRecvData(uint32_t *UartRecvBufLen, uint32_t *UartRecvPos);
 extern void UartSendData(uint8_t *data, uint32_t len);
 extern void AnalysisUartData(void);
@@ -111,6 +110,10 @@ typedef struct {
     uint8_t SoundFreq;
     uint8_t SoundChannelNum;
 } LCD_TFT_SOUND_PARA_ST;
+
+
+
+
 extern void SetLcdSoundParameter(LCD_TFT_SOUND_PARA_ST *pData);
 /* Lcd Parameter end */
 
@@ -187,11 +190,6 @@ extern void PackedTransfer_InitPointer(POINTER_ENUM PointerN, uint8_t *data, uin
 extern uint8_t GetPointerInitSt(POINTER_ENUM PointerN);
 extern void PackedTransfer_SetPointerDestVal(POINTER_ENUM PointerN, uint16_t DestVal, uint8_t NoDamping); /* DestVal:0~1000, NoDamping: 0-have damping, 1:no damping */
 extern uint16_t GetPointerCurVal(POINTER_ENUM PointerN);                               /* CurVal:0~1000 */
-
-#define POINTER_NUM_LIST_MAX 20
-extern void SetPointerNumPic(POINTER_ENUM PointerN, uint8_t n, uint16_t PicIndex, uint16_t PointerVal);
-extern void SetPointerNumZoomPara(POINTER_ENUM PointerN, uint16_t ZoomRange, float ZoomMax);
-extern void PackedTransfer_PointerNumData(POINTER_ENUM PointerN);
 /* Pointer end */
 
 /* Page Data */
@@ -229,20 +227,18 @@ typedef enum {
     TFT_ROT_270,
 } TFT_ROT_TYPE;
 
-#define TEXT_ROT_SCALE (r, s) ((((r) & 0xffff) << 16) | ((s) & 0xffff))
-#define TEXT_COLOR(r, g, b, a) ((((r) & 0xff) << 24) | (((g) & 0xff) << 16) | (((b) & 0xff) << 8) | ((a) & 0xff)
-#define TEXT_LINE_OFFSET(x, y) ((((x) & 0xffff) << 16) | ((y) & 0xffff))
+#define TEXT_ROT_SCALE (r, s) ((((r) & 0xffff) << 16) | (s) & 0xffff)
+#define TEXT_COLOR(r, g, b, a) ((((r) & 0xff) << 24) | (((g) & 0xff) << 16) | (((b) & 0xff) << 8) | ((a) & 0xff))
 
 #define GROUP_ALIGN_LEFT 0x0
 #define GROUP_ALIGN_CENTER 0x40
 extern void SetPageGuid(GRAPHICS_PAGE_ENUM page, uint8_t h, uint8_t m, uint8_t l);
 extern void SetPageBackground(GRAPHICS_PAGE_ENUM page, uint16_t PicIndex);
 extern void SetPagePic(GRAPHICS_PAGE_ENUM page, uint16_t PicIndex);
-extern void SetPagePicPointerNum(GRAPHICS_PAGE_ENUM page, POINTER_ENUM PointN, uint16_t PicIndex);
 extern void SetPagePicFree(GRAPHICS_PAGE_ENUM page, uint16_t PicIndex, int16_t PosX, int16_t PosY);
 extern void SetPagePicFreeAppend(GRAPHICS_PAGE_ENUM page, uint16_t pic, int16_t PosX, int16_t PosY);
 extern void SetPagePicGroup(GRAPHICS_PAGE_ENUM page, int16_t Interval, int16_t PosX, int16_t PosY, uint16_t *PicList, uint32_t Align_Num, uint16_t Dot_Itv, TFT_ROT_TYPE TftRot);
-extern void SetPageText(GRAPHICS_PAGE_ENUM page, uint16_t LabelNum, int16_t PosX, int16_t PosY, int16_t MaxX, TEXT_ALIGN_TYPE AlginType, uint32_t RotScale, uint32_t Color, uint32_t LineOffset);	/* TEXT_ROT_SCALE:use TEXT_ROT_SCALE macro, (r:0~3600); (s:-1000 ~ 1000, 0:no scale, 1 ~ 1000:zoom in, -1 ~ -1000:zoom out); Color:use TEXT_COLOR macro; LineOffset:use TEXT_LINE_OFFSET macro */
+extern void SetPageText(GRAPHICS_PAGE_ENUM page, uint16_t LabelNum, int16_t PosX, int16_t PosY, int16_t MaxX, TEXT_ALIGN_TYPE AlginType, uint32_t RotScale, uint32_t Color);	/* TEXT_ROT_SCALE:use TEXT_ROT_SCALE macro, (r:0~3600); (s:-1000 ~ 1000, 0:no scale, 1 ~ 1000:zoom in, -1 ~ -1000:zoom out); Color:use TEXT_COLOR macro */
 extern void SetPagePointerPic(GRAPHICS_PAGE_ENUM page, POINTER_ENUM PointN, uint16_t PicIndex);
 extern void SetPagePointerSePic(GRAPHICS_PAGE_ENUM page, POINTER_ENUM PointN);
 extern void SetPagePointerTrackPic(GRAPHICS_PAGE_ENUM page, POINTER_ENUM PointN, uint16_t PicIndex);
@@ -259,6 +255,9 @@ extern void PackedTransfer_ComposeData(uint8_t *data, uint8_t len);
 
 /* Label List */
 extern uint8_t GetLanguageInitSt(void);
+extern uint8_t GetCameraImageValid(void);
+extern uint8_t GetItuTakeVideo(void);
+extern uint8_t GetCarlinkLcdTack(void);
 extern void PackedTransfer_InitLanguageFont(uint8_t Language, uint8_t Font);
 extern void PackedTransfer_LabelsList(uint16_t LabelNum, uint8_t *LabelBuf, uint32_t LabelLen);
 /* Label List end */
@@ -275,7 +274,7 @@ extern void PackedTransfer_CheckFlashForceDisplay(FLASH_CHECK_FORCE_DISPLAY_TYPE
 /* Flash Check end */
 
 /* Video Input */
-extern void PackedTransfer_VedioInputOn(uint32_t PosX, uint32_t PosY, uint32_t Wdith, uint32_t Height, uint32_t CutX, uint32_t CutY);
+extern void PackedTransfer_VedioInputOn(void);
 extern void PackedTransfer_VedioInputOff(void);
 /* Video Input end */
 
@@ -283,6 +282,7 @@ extern void PackedTransfer_VedioInputOff(void);
 typedef enum {
 	REQ_DATA,
 	GET_STATUS,
+	GET_OFFSET,
 	GET_APP_DATA_OFFSET,
     GET_BACKUP_DATA_OFFSET,
     GET_BACKUP_DATA_CRC,
@@ -303,10 +303,6 @@ extern void PackedTransfer_GetBackupDataCrc(uint32_t addr, uint32_t len);
 extern void PackedTransfer_WriteBackupData(uint32_t addr, uint8_t *data, uint16_t len);
 /* Get Mcu or Backup Data end */
 
-/* Set tft io mode */
-extern void PackedTransfer_SetTftIoMode(uint8_t st);	/*st 0:normal gpio, 1:TFT io*/
-/* Set tft io mode end */
-
 enum {NUM_0, NUM_1, NUM_2, NUM_3, NUM_4, NUM_5, NUM_6, NUM_7, NUM_8, NUM_9, NUM_POINT, NUM_LINE};
 typedef struct {
     const uint16_t *NumList;
@@ -331,4 +327,188 @@ extern uint8_t Update630HBegin(uint32_t TimerCnts);
 extern uint8_t Update630HWrite(uint32_t TimerCnts, uint8_t *data, uint32_t len);
 extern uint8_t Update630HEnd(uint32_t TimerCnts);
 
+/*Mobile screen projection*/
+enum PhoneStatus
+{
+	Phone_Undefine = 0u,
+	Phone_Idle,
+	Phone_Connecting,
+	Phone_EndCall,
+	Phone_Outgoing,
+	Phone_Incoming,
+	Phone_Talking,
+};
+
+enum PhoneConTrol
+{
+	PhoneConTrol_Undefine = 0u,
+	Phone_Pick_Up,
+	Phone_Hangup_Out
+};
+enum BlueToothStatus
+{
+	BlueTooth_Undefine = 0u,
+	BlueTooth_DisConnect,
+	BlueTooth_Connection,
+};
+
+enum ECNaviIcon
+{
+    EC_NAVI_ICON_NONE                          = 0,               ///< 收到此值，不显示导航图标
+    EC_NAVI_ICON_DEFAULT                       = 1,               ///< 自车.请忽略这个元素，从左转图标开始
+    EC_NAVI_ICON_LEFT                          = 2,               ///< 左转
+    EC_NAVI_ICON_RIGHT                         = 3,               ///< 右转
+    EC_NAVI_ICON_LEFT_FRONT                    = 4,               ///< 左前方
+    EC_NAVI_ICON_RIGHT_FRONT                   = 5,               ///< 右前方
+    EC_NAVI_ICON_LEFT_BACK                     = 6,               ///< 左后方
+    EC_NAVI_ICON_RIGHT_BACK                    = 7,               ///< 右后方
+    EC_NAVI_ICON_LEFT_TURN_AROUND              = 8,               ///< 左转掉头
+    EC_NAVI_ICON_STRAIGHT                      = 9,               ///< 直行
+    EC_NAVI_ICON_ARRIVED_WAYPOINT              = 10,              ///< 到达途经点
+    EC_NAVI_ICON_ENTER_ROUNDABOUT              = 11,              ///< 进入环岛
+    EC_NAVI_ICON_OUT_ROUNDABOUT                = 12,              ///< 驶出环岛
+    EC_NAVI_ICON_ARRIVED_SERVICE_AREA          = 13,              ///< 到达服务区
+    EC_NAVI_ICON_ARRIVED_TOLLGATE              = 14,              ///< 到达收费站
+    EC_NAVI_ICON_ARRIVED_DESTINATION           = 15,              ///< 到达目的地
+    EC_NAVI_ICON_ARRIVED_TUNNEL                = 16,              ///< 到达隧道
+    EC_NAVI_ICON_CROSSWALK                     = 17,              ///< 通过人行横道
+    EC_NAVI_ICON_OVERPASS                      = 18,              ///< 通过过街天桥
+    EC_NAVI_ICON_UNDERPASS                     = 19,              ///< 通过地下通道
+    EC_NAVI_ICON_SQUARE                        = 20,              ///< 通过广场
+    EC_NAVI_ICON_PARK                          = 21,              ///< 通过公园
+    EC_NAVI_ICON_STAIRCASE                     = 22,              ///< 通过扶梯
+    EC_NAVI_ICON_LIFT                          = 23,              ///< 通过直梯
+    EC_NAVI_ICON_CABLEWAY                      = 24,              ///< 通过索道
+    EC_NAVI_ICON_SKY_CHANNEL                   = 25,              ///< 通过空中通道
+    EC_NAVI_ICON_CHANNEL                       = 26,              ///< 通过通道、建筑物穿越通道
+    EC_NAVI_ICON_WALK_ROAD                     = 27,              ///< 通过行人道路
+    EC_NAVI_ICON_CRUISE_ROUTE                  = 28,              ///< 通过游船路线
+    EC_NAVI_ICON_SIGHTSEEING_BUSLINE           = 29,              ///< 通过观光车路线
+    EC_NAVI_ICON_SLIDEWAY                      = 30,              ///< 通过滑道
+    EC_NAVI_ICON_LADDER                        = 31,              ///< 通过阶梯
+    EC_NAVI_ICON_MERGE_LEFT                    = 51,              ///< 靠左行驶
+    EC_NAVI_ICON_MERGE_RIGHT                   = 52,              ///< 靠右行驶
+    EC_NAVI_ICON_SLOW                          = 53,              ///< 减速慢行
+    EC_NAVI_ICON_ENTRY_RING_LEFT               = 54,              ///< 标准小环岛 绕环岛左转，右侧通行地区的逆时针环岛
+    EC_NAVI_ICON_ENTRY_RING_RIGHT              = 55,              ///< 标准小环岛 绕环岛右转，右侧通行地区的逆时针环岛
+    EC_NAVI_ICON_ENTRY_RING_CONTINUE           = 56,              ///< 标准小环岛 绕环岛直行，右侧通行地区的逆时针环岛
+    EC_NAVI_ICON_ENTRY_RING_UTURN              = 57,              ///< 标准小环岛 绕环岛调头，右侧通行地区的逆时针环岛
+    EC_NAVI_ICON_ENTRY_LEFT_RING               = 58,              ///< 进入环岛图标，左侧通行地区的顺时针环岛
+    EC_NAVI_ICON_LEAVE_LEFT_RING               = 59,              ///< 驶出环岛图标，左侧通行地区的顺时针环岛
+    EC_NAVI_ICON_UTURN_RIGHT                   = 60,              ///< 右转掉头图标，左侧通行地区的掉头
+    EC_NAVI_ICON_SPECIAL_CONTINUE              = 61,              ///< 顺行图标(和直行有区别，顺行图标带有虚线)
+    EC_NAVI_ICON_ENTRY_LEFT_RING_LEFT          = 62,              ///< 标准小环岛 绕环岛左转，左侧通行地区的顺时针环岛
+    EC_NAVI_ICON_ENTRY_LEFT_RING_RIGHT         = 63,              ///< 标准小环岛 绕环岛右转，左侧通行地区的顺时针环岛
+    EC_NAVI_ICON_ENTRY_LEFT_RING_CONTINUE      = 64,              ///< 标准小环岛 绕环岛直行，左侧通行地区的顺时针环岛
+    EC_NAVI_ICON_ENTRY_LEFT_RING_UTURN         = 65,              ///< 标准小环岛 绕环岛调头，左侧通行地区的顺时针环岛
+    EC_NAVI_ICON_SLOPE                         = 66,              ///< 通过斜坡图标
+    EC_NAVI_ICON_BRIDGE                        = 67,              ///< 通过桥图标
+    EC_NAVI_ICON_FERRYBOAT                     = 68,              ///< 通过渡轮图标
+    EC_NAVI_ICON_SUBWAY                        = 69,              ///< 通过地铁图标
+    EC_NAVI_ICON_ENTER_BUILDING                = 70,              ///< 进入建筑物图标
+    EC_NAVI_ICON_LEAVE_BUILDING                = 71,              ///< 离开建筑物图标
+    EC_NAVI_ICON_BY_ELEVATOR                   = 72,              ///< 电梯换层图标
+    EC_NAVI_ICON_BY_STAIR                      = 73,              ///< 楼梯换层图标
+    EC_NAVI_ICON_ESCALATOR                     = 74,              ///< 扶梯换层图标
+    EC_NAVI_ICON_LOW_TRAFFIC_CROSS             = 75,              ///< 非导航段通过红绿灯路口图标
+    EC_NAVI_ICON_LOW_CROSS                     = 76,              ///< 非导航段通过普通路口图标
+    EC_NAVI_ICON_ROTARY_SHARP_LEFT             = 77,              ///< 环岛左后转，右侧通行地区的逆时针环岛
+    EC_NAVI_ICON_ROTARY_SHARP_RIGHT            = 78,              ///< 环岛后右转，右侧通行地区的逆时针环岛
+    EC_NAVI_ICON_ROTARY_SLIGHT_LEFT            = 79,              ///< 环岛左前转，右侧通行地区的逆时针环岛
+    EC_NAVI_ICON_ROTARY_SLIGHT_RIGHT           = 80,              ///< 环岛右前转，右侧通行地区的逆时针环岛
+    EC_NAVI_ICON_MAX
+};
+
+enum ScreenType
+{
+    Circular_Instrument = 1,
+    Square_Instrument
+};
+
+typedef struct
+{
+    char ssid[20];
+    char password[10];
+}_update_info_stru;
+
+typedef struct 
+{
+    uint8_t BlueToothSignalSate;
+	uint8_t BlueToothPhoneSate;//incall、outcall
+	uint8_t  BlueToothPhoneName[100];
+	char PhoneNumber[20];
+    uint16_t PhoneBookTotalCount;
+	char  BlueToothName[20];
+    
+}_BlueToothPhoneData;
+typedef struct 
+{
+	unsigned char Data;
+	unsigned char Moth;
+	unsigned int  Year;
+	unsigned char Hour;
+    unsigned char Ninutes;
+	unsigned char Second;
+}_GPS_TIME;
+
+typedef struct 
+{
+  uint8_t  navigation_state;
+  uint8_t  EasyNavigationData;
+  uint8_t  RoadName[100];
+  uint32_t distance;
+}_NavigationData_struct;
+typedef struct 
+{
+   uint16_t x;
+   uint16_t y;
+   uint16_t width;
+   uint16_t height;
+  
+}_QRCODE_RECT;
+
+typedef struct
+{
+   uint16_t qr_pic_id;
+   uint16_t main_pic_id;
+   uint16_t qr_logo_id ;
+   uint16_t update_pic_id;
+   uint16_t second_menu;
+   uint16_t navigation_task_id;
+}_PICID_Struct;
+
+typedef struct{
+	uint8_t blearn;
+	uint8_t strmac[6];
+	uint16_t PressureVal;
+	int temperature;
+}ec_stru_TirePressure;
+
+extern ec_stru_TirePressure ec_stru_pressure;
+extern _update_info_stru update_info;
+extern uint8_t UUID_Received;
+extern _BlueToothPhoneData BlueToothPhoneData;
+extern _GPS_TIME GPS_Time;
+extern _NavigationData_struct NavigationData_st;
+extern void PackedTransfer_DisplayPhoneMirrorQRcode(uint8_t data,_PICID_Struct PICID_OBJ);
+extern void PackedTransfer_BlueTooth_DataSet(uint8_t data);
+extern void PackedTransfer_GetPhoneBookCmd(void);
+extern uint8_t GetPhoneMirrorst(void) ;
+extern void PackedTransfer_EasyNavigation(uint8_t data);
+
+extern void GerProgramVer(uint8_t * bufdata);
+extern uint8_t GetErrorInfo();
+extern uint8_t GetBACKUUIDSTATE();
+extern uint8_t GetBlueToothPowerSTATE();
+
+extern void SetBluetoothTurnXX(uint8_t data);
+extern void SetScreenType(uint8_t ntype,_QRCODE_RECT rect_st);
+extern void SetUUIDData(char *data,uint8_t len);
+extern void Set_UIFinishData(uint8_t data);
+extern void SetQRCodeTypeData(uint8_t data);
+extern void SetUpdateCtrl(uint8_t cmddata,_QRCODE_RECT qrcode_obj);
+extern void SetBlueToothName(uint8_t *data,uint8_t len);
+extern void SetTaskbarHeight(uint16_t height);
+extern void Set_Pro_Unique_Identifier(uint8_t *data,uint8_t len);
+
 #endif

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