projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 2a62403fbf394c9a858d740d72011113560cd7ef..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_
#ifndef _AO_PINS_H_
#define _AO_PINS_H_
-#define HAS_TASK_QUEUE 1
/* 8MHz High speed external crystal */
#define AO_HSE 8000000
/* 8MHz High speed external crystal */
#define AO_HSE 8000000
@@
-47,7
+46,7
@@
#define HAS_SERIAL_1 0
#define USE_SERIAL_1_STDIN 0
#define SERIAL_1_PB6_PB7 0
#define HAS_SERIAL_1 0
#define USE_SERIAL_1_STDIN 0
#define SERIAL_1_PB6_PB7 0
-#define SERIAL_1_PA9_PA10
1
+#define SERIAL_1_PA9_PA10
0
#define HAS_SERIAL_2 0
#define USE_SERIAL_2_STDIN 0
#define HAS_SERIAL_2 0
#define USE_SERIAL_2_STDIN 0
@@
-69,7
+68,7
@@
#define AO_CONFIG_MAX_SIZE 1024
#define LOG_ERASE_MARK 0x55
#define LOG_MAX_ERASE 128
#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
#define HAS_EEPROM 1
#define USE_INTERNAL_FLASH 0
@@
-89,8
+88,8
@@
#define HAS_SPI_1 1
#define SPI_1_PA5_PA6_PA7 1 /* Barometer */
#define HAS_SPI_1 1
#define SPI_1_PA5_PA6_PA7 1 /* Barometer */
-#define SPI_1_PB3_PB4_PB5
0
-#define SPI_1_PE13_PE14_PE15 1 /*
Accelerometer, Gyro
*/
+#define SPI_1_PB3_PB4_PB5
1 /* Accelerometer */
+#define SPI_1_PE13_PE14_PE15 1 /*
IMU
*/
#define SPI_1_OSPEEDR STM_OSPEEDR_10MHz
#define HAS_SPI_2 1
#define SPI_1_OSPEEDR STM_OSPEEDR_10MHz
#define HAS_SPI_2 1
@@
-98,13
+97,8
@@
#define SPI_2_PD1_PD3_PD4 0
#define SPI_2_OSPEEDR STM_OSPEEDR_10MHz
#define SPI_2_PD1_PD3_PD4 0
#define SPI_2_OSPEEDR STM_OSPEEDR_10MHz
-#define SPI_2_PORT (&stm_gpiob)
-#define SPI_2_SCK_PIN 13
-#define SPI_2_MISO_PIN 14
-#define SPI_2_MOSI_PIN 15
-
-#define HAS_I2C_1 1
-#define I2C_1_PB8_PB9 1
+#define HAS_I2C_1 0
+#define I2C_1_PB8_PB9 0
#define HAS_I2C_2 0
#define I2C_2_PB10_PB11 0
#define HAS_I2C_2 0
#define I2C_2_PB10_PB11 0
@@
-151,7
+145,7
@@
#define AO_PYRO_PIN_1 7
/* Pyro C */
#define AO_PYRO_PIN_1 7
/* Pyro C */
-#define AO_PYRO_PORT_2 (&stm_gpio
b
)
+#define AO_PYRO_PORT_2 (&stm_gpio
d
)
#define AO_PYRO_PIN_2 5
/* Pyro D */
#define AO_PYRO_PIN_2 5
/* Pyro D */
@@
-311,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_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
#define AO_CC1200_INT_PORT (&stm_gpioe)
#define AO_CC1200_INT_PIN 1
@@
-347,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_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 */
#define ao_data_mag_through(packet) ((packet)->bmx160.mag_z)
/* ADXL375 */
@@
-356,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_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
#define AO_ADXL375_AXIS x
#define AO_ADXL375_INVERT 1