From b20cee9a3445b3ea3c4f0a1aafec0ba202dc77b5 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期四, 12 六月 2025 14:00:43 +0800
Subject: [PATCH] 修改合并错误
---
keil/mk_4G.h | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/keil/mk_4G.h b/keil/mk_4G.h
index a30918e..6f6ebb9 100644
--- a/keil/mk_4G.h
+++ b/keil/mk_4G.h
@@ -1,11 +1,12 @@
#include "board.h"
typedef enum{
-BIND_SUCCESS=0,
+BIND_SUCCESS=1,
UNBIND,
OPEN_GNSS,
CLOSE_VIBRATION,
QUARY_INFORMATION,
CHANGE_POLL_FREQUENCY,
+OPEN_VIBRATION,
}Message_RecvState;
typedef enum
@@ -38,7 +39,7 @@
typedef struct{
Message_RecvState type;
-uint16_t applyID;
+char applyID[10];
uint16_t tagId;
uint16_t gunLableId;
uint16_t warnDistance;
--
Gitblit v1.9.3