diff options
| author | Julian Oes <julian@oes.ch> | 2013-10-11 10:19:50 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-10-11 10:19:50 +0200 |
| commit | 3dc2bdfa22f0ac152392299628e037e3a6120c2e (patch) | |
| tree | 485da7855cc87bb73b355503053c131734d98b95 /src/modules/systemlib/pwm_limit/pwm_limit.h | |
| parent | e2fef6b374e14f8c0f383557cf3569f8265ba034 (diff) | |
| download | px4-firmware-3dc2bdfa22f0ac152392299628e037e3a6120c2e.tar.gz px4-firmware-3dc2bdfa22f0ac152392299628e037e3a6120c2e.tar.bz2 px4-firmware-3dc2bdfa22f0ac152392299628e037e3a6120c2e.zip | |
Changed pwm_limit interface a bit
Diffstat (limited to 'src/modules/systemlib/pwm_limit/pwm_limit.h')
| -rw-r--r-- | src/modules/systemlib/pwm_limit/pwm_limit.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/modules/systemlib/pwm_limit/pwm_limit.h b/src/modules/systemlib/pwm_limit/pwm_limit.h index f8c6370e8..9974770be 100644 --- a/src/modules/systemlib/pwm_limit/pwm_limit.h +++ b/src/modules/systemlib/pwm_limit/pwm_limit.h @@ -46,8 +46,6 @@ #include <stdint.h> #include <stdbool.h> -__BEGIN_DECLS - /* * time for the ESCs to initialize * (this is not actually needed if PWM is sent right after boot) @@ -66,13 +64,13 @@ typedef struct { LIMIT_STATE_ON } state; uint64_t time_armed; - unsigned nchannels; } pwm_limit_t; -__EXPORT void pwm_limit_init(pwm_limit_t *limit); +__BEGIN_DECLS -__EXPORT void pwm_limit_calc(const bool armed, const uint16_t *disarmed_pwm, const uint16_t *min_pwm, const uint16_t *max_pwm, const float *output_requested, uint16_t *effective_pwm, pwm_limit_t *limit); +__EXPORT void pwm_limit_init(pwm_limit_t *limit); +__EXPORT void pwm_limit_calc(const bool armed, const unsigned num_channels, const uint16_t *disarmed_pwm, const uint16_t *min_pwm, const uint16_t *max_pwm, float *output, uint16_t *effective_pwm, pwm_limit_t *limit); __END_DECLS |