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

Adjust TX power settings to use current API fields

Browse source
This commit is contained in:
George Oikonomou 2016-11-13 14:14:24 +00:00
parent 4d0051ad4d
commit a3c80cedb9
2 changed files with 18 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
cpu/cc26xx-cc13xx/rf-core/ieee-mode.c
View file

@ -166,25 +166,23 @@ static uint8_t rf_stats[16] = { 0 };
/* TX Power dBm lookup table - values from SmartRF Studio */ /* TX Power dBm lookup table - values from SmartRF Studio */
typedef struct output_config { typedef struct output_config {
radio_value_t dbm; radio_value_t dbm;
uint8_t register_ib; uint16_t tx_power; /* Value for the CMD_RADIO_SETUP.txPower field */
uint8_t register_gc;
uint8_t temp_coeff;
} output_config_t; } output_config_t;
static const output_config_t output_power[] = { static const output_config_t output_power[] = {
{ 5, 0x30, 0x00, 0x93 }, { 5, 0x9330 },
{ 4, 0x24, 0x00, 0x93 }, { 4, 0x9324 },
{ 3, 0x1c, 0x00, 0x5a }, { 3, 0x5a1c },
{ 2, 0x18, 0x00, 0x4e }, { 2, 0x4e18 },
{ 1, 0x14, 0x00, 0x42 }, { 1, 0x4214 },
{ 0, 0x21, 0x01, 0x31 }, { 0, 0x3161 },
{ -3, 0x18, 0x01, 0x25 }, { -3, 0x2558 },
{ -6, 0x11, 0x01, 0x1d }, { -6, 0x1d52 },
{ -9, 0x0e, 0x01, 0x19 }, { -9, 0x194e },
{-12, 0x0b, 0x01, 0x14 }, {-12, 0x144b },
{-15, 0x0b, 0x03, 0x0c }, {-15, 0x0ccb },
{-18, 0x09, 0x03, 0x0c }, {-18, 0x0cc9 },
{-21, 0x07, 0x03, 0x0c }, {-21, 0x0cc7 },
}; };
#define OUTPUT_CONFIG_COUNT (sizeof(output_power) / sizeof(output_config_t)) #define OUTPUT_CONFIG_COUNT (sizeof(output_power) / sizeof(output_config_t))
@ -455,9 +453,7 @@ set_tx_power(radio_value_t power)
memset(&cmd, 0x00, sizeof(cmd)); memset(&cmd, 0x00, sizeof(cmd));
cmd.commandNo = CMD_SET_TX_POWER; cmd.commandNo = CMD_SET_TX_POWER;
cmd.txPower.IB = output_power[i].register_ib; cmd.txPower = output_power[i].tx_power;
cmd.txPower.GC = output_power[i].register_gc;
cmd.txPower.tempCoeff = output_power[i].temp_coeff;
if(rf_core_send_cmd((uint32_t)&cmd, &cmd_status) == RF_CORE_CMD_ERROR) { if(rf_core_send_cmd((uint32_t)&cmd, &cmd_status) == RF_CORE_CMD_ERROR) {
PRINTF("set_tx_power: CMDSTA=0x%08lx\n", cmd_status); PRINTF("set_tx_power: CMDSTA=0x%08lx\n", cmd_status);
@ -473,9 +469,7 @@ rf_radio_setup()
/* Create radio setup command */ /* Create radio setup command */
rf_core_init_radio_op((rfc_radioOp_t *)&cmd, sizeof(cmd), CMD_RADIO_SETUP); rf_core_init_radio_op((rfc_radioOp_t *)&cmd, sizeof(cmd), CMD_RADIO_SETUP);
cmd.txPower.IB = tx_power_current->register_ib; cmd.txPower = tx_power_current->tx_power;
cmd.txPower.GC = tx_power_current->register_gc;
cmd.txPower.tempCoeff = tx_power_current->temp_coeff;
cmd.pRegOverride = ieee_overrides; cmd.pRegOverride = ieee_overrides;
cmd.mode = 1; cmd.mode = 1;

14
cpu/cc26xx-cc13xx/rf-core/rf-ble.c
View file

@ -81,14 +81,7 @@ static uint8_t payload[BLE_ADV_PAYLOAD_BUF_LEN];
static int p = 0; static int p = 0;
static int i; static int i;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
typedef struct default_ble_tx_power_s { static uint16_t tx_power = 0x9330;
uint16_t ib:6;
uint16_t gc:2;
uint16_t boost:1;
uint16_t temp_coeff:7;
} default_ble_tx_power_t;
static default_ble_tx_power_t tx_power = { 0x29, 0x00, 0x00, 0x00 };
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* BLE beacond config */ /* BLE beacond config */
static struct ble_beacond_config { static struct ble_beacond_config {
@ -220,10 +213,7 @@ rf_radio_setup()
/* Create radio setup command */ /* Create radio setup command */
rf_core_init_radio_op((rfc_radioOp_t *)&cmd, sizeof(cmd), CMD_RADIO_SETUP); rf_core_init_radio_op((rfc_radioOp_t *)&cmd, sizeof(cmd), CMD_RADIO_SETUP);
cmd.txPower.IB = tx_power.ib; cmd.txPower = tx_power;
cmd.txPower.GC = tx_power.gc;
cmd.txPower.tempCoeff = tx_power.temp_coeff;
cmd.txPower.boost = tx_power.boost;
cmd.pRegOverride = ble_overrides; cmd.pRegOverride = ble_overrides;
cmd.mode = 0; cmd.mode = 0;