fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-30 18:33:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

commander remove continuous param_get in arm_auth_update

Browse Source
This commit is contained in:
Daniel Agar
2018-01-04 09:21:17 +01:00
committed by Lorenz Meier
parent 641129ad4e
commit 49180de27c
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/arm_auth.cpp
+4 -2
View File
@@ -179,9 +179,11 @@ uint8_t arm_auth_check()
return vehicle_command_ack_s::VEHICLE_RESULT_DENIED; return vehicle_command_ack_s::VEHICLE_RESULT_DENIED;
} }
void arm_auth_update(hrt_abstime now) void arm_auth_update(hrt_abstime now, bool param_update)
{ {
param_get(param_arm_parameters, (int32_t*)&arm_parameters); if (param_update) {
param_get(param_arm_parameters, (int32_t*)&arm_parameters);
}
switch (state) { switch (state) {
case ARM_AUTH_WAITING_AUTH: case ARM_AUTH_WAITING_AUTH:
src/modules/commander/arm_auth.h
+1 -1
View File
@@ -45,6 +45,6 @@ enum arm_auth_methods {
}; };
void arm_auth_init(orb_advert_t *mav_log_pub, uint8_t *system_id); void arm_auth_init(orb_advert_t *mav_log_pub, uint8_t *system_id);
void arm_auth_update(hrt_abstime now); void arm_auth_update(hrt_abstime now, bool param_update = true);
uint8_t arm_auth_check(); uint8_t arm_auth_check();
enum arm_auth_methods arm_auth_method_get(); enum arm_auth_methods arm_auth_method_get();
src/modules/commander/commander.cpp
+4 -3
View File
@@ -1704,9 +1704,10 @@ Commander::run()
arming_ret = TRANSITION_NOT_CHANGED; arming_ret = TRANSITION_NOT_CHANGED;
/* update parameters */ /* update parameters */
orb_check(param_changed_sub, &updated); bool params_updated = false;
orb_check(param_changed_sub, &params_updated);
if (updated || param_init_forced) { if (params_updated || param_init_forced) {
/* parameters changed */ /* parameters changed */
struct parameter_update_s param_changed; struct parameter_update_s param_changed;
@@ -3189,7 +3190,7 @@ Commander::run()
have_taken_off_since_arming = false; have_taken_off_since_arming = false;
} }
arm_auth_update(now); arm_auth_update(now, params_updated || param_init_forced);
usleep(COMMANDER_MONITORING_INTERVAL); usleep(COMMANDER_MONITORING_INTERVAL);
} }