diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-08 10:54:09 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-08 10:54:09 +0100 |
| commit | f960bbf529ba41580e06eb8a771600279f58e3c8 (patch) | |
| tree | 88992ecf02a45449f72a0e6e9af73b1db5ca19db /src/modules | |
| parent | f86c0ed892c0b63af11d23e860c815d1c087ff8e (diff) | |
| download | px4-firmware-f960bbf529ba41580e06eb8a771600279f58e3c8.tar.gz px4-firmware-f960bbf529ba41580e06eb8a771600279f58e3c8.tar.bz2 px4-firmware-f960bbf529ba41580e06eb8a771600279f58e3c8.zip | |
bring back switch_pos_t
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/sensors/sensors.cpp | 8 | ||||
| -rw-r--r-- | src/modules/uORB/uORB.h | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp index f6ffedc6b..0a27367d9 100644 --- a/src/modules/sensors/sensors.cpp +++ b/src/modules/sensors/sensors.cpp @@ -189,8 +189,8 @@ private: /** * Get switch position for specified function. */ - 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); + 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); /** * Update paramters from RC channels if the functionality is activated and the @@ -1666,7 +1666,7 @@ Sensors::get_rc_value(uint8_t func, float min_value, float max_value) } } -uint8_t +switch_pos_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) { @@ -1687,7 +1687,7 @@ Sensors::get_rc_sw3pos_position(uint8_t func, float on_th, bool on_inv, float mi } } -uint8_t +switch_pos_t Sensors::get_rc_sw2pos_position(uint8_t func, float on_th, bool on_inv) { if (_rc.function[func] >= 0) { diff --git a/src/modules/uORB/uORB.h b/src/modules/uORB/uORB.h index 707ff1efd..f19fbba7c 100644 --- a/src/modules/uORB/uORB.h +++ b/src/modules/uORB/uORB.h @@ -314,5 +314,6 @@ typedef uint8_t arming_state_t; typedef uint8_t main_state_t; typedef uint8_t hil_state_t; typedef uint8_t navigation_state_t; +typedef uint8_t switch_pos_t; #endif /* _UORB_UORB_H */ |