altos: Switch all tick variables to AO_TICK_TYPE/AO_TICK_SIGNED

[fw/altos] / src / telegps-v2.0 / ao_pins.h

diff --git a/src/telegps-v2.0/ao_pins.h b/src/telegps-v2.0/ao_pins.h
index 85a05f2282f312580b7b06d87fa4d3ce3e4571f9..7c8c5c3cf5ab313aca129f6c28f43328d7c78a7a 100644 (file)
--- a/src/telegps-v2.0/ao_pins.h
+++ b/src/telegps-v2.0/ao_pins.h
@@ -21,16 +21,21 @@
 
 #define LED_PORT_ENABLE STM_RCC_AHBENR_IOPBEN
 #define LED_PORT        (&stm_gpiob)
-#define LED_PIN_RED     5
-#define AO_LED_RED      (1 << LED_PIN_RED)
+#define LED_PIN_GREEN   5
+#define AO_LED_GREEN    (1 << LED_PIN_GREEN)
+#define AO_LED_PANIC   AO_LED_GREEN
+#define AO_LED_GPS_LOCK        AO_LED_GREEN
 
-#define LEDS_AVAILABLE  (AO_LED_RED)
+#define LEDS_AVAILABLE  (AO_LED_GREEN)
+
+#define AO_STACK_SIZE          512
 
 #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_1
 #define AO_PLLMUL               3
 #define AO_PLLDIV               1
 
@@ -42,22 +47,25 @@
 #define AO_APB_PRESCALER        1
 #define AO_RCC_CFGR_PPRE_DIV    STM_RCC_CFGR_PPRE_DIV_1
 
-#define AO_RCC_CFGR2_PLLDIV    STM_RCC_CFGR2_PREDIV_1
-
 #define HAS_USB                         1
 #define AO_USB_DIRECTIO                 0
 #define AO_PA11_PA12_RMP                1
+#define HAS_USB_CONNECT                        1
+#define AO_USB_CONNECT_PORT            (&stm_gpiob)
+#define AO_USB_CONNECT_PIN             3
 
 #define IS_FLASH_LOADER 0
 
 /* 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
 
@@ -79,7 +87,7 @@ struct ao_adc {
 };
 
 #define AO_ADC_DUMP(p) \
-        printf("tick: %5u batt: %5d\n", \
+        printf("tick: %5lu batt: %5d\n", \
                (p)->tick, \
                (p)->adc.v_batt)
 
@@ -90,8 +98,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
@@ -99,14 +105,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
@@ -114,7 +126,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
@@ -125,6 +136,7 @@ struct ao_adc {
 
 #define AO_CONFIG_DEFAULT_APRS_INTERVAL                0
 #define AO_CONFIG_DEFAULT_RADIO_POWER          0xc0
+#define AO_LOG_FORMAT                          AO_LOG_FORMAT_TELEGPS
 
 /*
  * GPS
@@ -143,22 +155,16 @@ 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_ */