aboutsummaryrefslogtreecommitdiff
path: root/src/modules/px4iofirmware
diff options
context:
space:
mode:
authorAnton Babushkin <anton.babushkin@me.com>2014-03-05 00:01:27 +0400
committerAnton Babushkin <anton.babushkin@me.com>2014-03-05 00:01:27 +0400
commitaf548db7cc0a53b1c07a74342ec528e6247b0fcb (patch)
tree56c47481ee2dc191155000e659d288b659771f01 /src/modules/px4iofirmware
parent529013ae1c9298c44e808a8fa97336b242623ad8 (diff)
downloadpx4-firmware-af548db7cc0a53b1c07a74342ec528e6247b0fcb.tar.gz
px4-firmware-af548db7cc0a53b1c07a74342ec528e6247b0fcb.tar.bz2
px4-firmware-af548db7cc0a53b1c07a74342ec528e6247b0fcb.zip
px4iofirmware: define 4 actuator control groups
Diffstat (limited to 'src/modules/px4iofirmware')
-rw-r--r--src/modules/px4iofirmware/mixer.cpp2
-rw-r--r--src/modules/px4iofirmware/px4io.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/px4iofirmware/mixer.cpp b/src/modules/px4iofirmware/mixer.cpp
index 6a4429461..9558198f3 100644
--- a/src/modules/px4iofirmware/mixer.cpp
+++ b/src/modules/px4iofirmware/mixer.cpp
@@ -267,7 +267,7 @@ mixer_callback(uintptr_t handle,
uint8_t control_index,
float &control)
{
- if (control_group > 3)
+ if (control_group >= PX4IO_CONTROL_GROUPS)
return -1;
switch (source) {
diff --git a/src/modules/px4iofirmware/px4io.h b/src/modules/px4iofirmware/px4io.h
index bb224f388..54c5663a5 100644
--- a/src/modules/px4iofirmware/px4io.h
+++ b/src/modules/px4iofirmware/px4io.h
@@ -53,7 +53,7 @@
*/
#define PX4IO_SERVO_COUNT 8
#define PX4IO_CONTROL_CHANNELS 8
-#define PX4IO_CONTROL_GROUPS 2
+#define PX4IO_CONTROL_GROUPS 4
#define PX4IO_RC_INPUT_CHANNELS 18
#define PX4IO_RC_MAPPED_CONTROL_CHANNELS 8 /**< This is the maximum number of channels mapped/used */