projects / fw / altos / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Switch from GPLv2 to GPLv2+
[fw/altos] / src / drivers / ao_cc115l.c
diff --git a/src/drivers/ao_cc115l.c b/src/drivers/ao_cc115l.c
index cf61acfe9c4ae45a6def0d88caf05c8d3d0dac96..a67071d24d879c44e348bb8ecb5ff8831e624e9c 100644 (file)
--- a/src/drivers/ao_cc115l.c
+++ b/src/drivers/ao_cc115l.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -38,7 +39,7 @@ static uint8_t ao_radio_abort;                /* radio operation should abort */
 
 #define FOSC   26000000
 
-#define ao_radio_select()      ao_spi_get_mask(AO_CC115L_SPI_CS_PORT,(1 << AO_CC115L_SPI_CS_PIN),AO_CC115L_SPI_BUS,AO_SPI_SPEED_1MHz)
+#define ao_radio_select()      ao_spi_get_mask(AO_CC115L_SPI_CS_PORT,(1 << AO_CC115L_SPI_CS_PIN),AO_CC115L_SPI_BUS,AO_SPI_SPEED_6MHz)
 #define ao_radio_deselect()    ao_spi_put_mask(AO_CC115L_SPI_CS_PORT,(1 << AO_CC115L_SPI_CS_PIN),AO_CC115L_SPI_BUS)
 #define ao_radio_spi_send(d,l) ao_spi_send((d), (l), AO_CC115L_SPI_BUS)
 #define ao_radio_spi_send_fixed(d,l) ao_spi_send_fixed((d), (l), AO_CC115L_SPI_BUS)
@@ -70,7 +71,7 @@ struct ao_cc115l_trace {
        const char                      *comment;
 };
 
-#define NUM_TRACE      256
+#define NUM_TRACE      32
 
 static struct ao_cc115l_trace  trace[NUM_TRACE];
 static int                     trace_i;
@@ -246,6 +247,8 @@ ao_radio_idle(void)
        }
        /* Flush any pending TX bytes */
        ao_radio_strobe(CC115L_SFTX);
+       /* Make sure the RF calibration is current */
+       ao_radio_strobe(CC115L_SCAL);
 }
 
 /*
@@ -325,23 +328,22 @@ static const struct {
 
 static const uint16_t packet_setup[] = {
        CC115L_MDMCFG3,         (PACKET_DRATE_M),
-       CC115L_MDMCFG2,         (0x00 |
-                                (CC115L_MDMCFG2_MOD_FORMAT_GFSK << CC115L_MDMCFG2_MOD_FORMAT) |
+       CC115L_MDMCFG2,         ((CC115L_MDMCFG2_MOD_FORMAT_GFSK << CC115L_MDMCFG2_MOD_FORMAT) |
                                 (0 << CC115L_MDMCFG2_MANCHESTER_EN) |
                                 (CC115L_MDMCFG2_SYNC_MODE_16BITS << CC115L_MDMCFG2_SYNC_MODE)),
 };
 
 
 /*
- * RDF deviation is 5kHz
+ * RDF deviation is 3kHz
  *
  *     fdev = fosc >> 17 * (8 + dev_m) << dev_e
  *
- *             26e6 / (2 ** 17) * (8 + 4) * (2 ** 1) = 4761Hz
+ *             26e6 / (2 ** 17) * (8 + 7) * (2 ** 0) = 2975
  */
 
