mirror of
https://github.com/paparazzi/paparazzi.git
synced 2026-03-23 15:34:18 +08:00
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.
This commit is contained in:
@@ -14,7 +14,7 @@
|
|||||||
<!-- Main autopilot MCU -->
|
<!-- Main autopilot MCU -->
|
||||||
<target name="ap" board="px4fmu_2.4">
|
<target name="ap" board="px4fmu_2.4">
|
||||||
<configure name="PERIODIC_FREQUENCY" value="200"/>
|
<configure name="PERIODIC_FREQUENCY" value="200"/>
|
||||||
<configure name="TELEMETRY_FREQUENCY" value="60"/>
|
<configure name="TELEMETRY_FREQUENCY" value="50"/>
|
||||||
|
|
||||||
<comment>
|
<comment>
|
||||||
amount of time it take for the bat to check
|
amount of time it take for the bat to check
|
||||||
|
|||||||
@@ -222,6 +222,7 @@
|
|||||||
<section name="SIMULATOR" prefix="NPS_">
|
<section name="SIMULATOR" prefix="NPS_">
|
||||||
<define name="ACTUATOR_NAMES" value="nw_motor, ne_motor, se_motor, sw_motor" type="string[]"/>
|
<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="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) -->
|
<!-- mode switch on joystick channel 5 (axis numbering starting at zero) -->
|
||||||
<define name="JS_AXIS_MODE" value="4"/>
|
<define name="JS_AXIS_MODE" value="4"/>
|
||||||
</section>
|
</section>
|
||||||
|
|||||||
@@ -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"
|
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"
|
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
|
<aircraft
|
||||||
name="LadyLisa"
|
name="LadyLisa"
|
||||||
ac_id="7"
|
ac_id="7"
|
||||||
|
|||||||
@@ -33,7 +33,13 @@
|
|||||||
#include "firmwares/fixedwing/guidance/guidance_v_n.h" // gvf_parametric is only compatible with the new pprz controller!
|
#include "firmwares/fixedwing/guidance/guidance_v_n.h" // gvf_parametric is only compatible with the new pprz controller!
|
||||||
#endif
|
#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 defined(FIXEDWING_FIRMWARE)
|
||||||
if (autopilot_get_mode() == AP_MODE_AUTO2) {
|
if (autopilot_get_mode() == AP_MODE_AUTO2) {
|
||||||
@@ -54,7 +60,7 @@ void gvf_parametric_low_level_control_2D(float heading_rate)
|
|||||||
#endif
|
#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 defined(FIXEDWING_FIRMWARE)
|
||||||
if (autopilot_get_mode() == AP_MODE_AUTO2) {
|
if (autopilot_get_mode() == AP_MODE_AUTO2) {
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ let open_compress file =
|
|||||||
else open_in file
|
else open_in file
|
||||||
|
|
||||||
let compress file =
|
let compress file =
|
||||||
assert (Sys.command ("gzip "^file) = 0)
|
assert (Sys.command ("gzip -f "^file) = 0)
|
||||||
|
|
||||||
|
|
||||||
let extensions = ["";".gz";".Z";".bz2";".zip";".ZIP"]
|
let extensions = ["";".gz";".Z";".bz2";".zip";".ZIP"]
|
||||||
|
|||||||
Reference in New Issue
Block a user