Revert "altos: Make APRS deviation configurable"

This reverts commit a18d68da1b0b23a6089166fcd14a5bb5368f10f1.

We're just going to use 3kHz for APRS

diff --git a/src/core/ao.h b/src/core/ao.h
index 731b43c89767d6b90cd2686f3df9ce0a368fbd49..0ad3e4aa6504b68774fdbd7b487a59385ff9a4f2 100644 (file)
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -749,8 +749,7 @@ struct ao_config {
 #if AO_PYRO_NUM
        struct ao_pyro  pyro[AO_PYRO_NUM];      /* minor version 12 */
 #endif
-       uint8_t         aprs_interval;          /* minor version 13 */
-       uint8_t         aprs_width;             /* minor version 13 */
+       uint16_t        aprs_interval;          /* minor version 13 */
 #if HAS_RADIO_POWER
        uint8_t         radio_power;            /* minor version 14 */
 #endif
@@ -770,10 +769,6 @@ struct ao_config {
 #define AO_PAD_ORIENTATION_ANTENNA_UP  0
 #define AO_PAD_ORIENTATION_ANTENNA_DOWN        1
 
-#define AO_APRS_WIDTH_NARROW           0
-#define AO_APRS_WIDTH_MEDIUM           1
-#define AO_APRS_WIDTH_WIDE             2
-
 extern __xdata struct ao_config ao_config;
 
 #define AO_CONFIG_MAX_SIZE     128

diff --git a/src/core/ao_config.c b/src/core/ao_config.c
index eea1f832b972bc42a7bdaaad175f2955f32187b2..73608a55c542923b9692458838f0e20f91106c3e 100644 (file)
--- a/src/core/ao_config.c
+++ b/src/core/ao_config.c
@@ -141,10 +141,8 @@ _ao_config_get(void)
                if (minor < 12)
                        memset(&ao_config.pyro, '\0', sizeof (ao_config.pyro));
 #endif
-               if (minor < 13) {
+               if (minor < 13)
                        ao_config.aprs_interval = 0;
-                       ao_config.aprs_width = AO_APRS_WIDTH_MEDIUM;
-               }
 #if HAS_RADIO_POWER
                if (minor < 14)
                        ao_config.radio_power = AO_CONFIG_DEFAULT_RADIO_POWER;
@@ -520,7 +518,7 @@ ao_config_key_set(void) __reentrant
 void
 ao_config_aprs_show(void)
 {
-       printf ("APRS interval: %d width %d\n", ao_config.aprs_interval, ao_config.aprs_width);
+       printf ("APRS interval: %d\n", ao_config.aprs_interval);
 }
 
 void
@@ -531,14 +529,6 @@ ao_config_aprs_set(void)
                return;
        _ao_config_edit_start();
        ao_config.aprs_interval = ao_cmd_lex_i;
-       ao_cmd_decimal();
-       if (ao_cmd_status == ao_cmd_success &&
-           AO_APRS_WIDTH_NARROW <= ao_cmd_lex_i &&
-           ao_cmd_lex_i <= AO_APRS_WIDTH_WIDE)
-       {
-               ao_config.aprs_width = ao_cmd_lex_i;
-       } else
-               ao_config.aprs_width = AO_APRS_WIDTH_MEDIUM;
        _ao_config_edit_finish();
 }
 

diff --git a/src/drivers/ao_cc115l.c b/src/drivers/ao_cc115l.c
index bbe1ad3ba94655932f6f8090b530f406f87565f2..30c56442093a5671f20ca088d2c569403f08ef2e 100644 (file)
--- a/src/drivers/ao_cc115l.c
+++ b/src/drivers/ao_cc115l.c
@@ -328,17 +328,11 @@ static const uint16_t rdf_setup[] = {
 };
 
 /*
- * APRS wide deviation is the same as RDF, medium is 3/4 of that, low is 1/2 of that
+ * APRS deviation is the same as RDF
  */
 
-#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
+#define APRS_DEV_E     RDF_DEV_E
+#define APRS_DEV_M     RDF_DEV_M
 
 /*
  * For our APRS beacon, set the symbol rate to 9.6kBaud (8x oversampling for 1200 baud data rate)
@@ -357,6 +351,8 @@ 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),
@@ -366,20 +362,6 @@ 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))
@@ -429,11 +411,9 @@ 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);
@@ -819,13 +799,7 @@ _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();
 }