Browse Source

bring back switch_pos_t

sbg
Thomas Gubler 10 years ago
parent
commit
f960bbf529
  1. 8
      src/modules/sensors/sensors.cpp
  2. 1
      src/modules/uORB/uORB.h

8
src/modules/sensors/sensors.cpp

@ -189,8 +189,8 @@ private: @@ -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) @@ -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 @@ -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) {

1
src/modules/uORB/uORB.h

@ -314,5 +314,6 @@ typedef uint8_t arming_state_t; @@ -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 */

Loading…
Cancel
Save