diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-10-31 18:50:00 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-10-31 18:50:00 +0100 |
| commit | 3c987d63680d153e4d954ad6249d24e5448e2204 (patch) | |
| tree | 8265c95c6115bc916a4f7aa60780db585b225190 | |
| parent | 8aed355a3fd357461bc91220df6b8fff86aa88ef (diff) | |
| download | px4-firmware-3c987d63680d153e4d954ad6249d24e5448e2204.tar.gz px4-firmware-3c987d63680d153e4d954ad6249d24e5448e2204.tar.bz2 px4-firmware-3c987d63680d153e4d954ad6249d24e5448e2204.zip | |
Casting and fix default param path
| -rw-r--r-- | apps/mavlink/mavlink_receiver.c | 9 | ||||
| -rw-r--r-- | apps/systemcmds/param/param.c | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/apps/mavlink/mavlink_receiver.c b/apps/mavlink/mavlink_receiver.c index cfff0f469..826eb5625 100644 --- a/apps/mavlink/mavlink_receiver.c +++ b/apps/mavlink/mavlink_receiver.c @@ -253,14 +253,13 @@ handle_message(mavlink_message_t *msg) break; } - offboard_control_sp.p1 = quad_motors_setpoint.roll[mavlink_system.sysid] / (float)INT16_MAX; - offboard_control_sp.p2 = quad_motors_setpoint.pitch[mavlink_system.sysid] / (float)INT16_MAX; - offboard_control_sp.p3= quad_motors_setpoint.yaw[mavlink_system.sysid] / (float)INT16_MAX; + offboard_control_sp.p1 = (float)quad_motors_setpoint.roll[mavlink_system.sysid] / (float)INT16_MAX; + offboard_control_sp.p2 = (float)quad_motors_setpoint.pitch[mavlink_system.sysid] / (float)INT16_MAX; + offboard_control_sp.p3= (float)quad_motors_setpoint.yaw[mavlink_system.sysid] / (float)INT16_MAX; offboard_control_sp.p4 = (float)quad_motors_setpoint.thrust[mavlink_system.sysid]/(float)UINT16_MAX; - if (quad_motors_setpoint.thrust[mavlink_system.sysid] ==0){ + if (quad_motors_setpoint.thrust[mavlink_system.sysid] == 0) { ml_armed = false; - } offboard_control_sp.armed = ml_armed; diff --git a/apps/systemcmds/param/param.c b/apps/systemcmds/param/param.c index 77f47b95d..9cb280933 100644 --- a/apps/systemcmds/param/param.c +++ b/apps/systemcmds/param/param.c @@ -62,7 +62,7 @@ static void do_import(const char* param_file_name); static void do_show(void); static void do_show_print(void *arg, param_t param); -static const char *param_file_name_default = "/fs/microsd/parameters"; +static const char *param_file_name_default = "/eeprom/parameters"; int param_main(int argc, char *argv[]) |