diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-21 15:19:19 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-08-21 15:19:19 +0200 |
| commit | 309ea8146055528c22395fca06b7a70b660c22b3 (patch) | |
| tree | 13478630a0543077da64db78ad59a972af1a5520 /src/modules/px4iofirmware/protocol.h | |
| parent | 5a8dc9c504f70b4ce1b45f91b3bdd9b7126ef0d3 (diff) | |
| parent | db1229dca338890c4aef26e17ebc622e5ba61b59 (diff) | |
| download | px4-firmware-309ea8146055528c22395fca06b7a70b660c22b3.tar.gz px4-firmware-309ea8146055528c22395fca06b7a70b660c22b3.tar.bz2 px4-firmware-309ea8146055528c22395fca06b7a70b660c22b3.zip | |
Merged fmuv2_bringup
Diffstat (limited to 'src/modules/px4iofirmware/protocol.h')
| -rw-r--r-- | src/modules/px4iofirmware/protocol.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/px4iofirmware/protocol.h b/src/modules/px4iofirmware/protocol.h index 97809d9c2..f5fa0ba75 100644 --- a/src/modules/px4iofirmware/protocol.h +++ b/src/modules/px4iofirmware/protocol.h @@ -74,7 +74,7 @@ #define REG_TO_FLOAT(_reg) ((float)REG_TO_SIGNED(_reg) / 10000.0f) #define FLOAT_TO_REG(_float) SIGNED_TO_REG((int16_t)((_float) * 10000.0f)) -#define PX4IO_PROTOCOL_VERSION 3 +#define PX4IO_PROTOCOL_VERSION 4 /* static configuration page */ #define PX4IO_PAGE_CONFIG 0 @@ -159,6 +159,7 @@ #define PX4IO_P_SETUP_ARMING_FAILSAFE_CUSTOM (1 << 3) /* use custom failsafe values, not 0 values of mixer */ #define PX4IO_P_SETUP_ARMING_INAIR_RESTART_OK (1 << 4) /* OK to try in-air restart */ #define PX4IO_P_SETUP_ARMING_ALWAYS_PWM_ENABLE (1 << 5) /* Output of PWM right after startup enabled to help ESCs initialize and prevent them from beeping */ +#define PX4IO_P_SETUP_ARMING_RC_HANDLING_DISABLED (1 << 6) /* Disable the IO-internal evaluation of the RC */ #define PX4IO_P_SETUP_PWM_RATES 2 /* bitmask, 0 = low rate, 1 = high rate */ #define PX4IO_P_SETUP_PWM_DEFAULTRATE 3 /* 'low' PWM frame output rate in Hz */ |