From 21885e54d3c21ba76586b70ef0b2d81e4e995d2b Mon Sep 17 00:00:00 2001 From: chen <15335560115@163.com> Date: 星期五, 06 六月 2025 11:55:13 +0800 Subject: [PATCH] 修改final包包体内容版本,刚可以与显示基站测试版本,包序和丢包问题未解决 --- Src/application/dw_app.h | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Src/application/dw_app.h b/Src/application/dw_app.h index 3359945..0f13215 100644 --- a/Src/application/dw_app.h +++ b/Src/application/dw_app.h @@ -8,15 +8,17 @@ #include "ADC.h" #include "TrackingDiff.h" -//#define WORK_MODE_TAG -#define WORK_MODE_ANCHOR +#define BASELOST_STOPMOTOR_TIME 5 +//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 @@ -28,6 +30,8 @@ #define MIN_ANCHOR_NUM 2 #define SYNC_SEQ_IDX 5 #define REMOTEPARA_LEN 18 +#define TOTAL_SLOTNUM 200 +#define SLOTTIME_MS 48 #define POLL 0x01 #define RESPONSE 0x02 @@ -42,7 +46,11 @@ #define ANCHOR_ID_IDX 1 #define TAG_ID_IDX 5 #define MESSAGE_TYPE_IDX 9 +//新增 +#define ANCHOR_SEQ 7 +#define ANCHOR_NUM 8 //Poll +#define TAGSTATE 7 #define ANC_TYPE_IDX 14 //respose #define DIST_IDX 10 @@ -52,6 +60,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 @@ -64,9 +73,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