SITL: track simulated ADSB vehicles relative to simulation origin

removes dependence on ArduPilot AHRS library

Also removes vehicles based off vehicle simulated position rather than distance-from-origin, so you always have company

libraries/SITL/SIM_ADSB.cpp

@@ -35,19 +35,26 @@ namespace SITL {
 /*
   update a simulated vehicle
  */
-void ADSB_Vehicle::update(float delta_t)
+void ADSB_Vehicle::update(const class Aircraft &aircraft, float delta_t)
 {
-    if (!initialised) {
+    const SIM *_sitl = AP::sitl();
-        const SIM *_sitl = AP::sitl();
+    if (_sitl == nullptr) {
-        if (_sitl == nullptr) {
+        return;
-            return;
+    }
-        }
 
+    const Location &origin { aircraft.get_origin() };
+
+    if (!initialised) {
+        // spawn another aircraft
         initialised = true;
         ICAO_address = (uint32_t)(rand() % 10000);
         snprintf(callsign, sizeof(callsign), "SIM%u", ICAO_address);
-        position.x = Aircraft::rand_normal(0, _sitl->adsb_radius_m);
+        Location aircraft_location = aircraft.get_location();
-        position.y = Aircraft::rand_normal(0, _sitl->adsb_radius_m);
+        const Vector2f aircraft_offset_ne = aircraft_location.get_distance_NE(origin);
+        position.x = aircraft_offset_ne[1];
+        position.y = aircraft_offset_ne[0];
+        position.x += Aircraft::rand_normal(0, _sitl->adsb_radius_m);
+        position.y += Aircraft::rand_normal(0, _sitl->adsb_radius_m);
         position.z = -fabsf(_sitl->adsb_altitude_m);
 
         double vel_min = 5, vel_max = 20;
@@ -81,11 +88,16 @@ void ADSB_Vehicle::update(float delta_t)
         // it has crashed! reset
         initialised = false;
     }
+
+    Location ret = origin;
+    ret.offset(position.x, position.y);
+
+    location = ret;
 }
 
-bool ADSB_Vehicle::location(Location &loc) const
+const Location &ADSB_Vehicle::get_location() const
 {
-    return AP::ahrs().get_location_from_home_offset(loc, position);
+    return location;
 }
 
 /*
@@ -115,18 +127,15 @@ void ADSB::update_simulated_vehicles(const class Aircraft &aircraft)
     float delta_t = (now_us - last_update_us) * 1.0e-6f;
     last_update_us = now_us;
 
-    const Location &home = aircraft.get_home();
+    // prune any aircraft which get too far away from our simulated vehicle:
+    const Location &aircraft_loc = aircraft.get_location();
 
     for (uint8_t i=0; i<num_vehicles; i++) {
-        vehicles[i].update(delta_t);
+        auto &vehicle = vehicles[i];
-
+        vehicle.update(aircraft, delta_t);
-        Location loc = home;
-
-        ADSB_Vehicle &vehicle = vehicles[i];
-        loc.offset(vehicle.position.x, vehicle.position.y);
 
         // re-init when exceeding radius range
-        if (home.get_distance(loc) > _sitl->adsb_radius_m) {
+        if (aircraft_loc.get_distance(vehicle.get_location()) > _sitl->adsb_radius_m) {
             vehicle.initialised = false;
         }
     }
@@ -216,8 +225,6 @@ void ADSB::send_report(const class Aircraft &aircraft)
     /*
       send a ADSB_VEHICLE messages
      */
-    const Location &home = aircraft.get_home();
-
     uint32_t now_us = AP_HAL::micros();
     if (now_us - last_report_us >= reporting_period_ms*1000UL) {
         for (uint8_t i=0; i<num_vehicles; i++) {
@@ -226,8 +233,7 @@ void ADSB::send_report(const class Aircraft &aircraft)
                 continue;
             }
 
-            Location loc = home;
+            const Location &loc { vehicle.get_location() };
-            loc.offset(vehicle.position.x, vehicle.position.y);
 
             mavlink_adsb_vehicle_t adsb_vehicle {};
             last_report_us = now_us;

libraries/SITL/SIM_ADSB.h

@@ -37,7 +37,7 @@ class ADSB_Vehicle {
 public:
     bool initialised = false;
 
-    bool location(class Location &) const;  // return vehicle absolute location
+    const Location &get_location() const;  // return vehicle absolute location
     // return earth-frame vehicle velocity:
     bool velocity(Vector3F &ret) const { ret = velocity_ef; return true; }
 
@@ -46,11 +46,14 @@ public:
     char callsign[9];
 
 private:
-    void update(float delta_t);
+    void update(const class Aircraft &aircraft, float delta_t);
-    
+
     Vector3p position; // NED from origin
+    Location location;
+
     ADSB_EMITTER_TYPE type;
     uint64_t stationary_object_created_ms; // allows expiring of slow/stationary objects
+
 };
 
 class ADSB : public SerialDevice {

libraries/SITL/SIM_ADSB_Sagetech_MXS.cpp

@@ -429,10 +429,7 @@ void ADSB_Sagetech_MXS::send_vehicle_message_state_vector(const SITL::ADSB_Vehic
     pack_int32_into_uint8_ts(vehicle.ICAO_address, my_report.participant_address);
     my_report.address_qualifier = 0x02;  // aircraft
 
-    Location loc;
+    Location loc = vehicle.get_location();
-    if (!vehicle.location(loc)) {
-        return;
-    }
 
     // pack in latitude/longitude:
     pack_scaled_geocoord(my_report.latitude, loc.lat * 1e-7);

libraries/SITL/SIM_Aircraft.cpp

@@ -590,7 +590,7 @@ void Aircraft::set_speedup(float speedup)
     setup_frame_time(rate_hz, speedup);
 }
 
-void Aircraft::update_model(const struct sitl_input &input)
+void Aircraft::update_home()
 {
     if (!home_is_set) {
         if (sitl == nullptr) {
@@ -602,6 +602,10 @@ void Aircraft::update_model(const struct sitl_input &input)
         loc.alt = sitl->opos.alt.get() * 1.0e2;
         set_start_location(loc, sitl->opos.hdg.get());
     }
+}
+
+void Aircraft::update_model(const struct sitl_input &input)
+{
     local_ground_level = 0.0f;
     update(input);
 }

libraries/SITL/SIM_Aircraft.h

@@ -83,6 +83,8 @@ public:
 
     void update_model(const struct sitl_input &input);
 
+    void update_home();
+
     /* fill a sitl_fdm structure from the simulator state */
     void fill_fdm(struct sitl_fdm &fdm);
 
@@ -121,6 +123,8 @@ public:
         config_ = config;
     }
 
+    // return simulation origin:
+    const Location &get_origin() const { return origin; }
 
     const Location &get_location() const { return location; }