Commit 2352c3e3 authored by 张金硕's avatar 张金硕

🐞 fix:修改投屏导航的bug

parent a5de7526
...@@ -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>
...@@ -978,6 +978,11 @@ ...@@ -978,6 +978,11 @@
<FileType>5</FileType> <FileType>5</FileType>
<FilePath>..\..\..\..\Source\Component\AMT630H\PicBin.h</FilePath> <FilePath>..\..\..\..\Source\Component\AMT630H\PicBin.h</FilePath>
</File> </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> <File>
<FileName>UartProtocol.h</FileName> <FileName>UartProtocol.h</FileName>
<FileType>5</FileType> <FileType>5</FileType>
...@@ -1013,16 +1018,6 @@ ...@@ -1013,16 +1018,6 @@
<FileType>5</FileType> <FileType>5</FileType>
<FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor_User.h</FilePath> <FilePath>..\..\..\..\Source\Component\System_Monitor\System_Monitor_User.h</FilePath>
</File> </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> </Files>
</Group> </Group>
<Group> <Group>
......
...@@ -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 */
......
...@@ -4445,7 +4445,6 @@ void AMT630H_GUI_DisplayProc(void) ...@@ -4445,7 +4445,6 @@ void AMT630H_GUI_DisplayProc(void)
PackedTransfer_Page(); PackedTransfer_Page();
} }
uint8_t shuotestflag = 0;
void AMT630H_GUI_ReadPosittion_Display(void) void AMT630H_GUI_ReadPosittion_Display(void)
{ {
switch (g_u8Cursor_Posittion) switch (g_u8Cursor_Posittion)
...@@ -4615,20 +4614,23 @@ void AMT630H_GUI_ReadPosittion_Display(void) ...@@ -4615,20 +4614,23 @@ void AMT630H_GUI_ReadPosittion_Display(void)
AMT630H_GUI_Phone_Connect_Win(); AMT630H_GUI_Phone_Connect_Win();
break; break;
case MENU_ITEM_PHONE_CONNECT_APP: case MENU_ITEM_PHONE_CONNECT_APP:
// PicObj.qr_logo_id = Pic_0234;//小数字9 PicObj.qr_logo_id = 0;//Pic_0234 小数字9 EA
// PicObj.main_pic_id = Pic_0382; //大白背景图 PicObj.main_pic_id = Pic_0382; //大白背景图 17E
// PicObj.qr_pic_id = Pic_0479;//小数字0 PicObj.qr_pic_id = Pic_0479;//小数字0 1DF
// PicObj.update_pic_id = Pic_0233;//小数字8 PicObj.update_pic_id = Pic_0233;//小数字8 E9
// PicObj.second_menu = 0; PicObj.second_menu = 0;
// PicObj.navigation_task_id = Pic_0411;//红色小e PicObj.navigation_task_id = Pic_0411;//红色小e 19B
// PackedTransfer_DisplayPhoneMirrorQRcode(1, PicObj); if (GetPhoneMirrorst() == 0)
// SetPagePic(GRAPHICS_PAGE_0, Pic_0001_0_0); { SetPagePic(GRAPHICS_PAGE_0, Pic_0001_0_0);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0476_0_0); SetPagePic(GRAPHICS_PAGE_0, Pic_0476_0_0);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0477_178_130); PackedTransfer_DisplayPhoneMirrorQRcode(1, PicObj);
// SetPagePic(GRAPHICS_PAGE_0, Pic_0234_605_289); }
// SetPagePic(GRAPHICS_PAGE_0, Pic_0479_242_313); else
// SetPagePic(GRAPHICS_PAGE_0, Pic_0411_56_533); {
SetPagePic(GRAPHICS_PAGE_0, Pic_0382_0_0);/*背景图*/ 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_Light();
AMT630H_GUI_PhoneConnect_TIME(Get_Dis_Hour_Time(), Get_Dis_Minute_Time()); AMT630H_GUI_PhoneConnect_TIME(Get_Dis_Hour_Time(), Get_Dis_Minute_Time());
AMT630H_GUI_PhoneConnect_VSpeed(VechileSpeed); AMT630H_GUI_PhoneConnect_VSpeed(VechileSpeed);
......
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