diff --git a/ROMFS/px4fmu_common/init.d-posix/airframes/1036_malolo b/ROMFS/px4fmu_common/init.d-posix/airframes/1036_malolo new file mode 100644 index 0000000000..7975bf11c4 --- /dev/null +++ b/ROMFS/px4fmu_common/init.d-posix/airframes/1036_malolo @@ -0,0 +1,56 @@ +#!/bin/sh +# +# @name Plane SITL +# + +. ${R}etc/init.d/rc.fw_defaults + +if [ $AUTOCNF = yes ] +then + param set EKF2_ARSP_THR 8 + param set EKF2_FUSE_BETA 1 + #param set EKF2_MAG_ACCLIM 0 + #param set EKF2_MAG_YAWLIM 0 + + param set FW_LND_AIRSPD_SC 1.1 + param set FW_LND_ANG 5 + param set FW_THR_LND_MAX 0 + param set FW_LND_HHDIST 30 + param set FW_LND_FL_PMIN 9.5 + param set FW_LND_FL_PMAX 20 + param set FW_LND_FLALT 5 + param set FW_LND_TLALT 15 + + param set FW_L1_PERIOD 25 + + param set FW_P_TC 0.4 + param set FW_PR_FF 0.40 + param set FW_PR_I 0.05 + param set FW_PR_P 0.05 + + param set FW_R_TC 0.45 + param set FW_RR_FF 0.40 + param set FW_RR_I 0.132 + param set FW_RR_P 0.085 + + param set FW_W_EN 1 + + param set MIS_LTRMIN_ALT 30 + param set MIS_TAKEOFF_ALT 20 + param set MIS_DIST_1WP 2500 + param set MIS_DIST_WPS 10000 + + param set NAV_ACC_RAD 15 + param set NAV_DLL_ACT 2 + param set NAV_LOITER_RAD 50 + + param set RWTO_TKOFF 1 + param set RWTO_MAX_PITCH 20 + param set RWTO_MAX_ROLL 10 + param set RWTO_PSP 8 + param set RWTO_AIRSPD_SCL 1.8 + +fi + +set MIXER_FILE etc/mixers-sitl/plane_sitl.main.mix +set MIXER custom diff --git a/ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt b/ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt index 8c8fb145e5..66519029f7 100644 --- a/ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt +++ b/ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt @@ -58,6 +58,7 @@ px4_add_romfs_files( 1033_rascal 1034_rascal-electric 1035_techpod + 1036_malolo 1040_standard_vtol 1041_tailsitter 1042_tiltrotor diff --git a/Tools/jsbsim_bridge b/Tools/jsbsim_bridge index 7df4fd965e..9f46d55291 160000 --- a/Tools/jsbsim_bridge +++ b/Tools/jsbsim_bridge @@ -1 +1 @@ -Subproject commit 7df4fd965e9f20b41f6aeff6ead21e8066de7440 +Subproject commit 9f46d5529158096e955a7950dc6ac55d0cdb1710 diff --git a/Tools/setup_jsbsim.bash b/Tools/setup_jsbsim.bash index 6e437fd868..be499ce7a8 100755 --- a/Tools/setup_jsbsim.bash +++ b/Tools/setup_jsbsim.bash @@ -21,6 +21,9 @@ case "$MODEL" in rascal) MODEL_NAME="Rascal110-JSBSim" ;; + malolo) + MODEL_NAME="Malolo1" + ;; quadrotor_x) MODEL_NAME="quadrotor_x" ;; diff --git a/platforms/posix/cmake/sitl_target.cmake b/platforms/posix/cmake/sitl_target.cmake index f63ce7aff3..bdaf19c781 100644 --- a/platforms/posix/cmake/sitl_target.cmake +++ b/platforms/posix/cmake/sitl_target.cmake @@ -177,7 +177,7 @@ foreach(viewer ${viewers}) endforeach() # create targets for jsbsim -set(models_jsbsim none rascal quadrotor_x hexarotor_x) +set(models_jsbsim none rascal quadrotor_x hexarotor_x malolo) set(worlds_jsbsim none LSZH) foreach(debugger ${debuggers}) foreach(model ${models_jsbsim})