Casting and fix default param path

This commit is contained in:
Lorenz Meier 2012-10-31 18:50:00 +01:00
parent 8aed355a3f
commit 3c987d6368
2 changed files with 5 additions and 6 deletions

View File

@ -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;

View File

@ -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[])