Commit 4a60b863 authored by 何锐's avatar 何锐

feat:l连接蓝牙时显示蓝牙名

parent 3e74870b
...@@ -309,12 +309,19 @@ uint8_t yibiaoshuju[34]; ...@@ -309,12 +309,19 @@ uint8_t yibiaoshuju[34];
break; break;
case 3: case 3:
blename[4] = 0xFF; // blename[4] = 0xFF;
// if(recvflag111 == 1) // // if(recvflag111 == 1)
// // {
// if((blename[0]+blename[1]+blename[2]+blename[3]) != 0)
// { // {
if((blename[0]+blename[1]+blename[2]+blename[3]) != 0) // General_Number_Disp(blename, 3, 165);
// }
blename[4] = 0xFF;
GUI_Display_Version_Code_Service(3, 150, "BT Name is ", Letter_Num_11, PCodeText_Space_size);
if(((blename[0]+blename[1]+blename[2]+blename[3]) != 0) && (blename[0] != 0xFF) && (blename[1] != 0xFF)&& (blename[2] != 0xFF)&& (blename[3] != 0xFF))
{ {
General_Number_Disp(blename, 3, 165); General_Number_Disp(blename, 110, 154);
} }
// recvflag111 = 0; // recvflag111 = 0;
// } // }
......
...@@ -2882,7 +2882,7 @@ void Display_Sub(void) ...@@ -2882,7 +2882,7 @@ void Display_Sub(void)
} }
uint32_t Get_Display_Type(void) uint32_t Get_Display_Type(void)
{ {
if(connectbleFlag == 1) if(BlueTooth == 1)
{ {
return 3; return 3;
} }
......
...@@ -202,7 +202,7 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent) ...@@ -202,7 +202,7 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent)
Confirmkeycount++; Confirmkeycount++;
if(Confirmkeycount >= 5) if(Confirmkeycount >= 5)
{ {
fsijnifvs = 1; mimayanzhengjieguo = 1;
Confirmkeycount = 0; Confirmkeycount = 0;
MENU_CHECK_STEP_ADD(); MENU_CHECK_STEP_ADD();
} }
...@@ -210,7 +210,7 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent) ...@@ -210,7 +210,7 @@ void Key_Operation_SW3(Key_Event_en_t enKeyEvent)
else else
{ {
Confirmkeycount == 0; Confirmkeycount == 0;
fsijnifvs = 0; mimayanzhengjieguo = 0;
} }
} }
else if ( enKeyEvent == KEY_EVENT_LONG_PRESS ) else if ( enKeyEvent == KEY_EVENT_LONG_PRESS )
......
...@@ -381,7 +381,7 @@ uint32_t R485_Send_0xD2(void) ...@@ -381,7 +381,7 @@ uint32_t R485_Send_0xD2(void)
return u32sendendflag; return u32sendendflag;
} }
uint8_t fsijnifvs = 0; uint8_t mimayanzhengjieguo = 0;
uint32_t R485_Send_0xD3(void) uint32_t R485_Send_0xD3(void)
{ {
memset(R485_IDD3h.Msg, 0xFF, 26); memset(R485_IDD3h.Msg, 0xFF, 26);
...@@ -434,7 +434,7 @@ uint32_t R485_Send_0xD3(void) ...@@ -434,7 +434,7 @@ uint32_t R485_Send_0xD3(void)
R485_IDD3h.Sig.PasswordUnlockCommand = 0x01; //密码开机 R485_IDD3h.Sig.PasswordUnlockCommand = 0x01; //密码开机
R485_IDD3h.Sig.PasswordCanbeEnter = 0x02; //开机次数 R485_IDD3h.Sig.PasswordCanbeEnter = 0x02; //开机次数
if(fsijnifvs == 1) if(mimayanzhengjieguo == 1)
{ {
R485_IDD3h.Sig.PasswordAuthResult = 0x00; //密码认证结果 R485_IDD3h.Sig.PasswordAuthResult = 0x00; //密码认证结果
} }
......
...@@ -1881,5 +1881,5 @@ extern uint8_t name1; ...@@ -1881,5 +1881,5 @@ extern uint8_t name1;
extern uint8_t name2; extern uint8_t name2;
extern uint8_t R485_0x80_msg[64]; extern uint8_t R485_0x80_msg[64];
extern uint8_t fsijnifvs; extern uint8_t mimayanzhengjieguo;
#endif #endif
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