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

Mixers: Include mixer_multirotor_normalized.generated.h everywhere

Browse Source
This commit is contained in:
Julien Lecoeur
2017-11-15 09:56:10 +01:00
committed by Beat Küng
parent 2ca00f1a65
commit 26d95ef674
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/pwm_out_rc_in/pwm_out_rc_in.cpp
+1 -1
View File
@@ -47,7 +47,7 @@
#include <drivers/drv_hrt.h> #include <drivers/drv_hrt.h>
#include <drivers/drv_mixer.h> #include <drivers/drv_mixer.h>
#include <lib/mixer/mixer.h> #include <lib/mixer/mixer.h>
#include <lib/mixer/mixer_multirotor.generated.h> #include <lib/mixer/mixer_multirotor_normalized.generated.h>
#include <systemlib/param/param.h> #include <systemlib/param/param.h>
#include <systemlib/pwm_limit/pwm_limit.h> #include <systemlib/pwm_limit/pwm_limit.h>
#include <dev_fs_lib_serial.h> #include <dev_fs_lib_serial.h>
src/drivers/snapdragon_pwm_out/snapdragon_pwm_out.cpp
+1 -1
View File
@@ -49,7 +49,7 @@
#include <drivers/drv_mixer.h> #include <drivers/drv_mixer.h>
#include <lib/mixer/mixer.h> #include <lib/mixer/mixer.h>
#include <lib/mixer/mixer_load.h> #include <lib/mixer/mixer_load.h>
#include <lib/mixer/mixer_multirotor.generated.h> #include <lib/mixer/mixer_multirotor_normalized.generated.h>
#include <systemlib/param/param.h> #include <systemlib/param/param.h>
#include <systemlib/pwm_limit/pwm_limit.h> #include <systemlib/pwm_limit/pwm_limit.h>
#include <dev_fs_lib_pwm.h> #include <dev_fs_lib_pwm.h>
src/lib/mixer/mixer.h
+1 -1
View File
@@ -527,7 +527,7 @@ private:
/** /**
* Supported multirotor geometries. * Supported multirotor geometries.
* *
* Values are generated by the multi_tables script and placed to mixer_multirotor.generated.h * Values are generated by the px_generate_mixers.py script and placed to mixer_multirotor_normalized.generated.h
*/ */
typedef unsigned int MultirotorGeometryUnderlyingType; typedef unsigned int MultirotorGeometryUnderlyingType;
enum class MultirotorGeometry : MultirotorGeometryUnderlyingType; enum class MultirotorGeometry : MultirotorGeometryUnderlyingType;
src/lib/mixer/mixer_multirotor.cpp
+1 -2
View File
@@ -56,10 +56,9 @@
#include "mixer.h" #include "mixer.h"
// This file is generated by the multi_tables script which is invoked during the build process // This file is generated by the px_generate_mixers.py script which is invoked during the build process
// #include "mixer_multirotor.generated.h" // #include "mixer_multirotor.generated.h"
#include "mixer_multirotor_normalized.generated.h" #include "mixer_multirotor_normalized.generated.h"
// #include "mixer_multirotor_legacy.generated.h"
#define debug(fmt, args...) do { } while(0) #define debug(fmt, args...) do { } while(0)
//#define debug(fmt, args...) do { printf("[mixer] " fmt "\n", ##args); } while(0) //#define debug(fmt, args...) do { printf("[mixer] " fmt "\n", ##args); } while(0)
src/platforms/qurt/fc_addon/uart_esc/uart_esc_main.cpp
+1 -1
View File
@@ -47,7 +47,7 @@
#include <drivers/drv_hrt.h> #include <drivers/drv_hrt.h>
#include <drivers/drv_mixer.h> #include <drivers/drv_mixer.h>
#include <lib/mixer/mixer.h> #include <lib/mixer/mixer.h>
#include <lib/mixer/mixer_multirotor.generated.h> #include <lib/mixer/mixer_multirotor_normalized.generated.h>
#include <systemlib/param/param.h> #include <systemlib/param/param.h>
#ifdef __cplusplus #ifdef __cplusplus