From 604cdc2b60b59cd2e4560c209e0add9685180b6e Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Wed, 3 Apr 2019 18:50:57 -0400
Subject: [PATCH] drivers/px4fmu initialize all arrays
---
src/drivers/px4fmu/fmu.cpp | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/drivers/px4fmu/fmu.cpp b/src/drivers/px4fmu/fmu.cpp
index c24a07371a..93314ca0de 100644
--- a/src/drivers/px4fmu/fmu.cpp
+++ b/src/drivers/px4fmu/fmu.cpp
@@ -190,7 +190,7 @@ private:
hrt_abstime _last_safety_check = 0;
hrt_abstime _time_last_mix = 0;
- static const unsigned _max_actuators = DIRECT_PWM_OUTPUT_CHANNELS;
+ static constexpr unsigned _max_actuators = DIRECT_PWM_OUTPUT_CHANNELS;
Mode _mode;
unsigned _pwm_default_rate;
@@ -218,18 +218,18 @@ private:
uint32_t _groups_required;
uint32_t _groups_subscribed;
- int _control_subs[actuator_controls_s::NUM_ACTUATOR_CONTROL_GROUPS];
- actuator_controls_s _controls[actuator_controls_s::NUM_ACTUATOR_CONTROL_GROUPS];
- orb_id_t _control_topics[actuator_controls_s::NUM_ACTUATOR_CONTROL_GROUPS];
- pollfd _poll_fds[actuator_controls_s::NUM_ACTUATOR_CONTROL_GROUPS];
+ int _control_subs[actuator_controls_s::NUM_ACTUATOR_CONTROL_GROUPS] {-1, -1, -1, -1};
+ actuator_controls_s _controls[actuator_controls_s::NUM_ACTUATOR_CONTROL_GROUPS] {};
+ orb_id_t _control_topics[actuator_controls_s::NUM_ACTUATOR_CONTROL_GROUPS] {};
+ pollfd _poll_fds[actuator_controls_s::NUM_ACTUATOR_CONTROL_GROUPS] {};
unsigned _poll_fds_num;
static pwm_limit_t _pwm_limit;
static actuator_armed_s _armed;
- uint16_t _failsafe_pwm[_max_actuators];
- uint16_t _disarmed_pwm[_max_actuators];
- uint16_t _min_pwm[_max_actuators];
- uint16_t _max_pwm[_max_actuators];
+ uint16_t _failsafe_pwm[_max_actuators] {};
+ uint16_t _disarmed_pwm[_max_actuators] {};
+ uint16_t _min_pwm[_max_actuators] {};
+ uint16_t _max_pwm[_max_actuators] {};
uint16_t _reverse_pwm_mask;
unsigned _num_failsafe_set;
unsigned _num_disarmed_set;
@@ -313,8 +313,6 @@ PX4FMU::PX4FMU(bool run_as_task) :
_groups_required(0),
_groups_subscribed(0),
_poll_fds_num(0),
- _failsafe_pwm{0},
- _disarmed_pwm{0},
_reverse_pwm_mask(0),
_num_failsafe_set(0),
_num_disarmed_set(0),
--
GitLab