X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftelemega-v4.0%2Fao_pins.h;h=fdf290716c041b0804fd617b8b066749288eb70b;hb=cdfa9303a024300141e8b328f81404a9b7466207;hp=47dfd015566a6a99b09106ef7d1924b2f81b1ef9;hpb=803e260dcf9beba5684c4dcdda14255d76b2e551;p=fw%2Faltos diff --git a/src/telemega-v4.0/ao_pins.h b/src/telemega-v4.0/ao_pins.h index 47dfd015..fdf29071 100644 --- 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 @@ -69,7 +68,7 @@ #define AO_CONFIG_MAX_SIZE 1024 #define LOG_ERASE_MARK 0x55 #define LOG_MAX_ERASE 128 -#define AO_LOG_FORMAT AO_LOG_FORMAT_TELEMEGA_3 +#define AO_LOG_FORMAT AO_LOG_FORMAT_TELEMEGA_4 #define HAS_EEPROM 1 #define USE_INTERNAL_FLASH 0 @@ -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