From 4c0b6dbe8689d49c0c01d4dda6007e37ed70d696 Mon Sep 17 00:00:00 2001 From: Matthias Grob Date: Fri, 1 Dec 2023 18:05:31 +0100 Subject: [PATCH] Remove trailing whitespaces and trailing duplicate newlines --- msg/ArmingCheckReply.msg | 1 - msg/ArmingCheckRequest.msg | 2 -- msg/ConfigOverrides.msg | 1 - msg/GotoSetpoint.msg | 1 - msg/MessageFormatRequest.msg | 1 - msg/RegisterExtComponentReply.msg | 1 - msg/UnregisterExtComponent.msg | 3 --- src/drivers/barometer/invensense/icp10100/Kconfig | 2 -- .../differential_pressure/asp5033/ASP5033.cpp | 13 ------------- .../differential_pressure/asp5033/parameters.c | 5 ----- src/drivers/roboclaw/CMakeLists.txt | 1 - src/examples/matlab_csv_serial/matlab_csv_serial.c | 2 -- src/lib/component_information/generate_crc.py | 2 -- src/lib/controllib/controllib_test/CMakeLists.txt | 3 +-- src/lib/mathlib/math/test/test.cpp | 2 -- src/lib/systemlib/otp.c | 8 +------- .../world_magnetic_model/geo_magnetic_tables.hpp | 2 -- .../HealthAndArmingChecks/checks/externalChecks.cpp | 1 - .../python/tuning_tools/mc_wind_estimator/readme.md | 2 +- src/systemcmds/io_bypass_control/io_controller.cpp | 4 ---- 20 files changed, 3 insertions(+), 54 deletions(-) diff --git a/msg/ArmingCheckReply.msg b/msg/ArmingCheckReply.msg index 375fb5269d..589ad1b1cd 100644 --- a/msg/ArmingCheckReply.msg +++ b/msg/ArmingCheckReply.msg @@ -31,4 +31,3 @@ bool mode_req_manual_control uint8 ORB_QUEUE_LENGTH = 4 - diff --git a/msg/ArmingCheckRequest.msg b/msg/ArmingCheckRequest.msg index cdbb2b5bfe..69e7e85f35 100644 --- a/msg/ArmingCheckRequest.msg +++ b/msg/ArmingCheckRequest.msg @@ -3,5 +3,3 @@ uint64 timestamp # time since system start (microseconds) # broadcast message to request all registered arming checks to be reported uint8 request_id - - diff --git a/msg/ConfigOverrides.msg b/msg/ConfigOverrides.msg index 9800066b2a..09b87253a8 100644 --- a/msg/ConfigOverrides.msg +++ b/msg/ConfigOverrides.msg @@ -16,4 +16,3 @@ uint8 source_id # ID depending on source_type uint8 ORB_QUEUE_LENGTH = 4 # TOPICS config_overrides config_overrides_request - diff --git a/msg/GotoSetpoint.msg b/msg/GotoSetpoint.msg index 6fdd32a5e5..5fe3ab8a79 100644 --- a/msg/GotoSetpoint.msg +++ b/msg/GotoSetpoint.msg @@ -22,4 +22,3 @@ float32 max_vertical_speed # (optional) [m/s] maximum speed (absolute) in the D- bool flag_set_max_heading_rate # true if setting a non-default heading rate limit float32 max_heading_rate # (optional) [rad/s] maximum heading rate (absolute) - diff --git a/msg/MessageFormatRequest.msg b/msg/MessageFormatRequest.msg index c852a6f005..6ceb66d038 100644 --- a/msg/MessageFormatRequest.msg +++ b/msg/MessageFormatRequest.msg @@ -7,4 +7,3 @@ uint16 LATEST_PROTOCOL_VERSION = 1 # Current version of this protocol. Increase uint16 protocol_version # Must be set to LATEST_PROTOCOL_VERSION. Do not change this field, it must be the first field after the timestamp char[50] topic_name # E.g. /fmu/in/vehicle_command - diff --git a/msg/RegisterExtComponentReply.msg b/msg/RegisterExtComponentReply.msg index 0223af711a..7cd7eef07b 100644 --- a/msg/RegisterExtComponentReply.msg +++ b/msg/RegisterExtComponentReply.msg @@ -11,4 +11,3 @@ int8 mode_id # assigned mode ID (-1 if invalid) int8 mode_executor_id # assigned mode executor ID (-1 if invalid) uint8 ORB_QUEUE_LENGTH = 2 - diff --git a/msg/UnregisterExtComponent.msg b/msg/UnregisterExtComponent.msg index fc4754ded6..2ad78d4b68 100644 --- a/msg/UnregisterExtComponent.msg +++ b/msg/UnregisterExtComponent.msg @@ -5,6 +5,3 @@ char[25] name # either the mode name, or component name int8 arming_check_id # arming check registration ID (-1 if not registered) int8 mode_id # assigned mode ID (-1 if not registered) int8 mode_executor_id # assigned mode executor ID (-1 if not registered) - - - diff --git a/src/drivers/barometer/invensense/icp10100/Kconfig b/src/drivers/barometer/invensense/icp10100/Kconfig index f5ee5a5139..2f883bccd4 100644 --- a/src/drivers/barometer/invensense/icp10100/Kconfig +++ b/src/drivers/barometer/invensense/icp10100/Kconfig @@ -3,5 +3,3 @@ menuconfig DRIVERS_BAROMETER_INVENSENSE_ICP10100 default n ---help--- Enable support for icp10100 - - diff --git a/src/drivers/differential_pressure/asp5033/ASP5033.cpp b/src/drivers/differential_pressure/asp5033/ASP5033.cpp index 9a3a263bbd..3f4b05b6d8 100644 --- a/src/drivers/differential_pressure/asp5033/ASP5033.cpp +++ b/src/drivers/differential_pressure/asp5033/ASP5033.cpp @@ -39,8 +39,6 @@ *@author Denislav Petrov */ - - #include "ASP5033.hpp" ASP5033::ASP5033(const I2CSPIDriverConfig &config) : @@ -80,9 +78,6 @@ int ASP5033::sensor_id_check() if ((transfer(&cmd_3, 1, &id[0], sizeof(id)) != PX4_OK) || (*id != REG_WHOAMI_RECHECK_ID_ASP5033)) { return 0; } return 1; - - - } int ASP5033::init() @@ -123,13 +118,11 @@ bool ASP5033::get_differential_pressure() press_sum = 0.; press_count = 0; return true; - } void ASP5033::print_status() { - I2CSPIDriverBase::print_status(); perf_print_counter(_sample_perf); @@ -209,7 +202,6 @@ int ASP5033::collect() perf_begin(_sample_perf); const hrt_abstime timestamp_sample = hrt_absolute_time(); - // Read pressure and temperature as one block uint8_t val[5] {0, 0, 0, 0, 0}; uint8_t cmd = REG_PRESS_DATA_ASP5033; @@ -251,8 +243,3 @@ int ASP5033::collect() return PX4_OK; } - - - - - diff --git a/src/drivers/differential_pressure/asp5033/parameters.c b/src/drivers/differential_pressure/asp5033/parameters.c index 5b50f628f6..07f91aac3d 100644 --- a/src/drivers/differential_pressure/asp5033/parameters.c +++ b/src/drivers/differential_pressure/asp5033/parameters.c @@ -31,7 +31,6 @@ * ****************************************************************************/ - /** * ASP5033 differential pressure sensor (external I2C) * @@ -40,7 +39,3 @@ * @boolean */ PARAM_DEFINE_INT32(SENS_EN_ASP5033, 0); - - - - diff --git a/src/drivers/roboclaw/CMakeLists.txt b/src/drivers/roboclaw/CMakeLists.txt index 4218a36553..f32d2fae4b 100644 --- a/src/drivers/roboclaw/CMakeLists.txt +++ b/src/drivers/roboclaw/CMakeLists.txt @@ -40,4 +40,3 @@ px4_add_module( MODULE_CONFIG module.yaml ) - diff --git a/src/examples/matlab_csv_serial/matlab_csv_serial.c b/src/examples/matlab_csv_serial/matlab_csv_serial.c index 78a7b79a0e..0ef2ab28af 100644 --- a/src/examples/matlab_csv_serial/matlab_csv_serial.c +++ b/src/examples/matlab_csv_serial/matlab_csv_serial.c @@ -235,5 +235,3 @@ int matlab_csv_serial_thread_main(int argc, char *argv[]) fflush(stdout); return 0; } - - diff --git a/src/lib/component_information/generate_crc.py b/src/lib/component_information/generate_crc.py index ea50680d1d..45b961cd0e 100755 --- a/src/lib/component_information/generate_crc.py +++ b/src/lib/component_information/generate_crc.py @@ -58,5 +58,3 @@ with open(filename, 'w') as outfile: outfile.write("}\n") - - diff --git a/src/lib/controllib/controllib_test/CMakeLists.txt b/src/lib/controllib/controllib_test/CMakeLists.txt index a6fed39a21..0d57d54cc1 100644 --- a/src/lib/controllib/controllib_test/CMakeLists.txt +++ b/src/lib/controllib/controllib_test/CMakeLists.txt @@ -30,6 +30,7 @@ # POSSIBILITY OF SUCH DAMAGE. # ############################################################################ + px4_add_module( MODULE lib__controllib__controllib_test MAIN controllib_test @@ -39,5 +40,3 @@ px4_add_module( controllib_test_main.cpp DEPENDS ) - - diff --git a/src/lib/mathlib/math/test/test.cpp b/src/lib/mathlib/math/test/test.cpp index 77d1991f53..663fb0f5a1 100644 --- a/src/lib/mathlib/math/test/test.cpp +++ b/src/lib/mathlib/math/test/test.cpp @@ -134,5 +134,3 @@ void __EXPORT float2SigExp(const float &num, float &sig, int &exp) for (int i = 0; i < abs(exp); i++) { sig *= 10; } } } - - diff --git a/src/lib/systemlib/otp.c b/src/lib/systemlib/otp.c index ee1c4f865c..d2e83ae074 100644 --- a/src/lib/systemlib/otp.c +++ b/src/lib/systemlib/otp.c @@ -53,7 +53,6 @@ #include "err.h" // warnx #include - int val_read(void *dest, volatile const void *src, int bytes) { @@ -144,8 +143,6 @@ int lock_otp(void) return errors; } - - // COMPLETE, BUSY, or other flash error? static int F_GetStatus(void) { @@ -177,7 +174,7 @@ void F_unlock(void) } } -// lock the FLASH Registers +// lock the FLASH Registers void F_lock(void) { FLASH->control |= F_CR_LOCK; @@ -233,6 +230,3 @@ int F_write_byte(unsigned long Address, uint8_t Data) //Return the Program Status return !(status == F_COMPLETE); } - - - diff --git a/src/lib/world_magnetic_model/geo_magnetic_tables.hpp b/src/lib/world_magnetic_model/geo_magnetic_tables.hpp index 29005b3e47..79615112e5 100644 --- a/src/lib/world_magnetic_model/geo_magnetic_tables.hpp +++ b/src/lib/world_magnetic_model/geo_magnetic_tables.hpp @@ -134,5 +134,3 @@ static constexpr float WMM_STRENGTH_MIN_GS = 22.2; // latitude: -30, longitude: static constexpr float WMM_STRENGTH_MAX_GS = 66.9; // latitude: -60, longitude: 140 static constexpr float WMM_STRENGTH_MEAN_GS = 46.4; static constexpr float WMM_STRENGTH_MEDIAN_GS = 48.8; - - diff --git a/src/modules/commander/HealthAndArmingChecks/checks/externalChecks.cpp b/src/modules/commander/HealthAndArmingChecks/checks/externalChecks.cpp index 1d476b1d24..c60a9a4af0 100644 --- a/src/modules/commander/HealthAndArmingChecks/checks/externalChecks.cpp +++ b/src/modules/commander/HealthAndArmingChecks/checks/externalChecks.cpp @@ -332,4 +332,3 @@ void ExternalChecks::checkNonRegisteredModes(const Context &context, Report &rep events::Log::Error, "Mode is not registered"); } } - diff --git a/src/modules/ekf2/EKF/python/tuning_tools/mc_wind_estimator/readme.md b/src/modules/ekf2/EKF/python/tuning_tools/mc_wind_estimator/readme.md index 5fdb93dbc3..da0a63c9fb 100644 --- a/src/modules/ekf2/EKF/python/tuning_tools/mc_wind_estimator/readme.md +++ b/src/modules/ekf2/EKF/python/tuning_tools/mc_wind_estimator/readme.md @@ -34,6 +34,6 @@ param set EKF2_BCOEF_Y 62.1 param set EKF2_MCOEF 0.16 # EXPERIMENTAL -param set EKF2_DRAG_NOISE 0.31 +param set EKF2_DRAG_NOISE 0.31 ``` ![DeepinScreenshot_matplotlib_20220329100027](https://user-images.githubusercontent.com/14822839/160563024-efddd100-d7db-46f7-8676-cf4296e9f737.png) diff --git a/src/systemcmds/io_bypass_control/io_controller.cpp b/src/systemcmds/io_bypass_control/io_controller.cpp index 3732a2a6b5..cc02df5dbd 100644 --- a/src/systemcmds/io_bypass_control/io_controller.cpp +++ b/src/systemcmds/io_bypass_control/io_controller.cpp @@ -98,7 +98,6 @@ IOController::IOController(const char *name, const px4::wq_config_t &config) : void IOController::Run() { - actuator_outputs_s actuator_outputs; while (_actuator_outputs_sub.update(&actuator_outputs)) { @@ -118,8 +117,5 @@ void IOController::Run() up_pwm_update(i); } } - } - - }