diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-02-01 10:33:09 +0100 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-02-01 10:33:09 +0100 |
| commit | 8660ea914a0410a3503653767efb09adc1cedff2 (patch) | |
| tree | 962bbdee5168e861e65001fead5796f1da1e7dbe | |
| parent | f835980b468fe44c49051df0b58f830bafb256f5 (diff) | |
| parent | 028aa918bc3ccd87afd967daf663a9c12d14258d (diff) | |
| download | px4-firmware-8660ea914a0410a3503653767efb09adc1cedff2.tar.gz px4-firmware-8660ea914a0410a3503653767efb09adc1cedff2.tar.bz2 px4-firmware-8660ea914a0410a3503653767efb09adc1cedff2.zip | |
Merge commit '028aa918bc3ccd87afd967daf663a9c12d14258d' into beta
| -rw-r--r-- | src/systemcmds/param/param.c | 2 | ||||
| -rw-r--r-- | src/systemcmds/tests/test_mixer.cpp | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/systemcmds/param/param.c b/src/systemcmds/param/param.c index 580fdc62f..0cbba0a37 100644 --- a/src/systemcmds/param/param.c +++ b/src/systemcmds/param/param.c @@ -320,7 +320,7 @@ do_set(const char* name, const char* val) char* end; f = strtod(val,&end); param_set(param, &f); - printf(" -> new: %f\n", f); + printf(" -> new: %4.4f\n", (double)f); } diff --git a/src/systemcmds/tests/test_mixer.cpp b/src/systemcmds/tests/test_mixer.cpp index 2a47551ee..df382e2c6 100644 --- a/src/systemcmds/tests/test_mixer.cpp +++ b/src/systemcmds/tests/test_mixer.cpp @@ -65,20 +65,20 @@ static int mixer_callback(uintptr_t handle, const unsigned output_max = 8; static float actuator_controls[output_max]; -static bool should_arm = false; -uint16_t r_page_servo_disarmed[output_max]; -uint16_t r_page_servo_control_min[output_max]; -uint16_t r_page_servo_control_max[output_max]; -uint16_t r_page_servos[output_max]; -uint16_t servo_predicted[output_max]; - -/* - * PWM limit structure - */ -pwm_limit_t pwm_limit; int test_mixer(int argc, char *argv[]) { + /* + * PWM limit structure + */ + pwm_limit_t pwm_limit; + static bool should_arm = false; + uint16_t r_page_servo_disarmed[output_max]; + uint16_t r_page_servo_control_min[output_max]; + uint16_t r_page_servo_control_max[output_max]; + uint16_t r_page_servos[output_max]; + uint16_t servo_predicted[output_max]; + warnx("testing mixer"); char *filename = "/etc/mixers/IO_pass.mix"; |