diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-07-03 12:58:43 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-07-03 12:58:43 +0200 |
| commit | 57f707af56be0d9281a95aebf64baf63ef022267 (patch) | |
| tree | dea25cf7e49af3c5dc792c11fedcd9d239a7de78 /src | |
| parent | 722fe924255d5fdfbba407143405da7578b0dad7 (diff) | |
| parent | 93dcd9040460d9e297478b4639aeaed72e0ce0ba (diff) | |
| download | px4-firmware-57f707af56be0d9281a95aebf64baf63ef022267.tar.gz px4-firmware-57f707af56be0d9281a95aebf64baf63ef022267.tar.bz2 px4-firmware-57f707af56be0d9281a95aebf64baf63ef022267.zip | |
Merge remote-tracking branch 'upstream/master' into offboard2_merge
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/px4iofirmware/controls.c | 4 | ||||
| -rw-r--r-- | src/modules/systemlib/err.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/modules/px4iofirmware/controls.c b/src/modules/px4iofirmware/controls.c index 62e6b12cb..185cb20dd 100644 --- a/src/modules/px4iofirmware/controls.c +++ b/src/modules/px4iofirmware/controls.c @@ -47,8 +47,8 @@ #include "px4io.h" #define RC_FAILSAFE_TIMEOUT 2000000 /**< two seconds failsafe timeout */ -#define RC_CHANNEL_HIGH_THRESH 5000 -#define RC_CHANNEL_LOW_THRESH -5000 +#define RC_CHANNEL_HIGH_THRESH 5000 /* 75% threshold */ +#define RC_CHANNEL_LOW_THRESH -8000 /* 10% threshold */ static bool ppm_input(uint16_t *values, uint16_t *num_values, uint16_t *frame_len); diff --git a/src/modules/systemlib/err.c b/src/modules/systemlib/err.c index 6c0e876d1..998b5ac7d 100644 --- a/src/modules/systemlib/err.c +++ b/src/modules/systemlib/err.c @@ -86,7 +86,7 @@ warnerr_core(int errcode, const char *fmt, va_list args) fprintf(stderr, "\n"); #elif CONFIG_ARCH_LOWPUTC lowsyslog("%s: ", getprogname()); - lowvyslog(fmt, args); + lowvsyslog(fmt, args); /* convenience as many parts of NuttX use negative errno */ if (errcode < 0) |