Merged master

This commit is contained in:
Lorenz Meier
2013-02-17 18:12:48 +01:00
4 changed files with 136 additions and 86 deletions
-2
View File
@@ -1467,8 +1467,6 @@ int commander_thread_main(int argc, char *argv[])
param_get(_param_system_id, &(current_status.system_id));
param_get(_param_component_id, &(current_status.component_id));
} else {
warnx("ARMED, rejecting sys type change\n");
}
}