projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
easymotor-v2
/
ao_pins.h
diff --git
a/src/easymotor-v2/ao_pins.h
b/src/easymotor-v2/ao_pins.h
index f8ef7e4de3e78abfce77c73442637e359decff15..0fa037b3b73dfe5866c3d393847d384e14d70249 100644
(file)
--- a/
src/easymotor-v2/ao_pins.h
+++ b/
src/easymotor-v2/ao_pins.h
@@
-53,7
+53,7
@@
#define SERIAL_3_PC10_PC11 0
#define SERIAL_3_PD8_PD9 0
#define SERIAL_3_PC10_PC11 0
#define SERIAL_3_PD8_PD9 0
-#define AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX (
512
* 1024)
+#define AO_CONFIG_DEFAULT_FLIGHT_LOG_MAX (
1984
* 1024)
#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
@@
-67,6
+67,7
@@
#define AO_PA11_PA12_RMP 1
#define HAS_BEEP 1
#define HAS_BATTERY_REPORT 1
#define AO_PA11_PA12_RMP 1
#define HAS_BEEP 1
#define HAS_BATTERY_REPORT 1
+#define HAS_PAD_REPORT 1
#define BEEPER_CHANNEL 3
#define BEEPER_TIMER 2
#define BEEPER_PORT (&stm_gpioa)
#define BEEPER_CHANNEL 3
#define BEEPER_TIMER 2
#define BEEPER_PORT (&stm_gpioa)
@@
-103,14
+104,14
@@
#define AO_DATA_RING 64
struct ao_adc {
#define AO_DATA_RING 64
struct ao_adc {
- int16_t pressure;
+ int16_t
motor_
pressure;
int16_t v_batt;
};
#define AO_ADC_DUMP(p) \
int16_t v_batt;
};
#define AO_ADC_DUMP(p) \
- printf("tick: %5
u
pressure: %5d batt: %5d\n", \
+ printf("tick: %5
lu motor_
pressure: %5d batt: %5d\n", \
(p)->tick, \
(p)->tick, \
- (p)->adc.pressure, \
+ (p)->adc.
motor_
pressure, \
(p)->adc.v_batt);
(p)->adc.v_batt);
@@
-156,8
+157,15
@@
struct ao_adc {
#define AO_ADXL375_AXIS x
#define AO_ADXL375_ACROSS_AXIS y
#define AO_ADXL375_AXIS x
#define AO_ADXL375_ACROSS_AXIS y
-#define AO_ADXL375_INVERT 1
+#define AO_ADXL375_THROUGH_AXIS z
+#define AO_ADXL375_INVERT 0
#define HAS_IMU 1
#define USE_ADXL375_IMU 1
#define HAS_IMU 1
#define USE_ADXL375_IMU 1
+/* Motor pressure */
+#define HAS_MOTOR_PRESSURE 1
+#define ao_data_motor_pressure(packet) ((packet)->adc.motor_pressure)
+
+typedef int16_t motor_pressure_t;
+
#endif /* _AO_PINS_H_ */
#endif /* _AO_PINS_H_ */