Browse Source

Use unsigned for channel counts

sbg
Julian Oes 11 years ago
parent
commit
e2fef6b374
  1. 2
      src/drivers/drv_pwm_output.h
  2. 2
      src/drivers/hil/hil.cpp
  3. 2
      src/modules/uORB/topics/actuator_outputs.h

2
src/drivers/drv_pwm_output.h

@ -99,7 +99,7 @@ typedef uint16_t servo_position_t;
struct pwm_output_values { struct pwm_output_values {
/** desired pulse widths for each of the supported channels */ /** desired pulse widths for each of the supported channels */
servo_position_t values[PWM_OUTPUT_MAX_CHANNELS]; servo_position_t values[PWM_OUTPUT_MAX_CHANNELS];
int channel_count; unsigned channel_count;
}; };
/* /*

2
src/drivers/hil/hil.cpp

@ -404,7 +404,7 @@ HIL::task_main()
for (unsigned i = 0; i < num_outputs; i++) { for (unsigned i = 0; i < num_outputs; i++) {
/* last resort: catch NaN, INF and out-of-band errors */ /* last resort: catch NaN, INF and out-of-band errors */
if (i < (unsigned)outputs.noutputs && if (i < outputs.noutputs &&
isfinite(outputs.output[i]) && isfinite(outputs.output[i]) &&
outputs.output[i] >= -1.0f && outputs.output[i] >= -1.0f &&
outputs.output[i] <= 1.0f) { outputs.output[i] <= 1.0f) {

2
src/modules/uORB/topics/actuator_outputs.h

@ -60,7 +60,7 @@
struct actuator_outputs_s { struct actuator_outputs_s {
uint64_t timestamp; /**< output timestamp in us since system boot */ uint64_t timestamp; /**< output timestamp in us since system boot */
float output[NUM_ACTUATOR_OUTPUTS]; /**< output data, in natural output units */ float output[NUM_ACTUATOR_OUTPUTS]; /**< output data, in natural output units */
int noutputs; /**< valid outputs */ unsigned noutputs; /**< valid outputs */
}; };
/** /**

Loading…
Cancel
Save