diff --git a/K74B/user/appTask.c b/K74B/user/appTask.c index 56c9b09..0b9a931 100644 --- a/K74B/user/appTask.c +++ b/K74B/user/appTask.c @@ -21,8 +21,8 @@ typedef struct { //BYTE 0 uint8_t HG:2;//滑轨 + uint8_t AM:2;//按摩 uint8_t KB:2;//靠背 - uint8_t TZ:2;//头枕 uint8_t REVERSE01:2; //BYTE 1 uint8_t TT:2; @@ -134,8 +134,8 @@ void TxMsgPro(void) LIN_msg_buf.FW = GetKeyFlag(SIGID_KEY13); LIN_msg_buf.TT = GetKeyFlag(SIGID_KEY6)<<1|GetKeyFlag(SIGID_KEY5); LIN_msg_buf.HG = GetKeyFlag(SIGID_KEY3)<<1|GetKeyFlag(SIGID_KEY4); - LIN_msg_buf.KB = GetKeyFlag(SIGID_KEY8)<<1|GetKeyFlag(SIGID_KEY7); - LIN_msg_buf.TZ = GetKeyFlag(SIGID_KEY9)<<1|GetKeyFlag(SIGID_KEY11); + LIN_msg_buf.AM = GetKeyFlag(SIGID_KEY8)<<1|GetKeyFlag(SIGID_KEY7); + LIN_msg_buf.KB = GetKeyFlag(SIGID_KEY9)<<1|GetKeyFlag(SIGID_KEY11); LIN_msg_buf.ZY = GetKeyFlag(SIGID_KEY12)<<1|GetKeyFlag(SIGID_KEY10); temp |= GetKeyFlag(SIGID_KEY1)<<1; temp |= GetKeyFlag(SIGID_KEY2)<<0; @@ -143,12 +143,14 @@ void TxMsgPro(void) LIN_msg_buf.FW = GetKeyFlag(SIGID_KEY13); LIN_msg_buf.HG = GetKeyFlag(SIGID_KEY5)<<1|GetKeyFlag(SIGID_KEY6); LIN_msg_buf.TT = GetKeyFlag(SIGID_KEY4)<<1|GetKeyFlag(SIGID_KEY3); - LIN_msg_buf.KB = GetKeyFlag(SIGID_KEY7)<<1|GetKeyFlag(SIGID_KEY8); - LIN_msg_buf.TZ = GetKeyFlag(SIGID_KEY9)<<1|GetKeyFlag(SIGID_KEY11); + LIN_msg_buf.AM = GetKeyFlag(SIGID_KEY7)<<1|GetKeyFlag(SIGID_KEY8); + LIN_msg_buf.KB = GetKeyFlag(SIGID_KEY9)<<1|GetKeyFlag(SIGID_KEY11); LIN_msg_buf.ZY = GetKeyFlag(SIGID_KEY10)<<1|GetKeyFlag(SIGID_KEY12); temp |= GetKeyFlag(SIGID_KEY1)<<0; temp |= GetKeyFlag(SIGID_KEY2)<<1; #endif + LIN_msg_buf.REVERSE01 = LIN_msg_buf.KB?1:0; + for (i = 0; i < 8; i++) { g_txbuf1[i] = ((uint8_t *)(&LIN_msg_buf))[i];