Version 1.9.6.2

[fw/altos] / src / telemega-v4.0 / ao_pins.h

diff --git a/src/telemega-v4.0/ao_pins.h b/src/telemega-v4.0/ao_pins.h
index 8f04431686438eca7d143b64266895ecf1018e7e..fdf290716c041b0804fd617b8b066749288eb70b 100644 (file)
--- a/src/telemega-v4.0/ao_pins.h
+++ b/src/telemega-v4.0/ao_pins.h
@@ -19,7 +19,6 @@
 #ifndef _AO_PINS_H_
 #define _AO_PINS_H_
 
-#define HAS_TASK_QUEUE         1
 
 /* 8MHz High speed external crystal */
 #define AO_HSE                 8000000
@@ -306,7 +305,6 @@ struct ao_adc {
 #define AO_CC1200_SPI_CS_PIN   5
 #define AO_CC1200_SPI_BUS      AO_SPI_2_PB13_PB14_PB15
 #define AO_CC1200_SPI          stm_spi2
-#define AO_CC1200_SPI_SPEED    AO_SPI_SPEED_FAST
 
 #define AO_CC1200_INT_PORT             (&stm_gpioe)
 #define AO_CC1200_INT_PIN              1
@@ -342,7 +340,7 @@ struct ao_adc {
 #define ao_data_yaw(packet)    ((packet)->bmx160.gyr_z)
 
 #define ao_data_mag_along(packet)      ((packet)->bmx160.mag_x)
-#define ao_data_mag_across(packet)     (-(packet)->bmx160.mag_y)
+#define ao_data_mag_across(packet)     ((packet)->bmx160.mag_y)
 #define ao_data_mag_through(packet)    ((packet)->bmx160.mag_z)
 
 /* ADXL375 */
@@ -351,7 +349,6 @@ struct ao_adc {
 #define AO_ADXL375_SPI_INDEX   (AO_SPI_1_PB3_PB4_PB5 | AO_SPI_MODE_3)
 #define AO_ADXL375_CS_PORT     (&stm_gpiod)
 #define AO_ADXL375_CS_PIN      4
-#define AO_ADXL375_SPI_SPEED   AO_SPI_SPEED_4MHz
 
 #define AO_ADXL375_AXIS                x
 #define AO_ADXL375_INVERT      1