altos: Add 2400 and 9600 baud telemetry support to cc115l driver

[fw/altos] / src / drivers / ao_cc115l.c

diff --git a/src/drivers/ao_cc115l.c b/src/drivers/ao_cc115l.c
index 5d4f3bd666892160699fdb7c7dc758b1e53465f8..b5103f9bec5edb5692f758062f37ce740eea7cc2 100644 (file)
--- a/src/drivers/ao_cc115l.c
+++ b/src/drivers/ao_cc115l.c
@@ -52,8 +52,8 @@ struct ao_cc115l_reg {
 
 #if CC115L_TRACE
 
-const static struct ao_cc115l_reg ao_cc115l_reg[];
-const static char *cc115l_state_name[];
+static const struct ao_cc115l_reg ao_cc115l_reg[];
+static const char *cc115l_state_name[];
 
 enum ao_cc115l_trace_type {
        trace_strobe,
@@ -88,6 +88,8 @@ static void trace_add(enum ao_cc115l_trace_type type, int16_t addr, int16_t valu
        case trace_strobe:
                comment = cc115l_state_name[(value >> 4) & 0x7];
                break;
+       default:
+               break;
        }
        trace[trace_i].type = type;
        trace[trace_i].addr = addr;
@@ -197,24 +199,22 @@ ao_radio_tx_fifo_space(void)
        return CC115L_FIFO_SIZE - (ao_radio_reg_read(CC115L_TXBYTES) & CC115L_TXBYTES_NUM_TX_BYTES_MASK);
 }
 
-#if UNUSED
+#if CC115L_DEBUG
 static uint8_t
 ao_radio_status(void)
 {
        return ao_radio_strobe (CC115L_SNOP);
 }
-#endif
-
-#define ao_radio_rdf_value 0x55
 
-#if UNUSED
 static uint8_t
 ao_radio_get_marcstate(void)
 {
        return ao_radio_reg_read(CC115L_MARCSTATE) & CC115L_MARCSTATE_MASK;
 }
 #endif
-         
+
+#define ao_radio_rdf_value 0x55
+
 static void
 ao_radio_done_isr(void)
 {
@@ -269,16 +269,30 @@ ao_radio_idle(void)
  *             (256 + 131) * (2 ** 10) / (2**28) * 26e6 = 38383
  *
  *     DATARATE_M = 131
- *     DATARATE_E = 10
+ *     DATARATE_E_384 = 10
+ *     DATARATE_E_96 = 8
+ *     DATARATE_E_24 = 6
  */
-#define PACKET_DRATE_E 10
-#define PACKET_DRATE_M 131
+#define PACKET_DRATE_M         131
+
+#define PACKET_DRATE_E_384     10
+#define PACKET_DRATE_E_96      8
+#define PACKET_DRATE_E_24      6
+
+static const uint16_t packet_rate_setup[] = {
+       [AO_RADIO_RATE_38400] = ((0xf << 4) |
+                                (PACKET_DRATE_E_384 << CC115L_MDMCFG4_DRATE_E)),
+
+       [AO_RADIO_RATE_9600] = ((0xf << 4) |
+                               (PACKET_DRATE_E_96 << CC115L_MDMCFG4_DRATE_E)),
+
+       [AO_RADIO_RATE_2400] = ((0xf << 4) |
+                               (PACKET_DRATE_E_24 << CC115L_MDMCFG4_DRATE_E)),
+};
 
 static const uint16_t packet_setup[] = {
        CC115L_DEVIATN,         ((PACKET_DEV_E << CC115L_DEVIATN_DEVIATION_E) |
                                 (PACKET_DEV_M << CC115L_DEVIATN_DEVIATION_M)),
-       CC115L_MDMCFG4,         ((0xf << 4) |
-                                (PACKET_DRATE_E << CC115L_MDMCFG4_DRATE_E)),
        CC115L_MDMCFG3,         (PACKET_DRATE_M),
        CC115L_MDMCFG2,         (0x00 |
                                 (CC115L_MDMCFG2_MOD_FORMAT_GFSK << CC115L_MDMCFG2_MOD_FORMAT) |
@@ -403,9 +417,12 @@ ao_radio_set_mode(uint16_t new_mode)
                return;
 
        changes = new_mode & (~ao_radio_mode);
-       if (changes & AO_RADIO_MODE_BITS_PACKET_TX)
+       if (changes & AO_RADIO_MODE_BITS_PACKET_TX) {
+               ao_radio_reg_write(CC115L_MDMCFG4, packet_rate_setup[ao_config.radio_rate]);
+
                for (i = 0; i < sizeof (packet_setup) / sizeof (packet_setup[0]); i += 2)
                        ao_radio_reg_write(packet_setup[i], packet_setup[i+1]);
+       }
 
        if (changes & AO_RADIO_MODE_BITS_RDF)
                for (i = 0; i < sizeof (rdf_setup) / sizeof (rdf_setup[0]); i += 2)
@@ -494,6 +511,7 @@ static void
 ao_radio_get(void)
 {
        static uint32_t last_radio_setting;
+       static uint8_t  last_radio_rate;
 
        ao_mutex_get(&ao_radio_mutex);
        if (!ao_radio_configured)
@@ -504,6 +522,10 @@ ao_radio_get(void)
                ao_radio_reg_write(CC115L_FREQ0, ao_config.radio_setting);
                last_radio_setting = ao_config.radio_setting;
        }
+       if (ao_config.radio_rate != last_radio_rate) {
+               ao_radio_mode &= ~AO_RADIO_MODE_BITS_PACKET_TX;
+               last_radio_rate = ao_config.radio_rate;
+       }
 }
 
 static void
@@ -564,6 +586,7 @@ ao_radio_tone_run(struct ao_radio_tone *tones, int ntones)
        ao_radio_tone = tones;
        ao_radio_tone_current = 0;
        ao_radio_tone_offset = 0;
+       ao_radio_tone_count = ntones;
        _ao_radio_send_lots(ao_radio_tone_fill, AO_RADIO_MODE_RDF);
        ao_radio_put();
 }
@@ -611,6 +634,12 @@ ao_radio_rdf_abort(void)
 
 #define POWER_STEP     0x08
 
+#if HAS_RADIO_POWER
+#define RADIO_POWER    ao_config.radio_power
+#else
+#define RADIO_POWER    0xc0
+#endif
+
 static void
 ao_radio_stx(void)
 {
@@ -618,9 +647,10 @@ ao_radio_stx(void)
        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)
+       for (power = POWER_STEP; power < RADIO_POWER; power += POWER_STEP)
                ao_radio_reg_write(CC115L_PA, power);
-       ao_radio_reg_write(CC115L_PA, ao_config.radio_power);
+       if (power != RADIO_POWER)
+               ao_radio_reg_write(CC115L_PA, RADIO_POWER);
 }
 
 static void
@@ -667,8 +697,8 @@ ao_radio_test_cmd(void)
 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));
