fix(tools): YAML generation leaking build options between targets (#7638)
Co-authored-by: philmoz <phil.a.mitchell@gmail.com> Co-authored-by: Peter Feerick <5500713+pfeerick@users.noreply.github.com>
This commit is contained in:
co-authored by
philmoz
Peter Feerick
parent
fcdf92d35b
commit
5c64f0a9db
@@ -455,7 +455,7 @@ static const struct YamlNode struct_RadioData[] = {
|
||||
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
|
||||
YAML_UNSIGNED( "rotEncMode", 3 ),
|
||||
YAML_PADDING( 2 ),
|
||||
YAML_UNSIGNED( "stickDeadZone", 3 ),
|
||||
YAML_PADDING( 3 ),
|
||||
YAML_SIGNED( "imuMax", 8 ),
|
||||
YAML_SIGNED( "imuOffset", 8 ),
|
||||
YAML_UNSIGNED( "imuInvert", 8 ),
|
||||
|
||||
@@ -455,7 +455,7 @@ static const struct YamlNode struct_RadioData[] = {
|
||||
YAML_CUSTOM("rotEncDirection",r_rotEncDirection,nullptr),
|
||||
YAML_UNSIGNED( "rotEncMode", 3 ),
|
||||
YAML_PADDING( 2 ),
|
||||
YAML_UNSIGNED( "stickDeadZone", 3 ),
|
||||
YAML_PADDING( 3 ),
|
||||
YAML_SIGNED( "imuMax", 8 ),
|
||||
YAML_SIGNED( "imuOffset", 8 ),
|
||||
YAML_UNSIGNED( "imuInvert", 8 ),
|
||||
|
||||
@@ -7,6 +7,7 @@ option(GHOST "Ghost TX Module" ON)
|
||||
option(MODULE_SIZE_STD "Standard size TX Module" ON)
|
||||
option(LUA_MIXER "Enable LUA mixer/model scripts support" ON)
|
||||
option(DISK_CACHE "Enable SD card disk cache" ON)
|
||||
option(STICK_DEAD_ZONE "Enable sticks dead zone" OFF)
|
||||
|
||||
set(FIRMWARE_QSPI YES)
|
||||
set(FIRMWARE_FORMAT_UF2 YES)
|
||||
@@ -28,8 +29,6 @@ set(ROTARY_ENCODER YES)
|
||||
set(FUNCTION_SWITCHES_WITH_RGB YES)
|
||||
add_definitions(-DRGB_LEDS_900NS)
|
||||
|
||||
#option(STICKS_DEAD_ZONE "Enable sticks dead zone" YES)
|
||||
|
||||
# IMU support
|
||||
set(IMU ON)
|
||||
|
||||
@@ -78,7 +77,7 @@ add_definitions(-DRTCLOCK)
|
||||
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
|
||||
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
|
||||
|
||||
if(STICKS_DEAD_ZONE)
|
||||
if(STICK_DEAD_ZONE)
|
||||
add_definitions(-DSTICK_DEAD_ZONE)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@ option(BLUETOOTH "FrSky BT module support" OFF)
|
||||
option(FLYSKY_GIMBAL "Serial gimbal support" OFF)
|
||||
option(KCX_BTAUDIO "KCX_BTAUDIO audio emitter installed" OFF)
|
||||
option(INTERNAL_GPS "Support for internal GPS" ON)
|
||||
option(STICK_DEAD_ZONE "Enable sticks dead zone" OFF)
|
||||
|
||||
set(FIRMWARE_QSPI YES)
|
||||
set(FIRMWARE_FORMAT_UF2 YES)
|
||||
@@ -41,8 +42,6 @@ elseif(KCX_BTAUDIO)
|
||||
set(FLYSKY_GIMBAL OFF)
|
||||
endif()
|
||||
|
||||
#option(STICK_DEAD_ZONE "Enable sticks dead zone" YES)
|
||||
|
||||
# IMU support
|
||||
set(IMU ON)
|
||||
add_definitions(-DIMU_ICM4207C)
|
||||
|
||||
@@ -10,6 +10,7 @@ option(DISK_CACHE "Enable SD card disk cache" ON)
|
||||
option(BLUETOOTH "FrSky BT module support" OFF)
|
||||
option(INTERNAL_GPS "Support for internal GPS" ON)
|
||||
option(KCX_BTAUDIO "KCX_BTAUDIO audio emitter installed" OFF)
|
||||
option(STICK_DEAD_ZONE "Enable sticks dead zone" OFF)
|
||||
|
||||
set(FIRMWARE_QSPI YES)
|
||||
set(FIRMWARE_FORMAT_UF2 YES)
|
||||
@@ -43,8 +44,6 @@ else()
|
||||
set(AUX2_SERIAL ON)
|
||||
endif()
|
||||
|
||||
#option(STICKS_DEAD_ZONE "Enable sticks dead zone" YES)
|
||||
|
||||
# IMU support
|
||||
set(IMU ON)
|
||||
add_definitions(-DIMU_ICM4207C)
|
||||
@@ -99,7 +98,7 @@ add_definitions(-DAUDIO -DVOICE -DRTCLOCK)
|
||||
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
|
||||
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
|
||||
|
||||
if(STICKS_DEAD_ZONE)
|
||||
if(STICK_DEAD_ZONE)
|
||||
add_definitions(-DSTICK_DEAD_ZONE)
|
||||
endif()
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@ option(GHOST "Ghost TX Module" ON)
|
||||
option(MODULE_SIZE_STD "Standard size TX Module" ON)
|
||||
option(LUA_MIXER "Enable LUA mixer/model scripts support" ON)
|
||||
option(DISK_CACHE "Enable SD card disk cache" ON)
|
||||
option(STICK_DEAD_ZONE "Enable sticks dead zone" OFF)
|
||||
|
||||
set(FIRMWARE_QSPI YES)
|
||||
set(FIRMWARE_FORMAT_UF2 YES)
|
||||
@@ -28,8 +29,6 @@ set(INTERNAL_EXTERNAL_ANT YES)
|
||||
set(ROTARY_ENCODER YES)
|
||||
set(FUNCTION_SWITCHES_WITH_RGB YES)
|
||||
|
||||
#option(STICKS_DEAD_ZONE "Enable sticks dead zone" YES)
|
||||
|
||||
# IMU is not populated on production V12/V12p units.
|
||||
set(IMU OFF)
|
||||
|
||||
@@ -88,7 +87,7 @@ add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
|
||||
add_definitions(-DPWR_BUTTON_DUAL)
|
||||
add_definitions(-DI2C_HAS_BUS_4)
|
||||
|
||||
if(STICKS_DEAD_ZONE)
|
||||
if(STICK_DEAD_ZONE)
|
||||
add_definitions(-DSTICK_DEAD_ZONE)
|
||||
endif()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user