deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

cc1200: configure RSSI offset as part of cc1200_rf_cfg

Browse source
This commit is contained in:
Simon Duquennoy 2016-09-22 11:28:27 +02:00
parent 97843ed322
commit 622d576439
4 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dev/cc1200/cc1200-802154g-863-870-fsk-50kbps.c
View file

@ -57,6 +57,8 @@
#define RF_CFG_MAX_TXPOWER CC1200_CONST_TX_POWER_MAX #define RF_CFG_MAX_TXPOWER CC1200_CONST_TX_POWER_MAX
/* The carrier sense level used for CCA in dBm */ /* The carrier sense level used for CCA in dBm */
#define RF_CFG_CCA_THRESHOLD (-91) #define RF_CFG_CCA_THRESHOLD (-91)
/* The RSSI offset in dBm */
#define RF_CFG_RSSI_OFFSET (-81)
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static const char rf_cfg_descriptor[] = "802.15.4g 863-870MHz MR-FSK mode #1"; static const char rf_cfg_descriptor[] = "802.15.4g 863-870MHz MR-FSK mode #1";
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -162,5 +164,6 @@ const cc1200_rf_cfg_t cc1200_802154g_863_870_fsk_50kbps = {
.max_channel = RF_CFG_MAX_CHANNEL, .max_channel = RF_CFG_MAX_CHANNEL,
.max_txpower = RF_CFG_MAX_TXPOWER, .max_txpower = RF_CFG_MAX_TXPOWER,
.cca_threshold = RF_CFG_CCA_THRESHOLD, .cca_threshold = RF_CFG_CCA_THRESHOLD,
.rssi_offset = RF_CFG_RSSI_OFFSET,
}; };
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/

12
dev/cc1200/cc1200-conf.h
View file

@ -121,18 +121,6 @@
#define CC1200_RF_CFG cc1200_802154g_863_870_fsk_50kbps #define CC1200_RF_CFG cc1200_802154g_863_870_fsk_50kbps
#endif #endif
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/*
* The RSSI offset in dBm (int8_t)
*
* Might be hardware dependent, so we make it a configuration parameter.
* This parameter is written to AGC_GAIN_ADJUST.GAIN_ADJUSTMENT
*/
#ifdef CC1200_CONF_RSSI_OFFSET
#define CC1200_RSSI_OFFSET CC1200_CONF_RSSI_OFFSET
#else
#define CC1200_RSSI_OFFSET (-81)
#endif
/*---------------------------------------------------------------------------*/
/* /*
* The frequency offset * The frequency offset
* *

3
dev/cc1200/cc1200-rf-cfg.h
View file

@ -82,6 +82,9 @@ typedef struct cc1200_rf_cfg {
* CC1200_CONST_CCA_THRESHOLD_MIN and CC1200_CONST_CCA_THRESHOLD_MAX. * CC1200_CONST_CCA_THRESHOLD_MIN and CC1200_CONST_CCA_THRESHOLD_MAX.
*/ */
int8_t cca_threshold; int8_t cca_threshold;
/* The RSSI offset in dBm.
* -99 when MDMCFG1.DVGA_GAIN=00, -81 when MDMCFG1.DVGA_GAIN=01 */
int8_t rssi_offset;
} cc1200_rf_cfg_t; } cc1200_rf_cfg_t;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#endif /* CC1200_RF_CFG_H */ #endif /* CC1200_RF_CFG_H */

2
dev/cc1200/cc1200.c
View file

@ -1459,7 +1459,7 @@ configure(void)
#endif #endif
/* RSSI offset */ /* RSSI offset */
single_write(CC1200_AGC_GAIN_ADJUST, (int8_t)CC1200_RSSI_OFFSET); single_write(CC1200_AGC_GAIN_ADJUST, (int8_t)CC1200_RF_CFG.rssi_offset);
/*************************************************************************** /***************************************************************************
* RF test modes needed during hardware development * RF test modes needed during hardware development