X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Ftelegps-v2.0%2Fao_pins.h;h=49f51a9c30c570d0fb194ecb72bc121e5671f495;hp=37a5fa392a9591fc84517e1bebb5fea7b89019ca;hb=63eeaada85cb9ddccb0fa9b2d751cc8f46399d9c;hpb=979a1b8d80189e56745316da3de9288ee32e102c

diff --git a/src/telegps-v2.0/ao_pins.h b/src/telegps-v2.0/ao_pins.h
index 37a5fa39..49f51a9c 100644
--- a/src/telegps-v2.0/ao_pins.h
+++ b/src/telegps-v2.0/ao_pins.h
@@ -33,11 +33,11 @@
 #define IS_FLASH_LOADER		0
 #define HAS_BEEP 	       0
 
-#define AO_HSE                  32000000
+#define AO_HSE                  16000000
 #define AO_RCC_CFGR_PLLMUL      STM_RCC_CFGR_PLLMUL_3
-#define AO_RCC_CFGR2_PLLDIV	STM_RCC_CFGR2_PREDIV_2
+#define AO_RCC_CFGR2_PLLDIV	STM_RCC_CFGR2_PREDIV_1
 #define AO_PLLMUL               3
-#define AO_PLLDIV               2
+#define AO_PLLDIV               1
 
 /* HCLK = 48MHz */
 #define AO_AHB_PRESCALER        1
@@ -56,11 +56,13 @@
 /* ADC */
 
 #define HAS_ADC			1
-#define AO_ADC_PIN0_PORT        (&stm_gpioa)
-#define AO_ADC_PIN0_PIN         0
-#define AO_ADC_PIN0_CH          0
+#define AO_ADC_PIN0_PORT        (&stm_gpiob)
+#define AO_ADC_PIN0_PIN         1
+#define AO_ADC_PIN0_CH          9
 
-#define AO_ADC_RCC_AHBENR       ((1 << STM_RCC_AHBENR_IOPAEN))
+#define AO_ADC_RCC_AHBENR       ((1 << STM_RCC_AHBENR_IOPBEN))
+
+#define ao_telemetry_battery_convert(a)	((a) << 3)
 
 #define AO_NUM_ADC              1
 
@@ -93,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
@@ -102,14 +102,20 @@ 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 USE_SERIAL_2_FLOW       0
+#define USE_SERIAL_2_SW_FLOW    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
@@ -117,7 +123,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
@@ -146,22 +151,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_ */