aboutsummaryrefslogtreecommitdiff
path: root/src/modules/sensors
diff options
context:
space:
mode:
authorThomas Gubler <thomasgubler@gmail.com>2014-12-08 11:06:56 +0100
committerThomas Gubler <thomasgubler@gmail.com>2014-12-08 11:06:56 +0100
commitb3600e5ee6fc4550533d65c1c25abceb6db4466e (patch)
treefad2a88a756ad1d5af293dfeab3f8aba596217be /src/modules/sensors
parent87df7c3243412d4fc7a0c40967b2abe078f7a0b2 (diff)
downloadpx4-firmware-b3600e5ee6fc4550533d65c1c25abceb6db4466e.tar.gz
px4-firmware-b3600e5ee6fc4550533d65c1c25abceb6db4466e.tar.bz2
px4-firmware-b3600e5ee6fc4550533d65c1c25abceb6db4466e.zip
manual_control_setpoint as msg
Diffstat (limited to 'src/modules/sensors')
-rw-r--r--src/modules/sensors/sensors.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp
index 672dc52c3..fca72c304 100644
--- a/src/modules/sensors/sensors.cpp
+++ b/src/modules/sensors/sensors.cpp
@@ -187,8 +187,8 @@ private:
/**
* Get switch position for specified function.
*/
- switch_pos_t get_rc_sw3pos_position(uint8_t func, float on_th, bool on_inv, float mid_th, bool mid_inv);
- switch_pos_t get_rc_sw2pos_position(uint8_t func, float on_th, bool on_inv);
+ uint8_t get_rc_sw3pos_position(uint8_t func, float on_th, bool on_inv, float mid_th, bool mid_inv);
+ uint8_t get_rc_sw2pos_position(uint8_t func, float on_th, bool on_inv);
/**
* Gather and publish RC input data.
@@ -1512,7 +1512,7 @@ Sensors::get_rc_value(uint8_t func, float min_value, float max_value)
}
}
-switch_pos_t
+uint8_t
Sensors::get_rc_sw3pos_position(uint8_t func, float on_th, bool on_inv, float mid_th, bool mid_inv)
{
if (_rc.function[func] >= 0) {
@@ -1533,7 +1533,7 @@ Sensors::get_rc_sw3pos_position(uint8_t func, float on_th, bool on_inv, float mi
}
}
-switch_pos_t
+uint8_t
Sensors::get_rc_sw2pos_position(uint8_t func, float on_th, bool on_inv)
{
if (_rc.function[func] >= 0) {