-#define RDF_DEV_E      1
-#define RDF_DEV_M      4
+#define RDF_DEV_E      0
+#define RDF_DEV_M      7
 
 /*
  * For our RDF beacon, set the symbol rate to 2kBaud (for a 1kHz tone)
@@ -364,8 +366,7 @@ static const uint16_t rdf_setup[] = {
        CC115L_MDMCFG4,         ((0xf << 4) |
                                 (RDF_DRATE_E << CC115L_MDMCFG4_DRATE_E)),
        CC115L_MDMCFG3,         (RDF_DRATE_M),
-       CC115L_MDMCFG2,         (0x00 |
-                                (CC115L_MDMCFG2_MOD_FORMAT_GFSK << CC115L_MDMCFG2_MOD_FORMAT) |
+       CC115L_MDMCFG2,         ((CC115L_MDMCFG2_MOD_FORMAT_GFSK << CC115L_MDMCFG2_MOD_FORMAT) |
                                 (0 << CC115L_MDMCFG2_MANCHESTER_EN) |
                                 (CC115L_MDMCFG2_SYNC_MODE_NONE << CC115L_MDMCFG2_SYNC_MODE)),
 };
@@ -401,8 +402,7 @@ static const uint16_t aprs_setup[] = {
        CC115L_MDMCFG4,         ((0xf << 4) |
                                 (APRS_DRATE_E << CC115L_MDMCFG4_DRATE_E)),
        CC115L_MDMCFG3,         (APRS_DRATE_M),
-       CC115L_MDMCFG2,         (0x00 |
-                                (CC115L_MDMCFG2_MOD_FORMAT_GFSK << CC115L_MDMCFG2_MOD_FORMAT) |
+       CC115L_MDMCFG2,         ((CC115L_MDMCFG2_MOD_FORMAT_GFSK << CC115L_MDMCFG2_MOD_FORMAT) |
                                 (0 << CC115L_MDMCFG2_MANCHESTER_EN) |
                                 (CC115L_MDMCFG2_SYNC_MODE_NONE << CC115L_MDMCFG2_SYNC_MODE)),
 };
@@ -491,16 +491,21 @@ 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 */
-       CC115L_MDMCFG1,                     (0x00 |
-                                            (CC115L_MDMCFG1_NUM_PREAMBLE_4 << CC115L_MDMCFG1_NUM_PREAMBLE) |
-                                            (1 << CC115L_MDMCFG1_CHANSPC_E)),
+       CC115L_MDMCFG1,                                 /* Modem Configuration */
+               ((CC115L_MDMCFG1_NUM_PREAMBLE_4 << CC115L_MDMCFG1_NUM_PREAMBLE) |
+                (1 << CC115L_MDMCFG1_CHANSPC_E)),
        CC115L_MDMCFG0,                     248,        /* Channel spacing M value (100kHz channels) */
+       CC115L_MCSM1,                       0x30,       /* Main Radio Control State Machine Configuration */
         CC115L_MCSM0,                       0x38,       /* Main Radio Control State Machine Configuration */
         CC115L_RESERVED_0X20,               0xfb,       /* Use setting from SmartRF Studio */
+       CC115L_FREND0,                      0x10,       /* Front End TX Configuration */
         CC115L_FSCAL3,                      0xe9,       /* Frequency Synthesizer Calibration */
         CC115L_FSCAL2,                      0x2a,       /* Frequency Synthesizer Calibration */
         CC115L_FSCAL1,                      0x00,       /* Frequency Synthesizer Calibration */
         CC115L_FSCAL0,                      0x1f,       /* Frequency Synthesizer Calibration */
+       CC115L_RESERVED_0X29,               0x59,       /* RESERVED */
+       CC115L_RESERVED_0X2A,               0x7f,       /* RESERVED */
+       CC115L_RESERVED_0X2B,               0x3f,       /* RESERVED */
         CC115L_TEST2,                       0x81,       /* Various Test Settings */
         CC115L_TEST1,                       0x35,       /* Various Test Settings */
         CC115L_TEST0,                       0x09,       /* Various Test Settings */
@@ -508,6 +513,18 @@ static const uint16_t radio_setup[] = {
 
 static uint8_t ao_radio_configured = 0;
 
+#if HAS_RADIO_POWER
+#define RADIO_POWER    ao_config.radio_power
+#else
+
+#if 0
+#define RADIO_POWER    0x03    /* -31.75dBm on the test board */
+#endif
+
+#define RADIO_POWER    0xc0    /* full power */
+
+#endif
+
 static void
 ao_radio_setup(void)
 {
@@ -523,6 +540,8 @@ ao_radio_setup(void)
 
        ao_config_get();
 
+       ao_radio_reg_write(CC115L_PA, RADIO_POWER);
+
        ao_radio_strobe(CC115L_SCAL);
 
        ao_radio_configured = 1;
@@ -553,6 +572,8 @@ ao_radio_get(void)
                ao_radio_reg_write(CC115L_FREQ1, ao_config.radio_setting >> 8);
                ao_radio_reg_write(CC115L_FREQ0, ao_config.radio_setting);
                last_radio_setting = ao_config.radio_setting;
+               /* Make sure the RF calibration is current */
+               ao_radio_strobe(CC115L_SCAL);
        }
        if (ao_config.radio_rate != last_radio_rate) {
                ao_radio_mode &= ~AO_RADIO_MODE_BITS_PACKET_TX;
@@ -666,23 +687,11 @@ 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)
 {
-       uint8_t power;
        ao_radio_pa_on();
-       ao_radio_reg_write(CC115L_PA, 0);
        ao_radio_strobe(CC115L_STX);
-       for (power = POWER_STEP; power < RADIO_POWER; power += POWER_STEP)
-               ao_radio_reg_write(CC115L_PA, power);
-       if (power != RADIO_POWER)
-               ao_radio_reg_write(CC115L_PA, RADIO_POWER);
 }
 
 static void
AltOS - the operating system for Altus Metrum products