projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add telemetry to megametrum
[fw/altos]
/
src
/
megametrum-v0.1
/
ao_pins.h
diff --git
a/src/megametrum-v0.1/ao_pins.h
b/src/megametrum-v0.1/ao_pins.h
index 2ae3cea84c3935ee28ac29220203362c035379d3..5c5c5972b828589568d1158d70e08432ab9f1cbf 100644
(file)
--- a/
src/megametrum-v0.1/ao_pins.h
+++ b/
src/megametrum-v0.1/ao_pins.h
@@
-65,6
+65,8
@@
#define USE_INTERNAL_FLASH 0
#define HAS_USB 1
#define HAS_BEEP 1
#define USE_INTERNAL_FLASH 0
#define HAS_USB 1
#define HAS_BEEP 1
+#define HAS_RADIO 1
+#define HAS_TELEMETRY 1
#define HAS_SPI_1 1
#define SPI_1_PA5_PA6_PA7 1
#define HAS_SPI_1 1
#define SPI_1_PA5_PA6_PA7 1
@@
-74,6
+76,10
@@
#define HAS_SPI_2 1
#define SPI_2_PB13_PB14_PB15 1
#define SPI_2_PD1_PD3_PD4 0
#define HAS_SPI_2 1
#define SPI_2_PB13_PB14_PB15 1
#define SPI_2_PD1_PD3_PD4 0
+#define SPI_2_GPIO stm_gpiob
+#define SPI_2_SCK 13
+#define SPI_2_MISO 14
+#define SPI_2_MOSI 15
#define HAS_I2C_1 1
#define I2C_1_PB8_PB9 1
#define HAS_I2C_1 1
#define I2C_1_PB8_PB9 1
@@
-81,7
+87,7
@@
#define HAS_I2C_2 1
#define I2C_2_PB10_PB11 1
#define HAS_I2C_2 1
#define I2C_2_PB10_PB11 1
-#define PACKET_HAS_SLAVE
1
+#define PACKET_HAS_SLAVE
0
#define LOW_LEVEL_DEBUG 1
#define LOW_LEVEL_DEBUG 1
@@
-98,6
+104,8
@@
#define HAS_FLIGHT 1
#define HAS_ADC 1
#define HAS_ACCEL 1
#define HAS_FLIGHT 1
#define HAS_ADC 1
#define HAS_ACCEL 1
+#define HAS_ACCEL_REF 1
+#define HAS_LOG 1
#define AO_DATA_RING 32
#define AO_ADC_NUM_SENSE 6
#define AO_DATA_RING 32
#define AO_ADC_NUM_SENSE 6
@@
-106,6
+114,8
@@
struct ao_adc {
int16_t sense[AO_ADC_NUM_SENSE];
int16_t v_batt;
int16_t v_pbatt;
int16_t sense[AO_ADC_NUM_SENSE];
int16_t v_batt;
int16_t v_pbatt;
+ int16_t accel_ref;
+ int16_t accel;
int16_t temp;
};
int16_t temp;
};
@@
-141,13
+151,22
@@
struct ao_adc {
#define AO_ADC_V_PBATT_PORT stm_gpiob
#define AO_ADC_V_PBATT_PIN 1
#define AO_ADC_V_PBATT_PORT stm_gpiob
#define AO_ADC_V_PBATT_PIN 1
+#define AO_ADC_ACCEL_REF 10
+#define AO_ADC_ACCEL_REF_PORT stm_gpioc
+#define AO_ADC_ACCEL_REF_PIN 0
+
+#define AO_ADC_ACCEL 11
+#define AO_ADC_ACCEL_PORT stm_gpioc
+#define AO_ADC_ACCEL_PIN 1
+
#define AO_ADC_TEMP 16
#define AO_ADC_RCC_AHBENR ((1 << STM_RCC_AHBENR_GPIOAEN) | \
(1 << STM_RCC_AHBENR_GPIOEEN) | \
#define AO_ADC_TEMP 16
#define AO_ADC_RCC_AHBENR ((1 << STM_RCC_AHBENR_GPIOAEN) | \
(1 << STM_RCC_AHBENR_GPIOEEN) | \
- (1 << STM_RCC_AHBENR_GPIOBEN))
+ (1 << STM_RCC_AHBENR_GPIOBEN) | \
+ (1 << STM_RCC_AHBENR_GPIOCEN))
-#define AO_NUM_ADC_PIN (AO_ADC_NUM_SENSE +
2
)
+#define AO_NUM_ADC_PIN (AO_ADC_NUM_SENSE +
4
)
#define AO_ADC_PIN0_PORT AO_ADC_SENSE_A_PORT
#define AO_ADC_PIN0_PIN AO_ADC_SENSE_A_PIN
#define AO_ADC_PIN0_PORT AO_ADC_SENSE_A_PORT
#define AO_ADC_PIN0_PIN AO_ADC_SENSE_A_PIN
@@
-165,8
+184,12
@@
struct ao_adc {
#define AO_ADC_PIN6_PIN AO_ADC_V_BATT_PIN
#define AO_ADC_PIN7_PORT AO_ADC_V_PBATT_PORT
#define AO_ADC_PIN7_PIN AO_ADC_V_PBATT_PIN
#define AO_ADC_PIN6_PIN AO_ADC_V_BATT_PIN
#define AO_ADC_PIN7_PORT AO_ADC_V_PBATT_PORT
#define AO_ADC_PIN7_PIN AO_ADC_V_PBATT_PIN
+#define AO_ADC_PIN8_PORT AO_ADC_ACCEL_REF_PORT
+#define AO_ADC_PIN8_PIN AO_ADC_ACCEL_REF_PIN
+#define AO_ADC_PIN9_PORT AO_ADC_ACCEL_PORT
+#define AO_ADC_PIN9_PIN AO_ADC_ACCEL_PIN
-#define AO_NUM_ADC (AO_ADC_NUM_SENSE +
3
)
+#define AO_NUM_ADC (AO_ADC_NUM_SENSE +
5
)
#define AO_ADC_SQ1 AO_ADC_SENSE_A
#define AO_ADC_SQ2 AO_ADC_SENSE_B
#define AO_ADC_SQ1 AO_ADC_SENSE_A
#define AO_ADC_SQ2 AO_ADC_SENSE_B
@@
-176,7
+199,9
@@
struct ao_adc {
#define AO_ADC_SQ6 AO_ADC_SENSE_F
#define AO_ADC_SQ7 AO_ADC_V_BATT
#define AO_ADC_SQ8 AO_ADC_V_PBATT
#define AO_ADC_SQ6 AO_ADC_SENSE_F
#define AO_ADC_SQ7 AO_ADC_V_BATT
#define AO_ADC_SQ8 AO_ADC_V_PBATT
-#define AO_ADC_SQ9 AO_ADC_TEMP
+#define AO_ADC_SQ9 AO_ADC_ACCEL_REF
+#define AO_ADC_SQ10 AO_ADC_ACCEL
+#define AO_ADC_SQ11 AO_ADC_TEMP
/*
* Pressure sensor settings
/*
* Pressure sensor settings
@@
-216,6
+241,7
@@
struct ao_adc {
* Mag sensor (hmc5883)
*/
* Mag sensor (hmc5883)
*/
+#define HAS_HMC5883 1
#define AO_HMC5883_INT_PORT stm_gpioc
#define AO_HMC5883_INT_PIN 12
#define AO_HMC5883_I2C_INDEX STM_I2C_INDEX(1)
#define AO_HMC5883_INT_PORT stm_gpioc
#define AO_HMC5883_INT_PIN 12
#define AO_HMC5883_I2C_INDEX STM_I2C_INDEX(1)
@@
-229,4
+255,8
@@
struct ao_adc {
#define AO_MPU6000_INT_PIN 13
#define AO_MPU6000_I2C_INDEX STM_I2C_INDEX(1)
#define AO_MPU6000_INT_PIN 13
#define AO_MPU6000_I2C_INDEX STM_I2C_INDEX(1)
+#define HAS_HIGHG_ACCEL 1
+
+#define NUM_CMDS 16
+
#endif /* _AO_PINS_H_ */
#endif /* _AO_PINS_H_ */