Commit f011c942 authored by 张金硕's avatar 张金硕

feat:更新630和279的串口协议库

parent aea302d5
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
</OCR_RVCT3> </OCR_RVCT3>
<OCR_RVCT4> <OCR_RVCT4>
<Type>1</Type> <Type>1</Type>
<StartAddress>0x0</StartAddress> <StartAddress>0xc400</StartAddress>
<Size>0x73c00</Size> <Size>0x73c00</Size>
</OCR_RVCT4> </OCR_RVCT4>
<OCR_RVCT5> <OCR_RVCT5>
...@@ -361,7 +361,7 @@ ...@@ -361,7 +361,7 @@
</VariousControls> </VariousControls>
</Aads> </Aads>
<LDads> <LDads>
<umfTarg>1</umfTarg> <umfTarg>0</umfTarg>
<Ropi>0</Ropi> <Ropi>0</Ropi>
<Rwpi>0</Rwpi> <Rwpi>0</Rwpi>
<noStLib>0</noStLib> <noStLib>0</noStLib>
...@@ -979,9 +979,9 @@ ...@@ -979,9 +979,9 @@
<FilePath>..\..\..\..\Source\Component\AMT630H\PicBin.h</FilePath> <FilePath>..\..\..\..\Source\Component\AMT630H\PicBin.h</FilePath>
</File> </File>
<File> <File>
<FileName>UartProtocol_V1.32_BAT32A239.lib</FileName> <FileName>kei_S1.0.4_20240818.lib</FileName>
<FileType>4</FileType> <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>
<File> <File>
<FileName>UartProtocol.h</FileName> <FileName>UartProtocol.h</FileName>
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
; *** Scatter-Loading Description File generated by uVision *** ; *** Scatter-Loading Description File generated by uVision ***
; ************************************************************* ; *************************************************************
LR_IROM1 0x00000000 0x00073C00 { ; load region size_region LR_IROM1 0x0000C400 0x00073C00 { ; load region size_region
ER_IROM1 0x00000000 0x00073C00 { ; load address = execution address ER_IROM1 0x0000C400 0x00073C00 { ; load address = execution address
*.o (RESET, +First) *.o (RESET, +First)
*(InRoot$$Sections) *(InRoot$$Sections)
.ANY (+RO) .ANY (+RO)
......
...@@ -20,7 +20,7 @@ User definitions ...@@ -20,7 +20,7 @@ User definitions
typedef unsigned short MD_STATUS; typedef unsigned short MD_STATUS;
#define HAS_BOOTLOADER (0u) // 仅仿真App时设置为0 #define HAS_BOOTLOADER (1u) // 仅仿真App时设置为0
#define APP_BASE (0x0000C400ul) #define APP_BASE (0x0000C400ul)
/* Status list definition */ /* Status list definition */
......
...@@ -31,6 +31,7 @@ extern uint8_t GetAliveCounter(ALIVE_COUNTER_TYPE n); /* 0:ALIVE_COUNTER_COMM, 1 ...@@ -31,6 +31,7 @@ extern uint8_t GetAliveCounter(ALIVE_COUNTER_TYPE n); /* 0:ALIVE_COUNTER_COMM, 1
extern uint32_t GetCrcErrCnts(void); extern uint32_t GetCrcErrCnts(void);
extern uint32_t GetRecvLenErrCnts(void); extern uint32_t GetRecvLenErrCnts(void);
extern uint8_t GetLcdInitSt(void); extern uint8_t GetLcdInitSt(void);
extern uint8_t GetLcdInitStB(void);
extern uint8_t *GetUartRecvData(uint32_t *UartRecvBufLen, uint32_t *UartRecvPos); extern uint8_t *GetUartRecvData(uint32_t *UartRecvBufLen, uint32_t *UartRecvPos);
extern void UartSendData(uint8_t *data, uint32_t len); extern void UartSendData(uint8_t *data, uint32_t len);
extern void AnalysisUartData(void); extern void AnalysisUartData(void);
...@@ -329,13 +330,13 @@ extern uint8_t Update630HEnd(uint32_t TimerCnts); ...@@ -329,13 +330,13 @@ extern uint8_t Update630HEnd(uint32_t TimerCnts);
/*Mobile screen projection*/ /*Mobile screen projection*/
enum PhoneStatus enum PhoneStatus
{ {
Phone_Undefine = 0u, Phone_Undefine = 0u,
Phone_Idle, Phone_Idle,
Phone_Connecting, Phone_Connecting,
Phone_Outgoing, Phone_EndCall,
Phone_Incoming, Phone_Outgoing,
Phone_Talking, Phone_Incoming,
Phone_EndCall Phone_Talking,
}; };
enum PhoneConTrol enum PhoneConTrol
...@@ -348,7 +349,7 @@ enum BlueToothStatus ...@@ -348,7 +349,7 @@ enum BlueToothStatus
{ {
BlueTooth_Undefine = 0u, BlueTooth_Undefine = 0u,
BlueTooth_DisConnect, BlueTooth_DisConnect,
BlueTooth_Connection BlueTooth_Connection,
}; };
enum ECNaviIcon enum ECNaviIcon
...@@ -434,7 +435,7 @@ typedef struct ...@@ -434,7 +435,7 @@ typedef struct
{ {
uint8_t BlueToothSignalSate; uint8_t BlueToothSignalSate;
uint8_t BlueToothPhoneSate;//incall、outcall uint8_t BlueToothPhoneSate;//incall、outcall
uint8_t BlueToothPhoneName[40]; uint8_t BlueToothPhoneName[100];
char PhoneNumber[20]; char PhoneNumber[20];
uint16_t PhoneBookTotalCount; uint16_t PhoneBookTotalCount;
char BlueToothName[20]; char BlueToothName[20];
...@@ -508,5 +509,6 @@ extern void SetQRCodeTypeData(uint8_t data); ...@@ -508,5 +509,6 @@ extern void SetQRCodeTypeData(uint8_t data);
extern void SetUpdateCtrl(uint8_t cmddata,_QRCODE_RECT qrcode_obj); extern void SetUpdateCtrl(uint8_t cmddata,_QRCODE_RECT qrcode_obj);
extern void SetBlueToothName(uint8_t *data,uint8_t len); extern void SetBlueToothName(uint8_t *data,uint8_t len);
extern void SetTaskbarHeight(uint16_t height); extern void SetTaskbarHeight(uint16_t height);
extern void Set_Pro_Unique_Identifier(uint8_t *data,uint8_t len);
#endif #endif
...@@ -52,7 +52,7 @@ void Sys_20ms_Tasks(void) ...@@ -52,7 +52,7 @@ void Sys_20ms_Tasks(void)
void Sys_50ms_Tasks(void) void Sys_50ms_Tasks(void)
{ {
BlueToothService(); // BlueToothService();
Telltales_Management(); Telltales_Management();
g_u8Cursor_Posittion = Menu_Get_Current_Cursor_Information(); g_u8Cursor_Posittion = Menu_Get_Current_Cursor_Information();
......
#new Option #new Option
#Tue Aug 13 23:16:37 CST 2024 #Sun Aug 18 11:51:19 CST 2024
IsSort=true IsSort=true
MergeFlashIsCompression=false MergeFlashIsCompression=false
ChangeAppFilePath= ChangeAppFilePath=
MergeCanXLSPath= MergeCanXLSPath=
RH850_D1M1AGPIOJSONpath= RH850_D1M1AGPIOJSONpath=
DBFFilePath= DBFFilePath=
MergeCrcTtpe=29 MergeCrcTtpe=21
MergeBootFilePath=C\:\\Users\\Lenovo\\Desktop\\haojin750_TFT\\haojin750tft\\Firmware\\utility\\Boot_Release\\HaoJin_750TFT_HJYB-7500TFT_BV1.01_20240808.hex MergeBootFilePath=D\:\\git\\haojin750tft\\Firmware\\utility\\Boot_Release\\HaoJin_750TFT_HJYB-7500TFT_BV1.03_20240816.hex
IsMergeChangeAddress=false IsMergeChangeAddress=false
MergeFlashOutPutFilePath= MergeFlashOutPutFilePath=
GPIOOutPutPath= GPIOOutPutPath=
...@@ -26,11 +26,11 @@ MergeLineInOutPutPath= ...@@ -26,11 +26,11 @@ MergeLineInOutPutPath=
Leave2ID=17 Leave2ID=17
PHYID=781 PHYID=781
BaudRate=500K BaudRate=500K
AppUpdateFilePath=C\:\\Users\\Lenovo\\Desktop\\haojin750tft_2024-8-13\\APP_20240813230755344371.srec AppUpdateFilePath=
FUNID=7DF FUNID=7DF
IsMergeCreateBin=false IsMergeCreateBin=false
IsOverWrite=true 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= MergeAudioOutPutPath=
MergeCanOutPutPath= MergeCanOutPutPath=
ChangeOutPutFilePath= ChangeOutPutFilePath=
...@@ -42,12 +42,12 @@ UpdateProcess=\u9ED8\u8BA4 ...@@ -42,12 +42,12 @@ UpdateProcess=\u9ED8\u8BA4
Driver=Kvaser Driver=Kvaser
MergeFlashImageFormat= MergeFlashImageFormat=
RH850_F1KMGPIOJSONpath= RH850_F1KMGPIOJSONpath=
DriverFilePath=C\:\\Users\\Lenovo\\Desktop\\haojin750_TFT\\haojin750tft\\Firmware\\utility\\\u8BCA\u65AD\u5DE5\u5177\\FlashDriver\\R5_FlashDriver.srec DriverFilePath=
IsMergeCreateHex=false IsMergeCreateHex=false
MergeFlashIsCreateREC=false MergeFlashIsCreateREC=false
TTFExtractTTFpath= TTFExtractTTFpath=
MergeImageFilePath= MergeImageFilePath=
IsMergeCreateUpdateBin=false IsMergeCreateUpdateBin=true
MergeImageSize=128M MergeImageSize=128M
CRCFilePath= CRCFilePath=
MergeFlashCompressionFormat= MergeFlashCompressionFormat=
...@@ -56,8 +56,8 @@ IsHexDisplay=true ...@@ -56,8 +56,8 @@ IsHexDisplay=true
MergeLineInXLSPath= MergeLineInXLSPath=
MergeFlashInPutFilePath= MergeFlashInPutFilePath=
MergeFlashIsInternal=false MergeFlashIsInternal=false
MergeOutPutFilePath=C\:\\Users\\Lenovo\\Desktop\\haojin750tft_2024-8-13 MergeOutPutFilePath=D\:\\\u9879\u76EE\\\u8C6A\u8FDB\\haojin750TFT\\srec
MergeAppFilePath=C\:\\Users\\Lenovo\\Desktop\\haojin750tft_2024-8-13\\HaoJin750TFT.hex MergeAppFilePath=D\:\\git\\haojin750tft\\Firmware\\Project\\Cmsemicon\\BAT32A279\\MDK_ARM\\Objects\\HaoJin750TFT.hex
MergeTelltalesXLSPath= MergeTelltalesXLSPath=
FillingByte=-86 FillingByte=-86
ImageVersion=0 ImageVersion=0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment