pwm_limit: rename to output_limit

As there is nothing pwm-specific about it.

src/drivers/linux_pwm_out/CMakeLists.txt

@@ -42,6 +42,6 @@ px4_add_module(
 		ocpoc_mmap.cpp
 		bbblue_pwm_rc.cpp
 	DEPENDS
-		pwm_limit
+		output_limit
 	)
 

src/drivers/linux_pwm_out/linux_pwm_out.cpp

@@ -54,7 +54,7 @@
 #include <lib/mixer/mixer.h>
 #include <lib/mixer/mixer_load.h>
 #include <parameters/param.h>
-#include <pwm_limit/pwm_limit.h>
+#include <output_limit/output_limit.h>
 #include <perf/perf_counter.h>
 
 #include "common.h"
@@ -98,7 +98,7 @@ px4_pollfd_struct_t _poll_fds[actuator_controls_s::NUM_ACTUATOR_CONTROL_GROUPS];
 uint32_t	_groups_required = 0;
 uint32_t	_groups_subscribed = 0;
 
-pwm_limit_t     _pwm_limit;
+output_limit_t     _pwm_limit;
 
 // esc parameters
 int32_t _pwm_disarmed;
@@ -268,7 +268,7 @@ void task_main(int argc, char *argv[])
 	_armed.armed = false;
 	_armed.prearmed = false;
 
-	pwm_limit_init(&_pwm_limit);
+	output_limit_init(&_pwm_limit);
 
 	while (!_task_should_exit) {
 
@@ -332,7 +332,7 @@ void task_main(int argc, char *argv[])
 			}
 
 			/* Switch off the PWM limit ramp for the calibration. */
-			_pwm_limit.state = PWM_LIMIT_STATE_ON;
+			_pwm_limit.state = OUTPUT_LIMIT_STATE_ON;
 		}
 
 		if (_mixer_group != nullptr) {
@@ -358,16 +358,16 @@ void task_main(int argc, char *argv[])
 			uint16_t pwm[actuator_outputs_s::NUM_ACTUATOR_OUTPUTS];
 
 			// TODO FIXME: pre-armed seems broken
-			pwm_limit_calc(_armed.armed,
-				       false/*_armed.prearmed*/,
-				       _outputs.noutputs,
-				       reverse_mask,
-				       disarmed_pwm,
-				       min_pwm,
-				       max_pwm,
-				       _outputs.output,
-				       pwm,
-				       &_pwm_limit);
+			output_limit_calc(_armed.armed,
+					  false/*_armed.prearmed*/,
+					  _outputs.noutputs,
+					  reverse_mask,
+					  disarmed_pwm,
+					  min_pwm,
+					  max_pwm,
+					  _outputs.output,
+					  pwm,
+					  &_pwm_limit);
 
 			if (_armed.lockdown || _armed.manual_lockdown) {
 				pwm_out->send_output_pwm(disarmed_pwm, _outputs.noutputs);

src/drivers/px4fmu/CMakeLists.txt

@@ -41,5 +41,5 @@ px4_add_module(
 		circuit_breaker
 		mixer
 		mixer_module
-		pwm_limit
+		output_limit
 	)

src/drivers/px4fmu/fmu.cpp

@@ -53,7 +53,6 @@
 #include <lib/mixer_module/mixer_module.hpp>
 #include <lib/parameters/param.h>
 #include <lib/perf/perf_counter.h>
-#include <lib/pwm_limit/pwm_limit.h>
 #include <px4_config.h>
 #include <px4_getopt.h>
 #include <px4_log.h>

src/drivers/snapdragon_pwm_out/CMakeLists.txt

@@ -38,5 +38,5 @@ px4_add_module(
 		snapdragon_pwm_out.cpp
 	DEPENDS
 		mixer
-		pwm_limit
+		output_limit
 	)

src/drivers/snapdragon_pwm_out/snapdragon_pwm_out.cpp

@@ -53,7 +53,7 @@
 #include <mixer/mixer_multirotor_normalized.generated.h>
 #include <parameters/param.h>
 #include <perf/perf_counter.h>
-#include <pwm_limit/pwm_limit.h>
+#include <output_limit/output_limit.h>
 #include <dev_fs_lib_pwm.h>
 
 /*
@@ -105,7 +105,7 @@ px4_pollfd_struct_t _poll_fds[actuator_controls_s::NUM_ACTUATOR_CONTROL_GROUPS];
 uint32_t	_groups_required = 0;
 
 // limit for pwm
-pwm_limit_t     _pwm_limit;
+output_limit_t     _pwm_limit;
 
 // esc parameters
 int32_t _pwm_disarmed;
@@ -364,7 +364,7 @@ void task_main(int argc, char *argv[])
 	_armed.prearmed = false;
 
 	// set max min pwm
-	pwm_limit_init(&_pwm_limit);
+	output_limit_init(&_pwm_limit);
 
 	_perf_control_latency = perf_alloc(PC_ELAPSED, "snapdragon_pwm_out control latency");
 
@@ -439,9 +439,9 @@ void task_main(int argc, char *argv[])
 
 
 		// TODO FIXME: pre-armed seems broken -> copied and pasted from pwm_out_rc_in: needs to be tested
-		pwm_limit_calc(_armed.armed,
-			       false/*_armed.prearmed*/, _outputs.noutputs, reverse_mask, disarmed_pwm,
-			       min_pwm, max_pwm, _outputs.output, pwm, &_pwm_limit);
+		output_limit_calc(_armed.armed,
+				  false/*_armed.prearmed*/, _outputs.noutputs, reverse_mask, disarmed_pwm,
+				  min_pwm, max_pwm, _outputs.output, pwm, &_pwm_limit);
 
 		// send and publish outputs
 		if (_armed.lockdown || _armed.manual_lockdown || timeout) {

src/drivers/tap_esc/CMakeLists.txt

@@ -40,6 +40,5 @@ px4_add_module(
 		tap_esc_common.cpp
 	DEPENDS
 		mixer
-		pwm_limit
 	)
 

src/drivers/tap_esc/tap_esc.cpp

@@ -60,7 +60,6 @@
 #include <drivers/drv_hrt.h>
 #include <drivers/drv_mixer.h>
 #include <mixer/mixer.h>
-#include <pwm_limit/pwm_limit.h>
 
 #include "tap_esc_common.h"