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

Merge branch 'dev' of http://tyw-server.synology.me:12345/shihao/haojin750tft into jinshuo

parents 46d93aed 8e64608e
...@@ -255,8 +255,8 @@ void TextService(void) ...@@ -255,8 +255,8 @@ void TextService(void)
} }
} }
} }
if(Menu_Get_Current_Cursor_Information() == MENU_ITEM_BLUETOOTH_CONNECT) // if(Menu_Get_Current_Cursor_Information() == MENU_ITEM_BLUETOOTH_CONNECT)
{ // {
if (memcmp(LastBlueToothName, BlueToothPhoneData.BlueToothName, sizeof(LastBlueToothName)) != 0) if (memcmp(LastBlueToothName, BlueToothPhoneData.BlueToothName, sizeof(LastBlueToothName)) != 0)
{ {
for (uint8_t i = 0; i < sizeof(BlueToothPhoneData.BlueToothName); i++) for (uint8_t i = 0; i < sizeof(BlueToothPhoneData.BlueToothName); i++)
...@@ -267,7 +267,7 @@ void TextService(void) ...@@ -267,7 +267,7 @@ void TextService(void)
memcpy(LastBlueToothName, BlueToothPhoneData.BlueToothName, sizeof(LastBlueToothName)); memcpy(LastBlueToothName, BlueToothPhoneData.BlueToothName, sizeof(LastBlueToothName));
TextPara[TEXT_NUM_BLUETOOTH_NAME].Vaild = 0X01; TextPara[TEXT_NUM_BLUETOOTH_NAME].Vaild = 0X01;
} }
} // }
if (LastPhoneBookTotalCount != BlueToothPhoneData.PhoneBookTotalCount) if (LastPhoneBookTotalCount != BlueToothPhoneData.PhoneBookTotalCount)
{ {
uint8_t TempNumberCnts = 0; uint8_t TempNumberCnts = 0;
......
#ifndef PICBIN_H #ifndef PICBIN_H
#define PICBIN_H #define PICBIN_H
/* Flash Bin Version:20240915 2024-09-15 09:22:36 Compression ratio:70.00% */ /* Flash Bin Version:20240924 2024-09-24 11:37:38 Compression ratio:70.00% */
#define Pic_0001 1 #define Pic_0001 1
#define Pic_0002 2 #define Pic_0002 2
#define Pic_0003 3 #define Pic_0003 3
...@@ -2135,6 +2135,7 @@ enum { ...@@ -2135,6 +2135,7 @@ enum {
Pic_0943_751_555, Pic_0943_751_555,
}; };
#define PIC_INDEX_DATA_CRC 0x8509F1BE #define PIC_INDEX_DATA_CRC 0x8509F1BE
extern void User_PicIndexDataInit(void); extern void User_PicIndexDataInit(void);
......
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