altos: Try a different carrier generation plan

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/drivers/ao_cc1120.c b/src/drivers/ao_cc1120.c
index 6eb115a4d42a65b06cc104b9f9a41dc2904830f4..822102ab2c759d70f3948ee697605ba76d630ea2 100644 (file)
--- a/src/drivers/ao_cc1120.c
+++ b/src/drivers/ao_cc1120.c
@@ -474,31 +474,31 @@ static const uint16_t aprs_setup[] = {
  */
 
 static const uint16_t test_setup[] = {
-       CC1120_DEVIATION_M,     PACKET_DEV_M,
+       CC1120_DEVIATION_M,     0,
        CC1120_MODCFG_DEV_E,    ((CC1120_MODCFG_DEV_E_MODEM_MODE_NORMAL << CC1120_MODCFG_DEV_E_MODEM_MODE) |
                                 (CC1120_MODCFG_DEV_E_MOD_FORMAT_2_GFSK << CC1120_MODCFG_DEV_E_MOD_FORMAT) |
-                                (PACKET_DEV_E << CC1120_MODCFG_DEV_E_DEV_E)),
+                                (0 << CC1120_MODCFG_DEV_E_DEV_E)),
        CC1120_DRATE2,          ((APRS_DRATE_E << CC1120_DRATE2_DATARATE_E) |
                                 (((APRS_DRATE_M >> 16) & CC1120_DRATE2_DATARATE_M_19_16_MASK) << CC1120_DRATE2_DATARATE_M_19_16)),
        CC1120_DRATE1,          ((APRS_DRATE_M >> 8) & 0xff),
        CC1120_DRATE0,          ((APRS_DRATE_M >> 0) & 0xff),
        CC1120_PKT_CFG2,        ((CC1120_PKT_CFG2_CCA_MODE_ALWAYS_CLEAR << CC1120_PKT_CFG2_CCA_MODE) |
-                                (CC1120_PKT_CFG2_PKT_FORMAT_TRANSPARENT_SERIAL << CC1120_PKT_CFG2_PKT_FORMAT)),
+                                (CC1120_PKT_CFG2_PKT_FORMAT_NORMAL << CC1120_PKT_CFG2_PKT_FORMAT)),
        CC1120_PKT_CFG1,        ((0 << CC1120_PKT_CFG1_WHITE_DATA) |
                                 (CC1120_PKT_CFG1_ADDR_CHECK_CFG_NONE << CC1120_PKT_CFG1_ADDR_CHECK_CFG) |
                                 (CC1120_PKT_CFG1_CRC_CFG_DISABLED << CC1120_PKT_CFG1_CRC_CFG) |
                                 (0 << CC1120_PKT_CFG1_APPEND_STATUS)),
-        CC1120_PREAMBLE_CFG1,  ((CC1120_PREAMBLE_CFG1_NUM_PREAMBLE_NONE << CC1120_PREAMBLE_CFG1_NUM_PREAMBLE) |
+        CC1120_PREAMBLE_CFG1,  ((CC1120_PREAMBLE_CFG1_NUM_PREAMBLE_4_BYTES << CC1120_PREAMBLE_CFG1_NUM_PREAMBLE) |
                                 (CC1120_PREAMBLE_CFG1_PREAMBLE_WORD_AA << CC1120_PREAMBLE_CFG1_PREAMBLE_WORD)),
-       CC1120_SOFT_TX_DATA_CFG,((1 << CC1120_SOFT_TX_DATA_CFG_SOFT_TX_DATA_EN)),
+       CC1120_SOFT_TX_DATA_CFG,((0 << CC1120_SOFT_TX_DATA_CFG_SOFT_TX_DATA_EN)),
        CC1120_MDMCFG1,         ((0 << CC1120_MDMCFG1_CARRIER_SENSE_GATE) |
-                                (0 << CC1120_MDMCFG1_FIFO_EN) |
+                                (1 << CC1120_MDMCFG1_FIFO_EN) |
                                 (0 << CC1120_MDMCFG1_MANCHESTER_EN) |
                                 (0 << CC1120_MDMCFG1_INVERT_DATA_EN) |
                                 (0 << CC1120_MDMCFG1_COLLISION_DETECT_EN) |
                                 (CC1120_MDMCFG1_DVGA_GAIN_9 << CC1120_MDMCFG1_DVGA_GAIN) |
                                 (0 << CC1120_MDMCFG1_SINGLE_ADC_EN)),
-       CC1120_MDMCFG0,         (0x45),
+       CC1120_MDMCFG0,         (0x5),
        CC1120_SOFT_TX_DATA_IN, 0,
 };