refactor(sih): some suggestions from trying to review

Honestly I don't understand why there needs to be another reference. I'll need to continue reviewing later since it's not trivial.

Tools/ci/package_build_artifacts.sh

@@ -6,32 +6,42 @@ cp **/**/*.elf artifacts/ 2>/dev/null || true
 for build_dir_path in build/*/ ; do
   build_dir_path=${build_dir_path::${#build_dir_path}-1}
   build_dir=${build_dir_path#*/}
-  mkdir artifacts/$build_dir
+  mkdir -p artifacts/$build_dir
   find artifacts/ -maxdepth 1 -type f -name "*$build_dir*"
-  # Airframe
-  cp $build_dir_path/airframes.xml artifacts/$build_dir/
+  # Airframe (NuttX: build root, SITL: docs/ subdirectory)
+  airframes_src=""
+  if [ -f "$build_dir_path/airframes.xml" ]; then
+    airframes_src="$build_dir_path/airframes.xml"
+  elif [ -f "$build_dir_path/docs/airframes.xml" ]; then
+    airframes_src="$build_dir_path/docs/airframes.xml"
+  fi
+  if [ -n "$airframes_src" ]; then
+    cp "$airframes_src" "artifacts/$build_dir/"
+  fi
   # Parameters
-  cp $build_dir_path/parameters.xml artifacts/$build_dir/
-  cp $build_dir_path/parameters.json artifacts/$build_dir/
-  cp $build_dir_path/parameters.json.xz artifacts/$build_dir/
+  cp $build_dir_path/parameters.xml artifacts/$build_dir/ 2>/dev/null || true
+  cp $build_dir_path/parameters.json artifacts/$build_dir/ 2>/dev/null || true
+  cp $build_dir_path/parameters.json.xz artifacts/$build_dir/ 2>/dev/null || true
   # Actuators
-  cp $build_dir_path/actuators.json artifacts/$build_dir/
-  cp $build_dir_path/actuators.json.xz artifacts/$build_dir/
+  cp $build_dir_path/actuators.json artifacts/$build_dir/ 2>/dev/null || true
+  cp $build_dir_path/actuators.json.xz artifacts/$build_dir/ 2>/dev/null || true
   # Events
-  cp $build_dir_path/events/all_events.json.xz artifacts/$build_dir/
-  # ROS 2 msgs
-  cp $build_dir_path/events/all_events.json.xz artifacts/$build_dir/
-  # Module Docs
+  mkdir -p artifacts/$build_dir/events/
+  cp $build_dir_path/events/all_events.json.xz artifacts/$build_dir/events/ 2>/dev/null || true
   ls -la artifacts/$build_dir
   echo "----------"
 done
 
 if [ -d artifacts/px4_sitl_default ]; then
-  # general metadata
-  mkdir artifacts/_general/
-  cp artifacts/px4_sitl_default/airframes.xml artifacts/_general/
+  # general metadata (used by Flight Review and other downstream consumers)
+  mkdir -p artifacts/_general/
   # Airframe
-  cp artifacts/px4_sitl_default/airframes.xml artifacts/_general/
+  if [ -f artifacts/px4_sitl_default/airframes.xml ]; then
+    cp artifacts/px4_sitl_default/airframes.xml artifacts/_general/
+  else
+    echo "Error: expected 'artifacts/px4_sitl_default/airframes.xml' not found." >&2
+    exit 1
+  fi
   # Parameters
   cp artifacts/px4_sitl_default/parameters.xml artifacts/_general/
   cp artifacts/px4_sitl_default/parameters.json artifacts/_general/
@@ -40,9 +50,11 @@ if [ -d artifacts/px4_sitl_default ]; then
   cp artifacts/px4_sitl_default/actuators.json artifacts/_general/
   cp artifacts/px4_sitl_default/actuators.json.xz artifacts/_general/
   # Events
-  cp artifacts/px4_sitl_default/events/all_events.json.xz artifacts/_general/
-  # ROS 2 msgs
-  cp artifacts/px4_sitl_default/events/all_events.json.xz artifacts/_general/
-  # Module Docs
+  if [ -f artifacts/px4_sitl_default/events/all_events.json.xz ]; then
+    cp artifacts/px4_sitl_default/events/all_events.json.xz artifacts/_general/
+  else
+    echo "Error: expected 'artifacts/px4_sitl_default/events/all_events.json.xz' not found." >&2
+    exit 1
+  fi
   ls -la artifacts/_general/
 fi

src/modules/simulation/simulator_sih/sih.cpp

@@ -72,6 +72,15 @@ void Sih::run()
 	_px4_accel.set_temperature(T1_C);
 	_px4_gyro.set_temperature(T1_C);
 
+	// Initialize position, velocity and attitude
+	_lla = LatLonAlt(_sih_lat0.get(), _sih_lon0.get(), _sih_h0.get());
+	_p_E = _p_E_ref = _lla.toEcef();
+	_lpos_ref.initReference(_lla.latitude_deg(), _lla.longitude_deg()); // Initialize MapProjection reference
+	_lpos_ref_alt = _lla.altitude();
+	_R_E2N_ref = computeRotEcefToNed(_lla); // Reference frame rotation (fixed, used for local position computation)
+	_R_N2E = _R_E2N_ref.transpose();
+	_q_E = Quatf(_R_N2E) * _q;
+
 	parameters_updated();
 
 	const hrt_abstime task_start = hrt_absolute_time();
@@ -246,27 +255,6 @@ void Sih::parameters_updated()
 	_KDV = _sih_kdv.get();
 	_KDW = _sih_kdw.get();
 
-	if (!_lpos_ref.isInitialized()
-	    || (fabsf(static_cast<float>(_lpos_ref.getProjectionReferenceLat()) - _sih_lat0.get()) > FLT_EPSILON)
-	    || (fabsf(static_cast<float>(_lpos_ref.getProjectionReferenceLon()) - _sih_lon0.get()) > FLT_EPSILON)
-	    || (fabsf(_lpos_ref_alt - _sih_h0.get()) > FLT_EPSILON)) {
-		_lpos_ref.initReference(static_cast<double>(_sih_lat0.get()), static_cast<double>(_sih_lon0.get()));
-		_lpos_ref_alt = _sih_h0.get();
-
-		// Reset earth position, velocity and attitude
-		_lla.setLatitudeDeg(static_cast<double>(_sih_lat0.get()));
-		_lla.setLongitudeDeg(static_cast<double>(_sih_lon0.get()));
-		_lla.setAltitude(_lpos_ref_alt);
-		_p_E = _lla.toEcef();
-
-		const Dcmf R_E2N = computeRotEcefToNed(_lla);
-		_R_N2E = R_E2N.transpose();
-		_v_E = _R_N2E * _v_N;
-
-		_q_E = Quatf(_R_N2E) * _q;
-		_q_E.normalize();
-	}
-
 	_MASS = _sih_mass.get();
 
 	_I = diag(Vector3f(_sih_ixx.get(), _sih_iyy.get(), _sih_izz.get()));
@@ -392,6 +380,7 @@ void Sih::generate_ts_aerodynamics()
 	// the aerodynamic is resolved in a frame like a standard aircraft (nose-right-belly)
 	Vector3f v_ts = _R_S2B.transpose() * v_B;
 	Vector3f w_ts = _R_S2B.transpose() * _w_B;
+	// NED frame: _lpos(2) above reference is negative
 	float altitude = _lpos_ref_alt - _lpos(2);
 
 	Vector3f Fa_ts{};
@@ -563,8 +552,10 @@ void Sih::equations_of_motion(const float dt)
 
 	ecefToNed();
 
-	_lpos_ref.project(_lla.latitude_deg(), _lla.longitude_deg(), _lpos(0), _lpos(1));
-	_lpos(2) = -(_lla.altitude() - _lpos_ref_alt);
+	// Compute local position directly from ECEF difference (avoids lat/lon precision issues)
+	// Use the fixed reference rotation to maintain a consistent local frame
+	const Vector3d dp_E = _p_E - _p_E_ref;
+	_lpos = _R_E2N_ref * Vector3f(dp_E);
 }
 
 void Sih::ecefToNed()
@@ -741,13 +732,18 @@ void Sih::publish_ground_truth(const hrt_abstime &time_now_us)
 
 	{
 		// publish global position groundtruth
+		// Use MapProjection reproject to ensure consistency with local position
 		vehicle_global_position_s global_position{};
 		global_position.timestamp_sample = time_now_us;
-		global_position.lat = _lla.latitude_deg();
-		global_position.lon = _lla.longitude_deg();
-		global_position.alt = _lla.altitude();
+
+		double lat, lon;
+		_lpos_ref.reproject(_lpos(0), _lpos(1), lat, lon);
+		global_position.lat = lat;
+		global_position.lon = lon;
+		// NED convention: _lpos(2) is negative when above reference, so alt = ref - (-height) = ref + height
+		global_position.alt = static_cast<double>(_lpos_ref_alt) - static_cast<double>(_lpos(2));
 		global_position.alt_ellipsoid = global_position.alt;
-		global_position.terrain_alt = -_lpos(2);
+		global_position.terrain_alt = static_cast<double>(_lpos_ref_alt);
 		global_position.timestamp = hrt_absolute_time();
 		_global_position_ground_truth_pub.publish(global_position);
 	}

src/modules/simulation/simulator_sih/sih.hpp

@@ -228,6 +228,8 @@ private:
 
 	LatLonAlt _lla{};
 	matrix::Vector3f _lpos{};  // position in a local tangent-plane frame [m]
+	matrix::Vector3d _p_E_ref{}; // ECEF reference position for local frame origin [m]
+	matrix::Dcmf _R_E2N_ref{}; // Rotation from ECEF to reference NED frame
 
 	float _u[NUM_ACTUATORS_MAX] {}; // thruster signals
 

src/modules/simulation/simulator_sih/sih_params.c

@@ -242,6 +242,7 @@ PARAM_DEFINE_FLOAT(SIH_KDW, 0.025f);
  * @unit deg
  * @min -90
  * @max  90
+ * @reboot_required true
  * @group Simulation In Hardware
  */
 PARAM_DEFINE_FLOAT(SIH_LOC_LAT0, 47.397742f);
@@ -257,6 +258,7 @@ PARAM_DEFINE_FLOAT(SIH_LOC_LAT0, 47.397742f);
  * @unit deg
  * @min -180
  * @max  180
+ * @reboot_required true
  * @group Simulation In Hardware
  */
 PARAM_DEFINE_FLOAT(SIH_LOC_LON0, 8.545594f);
@@ -278,6 +280,7 @@ PARAM_DEFINE_FLOAT(SIH_LOC_LON0, 8.545594f);
  * @max 8848.0
  * @decimal 2
  * @increment 0.01
+ * @reboot_required true
  * @group Simulation In Hardware
  */
 PARAM_DEFINE_FLOAT(SIH_LOC_H0, 489.4f);