altos/telemini-v3.0: Finish initial turn-on

[fw/altos] / src / telemini-v3.0 / ao_pins.h

diff --git a/src/telemini-v3.0/ao_pins.h b/src/telemini-v3.0/ao_pins.h
index e060b9314402aa76917907df4456f44e891e7874..031c1d18bf692e4216819a5d547560d3571c41a9 100644 (file)
--- a/src/telemini-v3.0/ao_pins.h
+++ b/src/telemini-v3.0/ao_pins.h
@@ -16,21 +16,25 @@
  */
 
 #define HAS_BEEP               1
+#define HAS_SERIAL_1           0
 #define HAS_BATTERY_REPORT     1
+#define HAS_BOOT_LOADER                0
 
-#define AO_STACK_SIZE  384
+#define AO_STACK_SIZE  448
+
+#define RELOCATE_INTERRUPT 0
 
 #define IS_FLASH_LOADER        0
 
-/* 40MHz clock based on 16MHz reference */
+/* 48MHz clock based on 16MHz reference */
 //#define AO_HSI48     1
 #define AO_HSE                 16000000
-#define AO_RCC_CFGR_PLLMUL     STM_RCC_CFGR_PLLMUL_5
-#define AO_RCC_CFGR2_PLLDIV    STM_RCC_CFGR2_PREDIV_2
-#define AO_PLLMUL              5
-#define AO_PLLDIV              2
+#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
 
-/* HCLK = 40MHz */
+/* HCLK = 48MHz */
 #define AO_AHB_PRESCALER       1
 #define AO_RCC_CFGR_HPRE_DIV   STM_RCC_CFGR_HPRE_DIV_1
 
@@ -38,11 +42,6 @@
 #define AO_APB_PRESCALER       1
 #define AO_RCC_CFGR_PPRE_DIV   STM_RCC_CFGR_PPRE_DIV_1
 
-/* Send PLL clock to cc1200 */
-#define AO_MCO_PORT            (&stm_gpioa)
-#define AO_MCO_PIN             9
-#define AO_MCO_AF              STM_AFR_AF5
-
 #define HAS_USB                        0
 #define AO_USB_DIRECTIO                0
 #define AO_PA11_PA12_RMP       0
@@ -75,26 +74,23 @@
 #define LED_PIN_GREEN          15
 #define AO_LED_GREEN           (1 << 15)
 #define AO_LED_PANIC           AO_LED_GREEN
+#define AO_LED_LOW             AO_LED_GREEN
+#define AO_LED_MID             AO_LED_GREEN
 
 #define LEDS_AVAILABLE         AO_LED_GREEN
 
-/* USART */
+/* Serial. Hooked to the spare pin (PA9/19) and the beeper (PA10/20) */
 
-#define HAS_SERIAL             0
-#define USE_SERIAL_0_STDIN     1
-#define SERIAL_0_18_19         1
-#define SERIAL_0_14_15         0
-#define SERIAL_0_17_18         0
-#define SERIAL_0_26_27         0
+#define SERIAL_1_PA9_PA10      1
+#define USE_SERIAL_1_STDIN     HAS_SERIAL_1
+#define DELAY_SERIAL_1_STDIN   0
 
 /* SPI */
 
-#define HAS_SPI_0              1
-#define SPI_SCK0_P0_6          1
 #define HAS_SPI_1              1
-#define SPI_SCK1_P1_15         1
-#define SPI_MISO1_P0_22                1
-#define SPI_MOSI1_P0_21                1
+#define SPI_1_PA5_PA6_PA7      1
+#define SPI_1_PB3_PB4_PB5      1
+#define SPI_1_OSPEEDR          STM_OSPEEDR_MEDIUM
 
 /* M25 */
 
@@ -115,17 +111,20 @@
 #define AO_MS5607_MISO_PIN     4
 #define AO_MS5607_MISO_MASK    (1 << AO_MS5607_MISO_PIN)
 #define AO_MS5607_SPI_INDEX    AO_SPI_1_PB3_PB4_PB5
+#define AO_MS5607_SPI_SPEED    AO_SPI_SPEED_12MHz
 
 /* CC1200 */
 
 // #define AO_RADIO_CAL_DEFAULT        5695733
-#define AO_RADIO_CAL_DEFAULT   5695947
+#define AO_RADIO_CAL_DEFAULT   5695717
 
 #define AO_FEC_DEBUG           0
+#define CC1200_DEBUG           0
 #define AO_CC1200_SPI_CS_PORT  (&stm_gpiob)
 #define AO_CC1200_SPI_CS_PIN   0
 #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_12MHz
 
 #define AO_CC1200_INT_PORT             (&stm_gpiob)
 #define AO_CC1200_INT_PIN              1
@@ -187,8 +186,8 @@ struct ao_adc {
 /*
  * Voltage divider on ADC battery sampler
  */
-#define AO_BATTERY_DIV_PLUS    100     /* 100k */
-#define AO_BATTERY_DIV_MINUS   27      /* 27k */
+#define AO_BATTERY_DIV_PLUS    56      /* 5.6k */
+#define AO_BATTERY_DIV_MINUS   100     /* 10k */
 
 /*
  * Voltage divider on ADC igniter samplers