Commit 0b0df01e authored by 何锐's avatar 何锐

feat:打点功能基本完成

parent ffa5a7a2
...@@ -298,7 +298,7 @@ void confirmkeyserve(void) ...@@ -298,7 +298,7 @@ void confirmkeyserve(void)
uint8_t KeyStep = 0; uint8_t KeyStep = 0;
void PasswordUnlock(void) void PasswordUnlock(void)
{ {
if(MENU_CHECK_STEP == 14) if(MENU_CHECK_STEP == 6)
{ {
if(KeyStep == 0) if(KeyStep == 0)
{ {
...@@ -319,8 +319,13 @@ void PasswordUnlock(void) ...@@ -319,8 +319,13 @@ void PasswordUnlock(void)
if(Confirmkeyflag) if(Confirmkeyflag)
{ {
KeyStep = 3; KeyStep = 3;
Display_TFT_Clear();
} }
} }
else
{
;
}
} }
else else
{ {
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#define RS485_RX_ID0XB2_DATA_LEN 76 #define RS485_RX_ID0XB2_DATA_LEN 76
#define RS485_RX_ID0XD2_DATA_LEN 36 #define RS485_RX_ID0XD2_DATA_LEN 36
#define RS485_RX_ID0XB3_DATA_LEN 89 #define RS485_RX_ID0XB3_DATA_LEN 89
#define RS485_RX_ID0XD3_DATA_LEN 26 #define RS485_RX_ID0XD3_DATA_LEN 59
#define RS485_RX_ID0XB6_DATA_LEN 86 #define RS485_RX_ID0XB6_DATA_LEN 86
#define RS485_RX_ID0XD6_DATA_LEN 111 #define RS485_RX_ID0XD6_DATA_LEN 111
#define RS485_RX_ID0XA4_DATA_LEN 1 #define RS485_RX_ID0XA4_DATA_LEN 1
...@@ -1553,7 +1553,7 @@ typedef union __attribute__((packed)) ...@@ -1553,7 +1553,7 @@ typedef union __attribute__((packed))
uint8_t : 4; uint8_t : 4;
uint8_t : 2; // 推行模式反馈 uint8_t : 2; // 推行模式反馈
uint8_t : 2; uint8_t SideStaySenseSetFeedback: 2; /*边撑感应功能设置反馈*/
uint8_t : 2; /*30*/ uint8_t : 2; /*30*/
uint8_t ReverseModeFeedback : 2; // 倒车模式反馈 uint8_t ReverseModeFeedback : 2; // 倒车模式反馈
...@@ -1575,7 +1575,7 @@ typedef union __attribute__((packed)) ...@@ -1575,7 +1575,7 @@ typedef union __attribute__((packed))
uint8_t SuperTPower : 2; // 超级T动力状态 uint8_t SuperTPower : 2; // 超级T动力状态
uint8_t : 2; uint8_t : 2;
uint8_t : 2; uint8_t RampParkedSetFeedback: 2; /*坡道驻停功能设置反馈*/
uint8_t RampParkedState : 2; // 坡道驻停状态 uint8_t RampParkedState : 2; // 坡道驻停状态
uint8_t SlopeDescentFunctionStatus: 2; //陡坡缓降功能设置反馈 uint8_t SlopeDescentFunctionStatus: 2; //陡坡缓降功能设置反馈
uint8_t SteepHillDescentEnable : 2; // 陡坡缓降激活 uint8_t SteepHillDescentEnable : 2; // 陡坡缓降激活
...@@ -1686,7 +1686,7 @@ typedef union __attribute__((packed)) ...@@ -1686,7 +1686,7 @@ typedef union __attribute__((packed))
uint8_t : 2; // 座垫加热等级设置反馈 uint8_t : 2; // 座垫加热等级设置反馈
uint8_t : 2; // 座垫感应开关状态反馈 uint8_t : 2; // 座垫感应开关状态反馈
uint8_t : 2; uint8_t CushionSenseSetFeedback: 2; // 座垫感应功能设置反馈
uint8_t DumpCategory : 2; // 倾倒类别 uint8_t DumpCategory : 2; // 倾倒类别
uint8_t SupportSwitchState : 2; // 边撑开关状态 uint8_t SupportSwitchState : 2; // 边撑开关状态
...@@ -1720,6 +1720,74 @@ typedef union __attribute__((packed)) ...@@ -1720,6 +1720,74 @@ typedef union __attribute__((packed))
uint8_t PasswordCanbeEnter : 3; // 密码可输入剩余次数 uint8_t PasswordCanbeEnter : 3; // 密码可输入剩余次数
uint8_t BlueToothPair : 1; // 经典蓝牙配对指令 uint8_t BlueToothPair : 1; // 经典蓝牙配对指令
/*-----B26------*/
uint8_t MusicPlayModeCommand :3; /*音乐播放模式设置指令*/
uint8_t :2;
uint8_t :3;
uint8_t :8;
uint8_t :8;
uint8_t MacAddr1 :8;
uint8_t MacAddr2 :8;
uint8_t MacAddr3 :8;
uint8_t MacAddr4 :8;
uint8_t MacAddr5 :8;
uint8_t MacAddr6 :8;
uint8_t :8;
uint8_t :8;
uint8_t :3;
uint8_t CurrentAccountID :3; /*当前账户ID*/
uint8_t AccompanyMeHome :2; /*伴我回家功能激活状态*/
uint8_t :8;
uint8_t :8;
uint8_t :8;
uint8_t :8;
uint8_t :8;
uint8_t :8;
uint8_t :8;
uint8_t :8;
uint8_t SuddenBrakeFlash :2; /*急刹爆闪*/
uint8_t :6;
uint8_t :2;
uint8_t WifiStartUpCommand :3; /*wifi开启设置指令B47*/
uint8_t :3;
uint8_t :8;
uint8_t :8;
uint8_t :8;
uint8_t :8;
uint8_t :8;
uint8_t :8;
uint8_t :8;
uint8_t :8;
uint8_t :8;
uint8_t :2;
uint8_t ManualAdjBacklightSet :2; /*手动调节背光功能设置指令*/
uint8_t :4;
uint8_t BackLightValueSet :8; /*背光亮度值设置*/
}Sig; }Sig;
} _ID0XD3h_Data; } _ID0XD3h_Data;
......
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