From 22a005c9f422180f0c0c5f96c20b16deb66a674c Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sat, 30 Nov 2019 18:22:19 -0500
Subject: [PATCH] delete module's redundant print_status()

 - we can already get the running status from ModuleBase and the other misc information is already available through perf or uORB
---
 src/drivers/batt_smbus/batt_smbus.cpp             |  7 -------
 src/drivers/batt_smbus/batt_smbus.h               |  3 ---
 src/drivers/distance_sensor/pga460/pga460.cpp     |  6 ------
 src/drivers/distance_sensor/pga460/pga460.h       |  5 -----
 src/drivers/safety_button/SafetyButton.cpp        |  8 --------
 src/drivers/safety_button/SafetyButton.hpp        |  3 ---
 .../airspeed_selector/airspeed_selector_main.cpp  | 15 ---------------
 .../fw_att_control/FixedwingAttitudeControl.cpp   |  7 -------
 .../fw_att_control/FixedwingAttitudeControl.hpp   |  3 ---
 .../FixedwingPositionControl.cpp                  |  7 -------
 .../FixedwingPositionControl.hpp                  |  3 ---
 src/modules/load_mon/load_mon.cpp                 | 10 ----------
 src/modules/mc_att_control/mc_att_control.hpp     |  3 ---
 .../mc_att_control/mc_att_control_main.cpp        |  9 ---------
 .../mc_rate_control/MulticopterRateControl.cpp    |  9 ---------
 .../mc_rate_control/MulticopterRateControl.hpp    |  3 ---
 src/modules/rc_update/rc_update.cpp               |  9 ---------
 src/modules/rc_update/rc_update.h                 |  3 ---
 src/modules/sih/sih.cpp                           |  5 -----
 src/modules/sih/sih.hpp                           |  3 ---
 .../vtol_att_control/vtol_att_control_main.cpp    |  8 --------
 .../vtol_att_control/vtol_att_control_main.h      |  3 ---
 22 files changed, 132 deletions(-)

diff --git a/src/drivers/batt_smbus/batt_smbus.cpp b/src/drivers/batt_smbus/batt_smbus.cpp
index cc69839199..c2484d6b9c 100644
--- a/src/drivers/batt_smbus/batt_smbus.cpp
+++ b/src/drivers/batt_smbus/batt_smbus.cpp
@@ -475,13 +475,6 @@ int BATT_SMBUS::manufacturer_name(uint8_t *man_name, const uint8_t length)
 	return result;
 }
 
