Switch TeleMega v2.0 to CC1200 radio chip

That's what we're using, after all

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

diff --git a/src/telemega-v2.0/Makefile b/src/telemega-v2.0/Makefile
index 2e0e8908e6d90fe962e7fc11486ef393c0bf5eb9..6a1c05b0b5d84d26de175a63ab6b4744fa427a04 100644 (file)
--- a/src/telemega-v2.0/Makefile
+++ b/src/telemega-v2.0/Makefile
@@ -21,7 +21,7 @@ INC = \
        ao_hmc5883.h \
        ao_mpu6000.h \
        ao_mma655x.h \
-       ao_cc1120_CC1120.h \
+       ao_cc1200_CC1200.h \
        ao_profile.h \
        ao_task.h \
        ao_whiten.h \
@@ -85,9 +85,7 @@ ALTOS_SRC = \
        ao_freq.c \
        ao_dma_stm.c \
        ao_spi_stm.c \
-       ao_cc1120.c \
-       ao_fec_tx.c \
-       ao_fec_rx.c \
+       ao_cc1200.c \
        ao_data.c \
        ao_ms5607.c \
        ao_mma655x.c \

diff --git a/src/telemega-v2.0/ao_pins.h b/src/telemega-v2.0/ao_pins.h
index 8409a1068a968a2366e9d567a996789cc143fb38..d796826cbc4ac13687518e488a093f169834ae1d 100644 (file)
--- a/src/telemega-v2.0/ao_pins.h
+++ b/src/telemega-v2.0/ao_pins.h
@@ -301,24 +301,24 @@ struct ao_adc {
 
 /* gets pretty close to 434.550 */
 
-#define AO_RADIO_CAL_DEFAULT   0x6ca333
+#define AO_RADIO_CAL_DEFAULT   5695733
 
 #define AO_FEC_DEBUG           0
-#define AO_CC1120_SPI_CS_PORT  (&stm_gpioc)
-#define AO_CC1120_SPI_CS_PIN   5
-#define AO_CC1120_SPI_BUS      AO_SPI_2_PB13_PB14_PB15
-#define AO_CC1120_SPI          stm_spi2
+#define AO_CC1200_SPI_CS_PORT  (&stm_gpioc)
+#define AO_CC1200_SPI_CS_PIN   5
+#define AO_CC1200_SPI_BUS      AO_SPI_2_PB13_PB14_PB15
+#define AO_CC1200_SPI          stm_spi2
 
-#define AO_CC1120_INT_PORT             (&stm_gpioe)
-#define AO_CC1120_INT_PIN              1
-#define AO_CC1120_MCU_WAKEUP_PORT      (&stm_gpioc)
-#define AO_CC1120_MCU_WAKEUP_PIN       (0)
+#define AO_CC1200_INT_PORT             (&stm_gpioe)
+#define AO_CC1200_INT_PIN              1
+#define AO_CC1200_MCU_WAKEUP_PORT      (&stm_gpioc)
+#define AO_CC1200_MCU_WAKEUP_PIN       (0)
 
-#define AO_CC1120_INT_GPIO     2
-#define AO_CC1120_INT_GPIO_IOCFG       CC1120_IOCFG2
+#define AO_CC1200_INT_GPIO     2
+#define AO_CC1200_INT_GPIO_IOCFG       CC1200_IOCFG2
 
-#define AO_CC1120_MARC_GPIO    3
-#define AO_CC1120_MARC_GPIO_IOCFG      CC1120_IOCFG3
+#define AO_CC1200_MARC_GPIO    3
+#define AO_CC1200_MARC_GPIO_IOCFG      CC1200_IOCFG3
 
 #define HAS_BOOT_RADIO         0