From 48bf9268c3c5bd97746c9f8bebe1bf88fd6b41b4 Mon Sep 17 00:00:00 2001 From: Steve Nogar Date: Thu, 30 Jul 2020 11:48:10 -0400 Subject: [PATCH] rename Mixer to MixerBase to resolve case-insensitivity on mac --- src/lib/mixer/CMakeLists.txt | 2 +- src/lib/mixer/HelicopterMixer/CMakeLists.txt | 2 +- src/lib/mixer/HelicopterMixer/HelicopterMixer.hpp | 2 +- src/lib/mixer/{Mixer => MixerBase}/CMakeLists.txt | 4 ++-- src/lib/mixer/{Mixer => MixerBase}/Mixer.cpp | 0 src/lib/mixer/{Mixer => MixerBase}/Mixer.hpp | 0 src/lib/mixer/MixerGroup.hpp | 2 +- src/lib/mixer/MultirotorMixer/CMakeLists.txt | 4 ++-- src/lib/mixer/MultirotorMixer/MultirotorMixer.hpp | 2 +- src/lib/mixer/NullMixer/CMakeLists.txt | 2 +- src/lib/mixer/NullMixer/NullMixer.hpp | 2 +- src/lib/mixer/SimpleMixer/CMakeLists.txt | 2 +- src/lib/mixer/SimpleMixer/SimpleMixer.hpp | 2 +- src/modules/mc_att_control/mc_att_control.hpp | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) rename src/lib/mixer/{Mixer => MixerBase}/CMakeLists.txt (96%) rename src/lib/mixer/{Mixer => MixerBase}/Mixer.cpp (100%) rename src/lib/mixer/{Mixer => MixerBase}/Mixer.hpp (100%) diff --git a/src/lib/mixer/CMakeLists.txt b/src/lib/mixer/CMakeLists.txt index 716a99d66a..9b4acf4f8c 100644 --- a/src/lib/mixer/CMakeLists.txt +++ b/src/lib/mixer/CMakeLists.txt @@ -32,7 +32,7 @@ ############################################################################ # required by other mixers -add_subdirectory(Mixer) +add_subdirectory(MixerBase) add_subdirectory(HelicopterMixer) add_subdirectory(MultirotorMixer) diff --git a/src/lib/mixer/HelicopterMixer/CMakeLists.txt b/src/lib/mixer/HelicopterMixer/CMakeLists.txt index 6a4b6d22a0..264f3335ef 100644 --- a/src/lib/mixer/HelicopterMixer/CMakeLists.txt +++ b/src/lib/mixer/HelicopterMixer/CMakeLists.txt @@ -35,5 +35,5 @@ add_library(HelicopterMixer HelicopterMixer.cpp HelicopterMixer.hpp ) -target_link_libraries(HelicopterMixer PRIVATE Mixer) +target_link_libraries(HelicopterMixer PRIVATE MixerBase) add_dependencies(HelicopterMixer prebuild_targets) diff --git a/src/lib/mixer/HelicopterMixer/HelicopterMixer.hpp b/src/lib/mixer/HelicopterMixer/HelicopterMixer.hpp index 42537a7591..ce50a8f58c 100644 --- a/src/lib/mixer/HelicopterMixer/HelicopterMixer.hpp +++ b/src/lib/mixer/HelicopterMixer/HelicopterMixer.hpp @@ -33,7 +33,7 @@ #pragma once -#include +#include /** helicopter swash servo mixer */ struct mixer_heli_servo_s { diff --git a/src/lib/mixer/Mixer/CMakeLists.txt b/src/lib/mixer/MixerBase/CMakeLists.txt similarity index 96% rename from src/lib/mixer/Mixer/CMakeLists.txt rename to src/lib/mixer/MixerBase/CMakeLists.txt index 07cc80e9bc..d4b1ec2915 100644 --- a/src/lib/mixer/Mixer/CMakeLists.txt +++ b/src/lib/mixer/MixerBase/CMakeLists.txt @@ -31,8 +31,8 @@ # ############################################################################ -add_library(Mixer +add_library(MixerBase Mixer.cpp Mixer.hpp ) -add_dependencies(Mixer prebuild_targets) +add_dependencies(MixerBase prebuild_targets) diff --git a/src/lib/mixer/Mixer/Mixer.cpp b/src/lib/mixer/MixerBase/Mixer.cpp similarity index 100% rename from src/lib/mixer/Mixer/Mixer.cpp rename to src/lib/mixer/MixerBase/Mixer.cpp diff --git a/src/lib/mixer/Mixer/Mixer.hpp b/src/lib/mixer/MixerBase/Mixer.hpp similarity index 100% rename from src/lib/mixer/Mixer/Mixer.hpp rename to src/lib/mixer/MixerBase/Mixer.hpp diff --git a/src/lib/mixer/MixerGroup.hpp b/src/lib/mixer/MixerGroup.hpp index ea50ecd234..a2859e270e 100644 --- a/src/lib/mixer/MixerGroup.hpp +++ b/src/lib/mixer/MixerGroup.hpp @@ -33,7 +33,7 @@ #pragma once -#include "Mixer/Mixer.hpp" +#include "MixerBase/Mixer.hpp" /** * Group of mixers, built up from single mixers and processed diff --git a/src/lib/mixer/MultirotorMixer/CMakeLists.txt b/src/lib/mixer/MultirotorMixer/CMakeLists.txt index 83682b7491..5ccc17be15 100644 --- a/src/lib/mixer/MultirotorMixer/CMakeLists.txt +++ b/src/lib/mixer/MultirotorMixer/CMakeLists.txt @@ -92,7 +92,7 @@ add_library(MultirotorMixer ${CMAKE_CURRENT_BINARY_DIR}/mixer_multirotor_normalized.generated.h ${CMAKE_CURRENT_BINARY_DIR}/mixer_multirotor_6dof.generated.h ) -target_link_libraries(MultirotorMixer PRIVATE Mixer) +target_link_libraries(MultirotorMixer PRIVATE MixerBase) target_include_directories(MultirotorMixer PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) add_dependencies(MultirotorMixer mixer_gen mixer_gen_6dof prebuild_targets) @@ -104,7 +104,7 @@ if(BUILD_TESTING) ) target_compile_definitions(test_mixer_multirotor PRIVATE MIXER_MULTIROTOR_USE_MOCK_GEOMETRY) target_compile_options(test_mixer_multirotor PRIVATE -Wno-unused-result) - target_link_libraries(test_mixer_multirotor PRIVATE Mixer) + target_link_libraries(test_mixer_multirotor PRIVATE MixerBase) add_test(NAME mixer_multirotor COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/mixer_multirotor.py --test --mixer-multirotor-binary $ diff --git a/src/lib/mixer/MultirotorMixer/MultirotorMixer.hpp b/src/lib/mixer/MultirotorMixer/MultirotorMixer.hpp index c7dd95bcef..456e863244 100644 --- a/src/lib/mixer/MultirotorMixer/MultirotorMixer.hpp +++ b/src/lib/mixer/MultirotorMixer/MultirotorMixer.hpp @@ -33,7 +33,7 @@ #pragma once -#include +#include /** * Supported multirotor geometries. diff --git a/src/lib/mixer/NullMixer/CMakeLists.txt b/src/lib/mixer/NullMixer/CMakeLists.txt index 31ef0205c7..6b2eeb3bbd 100644 --- a/src/lib/mixer/NullMixer/CMakeLists.txt +++ b/src/lib/mixer/NullMixer/CMakeLists.txt @@ -35,5 +35,5 @@ add_library(NullMixer NullMixer.cpp NullMixer.hpp ) -target_link_libraries(NullMixer PRIVATE Mixer) +target_link_libraries(NullMixer PRIVATE MixerBase) add_dependencies(NullMixer prebuild_targets) diff --git a/src/lib/mixer/NullMixer/NullMixer.hpp b/src/lib/mixer/NullMixer/NullMixer.hpp index 132bc7ec03..4f098298b3 100644 --- a/src/lib/mixer/NullMixer/NullMixer.hpp +++ b/src/lib/mixer/NullMixer/NullMixer.hpp @@ -33,7 +33,7 @@ #pragma once -#include +#include /** * Null mixer; returns zero. diff --git a/src/lib/mixer/SimpleMixer/CMakeLists.txt b/src/lib/mixer/SimpleMixer/CMakeLists.txt index 77677bd1cf..ef01747d26 100644 --- a/src/lib/mixer/SimpleMixer/CMakeLists.txt +++ b/src/lib/mixer/SimpleMixer/CMakeLists.txt @@ -35,5 +35,5 @@ add_library(SimpleMixer SimpleMixer.cpp SimpleMixer.hpp ) -target_link_libraries(SimpleMixer PRIVATE Mixer) +target_link_libraries(SimpleMixer PRIVATE MixerBase) add_dependencies(SimpleMixer prebuild_targets) diff --git a/src/lib/mixer/SimpleMixer/SimpleMixer.hpp b/src/lib/mixer/SimpleMixer/SimpleMixer.hpp index 7bae2da6d4..40b5622ccc 100644 --- a/src/lib/mixer/SimpleMixer/SimpleMixer.hpp +++ b/src/lib/mixer/SimpleMixer/SimpleMixer.hpp @@ -33,7 +33,7 @@ #pragma once -#include +#include /** simple channel scaler */ struct mixer_scaler_s { diff --git a/src/modules/mc_att_control/mc_att_control.hpp b/src/modules/mc_att_control/mc_att_control.hpp index 7a2f56d323..514a84c6ae 100644 --- a/src/modules/mc_att_control/mc_att_control.hpp +++ b/src/modules/mc_att_control/mc_att_control.hpp @@ -33,7 +33,7 @@ #pragma once -#include // Airmode +#include // Airmode #include #include #include