dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' of github.com:PX4/Firmware into power_enforce

This commit is contained in:
Lorenz Meier 2014-06-30 13:27:42 +02:00
parent 6aed623b6c 04efee0bc8
commit a5e7f5ca30
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/mc_pos_control/mc_pos_control_main.cpp
View File

@ -466,7 +466,7 @@ MulticopterPositionControl::update_ref()
{
if (_local_pos.ref_timestamp != _ref_timestamp) {
double lat_sp, lon_sp;
float alt_sp;
float alt_sp = 0.0f;
if (_ref_timestamp != 0) {
/* calculate current position setpoint in global frame */

2
src/systemcmds/nshterm/nshterm.c
View File

@ -60,7 +60,7 @@ nshterm_main(int argc, char *argv[])
printf("Usage: nshterm <device>\n");
exit(1);
}
uint8_t retries = 0;
unsigned retries = 0;
int fd = -1;
/* try the first 30 seconds */