From d40905917f700e561bfa7a73a9c4f131617f853c Mon Sep 17 00:00:00 2001 From: Francisco Molina Date: Mon, 28 Feb 2022 16:21:24 +0100 Subject: [PATCH] pkg/uwb-dw1000: fix default group delay --- pkg/uwb-dw1000/hal/uwb_dw1000.c | 2 +- pkg/uwb-dw1000/include/uwb_dw1000_config.h | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/uwb-dw1000/hal/uwb_dw1000.c b/pkg/uwb-dw1000/hal/uwb_dw1000.c index b4eb0372c7..8edf5de1f8 100644 --- a/pkg/uwb-dw1000/hal/uwb_dw1000.c +++ b/pkg/uwb-dw1000/hal/uwb_dw1000.c @@ -73,7 +73,7 @@ static const dw1000_dev_instance_t dw1000_instance_config_default = { .preambleLength = DW1000_TX_PREAM_LEN_DEFAULT, }, .txrf={ - .PGdly = DW1000_CHANNEL_DEFAULT, + .PGdly = DW1000_TX_PGDELAY_DEFAULT, .BOOSTNORM = dw1000_power_value(DW1000_txrf_config_9db, 2.5), .BOOSTP500 = dw1000_power_value(DW1000_txrf_config_9db, 2.5), .BOOSTP250 = dw1000_power_value(DW1000_txrf_config_9db, 2.5), diff --git a/pkg/uwb-dw1000/include/uwb_dw1000_config.h b/pkg/uwb-dw1000/include/uwb_dw1000_config.h index d9558ed728..8119af1cf5 100644 --- a/pkg/uwb-dw1000/include/uwb_dw1000_config.h +++ b/pkg/uwb-dw1000/include/uwb_dw1000_config.h @@ -65,8 +65,9 @@ extern "C" { */ #ifndef DW1000_CHANNEL_DEFAULT #define DW1000_CHANNEL_DEFAULT 5 -#if DW1000_CHANNEL_DEFAULT > 7 || DW1000_CHANNEL_DEFAULT < 1 -#error "DW1000_CHANNEL_DEFAULT must be 1..7" +#if DW1000_CHANNEL_DEFAULT > 7 || DW1000_CHANNEL_DEFAULT < 1 || \ + DW1000CHANNEL_DEFAULT == 6 +#error "DW1000_CHANNEL_DEFAULT must be 1..7, 6 excluded" #endif #endif @@ -84,8 +85,6 @@ extern "C" { #define DW1000_TX_PGDELAY_DEFAULT TC_PGDELAY_CH4 #elif DW1000_CHANNEL_DEFAULT == 5 #define DW1000_TX_PGDELAY_DEFAULT TC_PGDELAY_CH5 -#elif DW1000_CHANNEL_DEFAULT == 6 -#define DW1000_TX_PGDELAY_DEFAULT TC_PGDELAY_CH7 #elif DW1000_CHANNEL_DEFAULT == 7 #define DW1000_TX_PGDELAY_DEFAULT TC_PGDELAY_CH7 #endif