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

Merge remote-tracking branch 'upstream/master' into io

Browse Source 
Fixed Conflicts:
	apps/multirotor_att_control/multirotor_att_control_main.c

rc loss failsafe throttle tested
This commit is contained in:
Julian Oes
2012-11-15 11:55:55 -08:00
parent b7c6a11e67 3016ae72a3
commit 33e750602a
26 changed files with 560 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/systemlib/param/param.c
+1 -3
View File
@@ -517,13 +517,11 @@ param_save_default(void)
}
int result = param_export(fd, false);
/* should not be necessary, over-careful here */
fsync(fd);
close(fd);
if (result != 0) {
unlink(param_get_default_file());
warn("error exporting parameters to '%s'", param_get_default_file());
unlink(param_get_default_file());
return -2;
}
apps/systemlib/param/param.h
+1 -1
View File
@@ -250,7 +250,7 @@ __EXPORT int param_set_default_file(const char* filename);
* a result of a call to param_set_default_file, or the
* built-in default.
*/
__EXPORT const char *param_get_default_file(void);
__EXPORT const char* param_get_default_file(void);
/**
* Save parameters to the default file.