AP_Limits: fixed return of AP_Int8 parameters from object

we should return the base type, not the parameter, or callers could
use set on the result
This commit is contained in:
Randy Mackay 2013-04-23 23:13:54 +10:00 committed by Andrew Tridgell
parent fb0f5d46ba
commit 7f79398989
2 changed files with 17 additions and 17 deletions

View File

@ -139,12 +139,12 @@ bool AP_Limits::required() {
bool AP_Limits::check_all() {
// required=false, means "all"
return (bool) check_triggered(false);
return check_triggered(false);
}
bool AP_Limits::check_required() {
// required=true, means "only required modules"
return (bool) check_triggered(true);
return check_triggered(true);
}
bool AP_Limits::check_triggered(bool only_required) {
@ -176,29 +176,29 @@ bool AP_Limits::check_triggered(bool only_required) {
if (only_required) {
// just modules that are both required AND triggered. (binary AND)
return (bool) (mods_required & mods_triggered);
return (mods_required & mods_triggered) != 0;
} else {
return (bool) (mods_triggered);
return mods_triggered != 0;
}
}
AP_Int8 AP_Limits::state() {
return _state;
int8_t AP_Limits::state() {
return _state.get();
}
AP_Int8 AP_Limits::safetime() {
return _safetime;
int8_t AP_Limits::safetime() {
return _safetime.get();
}
void AP_Limits::set_state(int s) {
_state = (int) s;
_state.set(s);
}
AP_Int8 AP_Limits::channel() {
return _channel;
int8_t AP_Limits::channel() {
return _channel.get();
}
AP_Int8 AP_Limits::recmode() {
return _recmode;
int8_t AP_Limits::recmode() {
return _recmode.get();
}

View File

@ -41,10 +41,10 @@ public:
bool enabled();
bool debug();
bool required();
AP_Int8 state();
AP_Int8 safetime();
AP_Int8 channel();
AP_Int8 recmode();
int8_t state();
int8_t safetime();
int8_t channel();
int8_t recmode();
// module linked list management methods
// pointer to the first module in linked list of modules