+       return ((ao_gpio_get(AO_CC115L_DONE_INT_PORT, AO_CC115L_DONE_INT_PIN, AO_CC115L_DONE_INT) << 1) |
+               ao_gpio_get(AO_CC115L_FIFO_INT_PORT, AO_CC115L_FIFO_INT_PIN, AO_CC115L_FIFO_INT));
 }
 #endif
 
@@ -818,7 +848,7 @@ ao_radio_send_aprs(ao_radio_fill_func fill)
 }
 
 #if CC115L_DEBUG
-const static char *cc115l_state_name[] = {
+static const char *cc115l_state_name[] = {
        [CC115L_STATUS_STATE_IDLE] = "IDLE",
        [CC115L_STATUS_STATE_TX] = "TX",
        [CC115L_STATUS_STATE_FSTXON] = "FSTXON",
@@ -827,7 +857,7 @@ const static char *cc115l_state_name[] = {
        [CC115L_STATUS_STATE_TX_FIFO_UNDERFLOW] = "TX_FIFO_UNDERFLOW",
 };
 
-const static struct ao_cc115l_reg ao_cc115l_reg[] = {
+static const struct ao_cc115l_reg ao_cc115l_reg[] = {
        { .addr = CC115L_IOCFG2, .name = "IOCFG2" },
        { .addr = CC115L_IOCFG1, .name = "IOCFG1" },
        { .addr = CC115L_IOCFG0, .name = "IOCFG0" },
@@ -873,7 +903,7 @@ const static struct ao_cc115l_reg ao_cc115l_reg[] = {
 
 static void ao_radio_show(void) {
        uint8_t status = ao_radio_status();
-       int     i;
+       unsigned int    i;
 
        ao_radio_get();
        status = ao_radio_status();