Fix MacOS SITL and F722

iNavFlight · Nov 8, 2024 · 58d2efd · 58d2efd
1 parent 7d540a8
commit 58d2efd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/cmake/sitl.cmake b/cmake/sitl.cmake
@@ -62,6 +62,7 @@ if(NOT MACOSX)
     set(SITL_COMPILE_OPTIONS ${SITL_COMPILE_OPTIONS}
         -Wno-return-local-addr
         -Wno-error=maybe-uninitialized
+        -Wno-double-promotion
         -fsingle-precision-constant
     )
     if (CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 12.0)

diff --git a/src/main/navigation/navigation.h b/src/main/navigation/navigation.h
@@ -118,8 +118,6 @@ void resetFwAutolandApproach(int8_t idx);
 
 #if defined(USE_GEOZONE)
 
-#define MAX_GEOZONES_IN_CONFIG 63
-#define MAX_VERTICES_IN_CONFIG 126
 
 typedef enum {
     GEOZONE_MESSAGE_STATE_NONE,

diff --git a/src/main/navigation/navigation_geozone.c b/src/main/navigation/navigation_geozone.c
@@ -551,7 +551,7 @@ uint32_t geozoneGetDetectionDistance(void)
 
 static int32_t calcBounceCourseForZone(geoZoneRuntimeConfig_t *zone, fpVector3_t *prevPoint, fpVector3_t *intersection)
 {
-    int32_t course;
+    int32_t course = 0;
     if (zone->config.shape == GEOZONE_SHAPE_POLYGON)     {
         fpVector2_t intersect;
         bool found = false;
@@ -1517,7 +1517,7 @@ void geozoneResetRTH(void)
     rthWaypointCount = 0;
 }
 
-void geozoneSetupRTH() {
+void geozoneSetupRTH(void) {
     if (!geozone.insideFz && isAtLeastOneInclusiveZoneActive) {
         noZoneRTH = true;
     } else {

diff --git a/src/main/target/common.h b/src/main/target/common.h
@@ -209,6 +209,8 @@
 #define USE_34CHANNELS
 #define MAX_MIXER_PROFILE_COUNT 2
 #define USE_SMARTPORT_MASTER
+#define MAX_GEOZONES_IN_CONFIG 63
+#define MAX_VERTICES_IN_CONFIG 126
 #elif !defined(STM32F7)
 #define MAX_MIXER_PROFILE_COUNT 1
 #endif
@@ -217,6 +219,8 @@
     #define SKIP_CLI_COMMAND_HELP
     #undef USE_SERIALRX_SPEKTRUM
     #undef USE_TELEMETRY_SRXL
+    #define MAX_GEOZONES_IN_CONFIG 32
+    #define MAX_VERTICES_IN_CONFIG 64
 #endif
 
 #define USE_EZ_TUNE