WorkItem modules: Run() shouldn't be public

This commit is contained in:
Daniel Agar
2020-01-22 12:03:03 -05:00
parent 8162b1095b
commit 21a8d7db7f
23 changed files with 48 additions and 47 deletions
@@ -87,10 +87,10 @@ public:
/** @see ModuleBase */
static int print_usage(const char *reason = nullptr);
/* run the main loop */
private:
void Run() override;
private:
static constexpr int MAX_NUM_AIRSPEED_SENSORS = 3; /**< Support max 3 airspeed sensors */
enum airspeed_index {
DISABLED_INDEX = -1,
@@ -85,12 +85,12 @@ public:
/** @see ModuleBase */
static int print_usage(const char *reason = nullptr);
void Run() override;
bool init();
private:
void Run() override;
void update_parameters(bool force = false);
bool init_attq();
@@ -94,10 +94,11 @@ public:
/** @see ModuleBase */
static int print_usage(const char *reason = nullptr);
void Run() override;
bool init();
private:
void Run() override;
int _adc_fd{-1}; /**< ADC file handle */
uORB::Subscription _actuator_ctrl_0_sub{ORB_ID(actuator_controls_0)}; /**< attitude controls sub */
@@ -71,12 +71,12 @@ public:
/** @see ModuleBase */
static int print_usage(const char *reason = nullptr);
void Run() override;
bool init();
private:
void Run() override;
uORB::SubscriptionCallbackWorkItem _trigger_sub{this, ORB_ID(camera_trigger)};
uORB::Subscription _gpos_sub{ORB_ID(vehicle_global_position)};
+2 -2
View File
@@ -107,13 +107,13 @@ public:
/** @see ModuleBase */
static int print_usage(const char *reason = nullptr);
void Run() override;
bool init();
int print_status() override;
private:
void Run() override;
int getRangeSubIndex(); ///< get subscription index of first downward-facing range sensor
void fillGpsMsgWithVehicleGpsPosData(gps_message &msg, const vehicle_gps_position_s &data);
@@ -88,11 +88,10 @@ public:
/** @see ModuleBase */
static int print_usage(const char *reason = nullptr);
void Run() override;
bool init();
private:
void Run() override;
uORB::SubscriptionCallbackWorkItem _att_sub{this, ORB_ID(vehicle_attitude)}; /**< vehicle attitude */
@@ -141,11 +141,11 @@ public:
/** @see ModuleBase */
static int print_usage(const char *reason = nullptr);
void Run() override;
bool init();
private:
void Run() override;
orb_advert_t _mavlink_log_pub{nullptr};
uORB::SubscriptionCallbackWorkItem _global_pos_sub{this, ORB_ID(vehicle_global_position)};
@@ -78,11 +78,10 @@ public:
/** @see ModuleBase */
static int print_usage(const char *reason = nullptr);
void Run() override;
bool init();
private:
void Run() override;
/**
* initialize some vectors/matrices from parameters
@@ -95,14 +95,14 @@ public:
/** @see ModuleBase */
static int print_usage(const char *reason = nullptr);
void Run() override;
bool init();
/** @see ModuleBase::print_status() */
int print_status() override;
private:
void Run() override;
Takeoff _takeoff; /**< state machine and ramp to bring the vehicle off the ground without jumps */
uORB::Publication<vehicle_attitude_setpoint_s> _vehicle_attitude_setpoint_pub;
@@ -75,11 +75,10 @@ public:
/** @see ModuleBase */
static int print_usage(const char *reason = nullptr);
void Run() override;
bool init();
private:
void Run() override;
/**
* initialize some vectors/matrices from parameters
+2 -1
View File
@@ -83,11 +83,12 @@ public:
/** @see ModuleBase */
static int print_usage(const char *reason = nullptr);
void Run() override;
bool init();
private:
void Run() override;
/**
* Check for changes in rc_parameter_map
*/
@@ -80,8 +80,6 @@ public:
/** @see ModuleBase */
static int print_usage(const char *reason = nullptr);
void Run() override;
/** @see ModuleBase::print_status() */
int print_status() override;
@@ -92,6 +90,8 @@ public:
private:
void Run() override;
void accelPoll();
void gyroPoll();
void baroPoll();
@@ -91,7 +91,7 @@ class VtolAttitudeControl : public ModuleBase<VtolAttitudeControl>, public px4::
public:
VtolAttitudeControl();
~VtolAttitudeControl();
~VtolAttitudeControl() override;
/** @see ModuleBase */
static int task_spawn(int argc, char *argv[]);
@@ -102,8 +102,6 @@ public:
/** @see ModuleBase */
static int print_usage(const char *reason = nullptr);
void Run() override;
bool init();
bool is_fixed_wing_requested();
@@ -130,6 +128,8 @@ public:
private:
void Run() override;
uORB::SubscriptionCallbackWorkItem _actuator_inputs_fw{this, ORB_ID(actuator_controls_virtual_fw)};
uORB::SubscriptionCallbackWorkItem _actuator_inputs_mc{this, ORB_ID(actuator_controls_virtual_mc)};