From 0fae78c028789ce713b99ff778127514b3fd4cb1 Mon Sep 17 00:00:00 2001
From: Christophe De Wagter <dewagter@gmail.com>
Date: Fri, 22 Dec 2023 10:36:40 +0100
Subject: [PATCH] Fix all compile warnings confs (on 20.04) (#3227)

* JP aircraft removed from ENAC

* Silent compile warnings GVF

* silent warning: periodic freq must be dividable by telemetry freq

* NPS_COMMANDS_NB

* gzip -f since compiling make small targets in a row can have the same file name if compiling is too fast.
---
 conf/airframes/AGGIEAIR/aggieair_iris_indi.xml        |  2 +-
 conf/airframes/FLIXR/flixr_lisa_mx.xml                |  1 +
 conf/conf_tests_coverity.xml                          | 11 -----------
 .../gvf_parametric/gvf_parametric_low_level_control.c | 10 ++++++++--
 sw/lib/ocaml/ocaml_tools.ml                           |  2 +-
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/conf/airframes/AGGIEAIR/aggieair_iris_indi.xml b/conf/airframes/AGGIEAIR/aggieair_iris_indi.xml
index a067bbf247..d2fd580306 100644
--- a/conf/airframes/AGGIEAIR/aggieair_iris_indi.xml
+++ b/conf/airframes/AGGIEAIR/aggieair_iris_indi.xml
@@ -14,7 +14,7 @@
     <!-- Main autopilot MCU -->
     <target name="ap" board="px4fmu_2.4">
       <configure name="PERIODIC_FREQUENCY" value="200"/>
-      <configure name="TELEMETRY_FREQUENCY" value="60"/>
+      <configure name="TELEMETRY_FREQUENCY" value="50"/>
 
       <comment>
         amount of time it take for the bat to check
diff --git a/conf/airframes/FLIXR/flixr_lisa_mx.xml b/conf/airframes/FLIXR/flixr_lisa_mx.xml
index 711f295f81..42834406fa 100644
--- a/conf/airframes/FLIXR/flixr_lisa_mx.xml
+++ b/conf/airframes/FLIXR/flixr_lisa_mx.xml
@@ -222,6 +222,7 @@
   <section name="SIMULATOR" prefix="NPS_">
     <define name="ACTUATOR_NAMES"  value="nw_motor, ne_motor, se_motor, sw_motor" type="string[]"/>
     <define name="JSBSIM_MODEL" value="simple_x_quad_ccw" type="string"/>
+    <define name="COMMANDS_NB" value="4"/>
     <!-- mode switch on joystick channel 5 (axis numbering starting at zero) -->
     <define name="JS_AXIS_MODE" value="4"/>
   </section>
diff --git a/conf/conf_tests_coverity.xml b/conf/conf_tests_coverity.xml
index 03f4fba17e..3288c65f8d 100644
--- a/conf/conf_tests_coverity.xml
+++ b/conf/conf_tests_coverity.xml
@@ -32,17 +32,6 @@
    settings_modules="modules/ahrs_float_dcm.xml modules/air_data.xml modules/digital_cam.xml modules/electrical.xml modules/gps.xml modules/gps_ublox.xml modules/gps_ubx_ucenter.xml modules/guidance_basic_fw.xml modules/imu_common.xml modules/light.xml modules/nav_basic_fw.xml modules/nav_catapult.xml modules/stabilization_attitude_fw.xml"
    gui_color="blue"
   />
-  <aircraft
-   name="JP"
-   ac_id="6"
-   airframe="airframes/ENAC/fixed-wing/jp.xml"
-   radio="radios/cockpitSX.xml"
-   telemetry="telemetry/default_fixedwing_imu.xml"
-   flight_plan="flight_plans/basic.xml"
-   settings="settings/fixedwing_basic.xml"
-   settings_modules="modules/ahrs_float_dcm.xml modules/airspeed_adc.xml modules/electrical.xml modules/gps.xml modules/gps_ublox.xml modules/gps_ubx_ucenter.xml modules/guidance_full_pid_fw.xml modules/imu_common.xml modules/ins_float_invariant.xml modules/nav_basic_fw.xml modules/power_switch.xml modules/stabilization_adaptive_fw.xml"
-   gui_color="#ffff7d7d0000"
-  />
   <aircraft
    name="LadyLisa"
    ac_id="7"
diff --git a/sw/airborne/modules/guidance/gvf_parametric/gvf_parametric_low_level_control.c b/sw/airborne/modules/guidance/gvf_parametric/gvf_parametric_low_level_control.c
index fb6bd270c6..a94e23e94f 100644
--- a/sw/airborne/modules/guidance/gvf_parametric/gvf_parametric_low_level_control.c
+++ b/sw/airborne/modules/guidance/gvf_parametric/gvf_parametric_low_level_control.c
@@ -33,7 +33,13 @@
 #include "firmwares/fixedwing/guidance/guidance_v_n.h"   // gvf_parametric is only compatible with the new pprz controller!
 #endif
 
-void gvf_parametric_low_level_control_2D(float heading_rate)
+#if defined(FIXEDWING_FIRMWARE)
+#define USED_IN_FIXEDWING_ONLY
+#else
+#define USED_IN_FIXEDWING_ONLY UNUSED
+#endif
+
+void gvf_parametric_low_level_control_2D(float heading_rate USED_IN_FIXEDWING_ONLY )
 {
 #if defined(FIXEDWING_FIRMWARE)
   if (autopilot_get_mode() == AP_MODE_AUTO2) {
@@ -54,7 +60,7 @@ void gvf_parametric_low_level_control_2D(float heading_rate)
 #endif
 }
 
-void gvf_parametric_low_level_control_3D(float heading_rate, float climbing_rate)
+void gvf_parametric_low_level_control_3D(float heading_rate USED_IN_FIXEDWING_ONLY, float climbing_rate USED_IN_FIXEDWING_ONLY)
 {
 #if defined(FIXEDWING_FIRMWARE)
   if (autopilot_get_mode() == AP_MODE_AUTO2) {
diff --git a/sw/lib/ocaml/ocaml_tools.ml b/sw/lib/ocaml/ocaml_tools.ml
index 71c69c11b2..e7d90b60da 100644
--- a/sw/lib/ocaml/ocaml_tools.ml
+++ b/sw/lib/ocaml/ocaml_tools.ml
@@ -33,7 +33,7 @@ let open_compress file =
   else open_in file
 
 let compress file =
-  assert (Sys.command ("gzip "^file) = 0)
+  assert (Sys.command ("gzip -f "^file) = 0)
 
 
 let extensions = ["";".gz";".Z";".bz2";".zip";".ZIP"]