RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

pkg/uwb-dw1000: update txpower from OTP register on boot

Browse Source
This commit is contained in:
Francisco Molina 2022-03-24 17:17:10 +01:00
parent eed49a6004
commit 601df4d864
3 changed files with 51 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pkg/uwb-dw1000/0006-hw-drivers-dw1000_otp-fix-function-signature.patch Normal file
View File

Binary file not shown.

62
pkg/uwb-dw1000/hal/uwb_dw1000.c
View File

@ -20,6 +20,7 @@
#include "dpl/dpl.h"
#include "dw1000/dw1000_phy.h"
#include "dw1000/dw1000_hal.h"
#include "dw1000/dw1000_otp.h"
#include "uwb_dw1000.h"
#include "uwb_dw1000_config.h"
@ -38,8 +39,10 @@
#define DW1000_THREAD_PRIORITY MYNEWT_VAL_UWB_DEV_TASK_PRIO
#endif
#define OTP_CH1_TX_POWER_PRF_16 (0x0010)
/* Link list head */
static struct _dw1000_dev_instance_t * dw1000_instance_head;
static struct _dw1000_dev_instance_t *dw1000_instance_head;
/* Default instance configuration */
static const dw1000_dev_instance_t dw1000_instance_config_default = {
@ -47,12 +50,12 @@ static const dw1000_dev_instance_t dw1000_instance_config_default = {
.idx = 0,
.role = CONFIG_DW1000_ROLE_DEFAULT,
.task_prio = DW1000_THREAD_PRIORITY,
.status = {0},
.status = { 0 },
.rx_ant_separation = CONFIG_DW1000_RX_ANTSEP_DEFAULT,
.attrib = {
.nsfd = CONFIG_DW1000_NSFD_DEFAULT,
.nsync = CONFIG_DW1000_NSYNC_DEFAULT,
.nphr = CONFIG_DW1000_NPHR_DEFAULT ,
.nphr = CONFIG_DW1000_NPHR_DEFAULT,
},
.config = {
.channel = CONFIG_DW1000_CHANNEL_DEFAULT,
@ -64,15 +67,15 @@ static const dw1000_dev_instance_t dw1000_instance_config_default = {
.sfdType = CONFIG_DW1000_RX_SFD_TYPE_DEFAULT,
.phrMode = CONFIG_DW1000_RX_PHR_MODE_DEFAULT,
.sfdTimeout = CONFIG_DW1000_RX_SFD_TO_DEFAULT,
.timeToRxStable = CONFIG_DW1000_RX_STABLE_TIME_US ,
.timeToRxStable = CONFIG_DW1000_RX_STABLE_TIME_US,
.frameFilter = CONFIG_DW1000_FRAME_FILTER_DEFAULT,
.xtalTrim = CONFIG_DW1000_XTAL_TRIM_DEFAULT,
},
.tx ={
.tx = {
.preambleCodeIndex = CONFIG_DW1000_TX_PREAM_CIDX_DEAULT,
.preambleLength = CONFIG_DW1000_TX_PREAM_LEN_DEFAULT,
},
.txrf={
.txrf = {
.PGdly = CONFIG_DW1000_TX_PGDELAY_DEFAULT,
.BOOSTNORM = dw1000_power_value(DW1000_txrf_config_9db, 2.5),
.BOOSTP500 = dw1000_power_value(DW1000_txrf_config_9db, 2.5),
@ -87,24 +90,25 @@ static const dw1000_dev_instance_t dw1000_instance_config_default = {
.sleep_enable = CONFIG_DW1000_SLEEP_ENABLE,
.wakeup_rx_enable = CONFIG_DW1000_WAKEUP_RX_ENABLE,
.rxauto_enable = CONFIG_DW1000_RX_AUTO_ENABLE,
.cir_enable = 0, /**< Default behavior for CIR interface */
.cir_pdoa_slave = 0, /**< First instance should not act as pdoa slave */
.blocking_spi_transfers = 1, /**< Nonblocking spi transfers are not supported */
.cir_enable = 0, /**< Default behavior for CIR interface */
.cir_pdoa_slave = 0, /**< First instance should not act as pdoa slave */
.blocking_spi_transfers = 1, /**< Nonblocking spi transfers are not supported */
},
}
};
void _uwb_dw1000_set_idx(dw1000_dev_instance_t* dev)
void _uwb_dw1000_set_idx(dw1000_dev_instance_t *dev)
{
int count = 0;
dw1000_dev_instance_t *elt = NULL;
LL_COUNT(dw1000_instance_head, elt, count);
dev->uwb_dev.idx = count++;
/* prepend to list */
LL_PREPEND(dw1000_instance_head, dev);
}
void uwb_dw1000_setup(dw1000_dev_instance_t* dev, dw1000_params_t* params)
void uwb_dw1000_setup(dw1000_dev_instance_t *dev, dw1000_params_t *params)
{
/* set semaphore */
dpl_sem_init(params->spi_sem, 0x1);
@ -115,16 +119,36 @@ void uwb_dw1000_setup(dw1000_dev_instance_t* dev, dw1000_params_t* params)
_uwb_dw1000_set_idx(dev);
/* this will set the configuration and init uwb_dev which ATM only
allocates an RX and TX buffer if none is yet available */
dw1000_dev_init((struct os_dev *) dev, (void *) params);
dw1000_dev_init((struct os_dev *)dev, (void *)params);
}
void uwb_dw1000_config_and_start(dw1000_dev_instance_t* dev)
void uwb_dw1000_config_and_start(dw1000_dev_instance_t *dev)
{
dw1000_dev_config(dev);
uwb_dw1000_update_config_from_otp(dev);
}
void uwb_dw1000_set_buffs(dw1000_dev_instance_t* dev, uint8_t* tx_buf,
uint8_t* rx_buf)
void uwb_dw1000_update_config_from_otp(dw1000_dev_instance_t *dev)
{
/* every channel has to registers, first for PRF16, second PRF64 */
uint16_t address = OTP_CH1_TX_POWER_PRF_16 + (2 * (dev->uwb_dev.config.channel - 1)) +
(dev->uwb_dev.config.prf - DWT_PRF_16M);
/* channel 6 is missing, so channel 7 is actually to addresses ealier */
if (dev->uwb_dev.config.channel == 7) {
address -= 2;
}
uint32_t tx_power = _dw1000_otp_read(dev, address);
LOG_DEBUG("uwb-dw1000: OTP addr=(%" PRIx16 "),val=(%" PRIx32 ")\n", address, tx_power);
if (tx_power != 0) {
dev->uwb_dev.config.txrf.power = tx_power;
}
}
void uwb_dw1000_set_buffs(dw1000_dev_instance_t *dev, uint8_t *tx_buf,
uint8_t *rx_buf)
{
dev->uwb_dev.rxbuf = rx_buf;
dev->uwb_dev.txbuf = tx_buf;
@ -135,19 +159,19 @@ void uwb_dw1000_init(void)
dw1000_instance_head = NULL;
}
struct uwb_dev* uwb_dev_idx_lookup(int idx)
struct uwb_dev *uwb_dev_idx_lookup(int idx)
{
dw1000_dev_instance_t *current = dw1000_instance_head;
while (current) {
if (current->uwb_dev.idx == idx) {
LOG_DEBUG("uwb_dev: found dev of idx %d\n", idx);
LOG_DEBUG("uwb-dw1000: found dev of idx %d\n", idx);
break;
}
current = current->next;
}
return (struct uwb_dev*) &current->uwb_dev;
return (struct uwb_dev *)&current->uwb_dev;
}
/**
@ -157,7 +181,7 @@ struct uwb_dev* uwb_dev_idx_lookup(int idx)
* @return dw1000_dev_instance_t
*/
struct _dw1000_dev_instance_t * hal_dw1000_inst(uint8_t idx)
struct _dw1000_dev_instance_t *hal_dw1000_inst(uint8_t idx)
{
dw1000_dev_instance_t *current = dw1000_instance_head;

8
pkg/uwb-dw1000/include/uwb_dw1000.h
View File

@ -80,6 +80,14 @@ void uwb_dw1000_setup(dw1000_dev_instance_t* dev, dw1000_params_t* params);
*/
void uwb_dw1000_config_and_start(dw1000_dev_instance_t* dev);
/**
* @brief Updates tx_power config from OTP is any
*
*
* @param[out] dev dw1000 device descriptor
*/
void uwb_dw1000_update_config_from_otp(dw1000_dev_instance_t* dev);
#ifdef __cplusplus
}
#endif