rename Mixer to MixerBase to resolve case-insensitivity on mac

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)

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)

src/lib/mixer/HelicopterMixer/HelicopterMixer.hpp

@@ -33,7 +33,7 @@
 
 #pragma once
 
-#include <mixer/Mixer/Mixer.hpp>
+#include <mixer/MixerBase/Mixer.hpp>
 
 /** helicopter swash servo mixer */
 struct mixer_heli_servo_s {

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)

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

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 $<TARGET_FILE:test_mixer_multirotor>

src/lib/mixer/MultirotorMixer/MultirotorMixer.hpp

@@ -33,7 +33,7 @@
 
 #pragma once
 
-#include <mixer/Mixer/Mixer.hpp>
+#include <mixer/MixerBase/Mixer.hpp>
 
 /**
  * Supported multirotor geometries.

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)

src/lib/mixer/NullMixer/NullMixer.hpp

@@ -33,7 +33,7 @@
 
 #pragma once
 
-#include <mixer/Mixer/Mixer.hpp>
+#include <mixer/MixerBase/Mixer.hpp>
 
 /**
  * Null mixer; returns zero.

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)

src/lib/mixer/SimpleMixer/SimpleMixer.hpp

@@ -33,7 +33,7 @@
 
 #pragma once
 
-#include <mixer/Mixer/Mixer.hpp>
+#include <mixer/MixerBase/Mixer.hpp>
 
 /** simple channel scaler */
 struct mixer_scaler_s {

src/modules/mc_att_control/mc_att_control.hpp

@@ -33,7 +33,7 @@
 
 #pragma once
 
-#include <lib/mixer/Mixer/Mixer.hpp> // Airmode
+#include <lib/mixer/MixerBase/Mixer.hpp> // Airmode
 #include <matrix/matrix/math.hpp>
 #include <perf/perf_counter.h>
 #include <px4_platform_common/px4_config.h>