diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-08 18:11:16 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-08 18:11:16 +0100 |
| commit | 81afd23c6ced3fdab05c5e1d978c5101f2b7db42 (patch) | |
| tree | ffaa1009d8e0659e44337acea0a6de84277a6115 | |
| parent | 1b322c7764e62e4dec17fb2e38723e89e398bdfb (diff) | |
| parent | ce01aff241698ad1e1b3576782acee55f64bc54c (diff) | |
| download | px4-firmware-81afd23c6ced3fdab05c5e1d978c5101f2b7db42.tar.gz px4-firmware-81afd23c6ced3fdab05c5e1d978c5101f2b7db42.tar.bz2 px4-firmware-81afd23c6ced3fdab05c5e1d978c5101f2b7db42.zip | |
Merge branch 'master' into hil
| -rw-r--r-- | apps/mavlink/mavlink.c | 13 | ||||
| -rw-r--r-- | apps/multirotor_att_control/multirotor_rate_control.c | 6 | ||||
| -rw-r--r-- | apps/sensors/sensor_params.c | 6 |
3 files changed, 15 insertions, 10 deletions
diff --git a/apps/mavlink/mavlink.c b/apps/mavlink/mavlink.c index 6b4643ec7..460faf446 100644 --- a/apps/mavlink/mavlink.c +++ b/apps/mavlink/mavlink.c @@ -709,7 +709,7 @@ int mavlink_thread_main(int argc, char *argv[]) static void usage() { - fprintf(stderr, "usage: mavlink start [-d <devicename>] [-b <baud rate>] [-e] [-o]\n" + fprintf(stderr, "usage: mavlink start [-d <devicename>] [-b <baud rate>]\n" " mavlink stop\n" " mavlink status\n"); exit(1); @@ -718,8 +718,10 @@ usage() int mavlink_main(int argc, char *argv[]) { - if (argc < 1) - errx(1, "missing command"); + if (argc < 2) { + warnx("missing command"); + usage(); + } if (!strcmp(argv[1], "start")) { @@ -754,6 +756,9 @@ int mavlink_main(int argc, char *argv[]) } } - errx(1, "unrecognized command"); + warnx("unrecognized command"); + usage(); + /* not getting here */ + return 0; } diff --git a/apps/multirotor_att_control/multirotor_rate_control.c b/apps/multirotor_att_control/multirotor_rate_control.c index d5e20312b..bbaec3033 100644 --- a/apps/multirotor_att_control/multirotor_rate_control.c +++ b/apps/multirotor_att_control/multirotor_rate_control.c @@ -55,14 +55,14 @@ #include <systemlib/err.h> #include <drivers/drv_hrt.h> -PARAM_DEFINE_FLOAT(MC_YAWRATE_P, 0.1f); /* same on Flamewheel */ +PARAM_DEFINE_FLOAT(MC_YAWRATE_P, 0.0f); /* same on Flamewheel */ PARAM_DEFINE_FLOAT(MC_YAWRATE_D, 0.0f); PARAM_DEFINE_FLOAT(MC_YAWRATE_I, 0.0f); //PARAM_DEFINE_FLOAT(MC_YAWRATE_AWU, 0.0f); //PARAM_DEFINE_FLOAT(MC_YAWRATE_LIM, 1.0f); -PARAM_DEFINE_FLOAT(MC_ATTRATE_P, 0.2f); /* 0.15 F405 Flamewheel */ -PARAM_DEFINE_FLOAT(MC_ATTRATE_D, 0.05f); +PARAM_DEFINE_FLOAT(MC_ATTRATE_P, 0.0f); /* 0.15 F405 Flamewheel */ +PARAM_DEFINE_FLOAT(MC_ATTRATE_D, 0.0f); PARAM_DEFINE_FLOAT(MC_ATTRATE_I, 0.0f); //PARAM_DEFINE_FLOAT(MC_ATTRATE_AWU, 0.05f); //PARAM_DEFINE_FLOAT(MC_ATTRATE_LIM, 1.0f); /**< roughly < 500 deg/s limit */ diff --git a/apps/sensors/sensor_params.c b/apps/sensors/sensor_params.c index fd8a6602a..cc74ae705 100644 --- a/apps/sensors/sensor_params.c +++ b/apps/sensors/sensor_params.c @@ -52,9 +52,9 @@ PARAM_DEFINE_FLOAT(SENS_MAG_XOFF, 0.0f); PARAM_DEFINE_FLOAT(SENS_MAG_YOFF, 0.0f); PARAM_DEFINE_FLOAT(SENS_MAG_ZOFF, 0.0f); -PARAM_DEFINE_FLOAT(SENS_MAG_XSCALE, 0.0f); -PARAM_DEFINE_FLOAT(SENS_MAG_YSCALE, 0.0f); -PARAM_DEFINE_FLOAT(SENS_MAG_ZSCALE, 0.0f); +PARAM_DEFINE_FLOAT(SENS_MAG_XSCALE, 1.0f); +PARAM_DEFINE_FLOAT(SENS_MAG_YSCALE, 1.0f); +PARAM_DEFINE_FLOAT(SENS_MAG_ZSCALE, 1.0f); PARAM_DEFINE_FLOAT(SENS_ACC_XOFF, 0.0f); PARAM_DEFINE_FLOAT(SENS_ACC_YOFF, 0.0f); |