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 c4f8c69668fb752d79955224da536c70743692d1..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
@@ -191,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
  */
@@ -248,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