Skip to content

Commit 88bd39f

Browse files
pfeerickpfeerick
authored
chore(build): cleanup INTERNAL_GPS / INTERNAL_GPS_BAUDRATE options (#6260)
1 parent c03893f commit 88bd39f

File tree

4 files changed

+23
-25
lines changed

4 files changed

+23
-25
lines changed

‎radio/src/targets/horus/CMakeLists.txt

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ if (PCB STREQUAL X10)
6565
set(FUNCTION_SWITCHES ON)
6666
set(DEFAULT_INTERNAL_MODULE CROSSFIRE CACHE STRING "Default internal module")
6767
option(BLUETOOTH "Support for bluetooth module" OFF)
68-
option(INTERNAL_GPS "Support for internal NMEA GPS" OFF)
6968
if (BLUETOOTH)
7069
set(AUX_SERIAL OFF)
7170
else()
@@ -82,12 +81,10 @@ if (PCB STREQUAL X10)
8281
add_definitions(-DRADIO_FAMILY_T16)
8382
set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module")
8483
option(BLUETOOTH "Support for bluetooth module" OFF)
85-
option(INTERNAL_GPS "Support for internal GPS" ON)
8684
add_definitions(-DMANUFACTURER_JUMPER)
8785
if (NOT BLUETOOTH)
8886
set(AUX2_SERIAL ON)
8987
endif()
90-
set(INTERNAL_GPS_BAUDRATE "9600" CACHE STRING "Baud rate for internal GPS")
9188
set(FLYSKY_GIMBAL ON)
9289
elseif (PCBREV STREQUAL TX16S)
9390
set(FLAVOUR tx16s)
@@ -99,14 +96,12 @@ if (PCB STREQUAL X10)
9996

10097
set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module")
10198
option(BLUETOOTH "Support for bluetooth module" OFF)
102-
option(INTERNAL_GPS "Support for internal GPS" ON)
10399
set(SWSERIALPOWER YES)
104100
set(USB_CHARGER YES)
105101
add_definitions(-DMANUFACTURER_RADIOMASTER)
106102
if (NOT BLUETOOTH)
107103
set(AUX2_SERIAL ON)
108104
endif()
109-
set(INTERNAL_GPS_BAUDRATE "9600" CACHE STRING "Baud rate for internal GPS")
110105
set(FLYSKY_GIMBAL ON)
111106
set(FLEXSW "2" CACHE STRING "Max flex inputs usable as switches")
112107
elseif (PCBREV STREQUAL F16)
@@ -115,9 +110,7 @@ if (PCB STREQUAL X10)
115110
add_definitions(-DRADIO_FAMILY_T16)
116111
set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module")
117112
option(BLUETOOTH "Support for bluetooth module" OFF)
118-
option(INTERNAL_GPS "Support for internal NMEA GPS" OFF)
119113
add_definitions(-DMANUFACTURER_FATFISH)
120-
set(INTERNAL_GPS_BAUDRATE "9600" CACHE STRING "Baud rate for internal GPS")
121114
set(FLEXSW "2" CACHE STRING "Max flex inputs usable as switches")
122115
set(VIDEO_SWITCH ON)
123116
elseif (PCBREV STREQUAL V16)
@@ -126,10 +119,8 @@ if (PCB STREQUAL X10)
126119
add_definitions(-DRADIO_FAMILY_T16)
127120
set(DEFAULT_INTERNAL_MODULE CROSSFIRE CACHE STRING "Default internal module")
128121
option(BLUETOOTH "Support for bluetooth module" OFF)
129-
option(INTERNAL_GPS "Support for internal NMEA GPS" OFF)
130122
set(SWSERIALPOWER YES)
131123
add_definitions(-DMANUFACTURER_HELLORADIOSKY)
132-
set(INTERNAL_GPS_BAUDRATE "9600" CACHE STRING "Baud rate for internal GPS")
133124
set(FLEXSW "2" CACHE STRING "Max flex inputs usable as switches")
134125
set(AUX2_SERIAL OFF)
135126
set(CSD203_SENSOR ON)
@@ -143,12 +134,10 @@ if (PCB STREQUAL X10)
143134
add_definitions(-DRADIO_FAMILY_T16)
144135
set(DEFAULT_INTERNAL_MODULE MULTIMODULE CACHE STRING "Default internal module")
145136
option(BLUETOOTH "Support for bluetooth module" OFF)
146-
option(INTERNAL_GPS "Support for internal GPS" ON)
147137
add_definitions(-DMANUFACTURER_JUMPER)
148138
if (NOT BLUETOOTH)
149139
set(AUX2_SERIAL ON)
150140
endif()
151-
set(INTERNAL_GPS_BAUDRATE "9600" CACHE STRING "Baud rate for internal GPS")
152141
set(FLYSKY_GIMBAL ON)
153142
else()
154143
set(FLAVOUR x10)
@@ -161,22 +150,19 @@ elseif (PCB STREQUAL X12S)
161150
set(FLAVOUR x12s)
162151
set(BLUETOOTH ON)
163152
set(PCBREV "13" CACHE STRING "PCB Revision")
164-
if(${PCBREV} GREATER 10)
165-
option(INTERNAL_GPS "Internal GPS installed" YES)
166-
else()
167-
option(INTERNAL_GPS "Internal GPS installed" NO)
168-
if(NOT INTERNAL_GPS)
169-
message("Horus: Internal GPS is optional, use INTERNAL_GPS=YES option to enable it")
170-
endif()
171-
endif()
172-
set(INTERNAL_GPS_BAUDRATE "9600" CACHE STRING "Baud rate for internal GPS")
173153
set(AUX2_SERIAL ON) # wire to GPS
174154
set(USE_VS1053B ON)
175155
set(USE_ADS79xx ON)
176156
set(FONTS_TARGET x12s_fonts)
177157
add_definitions(-DMANUFACTURER_FRSKY)
178158
endif()
179159

160+
# enable GPS support if there is AUX port available unless otherwise disabled
161+
if(AUX_SERIAL)
162+
option(INTERNAL_GPS "Support for internal GPS" ON)
163+
set(INTERNAL_GPS_BAUDRATE "9600" CACHE STRING "Baud rate for internal GPS")
164+
endif()
165+
180166
if (BITMAPS_DIR STREQUAL 320x240)
181167
set(BITMAPS_TARGET bm320_bitmaps)
182168
elseif (BITMAPS_DIR STREQUAL 800x480)
@@ -196,7 +182,6 @@ set(RADIO_DEPENDENCIES
196182

197183
add_definitions(-DPCBHORUS -DSTM32F429_439xx -DSTM32F429xx -DSDRAM -DCOLORLCD -DHARDWARE_KEYS)
198184
add_definitions(-DAUDIO -DVOICE -DRTCLOCK)
199-
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
200185
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
201186
add_definitions(-DSTM32_SUPPORT_32BIT_TIMERS)
202187

@@ -205,8 +190,12 @@ add_definitions(-DTHREADSAFE_MALLOC)
205190

206191
set(SDRAM ON)
207192

193+
if(INTERNAL_GPS)
194+
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
195+
endif()
196+
208197
if(FUNCTION_SWITCHES)
209-
add_definitions(-DFUNCTION_SWITCHES)
198+
add_definitions(-DFUNCTION_SWITCHES)
210199
endif()
211200

212201
if(NOT UNEXPECTED_SHUTDOWN)

‎radio/src/targets/nv14/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,12 @@ add_definitions(
7070
set(SDRAM ON)
7171

7272
add_definitions(-DAUDIO -DVOICE -DRTCLOCK)
73-
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
7473
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
7574

75+
if(INTERNAL_GPS)
76+
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
77+
endif()
78+
7679
if(STICKS_DEAD_ZONE)
7780
add_definitions(-DSTICK_DEAD_ZONE)
7881
endif()

‎radio/src/targets/pl18/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,14 @@ add_definitions(
114114
set(SDRAM ON)
115115

116116
add_definitions(-DAUDIO -DVOICE)
117-
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
118117
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
119118
add_definitions(-DCROSSFIRE_NATIVE)
120119
add_definitions(-DHARDWARE_EXTERNAL_MODULE)
121120

121+
if(INTERNAL_GPS)
122+
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
123+
endif()
124+
122125
if(USE_RTC_CLOCK)
123126
message("-- RTC Clock enabled")
124127
add_definitions(-DRTCLOCK)

‎radio/src/targets/st16/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,12 @@ add_definitions(
7676
set(SDRAM ON)
7777

7878
add_definitions(-DAUDIO -DVOICE -DRTCLOCK)
79-
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
8079
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
8180

81+
if(INTERNAL_GPS)
82+
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
83+
endif()
84+
8285
if(STICKS_DEAD_ZONE)
8386
add_definitions(-DSTICK_DEAD_ZONE)
8487
endif()

0 commit comments

Comments
 (0)