Commit 760fed00 authored by Léo-Paul Géneau's avatar Léo-Paul Géneau 👾

Use timestamp in milliseconds

parent 1a778c02
...@@ -48,6 +48,7 @@ static double xy_ratio; ...@@ -48,6 +48,7 @@ static double xy_ratio;
static double target_latitude; static double target_latitude;
static double target_longitude; static double target_longitude;
static int mavsdk_started = 0; static int mavsdk_started = 0;
static uint64_t init_timestamp;
static Telemetry::Position origin; static Telemetry::Position origin;
// Logs functions // Logs functions
...@@ -142,14 +143,13 @@ int mavsdk_start(const char * url, const char * log_file, int timeout) { ...@@ -142,14 +143,13 @@ int mavsdk_start(const char * url, const char * log_file, int timeout) {
telemetry->subscribe_flight_mode([](Telemetry::FlightMode flight_mode) { telemetry->subscribe_flight_mode([](Telemetry::FlightMode flight_mode) {
if (takingOff && flight_mode != Telemetry::FlightMode::Takeoff) { if (takingOff && flight_mode != Telemetry::FlightMode::Takeoff) {
takingOff = false;
log("Subscribing to raw GPS..."); log("Subscribing to raw GPS...");
telemetry->subscribe_raw_gps([](Telemetry::RawGps gps) { telemetry->subscribe_raw_gps([](Telemetry::RawGps gps) {
std::ostringstream oss; std::ostringstream oss;
Telemetry::FixedwingMetrics metrics = telemetry->fixedwing_metrics(); Telemetry::FixedwingMetrics metrics = telemetry->fixedwing_metrics();
Telemetry::Position position = telemetry->position(); Telemetry::Position position = telemetry->position();
oss << gps.timestamp_us << ";" oss << (gps.timestamp_us - init_timestamp) / 1000 << ";"
<< gps.latitude_deg << ";" << gps.longitude_deg << ";" << gps.latitude_deg << ";" << gps.longitude_deg << ";"
<< gps.absolute_altitude_m << ";" << position.relative_altitude_m << ";" << gps.absolute_altitude_m << ";" << position.relative_altitude_m << ";"
<< telemetry->attitude_euler().yaw_deg << ";" << telemetry->attitude_euler().yaw_deg << ";"
...@@ -165,7 +165,10 @@ int mavsdk_start(const char * url, const char * log_file, int timeout) { ...@@ -165,7 +165,10 @@ int mavsdk_start(const char * url, const char * log_file, int timeout) {
break; break;
default: default:
return; if (takingOff) {
takingOff = false;
init_timestamp = telemetry->raw_gps().timestamp_us;
}
} }
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment