X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelegps-v2.0%2Fao_pins.h;h=f92564d6c86d0cdb2d9f31c2a7e0a49d26ba2a36;hb=refs%2Fheads%2Ftime-series;hp=71143bbca8867686b0b2c72f327036214887ce13;hpb=0f883aa1b1a1db61113489c260f44c09d5216bc7;p=fw%2Faltos

diff --git a/src/telegps-v2.0/ao_pins.h b/src/telegps-v2.0/ao_pins.h
index 71143bbc..f92564d6 100644
--- a/src/telegps-v2.0/ao_pins.h
+++ b/src/telegps-v2.0/ao_pins.h
@@ -95,8 +95,6 @@ struct ao_adc {
 #define SPI_1_PB3_PB4_PB5       0
 #define SPI_1_OSPEEDR           STM_OSPEEDR_HIGH
 
-#define HAS_MS5607              0
-
 /* Flash */
 
 #define M25_MAX_CHIPS           1
@@ -104,14 +102,18 @@ struct ao_adc {
 #define AO_M25_SPI_CS_MASK      (1 << 0)
 #define AO_M25_SPI_BUS          AO_SPI_1_PA5_PA6_PA7
 
-#define HAS_SERIAL_1		1
+/* Serial */
+#define HAS_SERIAL_1		0
 #define SERIAL_1_PB6_PB7	1
 #define USE_SERIAL_1_STDIN	0
 
-#define ao_gps_getchar		ao_serial1_getchar
-#define ao_gps_putchar		ao_serial1_putchar
-#define ao_gps_set_speed	ao_serial1_set_speed
-#define ao_gps_fifo		(ao_usart_rx_fifo)
+#define HAS_SERIAL_2	       	1
+#define SERIAL_2_PA2_PA3	1
+#define USE_SERIAL_2_STDIN	0
+
+#define ao_gps_getchar		ao_serial2_getchar
+#define ao_gps_putchar		ao_serial2_putchar
+#define ao_gps_set_speed	ao_serial2_set_speed
 
 #define HAS_EEPROM		1
 #define USE_INTERNAL_FLASH	0
@@ -119,7 +121,6 @@ struct ao_adc {
 #define HAS_TELEMETRY		1
 #define HAS_RDF			1
 #define HAS_APRS		1
-#define HAS_RADIO_RECV		0
 
 #define HAS_GPS			1
 #define HAS_FLIGHT		0
@@ -148,22 +149,17 @@ struct ao_adc {
 
 #define AO_FEC_DEBUG            0
 #define AO_CC1200_SPI_CS_PORT   (&stm_gpioa)
-#define AO_CC1200_SPI_CS_PIN    5
+#define AO_CC1200_SPI_CS_PIN    1
 #define AO_CC1200_SPI_BUS       AO_SPI_1_PA5_PA6_PA7
 #define AO_CC1200_SPI           stm_spi1
 #define AO_CC1200_SPI_SPEED     AO_SPI_SPEED_6MHz
 
 #define AO_CC1200_INT_PORT              (&stm_gpioa)
 #define AO_CC1200_INT_PIN               4
-#define AO_CC1200_MCU_WAKEUP_PORT       (&stm_gpioa)
-#define AO_CC1200_MCU_WAKEUP_PIN        (0)
 
 #define AO_CC1200_INT_GPIO      2
 #define AO_CC1200_INT_GPIO_IOCFG        CC1200_IOCFG2
 
-#define AO_CC1200_MARC_GPIO     3
-#define AO_CC1200_MARC_GPIO_IOCFG       CC1200_IOCFG3
-
 #define HAS_BOOT_RADIO          0
 
 #endif /* _AO_PINS_H_ */