altos: Make APRS deviation configurable

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

diff --git a/src/drivers/ao_cc115l.c b/src/drivers/ao_cc115l.c
index 9a4908b501d0030b7f9a2fd169a2bf7bb51d72a3..bbe1ad3ba94655932f6f8090b530f406f87565f2 100644 (file)
--- a/src/drivers/ao_cc115l.c
+++ b/src/drivers/ao_cc115l.c
@@ -23,7 +23,7 @@
 
 #define AO_RADIO_MAX_SEND      sizeof (struct ao_telemetry_generic)
 
-static uint8_t ao_radio_mutex;
+uint8_t ao_radio_mutex;
 
 static uint8_t ao_radio_fifo;          /* fifo drained interrupt received */
 static uint8_t ao_radio_done;          /* tx done interrupt received */
@@ -328,11 +328,17 @@ static const uint16_t rdf_setup[] = {
 };
 
 /*
- * APRS deviation is the same as RDF
+ * APRS wide deviation is the same as RDF, medium is 3/4 of that, low is 1/2 of that
  */
 
-#define APRS_DEV_E     RDF_DEV_E
-#define APRS_DEV_M     RDF_DEV_M
+#define APRS_WIDE_DEV_E        RDF_DEV_E
+#define APRS_WIDE_DEV_M        RDF_DEV_M
+
+#define APRS_MED_DEV_E 1
+#define APRS_MED_DEV_M 1
+
+#define APRS_NAR_DEV_E 0
+#define APRS_NAR_DEV_M 4
 
 /*
  * For our APRS beacon, set the symbol rate to 9.6kBaud (8x oversampling for 1200 baud data rate)
@@ -351,8 +357,6 @@ static const uint16_t rdf_setup[] = {
 #define APRS_DRATE_M   131
 
 static const uint16_t aprs_setup[] = {
-       CC115L_DEVIATN,         ((APRS_DEV_E << CC115L_DEVIATN_DEVIATION_E) |
-                                (APRS_DEV_M << CC115L_DEVIATN_DEVIATION_M)),
        CC115L_MDMCFG4,         ((0xf << 4) |
                                 (APRS_DRATE_E << CC115L_MDMCFG4_DRATE_E)),
        CC115L_MDMCFG3,         (APRS_DRATE_M),
@@ -362,6 +366,20 @@ static const uint16_t aprs_setup[] = {
                                 (CC115L_MDMCFG2_SYNC_MODE_NONE << CC115L_MDMCFG2_SYNC_MODE)),
 };
 
+#define APRS_WIDE_DEVIATN      ((APRS_WIDE_DEV_E << CC115L_DEVIATN_DEVIATION_E) | \
+                                (APRS_WIDE_DEV_M << CC115L_DEVIATN_DEVIATION_M))
+
+#define APRS_MED_DEVIATN       ((APRS_MED_DEV_E << CC115L_DEVIATN_DEVIATION_E) | \
+                                (APRS_MED_DEV_M << CC115L_DEVIATN_DEVIATION_M))
+
+#define APRS_NAR_DEVIATN       ((APRS_NAR_DEV_E << CC115L_DEVIATN_DEVIATION_E) | \
+                                (APRS_NAR_DEV_M << CC115L_DEVIATN_DEVIATION_M))
+
+
+static const uint8_t aprs_width[] = {
+       APRS_NAR_DEVIATN, APRS_MED_DEVIATN, APRS_WIDE_DEVIATN
+};
+
 #define AO_PKTCTRL0_INFINITE   ((CC115L_PKTCTRL0_PKT_FORMAT_NORMAL << CC115L_PKTCTRL0_PKT_FORMAT) | \
                                 (0 << CC115L_PKTCTRL0_PKT_CRC_EN) |                                    \
                                 (CC115L_PKTCTRL0_PKT_LENGTH_CONFIG_INFINITE << CC115L_PKTCTRL0_PKT_LENGTH_CONFIG))
@@ -411,9 +429,11 @@ ao_radio_set_mode(uint16_t new_mode)
                for (i = 0; i < sizeof (rdf_setup) / sizeof (rdf_setup[0]); i += 2)
                        ao_radio_reg_write(rdf_setup[i], rdf_setup[i+1]);
 
-       if (changes & AO_RADIO_MODE_BITS_APRS)
+       if (changes & AO_RADIO_MODE_BITS_APRS) {
                for (i = 0; i < sizeof (aprs_setup) / sizeof (aprs_setup[0]); i += 2)
                        ao_radio_reg_write(aprs_setup[i], aprs_setup[i+1]);
+               ao_radio_reg_write(CC115L_DEVIATN, aprs_width[ao_config.aprs_width]);
+       }
 
        if (changes & AO_RADIO_MODE_BITS_INFINITE)
                ao_radio_reg_write(CC115L_PKTCTRL0, AO_PKTCTRL0_INFINITE);
@@ -442,15 +462,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 */
-        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_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 */
@@ -460,7 +475,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_PA,                          0x00,       /* Power setting (as low as possible) */
 };
 
 static uint8_t ao_radio_configured = 0;
@@ -638,7 +652,7 @@ ao_radio_test_cmd(void)
 #endif
                ao_radio_get();
                ao_radio_set_len(0xff);
-               ao_radio_set_mode(AO_RADIO_MODE_PACKET_TX | AO_RADIO_MODE_BITS_FIXED);
+               ao_radio_set_mode(AO_RADIO_MODE_RDF|AO_RADIO_MODE_BITS_FIXED);
                ao_radio_strobe(CC115L_SFTX);
                ao_radio_pa_on();
                ao_radio_strobe(CC115L_STX);
@@ -805,7 +819,13 @@ _ao_radio_send_lots(ao_radio_fill_func fill, uint8_t mode)
 void
 ao_radio_send_aprs(ao_radio_fill_func fill)
 {
+       static uint8_t  last_width;
        ao_radio_get();
+       /* Force deviation set when it changes */
+       if (last_width != ao_config.aprs_width) {
+               last_width = ao_config.aprs_width;
+               ao_radio_mode &= ~AO_RADIO_MODE_APRS;
+       }
        _ao_radio_send_lots(fill, AO_RADIO_MODE_APRS);
        ao_radio_put();
 }