Skip to content
Snippets Groups Projects
Commit db770d6a authored by Pier Francesco A. Bachini's avatar Pier Francesco A. Bachini
Browse files

Update main to ensure timestamps are read correctly

parent 9c6ee4cd
No related branches found
No related tags found
No related merge requests found
...@@ -6,12 +6,15 @@ clc; ...@@ -6,12 +6,15 @@ clc;
IMU = table2array(readtable('IMU.csv')); IMU = table2array(readtable('IMU.csv'));
dt_IMU = 1000; dt_IMU = 1000;
lastImuIdx = 0;
GPS = table2array(readtable('GPS.csv')); GPS = table2array(readtable('GPS.csv'));
dt_GPS = 200000; dt_GPS = 200000;
lastGPSIdx = 0;
baro = table2array(readtable('barometer.csv')); baro = table2array(readtable('barometer.csv'));
dt_baro = mean(diff(baro(:, 1))); dt_baro = mean(diff(baro(:, 1)));
lastBaroIdx = 0;
t_end = min([IMU(end,1), baro(end,1), GPS(end,1)]); t_end = min([IMU(end,1), baro(end,1), GPS(end,1)]);
...@@ -26,10 +29,30 @@ apogee_time = -1; ...@@ -26,10 +29,30 @@ apogee_time = -1;
% Simulation % Simulation
for t = 0:2000:t_end for t = 0:2000:t_end
% Getting measurment form sensors % Getting measurment from sensors
pressure_measurment = baro(floor(t/dt_baro)+1,2); baro_idx = sum(baro(:,1) <= t);
IMU_measurment = IMU(floor(t/dt_IMU)+1, 2:7); if baro_idx > lastBaroIdx
GPS_measurment = GPS(floor(t/dt_GPS)+1, 2:4); pressure_measurment = baro(baro_idx, 2);
lastBaroIdx = baro_idx;
else
pressure_measurment = baro(lastBaroIdx,2);
end
imu_idx = sum(IMU(:,1) <= t);
if imu_idx > lastImuIdx
IMU_measurment = IMU(imu_idx, 2);
lastImuIdx = imu_idx;
else
IMU_measurment = IMU(lastImuIdx,2:7);
end
gps_idx = sum(GPS(:,1) <= t);
if gps_idx > lastGPSIdx
GPS_measurment = GPS(gps_idx, 2:4);
lastGPSIdx = gps_idx;
else
GPS_measurment = GPS(lastGPSIdx,2:4);
end
% Apogee detection % Apogee detection
[flag_apogee, data] = apogee_detector(pressure_measurment, IMU_measurment, GPS_measurment, data); [flag_apogee, data] = apogee_detector(pressure_measurment, IMU_measurment, GPS_measurment, data);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment