remove confusing 'SVTOL' abbreviation

PX4 · Jan 15, 2025 · a0bf546 · a0bf546
1 parent 1a68bef
commit a0bf546
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/...init.d-posix/airframes/10043_sihsim_svtol → ...osix/airframes/10043_sihsim_standard_vtol b/...init.d-posix/airframes/10043_sihsim_svtol → ...osix/airframes/10043_sihsim_standard_vtol
@@ -23,7 +23,7 @@
 # inspired by: diff ROMFS/px4fmu_common/init.d/airframes/4001_quad_x ROMFS/px4fmu_common/init.d-posix/airframes/10040_sihsim_quadx
 
 PX4_SIMULATOR=${PX4_SIMULATOR:=sihsim}
-PX4_SIM_MODEL=${PX4_SIM_MODEL:=svtol}
+PX4_SIM_MODEL=${PX4_SIM_MODEL:=standard_vtol}
 
 param set-default SENS_EN_GPSSIM 1
 param set-default SENS_EN_BAROSIM 1

diff --git a/ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt b/ROMFS/px4fmu_common/init.d-posix/airframes/CMakeLists.txt
@@ -109,7 +109,7 @@ px4_add_romfs_files(
 	10040_sihsim_quadx
 	10041_sihsim_airplane
 	10042_sihsim_xvert
-	10043_sihsim_svtol
+	10043_sihsim_standard_vtol
 
 	17001_flightgear_tf-g1
 	17002_flightgear_tf-g2

diff --git a/src/modules/simulation/simulator_sih/CMakeLists.txt b/src/modules/simulation/simulator_sih/CMakeLists.txt
@@ -53,7 +53,7 @@ if(PX4_PLATFORM MATCHES "posix")
 		airplane
 		quadx
 		xvert
-		svtol
+		standard_vtol
 	)
 
 	# find corresponding airframes

diff --git a/src/modules/simulation/simulator_sih/sih.hpp b/src/modules/simulation/simulator_sih/sih.hpp
@@ -220,7 +220,12 @@ class Sih : public ModuleBase<Sih>, public ModuleParams
 
 	float       _u[NUM_ACTUATORS_MAX] {};         // thruster signals
 
+	// MC = Multicopter
+	// FW = Fixed Wing
+	// TS = Tailsitter VTOL
+	// SVTOL = Standard VTOL
 	enum class VehicleType {MC, FW, TS, SVTOL};
+
 	VehicleType _vehicle = VehicleType::MC;
 
 	// aerodynamic segments for the fixedwing
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,7 +53,7 @@ if(PX4_PLATFORM MATCHES "posix") @@
     		airplane
     		quadx
     		xvert
-    		svtol
+    		standard_vtol
     	)
     	# find corresponding airframes
@@ Expand Down @@