Browse Source

AP_Param: fixed loading defaults file after storage

make sure defaults don't override storage values
master
Andrew Tridgell 8 years ago
parent
commit
d430cd62a6
  1. 4
      libraries/AP_Param/AP_Param.cpp

4
libraries/AP_Param/AP_Param.cpp

@ -1797,7 +1797,9 @@ bool AP_Param::load_defaults_file(const char *filename, bool panic_on_error) @@ -1797,7 +1797,9 @@ bool AP_Param::load_defaults_file(const char *filename, bool panic_on_error)
AP_HAL::panic("AP_Param: Failed to set param default");
return false;
}
vp->set_float(value, var_type);
if (!vp->configured_in_storage()) {
vp->set_float(value, var_type);
}
}
fclose(f);

Loading…
Cancel
Save