diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 12:31:51 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-06-30 12:31:51 +0200 |
| commit | d45d204691531dc3ba9b1ba2f397409938d184dd (patch) | |
| tree | e04c03a1aa27de7ba4a6b06f5d0fd8fbb509a325 | |
| parent | b5f9e95af0be6208a1eb411ed56c830d762227f9 (diff) | |
| parent | 04efee0bc8a2b0e8e9ffae4cf2c5b28bb1ba9ba9 (diff) | |
| download | px4-firmware-d45d204691531dc3ba9b1ba2f397409938d184dd.tar.gz px4-firmware-d45d204691531dc3ba9b1ba2f397409938d184dd.tar.bz2 px4-firmware-d45d204691531dc3ba9b1ba2f397409938d184dd.zip | |
Merge branch 'master' into warning_fixes_v3
| -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 */ |