diff --git a/RoccarasoFlight/postprocessing/GNC/postProcess.m b/RoccarasoFlight/postprocessing/GNC/postProcess.m index 401690b67ed5128864f91605568d8483681c4a0d..88380364bab5f66f6e57178edb06c9d3e0bf95c5 100644 --- a/RoccarasoFlight/postprocessing/GNC/postProcess.m +++ b/RoccarasoFlight/postprocessing/GNC/postProcess.m @@ -156,10 +156,13 @@ sensorTot.barometer.altitude = -(atmospalt(main.STATIC_PRESSURE1(:,2))-atmospalt % sensorTot.barometer.altitude = -(atmosphereAlt(main.STATIC_PRESSURE1(:,2),localAmbientCond)-localAmbientCond(1)); sensorTot.barometer.pressureMeasures = main.STATIC_PRESSURE1(:,2); % imu +ROT = [1 0 0; + 0 cosd(45) sind(45); + 0 -sind(45) cosd(45)]; sensorTot.imu.accTime = main.IMU(:,1); -sensorTot.imu.accelerometerMeasures = main.IMU(:,2:4); +sensorTot.imu.accelerometerMeasures = (ROT*main.IMU(:,2:4)')'; sensorTot.imu.gyroTime = main.IMU(:,5); -sensorTot.imu.gyroMeasures = main.IMU(:,6:8); +sensorTot.imu.gyroMeasures = (ROT*main.IMU(:,6:8)')'; sensorTot.imu.magTime = main.MAGNETOMETER(:,1); sensorTot.imu.magnetometerMeasures = main.MAGNETOMETER(:,2:4); sensorTot.imu.magnetometerMeasures(:,2) = -sensorTot.imu.magnetometerMeasures(:,2); @@ -192,8 +195,7 @@ sensorTot.imu.magnetometerMeasuresCalib = sensorTot.imu.magnetometerMeasures - c R_b2r = quat2dcm(eul2quat(settings.sensorBoard.board2rocket)); % R_calib = findRotationMatrix(sensorTot.imu.magnetometerMeasures(1,:),[1 0 0]); % -sensorTot.imu.magnetometerMeasuresCalib = (R_b2r*sensorTot.imu.magnetometerMeasuresCalib')'; - +sensorTot.imu.magnetometerMeasuresCalib = (ROT*(R_b2r*sensorTot.imu.magnetometerMeasuresCalib'))'; % set configuration parameters ( equal to OBSW ) nas.dt_k = 0.02; % [s] nas time step nas.sigma_baro = 4.3; % [m/2] estimated barometer variance @@ -700,7 +702,7 @@ legend %% rocket animation for i = 1:length(main.NASData(:,1)) dcm(:,:,i) = quat2dcm(sensorTot_NoPitot.nas.states(i,[10,7:9])); -end +end % animateOrientation(dcm, sensorTot_NoPitot.nas.time, 'prova1') %% -disp("pitot bits = "+bits); \ No newline at end of file +% disp("pitot bits = "+bits); \ No newline at end of file