Skip to content

H
haoJin750TFT
Commit 37e4eff4 authored by 王雅楠's avatar 王雅楠 🍎
Browse files
Options

✨ feat:新增OS MCU版本号

parent f40f6b1d
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 16 deletions
Firmware/Source/Component/AMT630H/AMT630H_Datas.c
View file @ 37e4eff4
...@@ -121,8 +121,10 @@ void AMT630H_GUI_Fault_Information(void) ...@@ -121,8 +121,10 @@ void AMT630H_GUI_Fault_Information(void)
/*蓝牙名称改为字库显示*/ /*蓝牙名称改为字库显示*/
/* RGB 0 0 0 --- 黑*/ /* RGB 0 0 0 --- 黑*/
/* RGB 0XFF 0XFF 0XFF --- 白*/ /* RGB 0XFF 0XFF 0XFF --- 白*/
//PackedTransfer_LabelsList( 0x5022,(uint8_t *)BlueToothName, 40); PackedTransfer_LabelsList( 0x8022,(uint8_t *)InformationOSVersion, 20);
//SetPageText(GRAPHICS_PAGE_0, 0x5022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x8022, 574 , 292 , 400, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
PackedTransfer_LabelsList( 0x9022,(uint8_t *)InformationMCUVersion, 26);
SetPageText(GRAPHICS_PAGE_0, 0x9022, 567 , 356 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
} }
else if(g_u8Display_Mode == ModeNIGHT) else if(g_u8Display_Mode == ModeNIGHT)
{ {
...@@ -163,8 +165,10 @@ void AMT630H_GUI_Fault_Information(void) ...@@ -163,8 +165,10 @@ void AMT630H_GUI_Fault_Information(void)
/*蓝牙名称改为字库显示*/ /*蓝牙名称改为字库显示*/
/* RGB 0 0 0 --- 黑*/ /* RGB 0 0 0 --- 黑*/
/* RGB 0XFF 0XFF 0XFF --- 白*/ /* RGB 0XFF 0XFF 0XFF --- 白*/
//PackedTransfer_LabelsList( 0x5022,(uint8_t *)BlueToothName, 40); PackedTransfer_LabelsList( 0x8022,(uint8_t *)InformationOSVersion, 20);
//SetPageText(GRAPHICS_PAGE_0, 0x5022, 570 , 165 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x8022, 574 , 292 , 400, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
PackedTransfer_LabelsList( 0x9022,(uint8_t *)InformationMCUVersion, 26);
SetPageText(GRAPHICS_PAGE_0, 0x9022, 567 , 356 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
} }
} }
...@@ -776,14 +780,14 @@ void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON) ...@@ -776,14 +780,14 @@ void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON)
if(Contect_totalnumber == 1) if(Contect_totalnumber == 1)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0038_590_287); /*【括号】 一位数 */ SetPagePic(GRAPHICS_PAGE_0, Pic_0038_590_287); /*【括号】 一位数 */
PackedTransfer_LabelsList( 0x7022,(uint8_t *)PhoneNumberTotal, 40); PackedTransfer_LabelsList( 0x7022,(uint8_t *)PhoneNumberTotal, 20);
SetPageText(GRAPHICS_PAGE_0, 0x7022, 605 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x7022, 605 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
} }
else if(Contect_totalnumber == 2) else if(Contect_totalnumber == 2)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0039_583_287); /*【括号】 两位数 */ SetPagePic(GRAPHICS_PAGE_0, Pic_0039_583_287); /*【括号】 两位数 */
PackedTransfer_LabelsList( 0x7022,(uint8_t *)PhoneNumberTotal, 40); PackedTransfer_LabelsList( 0x7022,(uint8_t *)PhoneNumberTotal, 20);
SetPageText(GRAPHICS_PAGE_0, 0x7022, 612 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x7022, 600 , 285 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
} }
// else if(Contect_totalnumber == 3) // else if(Contect_totalnumber == 3)
// { // {
...@@ -797,14 +801,14 @@ void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON) ...@@ -797,14 +801,14 @@ void AMT630H_GUI_Bluetooth_Information( uint8_t Connect_ON)
if(Contect_totalnumber == 1) if(Contect_totalnumber == 1)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0223_590_287); /*【括号】 一位数 */ SetPagePic(GRAPHICS_PAGE_0, Pic_0223_590_287); /*【括号】 一位数 */
PackedTransfer_LabelsList( 0x7022,(uint8_t *)PhoneNumberTotal, 40); PackedTransfer_LabelsList( 0x7022,(uint8_t *)PhoneNumberTotal, 20);
SetPageText(GRAPHICS_PAGE_0, 0x7022, 605 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x7022, 605 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
} }
else if(Contect_totalnumber == 2) else if(Contect_totalnumber == 2)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0224_583_287); /*【括号】 两位数 */ SetPagePic(GRAPHICS_PAGE_0, Pic_0224_583_287); /*【括号】 两位数 */
PackedTransfer_LabelsList( 0x7022,(uint8_t *)PhoneNumberTotal, 40); PackedTransfer_LabelsList( 0x7022,(uint8_t *)PhoneNumberTotal, 20);
SetPageText(GRAPHICS_PAGE_0, 0x7022, 612 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x7022, 600 , 285 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
} }
// else if(Contect_totalnumber == 3) // else if(Contect_totalnumber == 3)
// { // {
...@@ -2270,14 +2274,14 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connec ...@@ -2270,14 +2274,14 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connec
if(Contect_totalnumber == 1) if(Contect_totalnumber == 1)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0038_590_287); /*【括号】 一位数 */ SetPagePic(GRAPHICS_PAGE_0, Pic_0038_590_287); /*【括号】 一位数 */
PackedTransfer_LabelsList( 0x7022,(uint8_t *)PhoneNumberTotal, 40); PackedTransfer_LabelsList( 0x7022,(uint8_t *)PhoneNumberTotal, 20);
SetPageText(GRAPHICS_PAGE_0, 0x7022, 605 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x7022, 605 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
} }
else if(Contect_totalnumber == 2) else if(Contect_totalnumber == 2)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0039_583_287); /*【括号】 两位数 */ SetPagePic(GRAPHICS_PAGE_0, Pic_0039_583_287); /*【括号】 两位数 */
PackedTransfer_LabelsList( 0x7022,(uint8_t *)PhoneNumberTotal, 40); PackedTransfer_LabelsList( 0x7022,(uint8_t *)PhoneNumberTotal, 20);
SetPageText(GRAPHICS_PAGE_0, 0x7022, 612 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x7022, 600 , 285 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0,0,0,0XFF),TEXT_LINE_OFFSET(1,1));
} }
// else if(Contect_totalnumber == 3) // else if(Contect_totalnumber == 3)
// { // {
...@@ -2291,14 +2295,14 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connec ...@@ -2291,14 +2295,14 @@ void AMT630H_GUI_Bluetooth_Connect_Setting(Menu_Item_en_t select, uint8_t Connec
if(Contect_totalnumber == 1) if(Contect_totalnumber == 1)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0223_590_287); /*【括号】 一位数 */ SetPagePic(GRAPHICS_PAGE_0, Pic_0223_590_287); /*【括号】 一位数 */
PackedTransfer_LabelsList( 0x7022,(uint8_t *)PhoneNumberTotal, 40); PackedTransfer_LabelsList( 0x7022,(uint8_t *)PhoneNumberTotal, 20);
SetPageText(GRAPHICS_PAGE_0, 0x7022, 605 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x7022, 605 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
} }
else if(Contect_totalnumber == 2) else if(Contect_totalnumber == 2)
{ {
SetPagePic(GRAPHICS_PAGE_0, Pic_0224_583_287); /*【括号】 两位数 */ SetPagePic(GRAPHICS_PAGE_0, Pic_0224_583_287); /*【括号】 两位数 */
PackedTransfer_LabelsList( 0x7022,(uint8_t *)PhoneNumberTotal, 40); PackedTransfer_LabelsList( 0x7022,(uint8_t *)PhoneNumberTotal, 20);
SetPageText(GRAPHICS_PAGE_0, 0x7022, 612 , 289 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1)); SetPageText(GRAPHICS_PAGE_0, 0x7022, 600 , 285 , 200, ALIGN_LEFT, 0, TEXT_COLOR(0XFF,0XFF,0XFF,0XFF),TEXT_LINE_OFFSET(1,1));
} }
// else if(Contect_totalnumber == 3) // else if(Contect_totalnumber == 3)
// { // {
......
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