From 015bafa2f40cfbf4ea884e26ebbbf398a5565b5a Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期二, 15 九月 2020 21:49:57 +0800 Subject: [PATCH] 修改标签按键读取参数BUG --- Src/application/dw_app.h | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Src/application/dw_app.h b/Src/application/dw_app.h index e655a38..c8a911a 100644 --- a/Src/application/dw_app.h +++ b/Src/application/dw_app.h @@ -8,15 +8,16 @@ #include "ADC.h" #include "TrackingDiff.h" -//#define WORK_MODE_TAG -#define WORK_MODE_ANCHOR +//BITSTATE +#define GOINGSLEEPBIT 1 //#define NEWBOARD //#define TAG_OUTPUT #define HEX_OUTPUT +#define SLOT_SCALE 0.7 #define MAX_NEARBASE_NUM 12 -#define KEEP_TIMES 5 +#define KEEP_TIMES 3 #define REPOET_ANC_NUM 1 #define REPOET_ANC_NUM_MIN 1 @@ -27,7 +28,7 @@ #define THRESHOLD_CHANGE_MAINBASE_DIST 50 #define MIN_ANCHOR_NUM 2 #define SYNC_SEQ_IDX 5 - +#define REMOTEPARA_LEN 18 #define POLL 0x01 #define RESPONSE 0x02 @@ -43,13 +44,17 @@ #define TAG_ID_IDX 5 #define MESSAGE_TYPE_IDX 9 //Poll +#define TAGSTATE 7 #define ANC_TYPE_IDX 14 //respose #define DIST_IDX 10 #define ANCTIMEMS 14 #define ANCTIMEUS 16 #define TAGSLOTPOS 7 +#define MOTORSTATE_INDEX 19 +#define REMOTEPARA_INDEX 20 //Final +#define TAGCONFIGSUCCESS_INDEX 7 #define FINAL_MSG_POLL_TX_TS_IDX 10 #define FINAL_MSG_RESP_RX_TS_IDX 14 #define FINAL_MSG_FINAL_TX_TS_IDX 18 @@ -62,9 +67,11 @@ #define NEARBASENUM_INDEX 10 #define NEARBASEID_INDEX 11 //NEAR POLL -#define BATTARY_IDX 1 -#define BUTTON_IDX 2 + + #define SEQUENCE_IDX 3 +#define BATTARY_IDX 4 +#define BUTTON_IDX 7 #define DW_CTRL_GPIO GPIOA #define DW_ENABLE HAL_GPIO_WritePin(DW_CTRL_GPIO, DW_CTRL_Pin, GPIO_PIN_RESET) -- Gitblit v1.9.3