diff options
| author | px4dev <px4@purgatory.org> | 2013-03-20 23:05:19 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-03-20 23:05:19 -0700 |
| commit | db91dffb23cae1e8aa6c3945aa32b9d2e4ecd6a0 (patch) | |
| tree | 0c6e8e86891285c45f7a60d857929a2a5e963599 /apps/examples | |
| parent | f7b14b2e23113093d1f76565041b91f22be79246 (diff) | |
| parent | b7d65bf8fc65b2fd7c98d46d60fb24fb937baa94 (diff) | |
| download | px4-firmware-db91dffb23cae1e8aa6c3945aa32b9d2e4ecd6a0.tar.gz px4-firmware-db91dffb23cae1e8aa6c3945aa32b9d2e4ecd6a0.tar.bz2 px4-firmware-db91dffb23cae1e8aa6c3945aa32b9d2e4ecd6a0.zip | |
Merge branch 'master' into export-build
Diffstat (limited to 'apps/examples')
| -rw-r--r-- | apps/examples/control_demo/params.c | 4 | ||||
| -rw-r--r-- | apps/examples/kalman_demo/KalmanNav.cpp | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/apps/examples/control_demo/params.c b/apps/examples/control_demo/params.c index 8cefc298f..83e01e63c 100644 --- a/apps/examples/control_demo/params.c +++ b/apps/examples/control_demo/params.c @@ -56,8 +56,4 @@ PARAM_DEFINE_FLOAT(FWB_V_MIN, 10.0f); // minimum commanded velocity PARAM_DEFINE_FLOAT(FWB_V_CMD, 12.0f); // commanded velocity PARAM_DEFINE_FLOAT(FWB_V_MAX, 16.0f); // maximum commanded velocity -// trim -PARAM_DEFINE_FLOAT(FWB_TRIM_AIL, 0.0f); // trim aileron, normalized (-1,1) -PARAM_DEFINE_FLOAT(FWB_TRIM_ELV, 0.005f); // trim elevator (-1,1) -PARAM_DEFINE_FLOAT(FWB_TRIM_RDR, 0.0f); // trim rudder (-1,1) PARAM_DEFINE_FLOAT(FWB_TRIM_THR, 0.8f); // trim throttle (0,1) diff --git a/apps/examples/kalman_demo/KalmanNav.cpp b/apps/examples/kalman_demo/KalmanNav.cpp index db851221b..955e77b3e 100644 --- a/apps/examples/kalman_demo/KalmanNav.cpp +++ b/apps/examples/kalman_demo/KalmanNav.cpp @@ -247,8 +247,8 @@ void KalmanNav::update() // output if (newTimeStamp - _outTimeStamp > 10e6) { // 0.1 Hz _outTimeStamp = newTimeStamp; - printf("nav: %4d Hz, miss #: %4d\n", - _navFrames / 10, _miss / 10); + //printf("nav: %4d Hz, miss #: %4d\n", + // _navFrames / 10, _miss / 10); _navFrames = 0; _miss = 0; } |