Modifing pins to work with telestern (thx Vincent)

This commit is contained in:
Jannis Bergmann 2024-06-25 22:16:13 +02:00
parent 13fc49c923
commit 093c452c22

View File

@ -43,11 +43,17 @@
#define AO_APB2_PRESCALER 2
#define AO_RCC_CFGR_PPRE2_DIV STM_RCC_CFGR_PPRE2_DIV_2
//UART 1
#define HAS_SERIAL_1 0
#define USE_SERIAL_1_STDIN 0
#define SERIAL_1_PB6_PB7 0
#define SERIAL_1_PA9_PA10 0
//UART 2
#define HAS_SERIAL_2 1
#define USE_SERIAL_2_STDIN 0
#define SERIAL_2_PA2_PA3 1
@ -55,12 +61,15 @@
#define USE_SERIAL_2_FLOW 0
#define USE_SERIAL_2_SW_FLOW 0
//UART 3
#define HAS_SERIAL_3 0
#define USE_SERIAL_3_STDIN 0
#define SERIAL_3_PB10_PB11 0
#define SERIAL_3_PC10_PC11 0
#define SERIAL_3_PD8_PD9 0
//Define UART2 connected to GPS
#define ao_gps_getchar ao_serial2_getchar
#define ao_gps_putchar ao_serial2_putchar
#define ao_gps_set_speed ao_serial2_set_speed
@ -92,7 +101,7 @@
#define HAS_SPI_1 1
#define SPI_1_PA5_PA6_PA7 1 /* Barometer */
#define SPI_1_PB3_PB4_PB5 1 /* Accelerometer */
#define SPI_1_PE13_PE14_PE15 1 /* MPU6000 */
#define SPI_1_PE13_PE14_PE15 0 /* MPU6000 */ //ALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARM!
#define SPI_1_OSPEEDR STM_OSPEEDR_10MHz
//#define MMC5983_I2C 1
@ -190,37 +199,41 @@ struct ao_adc {
(p)->adc.sense[3], (p)->adc.sense[4], (p)->adc.sense[5], \
(p)->adc.v_batt, (p)->adc.v_pbatt, (p)->adc.temp)
#define AO_ADC_SENSE_A 0
#define AO_ADC_SENSE_A_PORT (&stm_gpioa)
#define AO_ADC_SENSE_A_PIN 0
//Capacitor voltages:
// ADC CHannel
// Port
// PIN
#define AO_ADC_SENSE_A 11
#define AO_ADC_SENSE_A_PORT (&stm_gpioc)
#define AO_ADC_SENSE_A_PIN 1
#define AO_ADC_SENSE_B 1
#define AO_ADC_SENSE_B_PORT (&stm_gpioa)
#define AO_ADC_SENSE_B_PIN 1
#define AO_ADC_SENSE_B 12
#define AO_ADC_SENSE_B_PORT (&stm_gpioc)
#define AO_ADC_SENSE_B_PIN 2
#define AO_ADC_SENSE_C 24
#define AO_ADC_SENSE_C_PORT (&stm_gpioe)
#define AO_ADC_SENSE_C_PIN 9
#define AO_ADC_SENSE_C 13
#define AO_ADC_SENSE_C_PORT (&stm_gpioc)
#define AO_ADC_SENSE_C_PIN 3
#define AO_ADC_SENSE_D 25
#define AO_ADC_SENSE_D_PORT (&stm_gpioe)
#define AO_ADC_SENSE_D_PIN 10
#define AO_ADC_SENSE_D 0
#define AO_ADC_SENSE_D_PORT (&stm_gpioa)
#define AO_ADC_SENSE_D_PIN 0
#define AO_ADC_SENSE_DROGUE 4
#define AO_ADC_SENSE_DROGUE 1
#define AO_ADC_SENSE_DROGUE_PORT (&stm_gpioa)
#define AO_ADC_SENSE_DROGUE_PIN 4
#define AO_ADC_SENSE_DROGUE_PIN 1 //neee
#define AO_ADC_SENSE_MAIN 22
#define AO_ADC_SENSE_MAIN_PORT (&stm_gpioe)
#define AO_ADC_SENSE_MAIN_PIN 7
#define AO_ADC_SENSE_MAIN 10
#define AO_ADC_SENSE_MAIN_PORT (&stm_gpioc)
#define AO_ADC_SENSE_MAIN_PIN 0
#define AO_ADC_V_BATT 8
#define AO_ADC_V_BATT_PORT (&stm_gpiob)
#define AO_ADC_V_BATT_PIN 0
#define AO_ADC_V_PBATT 9
#define AO_ADC_V_PBATT_PORT (&stm_gpiob)
#define AO_ADC_V_PBATT_PIN 1
#define AO_ADC_V_PBATT 22
#define AO_ADC_V_PBATT_PORT (&stm_gpioe)
#define AO_ADC_V_PBATT_PIN 7
#define AO_ADC_TEMP 16
@ -269,13 +282,13 @@ struct ao_adc {
* Voltage divider on ADC pyro battery sampler
*/
#define AO_PYRO_BATTERY_DIV_PLUS 100 /* 100k */
#define AO_PYRO_BATTERY_DIV_MINUS 27 /* 27k */
#define AO_PYRO_BATTERY_DIV_MINUS 30 /* 27k */
/*
* Voltage divider on ADC igniter samplers
*/
#define AO_IGNITE_DIV_PLUS 100 /* 100k */
#define AO_IGNITE_DIV_MINUS 27 /* 27k */
#define AO_IGNITE_DIV_PLUS 30 /* 100k */
#define AO_IGNITE_DIV_MINUS 10 /* 27k */
/*
* ADC reference in decivolts
@ -302,7 +315,7 @@ struct ao_adc {
#define M25_MAX_CHIPS 1
#define AO_M25_SPI_CS_PORT (&stm_gpiod)
#define AO_M25_SPI_CS_MASK (1 << 10)
#define AO_M25_SPI_CS_MASK (1 << 11) //Changed to 11 because then it works
#define AO_M25_SPI_BUS AO_SPI_2_PB13_PB14_PB15
/*
@ -426,7 +439,7 @@ struct ao_adc {
#define HAS_ADXL375 1
#define AO_ADXL375_SPI_INDEX (AO_SPI_1_PB3_PB4_PB5 | AO_SPI_MODE_3)
#define AO_ADXL375_CS_PORT (&stm_gpioc)
#define AO_ADXL375_CS_PIN 0
#define AO_ADXL375_CS_PIN 6 //CHANGED from 0
#define AO_ADXL375_AXIS x
#define AO_ADXL375_INVERT 1