projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/lpc: Reset less of the device on USB reset.
[fw/altos]
/
src
/
drivers
/
ao_cc115l.c
diff --git
a/src/drivers/ao_cc115l.c
b/src/drivers/ao_cc115l.c
index 216432bdc6ee9aba8e0a86553afc4be79bc787eb..0fa1e899044a23fae470cbaa7ac1b9a657b84014 100644
(file)
--- a/
src/drivers/ao_cc115l.c
+++ b/
src/drivers/ao_cc115l.c
@@
-245,6
+245,8
@@
ao_radio_idle(void)
uint8_t state = ao_radio_strobe(CC115L_SIDLE);
if ((state >> CC115L_STATUS_STATE) == CC115L_STATUS_STATE_IDLE)
break;
uint8_t state = ao_radio_strobe(CC115L_SIDLE);
if ((state >> CC115L_STATUS_STATE) == CC115L_STATUS_STATE_IDLE)
break;
+ if ((state >> CC115L_STATUS_STATE) == CC115L_STATUS_STATE_TX_FIFO_UNDERFLOW)
+ ao_radio_strobe(CC115L_SFTX);
}
/* Flush any pending TX bytes */
ao_radio_strobe(CC115L_SFTX);
}
/* Flush any pending TX bytes */
ao_radio_strobe(CC115L_SFTX);
@@
-328,11
+330,13
@@
static const uint16_t rdf_setup[] = {
};
/*
};
/*
- * APRS deviation is the same as RDF
+ * APRS deviation is 3kHz
+ *
+ * 26e6 / (2 ** 17) * (8 + 7) * (2 ** 0) = 2975
*/
*/
-#define APRS_DEV_E
RDF_DEV_E
-#define APRS_DEV_M
RDF_DEV_M
+#define APRS_DEV_E
0
+#define APRS_DEV_M
7
/*
* For our APRS beacon, set the symbol rate to 9.6kBaud (8x oversampling for 1200 baud data rate)
/*
* For our APRS beacon, set the symbol rate to 9.6kBaud (8x oversampling for 1200 baud data rate)
@@
-442,15
+446,10
@@
static const uint16_t radio_setup[] = {
AO_CC115L_DONE_INT_GPIO_IOCFG, CC115L_IOCFG_GPIO_CFG_PA_PD | (1 << CC115L_IOCFG_GPIO_INV),
CC115L_FIFOTHR, 0x47, /* TX FIFO Thresholds */
AO_CC115L_DONE_INT_GPIO_IOCFG, CC115L_IOCFG_GPIO_CFG_PA_PD | (1 << CC115L_IOCFG_GPIO_INV),
CC115L_FIFOTHR, 0x47, /* TX FIFO Thresholds */
- CC115L_FREQ2, 0x10, /* Frequency Control Word, High Byte */
- CC115L_FREQ1, 0xb6, /* Frequency Control Word, Middle Byte */
- CC115L_FREQ0, 0xa5, /* Frequency Control Word, Low Byte */
- CC115L_MDMCFG2, 0x13, /* Modem Configuration */
CC115L_MDMCFG1, (0x00 |
(CC115L_MDMCFG1_NUM_PREAMBLE_4 << CC115L_MDMCFG1_NUM_PREAMBLE) |
(1 << CC115L_MDMCFG1_CHANSPC_E)),
CC115L_MDMCFG0, 248, /* Channel spacing M value (100kHz channels) */
CC115L_MDMCFG1, (0x00 |
(CC115L_MDMCFG1_NUM_PREAMBLE_4 << CC115L_MDMCFG1_NUM_PREAMBLE) |
(1 << CC115L_MDMCFG1_CHANSPC_E)),
CC115L_MDMCFG0, 248, /* Channel spacing M value (100kHz channels) */
- CC115L_DEVIATN, 0x35, /* Modem Deviation Setting */
CC115L_MCSM0, 0x38, /* Main Radio Control State Machine Configuration */
CC115L_RESERVED_0X20, 0xfb, /* Use setting from SmartRF Studio */
CC115L_FSCAL3, 0xe9, /* Frequency Synthesizer Calibration */
CC115L_MCSM0, 0x38, /* Main Radio Control State Machine Configuration */
CC115L_RESERVED_0X20, 0xfb, /* Use setting from SmartRF Studio */
CC115L_FSCAL3, 0xe9, /* Frequency Synthesizer Calibration */
@@
-460,7
+459,6
@@
static const uint16_t radio_setup[] = {
CC115L_TEST2, 0x81, /* Various Test Settings */
CC115L_TEST1, 0x35, /* Various Test Settings */
CC115L_TEST0, 0x09, /* Various Test Settings */
CC115L_TEST2, 0x81, /* Various Test Settings */
CC115L_TEST1, 0x35, /* Various Test Settings */
CC115L_TEST0, 0x09, /* Various Test Settings */
- CC115L_PA, 0x00, /* Power setting (as low as possible) */
};
static uint8_t ao_radio_configured = 0;
};
static uint8_t ao_radio_configured = 0;
@@
-480,6
+478,8
@@
ao_radio_setup(void)
ao_config_get();
ao_config_get();
+ ao_radio_strobe(CC115L_SCAL);
+
ao_radio_configured = 1;
}
ao_radio_configured = 1;
}
@@
-498,7
+498,6
@@
static void
ao_radio_get(void)
{
static uint32_t last_radio_setting;
ao_radio_get(void)
{
static uint32_t last_radio_setting;
- static uint8_t last_power_setting;
ao_mutex_get(&ao_radio_mutex);
if (!ao_radio_configured)
ao_mutex_get(&ao_radio_mutex);
if (!ao_radio_configured)
@@
-509,10
+508,6
@@
ao_radio_get(void)
ao_radio_reg_write(CC115L_FREQ0, ao_config.radio_setting);
last_radio_setting = ao_config.radio_setting;
}
ao_radio_reg_write(CC115L_FREQ0, ao_config.radio_setting);
last_radio_setting = ao_config.radio_setting;
}
- if (ao_config.radio_power != last_power_setting) {
- ao_radio_reg_write(CC115L_PA, ao_config.radio_power);
- last_power_setting = ao_config.radio_power;
- }
}
static void
}
static void
@@
-618,6
+613,20
@@
ao_radio_rdf_abort(void)
ao_wakeup(&ao_radio_wake);
}
ao_wakeup(&ao_radio_wake);
}
+#define POWER_STEP 0x08
+
+static void
+ao_radio_stx(void)
+{
+ uint8_t power;
+ ao_radio_pa_on();
+ ao_radio_reg_write(CC115L_PA, 0);
+ ao_radio_strobe(CC115L_STX);
+ for (power = POWER_STEP; power < ao_config.radio_power; power += POWER_STEP)
+ ao_radio_reg_write(CC115L_PA, power);
+ ao_radio_reg_write(CC115L_PA, ao_config.radio_power);
+}
+
static void
ao_radio_test_cmd(void)
{
static void
ao_radio_test_cmd(void)
{
@@
-637,11
+646,10
@@
ao_radio_test_cmd(void)
ao_packet_slave_stop();
#endif
ao_radio_get();
ao_packet_slave_stop();
#endif
ao_radio_get();
+ ao_radio_strobe(CC115L_SFTX);
ao_radio_set_len(0xff);
ao_radio_set_mode(AO_RADIO_MODE_RDF);
ao_radio_set_len(0xff);
ao_radio_set_mode(AO_RADIO_MODE_RDF);
- ao_radio_strobe(CC115L_SFTX);
- ao_radio_pa_on();
- ao_radio_strobe(CC115L_STX);
+ ao_radio_stx();
radio_on = 1;
}
if (mode == 3) {
radio_on = 1;
}
if (mode == 3) {
@@
-659,12
+667,14
@@
ao_radio_test_cmd(void)
}
}
}
}
+#if CC115L_TRACE
static inline int16_t
ao_radio_gpio_bits(void)
{
return AO_CC115L_DONE_INT_PORT->idr & ((1 << AO_CC115L_FIFO_INT_PIN) |
(1 << AO_CC115L_DONE_INT_PIN));
}
static inline int16_t
ao_radio_gpio_bits(void)
{
return AO_CC115L_DONE_INT_PORT->idr & ((1 << AO_CC115L_FIFO_INT_PIN) |
(1 << AO_CC115L_DONE_INT_PIN));
}
+#endif
static void
ao_radio_wait_fifo(void)
static void
ao_radio_wait_fifo(void)
@@
-742,6
+752,10
@@
_ao_radio_send_lots(ao_radio_fill_func fill, uint8_t mode)
uint8_t fifo_space;
fifo_space = CC115L_FIFO_SIZE;
uint8_t fifo_space;
fifo_space = CC115L_FIFO_SIZE;
+ ao_radio_abort = 0;
+
+ ao_radio_strobe(CC115L_SFTX);
+
ao_radio_done = 0;
ao_radio_fifo = 0;
while (!done) {
ao_radio_done = 0;
ao_radio_fifo = 0;
while (!done) {
@@
-788,8
+802,7
@@
_ao_radio_send_lots(ao_radio_fill_func fill, uint8_t mode)
ao_exti_enable(AO_CC115L_DONE_INT_PORT, AO_CC115L_DONE_INT_PIN);
if (!started) {
ao_exti_enable(AO_CC115L_DONE_INT_PORT, AO_CC115L_DONE_INT_PIN);
if (!started) {
- ao_radio_pa_on();
- ao_radio_strobe(CC115L_STX);
+ ao_radio_stx();
started = 1;
}
}
started = 1;
}
}