diff options
| author | px4dev <px4@purgatory.org> | 2013-05-22 21:39:30 +0200 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-05-22 21:39:30 +0200 |
| commit | 437d9e4180b6248d0f0a4176c875b41deceef17d (patch) | |
| tree | 689af295626df673c13994f435ed221ba6f268e5 /src/modules/px4iofirmware/protocol.h | |
| parent | e67022f874f0fa091ed7dffd617c70c0c0253b5c (diff) | |
| parent | 78d29045c4da2d5ed4cea50fc2184b57dea01951 (diff) | |
| download | px4-firmware-437d9e4180b6248d0f0a4176c875b41deceef17d.tar.gz px4-firmware-437d9e4180b6248d0f0a4176c875b41deceef17d.tar.bz2 px4-firmware-437d9e4180b6248d0f0a4176c875b41deceef17d.zip | |
Merge branch 'fmuv2_bringup' into fmuv2_bringup_io2
Diffstat (limited to 'src/modules/px4iofirmware/protocol.h')
| -rw-r--r-- | src/modules/px4iofirmware/protocol.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/modules/px4iofirmware/protocol.h b/src/modules/px4iofirmware/protocol.h index 1a687bd2a..29107f79f 100644 --- a/src/modules/px4iofirmware/protocol.h +++ b/src/modules/px4iofirmware/protocol.h @@ -138,7 +138,7 @@ #define PX4IO_P_STATUS_ALARMS_PWM_ERROR (1 << 6) /* PWM configuration or output was bad */ #define PX4IO_P_STATUS_VBATT 4 /* battery voltage in mV */ -#define PX4IO_P_STATUS_IBATT 5 /* battery current in cA */ +#define PX4IO_P_STATUS_IBATT 5 /* battery current (raw ADC) */ /* array of post-mix actuator outputs, -10000..10000 */ #define PX4IO_PAGE_ACTUATORS 2 /* 0..CONFIG_ACTUATOR_COUNT-1 */ @@ -168,9 +168,9 @@ #define PX4IO_P_SETUP_FEATURES 0 #define PX4IO_P_SETUP_ARMING 1 /* arming controls */ -#define PX4IO_P_SETUP_ARMING_ARM_OK (1 << 0) /* OK to arm */ +#define PX4IO_P_SETUP_ARMING_IO_ARM_OK (1 << 0) /* OK to arm the IO side */ +#define PX4IO_P_SETUP_ARMING_FMU_ARMED (1 << 1) /* FMU is already armed */ #define PX4IO_P_SETUP_ARMING_MANUAL_OVERRIDE_OK (1 << 2) /* OK to switch to manual override via override RC channel */ -#define PX4IO_P_SETUP_ARMING_VECTOR_FLIGHT_OK (1 << 3) /* OK to perform position / vector control (= position lock) */ #define PX4IO_P_SETUP_ARMING_INAIR_RESTART_OK (1 << 4) /* OK to try in-air restart */ #define PX4IO_P_SETUP_PWM_RATES 2 /* bitmask, 0 = low rate, 1 = high rate */ @@ -178,8 +178,6 @@ #define PX4IO_P_SETUP_PWM_ALTRATE 4 /* 'high' PWM frame output rate in Hz */ #define PX4IO_P_SETUP_RELAYS 5 /* bitmask of relay/switch outputs, 0 = off, 1 = on */ #define PX4IO_P_SETUP_VBATT_SCALE 6 /* battery voltage correction factor (float) */ -#define PX4IO_P_SETUP_IBATT_SCALE 7 /* battery current scaling factor (float) */ -#define PX4IO_P_SETUP_IBATT_BIAS 8 /* battery current bias value */ #define PX4IO_P_SETUP_SET_DEBUG 9 /* debug level for IO board */ /* autopilot control values, -10000..10000 */ |