diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 13:27:42 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 13:27:42 +0200 |
| commit | a5e7f5ca3051800d3bca3c10a6ecd531774fc781 (patch) | |
| tree | 79d34386c2654050f84210ba026ce89b2f70f125 /src | |
| parent | 6aed623b6c2490c43bc6c36fbcef36f9181f7c8c (diff) | |
| parent | 04efee0bc8a2b0e8e9ffae4cf2c5b28bb1ba9ba9 (diff) | |
| download | px4-firmware-a5e7f5ca3051800d3bca3c10a6ecd531774fc781.tar.gz px4-firmware-a5e7f5ca3051800d3bca3c10a6ecd531774fc781.tar.bz2 px4-firmware-a5e7f5ca3051800d3bca3c10a6ecd531774fc781.zip | |
Merge branch 'master' of github.com:PX4/Firmware into power_enforce
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/mc_pos_control/mc_pos_control_main.cpp | 2 | ||||
| -rw-r--r-- | src/systemcmds/nshterm/nshterm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/mc_pos_control/mc_pos_control_main.cpp b/src/modules/mc_pos_control/mc_pos_control_main.cpp index c24c172af..bcc3e2ae7 100644 --- a/src/modules/mc_pos_control/mc_pos_control_main.cpp +++ b/src/modules/mc_pos_control/mc_pos_control_main.cpp @@ -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 */ diff --git a/src/systemcmds/nshterm/nshterm.c b/src/systemcmds/nshterm/nshterm.c index 7d9484d3e..fca1798e6 100644 --- a/src/systemcmds/nshterm/nshterm.c +++ b/src/systemcmds/nshterm/nshterm.c @@ -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 */ |