-int BATT_SMBUS::print_status()
-{
-	PX4_INFO("Running");
-	print_message(_last_report);
-	return 0;
-}
-
 int BATT_SMBUS::manufacturer_read(const uint16_t cmd_code, void *data, const unsigned length)
 {
 	uint8_t code = BATT_SMBUS_MANUFACTURER_BLOCK_ACCESS;
diff --git a/src/drivers/batt_smbus/batt_smbus.h b/src/drivers/batt_smbus/batt_smbus.h
index e8c0d619dd..cda4f0a3a2 100644
--- a/src/drivers/batt_smbus/batt_smbus.h
+++ b/src/drivers/batt_smbus/batt_smbus.h
@@ -141,9 +141,6 @@ public:
 	/** @see ModuleBase */
 	static int task_spawn(int argc, char *argv[]);
 
-	/** @see ModuleBase::print_status() */
-	int print_status() override;
-
 	/**
 	 * @brief Reads data from flash.
 	 * @param address The address to start the read from.
diff --git a/src/drivers/distance_sensor/pga460/pga460.cpp b/src/drivers/distance_sensor/pga460/pga460.cpp
index d41c9c2524..3092c4166d 100644
--- a/src/drivers/distance_sensor/pga460/pga460.cpp
+++ b/src/drivers/distance_sensor/pga460/pga460.cpp
@@ -464,12 +464,6 @@ void PGA460::print_diagnostics(const uint8_t diagnostic_byte)
 	}
 }
 
-int PGA460::print_status()
-{
-	PX4_INFO("Distance: %2.2f", (double)_previous_valid_report_distance);
-	return PX4_OK;
-}
-
 int PGA460::print_usage(const char *reason)
 {
 	if (reason) {
diff --git a/src/drivers/distance_sensor/pga460/pga460.h b/src/drivers/distance_sensor/pga460/pga460.h
index bd5eb27218..326f64de93 100644
--- a/src/drivers/distance_sensor/pga460/pga460.h
+++ b/src/drivers/distance_sensor/pga460/pga460.h
@@ -267,11 +267,6 @@ public:
 	 */
 	void print_diagnostics(const uint8_t diagnostic_byte);
 
-	/**
-	 * Diagnostics - print some basic information about the driver.
-	 */
-	int print_status() override;
-
 	/**
 	 * @brief Reads the threshold registers.
 	 * @return Returns true if the threshold registers are set to default
diff --git a/src/drivers/safety_button/SafetyButton.cpp b/src/drivers/safety_button/SafetyButton.cpp
index f62970eb79..21920d74be 100644
--- a/src/drivers/safety_button/SafetyButton.cpp
+++ b/src/drivers/safety_button/SafetyButton.cpp
@@ -199,14 +199,6 @@ SafetyButton::custom_command(int argc, char *argv[])
 	return print_usage("unknown command");
 }
 
-int
-SafetyButton::print_status()
-{
-	PX4_INFO("Safety State (from button): %s", _safety_btn_off ? "off" : "on");
-
-	return 0;
-}
-
 int
 SafetyButton::print_usage(const char *reason)
 {
diff --git a/src/drivers/safety_button/SafetyButton.hpp b/src/drivers/safety_button/SafetyButton.hpp
index 1408150cd5..8469c5c159 100644
--- a/src/drivers/safety_button/SafetyButton.hpp
+++ b/src/drivers/safety_button/SafetyButton.hpp
@@ -62,9 +62,6 @@ public:
 	/** @see ModuleBase */
 	static int print_usage(const char *reason = nullptr);
 
-	/** @see ModuleBase::print_status() */
-	int print_status() override;
-
 	void Run() override;
 
 	int Start();
diff --git a/src/modules/airspeed_selector/airspeed_selector_main.cpp b/src/modules/airspeed_selector/airspeed_selector_main.cpp
index 85f7efae18..6a6709079a 100644
--- a/src/modules/airspeed_selector/airspeed_selector_main.cpp
+++ b/src/modules/airspeed_selector/airspeed_selector_main.cpp
@@ -90,8 +90,6 @@ public:
 	/* run the main loop */
 	void Run() override;
 
-	int print_status() override;
-
 private:
 	static constexpr int MAX_NUM_AIRSPEED_SENSORS = 3; /**< Support max 3 airspeed sensors */
 	enum airspeed_index {
@@ -590,19 +588,6 @@ int AirspeedModule::custom_command(int argc, char *argv[])
 	return print_usage("unknown command");
 }
 
-int AirspeedModule::print_status()
-{
-	perf_print_counter(_perf_elapsed);
-
-	int instance = 0;
-	uORB::SubscriptionData<airspeed_validated_s> est{ORB_ID(airspeed_validated), (uint8_t)instance};
-	est.update();
-	PX4_INFO("Number of airspeed sensors: %i", _number_of_airspeed_sensors);
-	print_message(est.get());
-
-	return 0;
-}
-
 int AirspeedModule::print_usage(const char *reason)
 {
 	if (reason) {
diff --git a/src/modules/fw_att_control/FixedwingAttitudeControl.cpp b/src/modules/fw_att_control/FixedwingAttitudeControl.cpp
index e1657d160a..0ef3ce4073 100644
--- a/src/modules/fw_att_control/FixedwingAttitudeControl.cpp
+++ b/src/modules/fw_att_control/FixedwingAttitudeControl.cpp
@@ -736,13 +736,6 @@ int FixedwingAttitudeControl::custom_command(int argc, char *argv[])
 	return print_usage("unknown command");
 }
 
-int FixedwingAttitudeControl::print_status()
-{
-	PX4_INFO("Running");
-	perf_print_counter(_loop_perf);
-	return 0;
-}
-
 int FixedwingAttitudeControl::print_usage(const char *reason)
 {
 	if (reason) {
diff --git a/src/modules/fw_att_control/FixedwingAttitudeControl.hpp b/src/modules/fw_att_control/FixedwingAttitudeControl.hpp
index a9d1e4e7fe..3ce5ab1ca7 100644
--- a/src/modules/fw_att_control/FixedwingAttitudeControl.hpp
+++ b/src/modules/fw_att_control/FixedwingAttitudeControl.hpp
@@ -88,9 +88,6 @@ public:
 	/** @see ModuleBase */
 	static int print_usage(const char *reason = nullptr);
 
-	/** @see ModuleBase::print_status() */
-	int print_status() override;
-
 	void Run() override;
 
 	bool init();
diff --git a/src/modules/fw_pos_control_l1/FixedwingPositionControl.cpp b/src/modules/fw_pos_control_l1/FixedwingPositionControl.cpp
index 57a139f5a8..43ad692df0 100644
--- a/src/modules/fw_pos_control_l1/FixedwingPositionControl.cpp
+++ b/src/modules/fw_pos_control_l1/FixedwingPositionControl.cpp
@@ -1953,13 +1953,6 @@ int FixedwingPositionControl::custom_command(int argc, char *argv[])
 	return print_usage("unknown command");
 }
 
-int FixedwingPositionControl::print_status()
-{
-	PX4_INFO("Running");
-	perf_print_counter(_loop_perf);
-	return 0;
-}
-
 int FixedwingPositionControl::print_usage(const char *reason)
 {
 	if (reason) {
diff --git a/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp b/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp
index 585d4534de..ef2c481b27 100644
--- a/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp
+++ b/src/modules/fw_pos_control_l1/FixedwingPositionControl.hpp
@@ -145,9 +145,6 @@ public:
 
 	bool init();
 
-	/** @see ModuleBase::print_status() */
-	int print_status() override;
-
 private:
 	orb_advert_t	_mavlink_log_pub{nullptr};
 
diff --git a/src/modules/load_mon/load_mon.cpp b/src/modules/load_mon/load_mon.cpp
index c3d46aa669..110cf1097d 100644
--- a/src/modules/load_mon/load_mon.cpp
+++ b/src/modules/load_mon/load_mon.cpp
@@ -84,9 +84,6 @@ public:
 	/** @see ModuleBase */
 	static int print_usage(const char *reason = nullptr);
 
-	/** @see ModuleBase::print_status() */
-	int print_status() override;
-
 	void start();
 
 private:
@@ -307,13 +304,6 @@ void LoadMon::_stack_usage()
 }
 #endif
 
-int LoadMon::print_status()
-{
-	PX4_INFO("running");
-	perf_print_counter(_stack_perf);
-	return 0;
-}
-
 int LoadMon::print_usage(const char *reason)
 {
 	if (reason) {
diff --git a/src/modules/mc_att_control/mc_att_control.hpp b/src/modules/mc_att_control/mc_att_control.hpp
index 12f582d8b1..701cfb356e 100644
--- a/src/modules/mc_att_control/mc_att_control.hpp
+++ b/src/modules/mc_att_control/mc_att_control.hpp
@@ -78,9 +78,6 @@ public:
 	/** @see ModuleBase */
 	static int print_usage(const char *reason = nullptr);
 
-	/** @see ModuleBase::print_status() */
-	int print_status() override;
-
 	void Run() override;
 
 	bool init();
diff --git a/src/modules/mc_att_control/mc_att_control_main.cpp b/src/modules/mc_att_control/mc_att_control_main.cpp
index 9d2d9acb79..827118156b 100644
--- a/src/modules/mc_att_control/mc_att_control_main.cpp
+++ b/src/modules/mc_att_control/mc_att_control_main.cpp
@@ -378,15 +378,6 @@ int MulticopterAttitudeControl::task_spawn(int argc, char *argv[])
 	return PX4_ERROR;
 }
 
-int MulticopterAttitudeControl::print_status()
-{
-	PX4_INFO("Running");
-
-	perf_print_counter(_loop_perf);
-
-	return 0;
-}
-
 int MulticopterAttitudeControl::custom_command(int argc, char *argv[])
 {
 	return print_usage("unknown command");
diff --git a/src/modules/mc_rate_control/MulticopterRateControl.cpp b/src/modules/mc_rate_control/MulticopterRateControl.cpp
index 79c48af81a..ce619a992a 100644
--- a/src/modules/mc_rate_control/MulticopterRateControl.cpp
+++ b/src/modules/mc_rate_control/MulticopterRateControl.cpp
@@ -356,15 +356,6 @@ int MulticopterRateControl::task_spawn(int argc, char *argv[])
 	return PX4_ERROR;
 }
 
-int MulticopterRateControl::print_status()
-{
-	PX4_INFO("Running");
-
-	perf_print_counter(_loop_perf);
-
-	return 0;
-}
-
 int MulticopterRateControl::custom_command(int argc, char *argv[])
 {
 	return print_usage("unknown command");
diff --git a/src/modules/mc_rate_control/MulticopterRateControl.hpp b/src/modules/mc_rate_control/MulticopterRateControl.hpp
index c8aff461dc..849003ab56 100644
--- a/src/modules/mc_rate_control/MulticopterRateControl.hpp
+++ b/src/modules/mc_rate_control/MulticopterRateControl.hpp
@@ -75,9 +75,6 @@ public:
 	/** @see ModuleBase */
 	static int print_usage(const char *reason = nullptr);
 
-	/** @see ModuleBase::print_status() */
-	int print_status() override;
-
 	void Run() override;
 
 	bool init();
diff --git a/src/modules/rc_update/rc_update.cpp b/src/modules/rc_update/rc_update.cpp
index f278b5aeed..ca828f6d12 100644
--- a/src/modules/rc_update/rc_update.cpp
+++ b/src/modules/rc_update/rc_update.cpp
@@ -511,15 +511,6 @@ RCUpdate::task_spawn(int argc, char *argv[])
 	return PX4_ERROR;
 }
 
-int
-RCUpdate::print_status()
-{
-	PX4_INFO("Running");
-	perf_print_counter(_loop_perf);
-
-	return 0;
-}
-
 int
 RCUpdate::custom_command(int argc, char *argv[])
 {
diff --git a/src/modules/rc_update/rc_update.h b/src/modules/rc_update/rc_update.h
index 2feb9a0065..cae531fd15 100644
--- a/src/modules/rc_update/rc_update.h
+++ b/src/modules/rc_update/rc_update.h
@@ -87,9 +87,6 @@ public:
 	void Run() override;
 	bool init();
 
-	/** @see ModuleBase::print_status() */
-	int print_status() override;
-
 private:
 
 	/**
diff --git a/src/modules/sih/sih.cpp b/src/modules/sih/sih.cpp
index 60bcbb7e73..7c1c7ac538 100644
--- a/src/modules/sih/sih.cpp
+++ b/src/modules/sih/sih.cpp
@@ -55,11 +55,6 @@
 using namespace math;
 using namespace matrix;
 
-int Sih::print_status()
-{
-	PX4_INFO("Running");
-	return 0;
-}
 
 int Sih::custom_command(int argc, char *argv[])
 {
diff --git a/src/modules/sih/sih.hpp b/src/modules/sih/sih.hpp
index f245315a38..1595241602 100644
--- a/src/modules/sih/sih.hpp
+++ b/src/modules/sih/sih.hpp
@@ -79,9 +79,6 @@ public:
 	/** @see ModuleBase::run() */
 	void run() override;
 
-	/** @see ModuleBase::print_status() */
-	int print_status() override;
-
 	static float generate_wgn();    // generate white Gaussian noise sample
 
 	// generate white Gaussian noise sample as a 3D vector with specified std
diff --git a/src/modules/vtol_att_control/vtol_att_control_main.cpp b/src/modules/vtol_att_control/vtol_att_control_main.cpp
index 45ac57fcc8..dcb0aa6d93 100644
--- a/src/modules/vtol_att_control/vtol_att_control_main.cpp
+++ b/src/modules/vtol_att_control/vtol_att_control_main.cpp
@@ -462,14 +462,6 @@ VtolAttitudeControl::custom_command(int argc, char *argv[])
 	return print_usage("unknown command");
 }
 
-int
-VtolAttitudeControl::print_status()
-{
-	PX4_INFO("Running");
-	perf_print_counter(_loop_perf);
-	return PX4_OK;
-}
-
 int
 VtolAttitudeControl::print_usage(const char *reason)
 {
diff --git a/src/modules/vtol_att_control/vtol_att_control_main.h b/src/modules/vtol_att_control/vtol_att_control_main.h
index 19eaa196fc..3c6b889fe7 100644
--- a/src/modules/vtol_att_control/vtol_att_control_main.h
+++ b/src/modules/vtol_att_control/vtol_att_control_main.h
@@ -106,9 +106,6 @@ public:
 
 	bool init();
 
-	/** @see ModuleBase::print_status() */
-	int print_status() override;
-
 	bool is_fixed_wing_requested();
 	void abort_front_transition(const char *reason);