fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-03 15:38:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

pwm_input: remove 'test' command and use 'status' instead

Browse Source
This commit is contained in:
Beat Küng
2021-09-08 16:10:24 -04:00
committed by Daniel Agar
parent f1aafe83b3
commit ae8733c2d4
2 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/pwm_input/pwm_input.cpp
+5 -19
View File
@@ -179,13 +179,14 @@ PWMIN::publish(uint16_t status, uint32_t period, uint32_t pulse_width)
_pulses_captured++; _pulses_captured++;
} }
void int
PWMIN::print_info(void) PWMIN::print_status()
{ {
PX4_INFO("count=%u period=%u width=%u\n", PX4_INFO("count=%u period=%u width=%u",
static_cast<unsigned>(_pulses_captured), static_cast<unsigned>(_pulses_captured),
static_cast<unsigned>(_last_period), static_cast<unsigned>(_last_period),
static_cast<unsigned>(_last_width)); static_cast<unsigned>(_last_width));
return 0;
} }
int int
@@ -204,7 +205,6 @@ Measures the PWM input on AUX5 (or MAIN5) via a timer capture ISR and publishes
PRINT_MODULE_USAGE_NAME("pwm_input", "system"); PRINT_MODULE_USAGE_NAME("pwm_input", "system");
PRINT_MODULE_USAGE_COMMAND("start"); PRINT_MODULE_USAGE_COMMAND("start");
PRINT_MODULE_USAGE_COMMAND_DESCR("test", "prints PWM capture info.");
PRINT_MODULE_USAGE_DEFAULT_COMMANDS(); PRINT_MODULE_USAGE_DEFAULT_COMMANDS();
return PX4_OK; return PX4_OK;
@@ -213,21 +213,7 @@ Measures the PWM input on AUX5 (or MAIN5) via a timer capture ISR and publishes
int int
PWMIN::custom_command(int argc, char *argv[]) PWMIN::custom_command(int argc, char *argv[])
{ {
const char *input = argv[0]; return print_usage();
auto *obj = get_instance();
if (!is_running() || !obj) {
PX4_ERR("not running");
return PX4_ERROR;
}
if (!strcmp(input, "test")) {
obj->print_info();
return PX4_OK;
}
print_usage();
return PX4_ERROR;
} }
extern "C" __EXPORT int pwm_input_main(int argc, char *argv[]) extern "C" __EXPORT int pwm_input_main(int argc, char *argv[])
src/drivers/pwm_input/pwm_input.h
+1 -1
View File
@@ -125,7 +125,7 @@ class PWMIN : public ModuleBase<PWMIN>
public: public:
void start(); void start();
void publish(uint16_t status, uint32_t period, uint32_t pulse_width); void publish(uint16_t status, uint32_t period, uint32_t pulse_width);
void print_info(void); int print_status() override;
static int pwmin_tim_isr(int irq, void *context, void *arg); static int pwmin_tim_isr(int irq, void *context, void *arg);