From 8527c8276f0cbf2b3c1a9ad808a147452852afe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Tue, 6 Jun 2017 15:40:24 +0200 Subject: [PATCH] drivers: rename rpi_pwm_out to linux_pwm_out --- cmake/configs/posix_rpi_common.cmake | 2 +- posix-configs/rpi/px4.config | 2 +- posix-configs/rpi/px4_fw.config | 2 +- posix-configs/rpi/px4_no_shield.config | 2 +- .../CMakeLists.txt | 6 ++-- .../PCA9685.cpp | 2 +- .../{rpi_pwm_out => linux_pwm_out}/PCA9685.h | 2 +- .../{rpi_pwm_out => linux_pwm_out}/common.h | 2 +- .../linux_pwm_out.cpp} | 34 +++++++++---------- .../navio_sysfs.cpp | 2 +- .../navio_sysfs.h | 2 +- 11 files changed, 29 insertions(+), 29 deletions(-) rename src/drivers/{rpi_pwm_out => linux_pwm_out}/CMakeLists.txt (96%) rename src/drivers/{rpi_pwm_out => linux_pwm_out}/PCA9685.cpp (99%) rename src/drivers/{rpi_pwm_out => linux_pwm_out}/PCA9685.h (99%) rename src/drivers/{rpi_pwm_out => linux_pwm_out}/common.h (98%) rename src/drivers/{rpi_pwm_out/rpi_pwm_out.cpp => linux_pwm_out/linux_pwm_out.cpp} (92%) rename src/drivers/{rpi_pwm_out => linux_pwm_out}/navio_sysfs.cpp (99%) rename src/drivers/{rpi_pwm_out => linux_pwm_out}/navio_sysfs.h (98%) diff --git a/cmake/configs/posix_rpi_common.cmake b/cmake/configs/posix_rpi_common.cmake index 624d40c1aa..5804660d96 100644 --- a/cmake/configs/posix_rpi_common.cmake +++ b/cmake/configs/posix_rpi_common.cmake @@ -78,7 +78,7 @@ set(config_module_list drivers/navio_adc drivers/navio_sysfs_rc_in drivers/linux_gpio - drivers/rpi_pwm_out + drivers/linux_pwm_out drivers/navio_rgbled drivers/pwm_out_sim drivers/rpi_rc_in diff --git a/posix-configs/rpi/px4.config b/posix-configs/rpi/px4.config index 32d0304cf9..3c5e871746 100644 --- a/posix-configs/rpi/px4.config +++ b/posix-configs/rpi/px4.config @@ -31,6 +31,6 @@ mavlink start -d /dev/ttyUSB0 mavlink stream -d /dev/ttyUSB0 -s HIGHRES_IMU -r 50 mavlink stream -d /dev/ttyUSB0 -s ATTITUDE -r 50 navio_sysfs_rc_in start -rpi_pwm_out start +linux_pwm_out start logger start -t -b 200 mavlink boot_complete diff --git a/posix-configs/rpi/px4_fw.config b/posix-configs/rpi/px4_fw.config index d542831ef3..1b5d6c0393 100644 --- a/posix-configs/rpi/px4_fw.config +++ b/posix-configs/rpi/px4_fw.config @@ -29,6 +29,6 @@ mavlink stream -u 14556 -s MANUAL_CONTROL -r 10 navio_sysfs_rc_in start -rpi_pwm_out start -m ROMFS/px4fmu_common/mixers/AERT.main.mix +linux_pwm_out start -m ROMFS/px4fmu_common/mixers/AERT.main.mix logger start -t -b 200 mavlink boot_complete diff --git a/posix-configs/rpi/px4_no_shield.config b/posix-configs/rpi/px4_no_shield.config index f0c8b066d2..d5c26cf5d5 100644 --- a/posix-configs/rpi/px4_no_shield.config +++ b/posix-configs/rpi/px4_no_shield.config @@ -27,6 +27,6 @@ mavlink stream -u 14556 -s ATTITUDE -r 50 #mavlink stream -d /dev/ttyUSB0 -s HIGHRES_IMU -r 50 #mavlink stream -d /dev/ttyUSB0 -s ATTITUDE -r 50 rpi_rc_in start -rpi_pwm_out start -p pca9685 +linux_pwm_out start -p pca9685 logger start -t mavlink boot_complete diff --git a/src/drivers/rpi_pwm_out/CMakeLists.txt b/src/drivers/linux_pwm_out/CMakeLists.txt similarity index 96% rename from src/drivers/rpi_pwm_out/CMakeLists.txt rename to src/drivers/linux_pwm_out/CMakeLists.txt index e7909cb2d5..a5ce8123b6 100644 --- a/src/drivers/rpi_pwm_out/CMakeLists.txt +++ b/src/drivers/linux_pwm_out/CMakeLists.txt @@ -31,13 +31,13 @@ # ############################################################################ px4_add_module( - MODULE drivers__rpi_pwm_out - MAIN rpi_pwm_out + MODULE drivers__linux_pwm_out + MAIN linux_pwm_out COMPILE_FLAGS SRCS PCA9685.cpp navio_sysfs.cpp - rpi_pwm_out.cpp + linux_pwm_out.cpp DEPENDS platforms__common ) diff --git a/src/drivers/rpi_pwm_out/PCA9685.cpp b/src/drivers/linux_pwm_out/PCA9685.cpp similarity index 99% rename from src/drivers/rpi_pwm_out/PCA9685.cpp rename to src/drivers/linux_pwm_out/PCA9685.cpp index 343013e993..7504d07b9e 100644 --- a/src/drivers/rpi_pwm_out/PCA9685.cpp +++ b/src/drivers/linux_pwm_out/PCA9685.cpp @@ -53,7 +53,7 @@ #include -using namespace rpi_pwm_out; +using namespace linux_pwm_out; void PCA9685::init(int bus, int address) { diff --git a/src/drivers/rpi_pwm_out/PCA9685.h b/src/drivers/linux_pwm_out/PCA9685.h similarity index 99% rename from src/drivers/rpi_pwm_out/PCA9685.h rename to src/drivers/linux_pwm_out/PCA9685.h index fd1e86803e..128ff92085 100644 --- a/src/drivers/rpi_pwm_out/PCA9685.h +++ b/src/drivers/linux_pwm_out/PCA9685.h @@ -41,7 +41,7 @@ #include #include "common.h" -namespace rpi_pwm_out +namespace linux_pwm_out { // Register Definitions diff --git a/src/drivers/rpi_pwm_out/common.h b/src/drivers/linux_pwm_out/common.h similarity index 98% rename from src/drivers/rpi_pwm_out/common.h rename to src/drivers/linux_pwm_out/common.h index c28085c9e1..315e34198f 100644 --- a/src/drivers/rpi_pwm_out/common.h +++ b/src/drivers/linux_pwm_out/common.h @@ -35,7 +35,7 @@ #include -namespace rpi_pwm_out +namespace linux_pwm_out { /** diff --git a/src/drivers/rpi_pwm_out/rpi_pwm_out.cpp b/src/drivers/linux_pwm_out/linux_pwm_out.cpp similarity index 92% rename from src/drivers/rpi_pwm_out/rpi_pwm_out.cpp rename to src/drivers/linux_pwm_out/linux_pwm_out.cpp index 6ae1d425ca..153c8edce5 100644 --- a/src/drivers/rpi_pwm_out/rpi_pwm_out.cpp +++ b/src/drivers/linux_pwm_out/linux_pwm_out.cpp @@ -55,7 +55,7 @@ #include "navio_sysfs.h" #include "PCA9685.h" -namespace rpi_pwm_out +namespace linux_pwm_out { static px4_task_t _task_handle = -1; volatile bool _task_should_exit = false; @@ -388,12 +388,12 @@ void usage() PX4_INFO(" pwm_out status"); } -} // namespace rpi_pwm_out +} // namespace linux_pwm_out /* driver 'main' command */ -extern "C" __EXPORT int rpi_pwm_out_main(int argc, char *argv[]); +extern "C" __EXPORT int linux_pwm_out_main(int argc, char *argv[]); -int rpi_pwm_out_main(int argc, char *argv[]) +int linux_pwm_out_main(int argc, char *argv[]) { int ch; int myoptind = 1; @@ -411,15 +411,15 @@ int rpi_pwm_out_main(int argc, char *argv[]) while ((ch = px4_getopt(argc, argv, "d:m:p:n:", &myoptind, &myoptarg)) != EOF) { switch (ch) { case 'd': - strncpy(rpi_pwm_out::_device, myoptarg, sizeof(rpi_pwm_out::_device)); + strncpy(linux_pwm_out::_device, myoptarg, sizeof(linux_pwm_out::_device)); break; case 'm': - strncpy(rpi_pwm_out::_mixer_filename, myoptarg, sizeof(rpi_pwm_out::_mixer_filename)); + strncpy(linux_pwm_out::_mixer_filename, myoptarg, sizeof(linux_pwm_out::_mixer_filename)); break; case 'p': - strncpy(rpi_pwm_out::_protocol, myoptarg, sizeof(rpi_pwm_out::_protocol)); + strncpy(linux_pwm_out::_protocol, myoptarg, sizeof(linux_pwm_out::_protocol)); break; case 'n': { @@ -433,44 +433,44 @@ int rpi_pwm_out_main(int argc, char *argv[]) max_num = actuator_outputs_s::NUM_ACTUATOR_OUTPUTS; } - rpi_pwm_out::_max_mum_outputs = max_num; + linux_pwm_out::_max_mum_outputs = max_num; } break; } } // gets the parameters for the esc's pwm - param_get(param_find("PWM_DISARMED"), &rpi_pwm_out::_pwm_disarmed); - param_get(param_find("PWM_MIN"), &rpi_pwm_out::_pwm_min); - param_get(param_find("PWM_MAX"), &rpi_pwm_out::_pwm_max); + param_get(param_find("PWM_DISARMED"), &linux_pwm_out::_pwm_disarmed); + param_get(param_find("PWM_MIN"), &linux_pwm_out::_pwm_min); + param_get(param_find("PWM_MAX"), &linux_pwm_out::_pwm_max); /* * Start/load the driver. */ if (!strcmp(verb, "start")) { - if (rpi_pwm_out::_is_running) { + if (linux_pwm_out::_is_running) { PX4_WARN("pwm_out already running"); return 1; } - rpi_pwm_out::start(); + linux_pwm_out::start(); } else if (!strcmp(verb, "stop")) { - if (!rpi_pwm_out::_is_running) { + if (!linux_pwm_out::_is_running) { PX4_WARN("pwm_out is not running"); return 1; } - rpi_pwm_out::stop(); + linux_pwm_out::stop(); } else if (!strcmp(verb, "status")) { - PX4_WARN("pwm_out is %s", rpi_pwm_out::_is_running ? "running" : "not running"); + PX4_WARN("pwm_out is %s", linux_pwm_out::_is_running ? "running" : "not running"); return 0; } else { - rpi_pwm_out::usage(); + linux_pwm_out::usage(); return 1; } diff --git a/src/drivers/rpi_pwm_out/navio_sysfs.cpp b/src/drivers/linux_pwm_out/navio_sysfs.cpp similarity index 99% rename from src/drivers/rpi_pwm_out/navio_sysfs.cpp rename to src/drivers/linux_pwm_out/navio_sysfs.cpp index 2761c69d7b..8ebcc9f111 100644 --- a/src/drivers/rpi_pwm_out/navio_sysfs.cpp +++ b/src/drivers/linux_pwm_out/navio_sysfs.cpp @@ -37,7 +37,7 @@ #include #include -using namespace rpi_pwm_out; +using namespace linux_pwm_out; NavioSysfsPWMOut::NavioSysfsPWMOut(const char *device, int max_num_outputs) : _device(device) diff --git a/src/drivers/rpi_pwm_out/navio_sysfs.h b/src/drivers/linux_pwm_out/navio_sysfs.h similarity index 98% rename from src/drivers/rpi_pwm_out/navio_sysfs.h rename to src/drivers/linux_pwm_out/navio_sysfs.h index 0605fba334..17b5e9c234 100644 --- a/src/drivers/rpi_pwm_out/navio_sysfs.h +++ b/src/drivers/linux_pwm_out/navio_sysfs.h @@ -35,7 +35,7 @@ #include "common.h" -namespace rpi_pwm_out +namespace linux_pwm_out { /**