altos/telemetrum-v2.0: Use 9600 baud for ublox

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

diff --git a/src/telemetrum-v2.0/ao_pins.h b/src/telemetrum-v2.0/ao_pins.h
index 36cfc7e00c5fe48605d376ac222b79553a90fce8..04cce99e6813e54729e485dcce0629e99eb19ea5 100644 (file)
--- a/src/telemetrum-v2.0/ao_pins.h
+++ b/src/telemetrum-v2.0/ao_pins.h
@@ -59,11 +59,6 @@
 #define SERIAL_3_PC10_PC11     0
 #define SERIAL_3_PD8_PD9       0
 
-#define ao_gps_getchar         ao_serial3_getchar
-#define ao_gps_putchar         ao_serial3_putchar
-#define ao_gps_set_speed       ao_serial3_set_speed
-#define ao_gps_fifo            (ao_stm_usart3.rx_fifo)
-
 #define HAS_EEPROM             1
 #define USE_INTERNAL_FLASH     0
 #define HAS_USB                        1
@@ -122,8 +117,8 @@
 #define HAS_IGNITE             1
 #define HAS_IGNITE_REPORT      1
 
-#define AO_SENSE_DROGUE(p)     ((p)->adc.sense[0])
-#define AO_SENSE_MAIN(p)       ((p)->adc.sense[1])
+#define AO_SENSE_DROGUE(p)     ((p)->adc.sense_a)
+#define AO_SENSE_MAIN(p)       ((p)->adc.sense_m)
 #define AO_IGNITER_CLOSED      400
 #define AO_IGNITER_OPEN                60
 
@@ -145,16 +140,17 @@
 #define AO_ADC_NUM_SENSE       2
 
 struct ao_adc {
-       int16_t                 sense[AO_ADC_NUM_SENSE];
+       int16_t                 sense_a;
+       int16_t                 sense_m;
        int16_t                 v_batt;
        int16_t                 temp;
 };
 
 #define AO_ADC_DUMP(p) \
-       printf("tick: %5u drogue: %5d main: %5d batt: %5d pbatt: %5d temp: %5d\n", \
+       printf("tick: %5u drogue: %5d main: %5d batt: %5d\n", \
               (p)->tick, \
-              (p)->adc.sense[0], (p)->adc.sense[1], \
-              (p)->adc.v_batt, (p)->adc.temp)
+              (p)->adc.sense_a, (p)->adc.sense_m, \
+              (p)->adc.v_batt);
 
 #define AO_ADC_SENSE_DROGUE    0
 #define AO_ADC_SENSE_DROGUE_PORT       (&stm_gpioa)
@@ -190,6 +186,17 @@ struct ao_adc {
 #define AO_ADC_SQ3             AO_ADC_V_BATT
 #define AO_ADC_SQ4             AO_ADC_TEMP
 
+/*
+ * GPS
+ */
+
+#define AO_SERIAL_SPEED_UBLOX  AO_SERIAL_SPEED_9600
+
+#define ao_gps_getchar         ao_serial3_getchar
+#define ao_gps_putchar         ao_serial3_putchar
+#define ao_gps_set_speed       ao_serial3_set_speed
+#define ao_gps_fifo            (ao_stm_usart3.rx_fifo)
+
 /*
  * Pressure sensor settings
  */
@@ -247,9 +254,9 @@ struct ao_adc {
  */
 
 #define HAS_MMA655X            1
-#define AO_MMA655X_SPI_INDEX   AO_SPI_1_PE13_PE14_PE15
-#define AO_MMA655X_CS_PORT     (&stm_gpiod)
-#define AO_MMA655X_CS_PIN      4
+#define AO_MMA655X_SPI_INDEX   AO_SPI_1_PB3_PB4_PB5
+#define AO_MMA655X_CS_PORT     (&stm_gpiob)
+#define AO_MMA655X_CS_PIN      9
 
 #define NUM_CMDS               16