X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Feasymotor-v3%2Fao_pins.h;h=a0e40bd7ba5d326a7591d4da75bd13dfef5fed79;hb=05839dccf5afa431d93ae6124ab8b76f09bf6b54;hp=89d9db0ed09e0b9d81a111656a0d762973bd0094;hpb=6659ec1002da325588a631d9c43a7a9b9a4dbfe3;p=fw%2Faltos diff --git a/src/easymotor-v3/ao_pins.h b/src/easymotor-v3/ao_pins.h index 89d9db0e..a0e40bd7 100644 --- a/src/easymotor-v3/ao_pins.h +++ b/src/easymotor-v3/ao_pins.h @@ -45,11 +45,6 @@ #define PACKET_HAS_SLAVE 0 #define HAS_SERIAL 0 -#define USE_SERIAL_0_STDIN 1 -#define SERIAL_0_18_19 1 -#define SERIAL_0_14_15 0 -#define SERIAL_0_17_18 0 -#define SERIAL_0_26_27 0 #define AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX (1984 * 1024) #define AO_CONFIG_MAX_SIZE 1024 @@ -67,10 +62,10 @@ #define HAS_PAD_REPORT 1 /* Beeper is on pio0_1 ct32b0_mat2 */ -#define BEEPER_PORT 0 -#define BEEPER_PIN 1 -#define BEEPER_TIMER 0 -#define BEEPER_OUTPUT 2 +#define AO_LPC_BEEP_PORT 0 +#define AO_LPC_BEEP_PIN 1 +#define AO_LPC_BEEP_TIMER 0 +#define AO_LPC_BEEP_CHANNEL 2 #define HAS_RADIO 0 #define HAS_TELEMETRY 0 @@ -95,10 +90,6 @@ #define AO_DATA_RING 32 -struct ao_adc { - int16_t v_batt; - int16_t motor_pressure; -}; #define AO_ADC_DUMP(p) \ printf("tick: %5lu batt: %5d motor_pressure: %5d\n", \ @@ -126,11 +117,13 @@ struct ao_adc { /* SPI */ #define HAS_SPI_0 1 +#define SPI_0_MODE ((0 << LPC_SSP_CR0_CPOL) | (0 << LPC_SSP_CR0_CPHA)) #define SPI_SCK0_P0_6 1 #define HAS_SPI_1 1 #define SPI_SCK1_P1_15 1 #define SPI_MISO1_P0_22 1 #define SPI_MOSI1_P0_21 1 +#define SPI_1_MODE ((1 << LPC_SSP_CR0_CPOL) | (1 << LPC_SSP_CR0_CPHA)) /* * SPI Flash memory @@ -155,10 +148,26 @@ struct ao_adc { #define HAS_IMU 1 #define USE_ADXL375_IMU 1 +#define HAS_KALMAN 0 + /* Motor pressure */ #define HAS_MOTOR_PRESSURE 1 #define ao_data_motor_pressure(packet) ((packet)->adc.motor_pressure) typedef int16_t motor_pressure_t; +/* want about 50psi, or 344kPa for boost and 30psi for coast */ + +#define AO_FULL_SCALE_PRESSURE 11031612 /* 1600psi */ +#define AO_BOOST_DETECT_PRESSURE 344000 /* 50psi */ +#define AO_QUIET_DETECT_PRESSURE 207000 /* 30psi */ + +#define AO_PRESSURE_VOLTS_BASE 0.5 +#define AO_PRESSURE_VOLTS_MAX 4.5 + +struct ao_adc { + int16_t v_batt; + int16_t motor_pressure; +}; + #endif /* _AO_PINS_H_ */