From ecbe22ac9b933e98d05dff5a4599d8eaf6a620f9 Mon Sep 17 00:00:00 2001
From: Stefano Belletti <stefano.belletti@skywarder.eu>
Date: Fri, 17 Jan 2025 12:03:03 +0100
Subject: [PATCH] Removed old function and data
---
.../initSensors2024_Lyra_Portugal_October.m | 78 +------------------
1 file changed, 1 insertion(+), 77 deletions(-)
diff --git a/data/2024_Lyra_Portugal_October/initSensors2024_Lyra_Portugal_October.m b/data/2024_Lyra_Portugal_October/initSensors2024_Lyra_Portugal_October.m
index 8de0bb4..b36ed6b 100644
--- a/data/2024_Lyra_Portugal_October/initSensors2024_Lyra_Portugal_October.m
+++ b/data/2024_Lyra_Portugal_October/initSensors2024_Lyra_Portugal_October.m
@@ -3,7 +3,7 @@
% author: Giuseppe Brentino - ipt GNC 2024
% giuseppe.brentino@skywarder.eu
% release 24/02/2024
-% latest update: Stefano Belletti (30/11/2024)
+% latest update: Stefano Belletti (17/01/2025)
load("Lyra_Port_sensor_vect_res.mat")
@@ -13,11 +13,6 @@ sensorSettings.barometer1 = SensorFault();
sensorSettings.barometer1.maxMeasurementRange = 1000; % 1100, 1300 in mbar
sensorSettings.barometer1.minMeasurementRange = 0; % 300, 10 in mbar
sensorSettings.barometer1.bit = 24; % adc on rocket is 24 bits
-% sensorSettings.barometer1.resolution = (sensorSettings.barometer1.maxMeasurementRange -sensorSettings.barometer1.minMeasurementRange)/(2^sensorSettings.barometer1.bit);
-
-% sensorSettings.barometer1 = loadSensorNoiseData(sensorSettings.barometer1, Lyra_Port_sensor_vect, "main_Main_StaticPressureData1.csv", 1);
-% sensorSettings.barometer1.noiseVariance = 1; % mbar^2
-
sensorSettings.barometer1.fault_time = 9; % if negative it will be generated at random between a max and a min value
sensorSettings.barometer1.max_fault_time = 96; % max seconds to wait before possible fault
sensorSettings.barometer1.min_fault_time = 6; % min seconds to wait before possible fault
@@ -46,11 +41,6 @@ sensorSettings.barometer2 = SensorFault();
sensorSettings.barometer2.maxMeasurementRange = 1000; % 1100, 1300 in mbar
sensorSettings.barometer2.minMeasurementRange = 0; % 300, 10 in mbar
sensorSettings.barometer2.bit = 24; % adc on rocket is 24 bits
-% sensorSettings.barometer2.resolution = (sensorSettings.barometer2.maxMeasurementRange -sensorSettings.barometer2.minMeasurementRange)/(2^sensorSettings.barometer2.bit);
-
-% sensorSettings.barometer2 = loadSensorNoiseData(sensorSettings.barometer2, Lyra_Port_sensor_vect, "main_Main_StaticPressureData2.csv", 1);
-% sensorSettings.barometer2.noiseVariance = 1; % mbar^2
-
sensorSettings.barometer2.fault_time = -1; % if negative it will be generated at random between a max and a min value
sensorSettings.barometer2.max_fault_time = 96; % max seconds to wait before possible fault
sensorSettings.barometer2.min_fault_time = 6; % min seconds to wait before possible fault
@@ -79,11 +69,6 @@ sensorSettings.barometer3 = SensorFault();
sensorSettings.barometer3.maxMeasurementRange = 4060; % 1100, 1300 in mbar
sensorSettings.barometer3.minMeasurementRange = 260; % 300, 10 in mbar
sensorSettings.barometer3.bit = 24;
-% sensorSettings.barometer3.resolution = (sensorSettings.barometer3.maxMeasurementRange -sensorSettings.barometer3.minMeasurementRange)/(2^sensorSettings.barometer3.bit);
-
-% sensorSettings.barometer3 = loadSensorNoiseData(sensorSettings.barometer3, Lyra_Port_sensor_vect, "main_Boardcore_LPS28DFWData.csv", 1);
-% sensorSettings.barometer3.noiseVariance = 4.06; % guess in mbar
-
sensorSettings.barometer3.fault_time = -1; % if negative it will be generated at random between a max and a min value
sensorSettings.barometer3.max_fault_time = 96; % max seconds to wait before possible fault
sensorSettings.barometer3.min_fault_time = 6; % min seconds to wait before possible fault
@@ -112,9 +97,6 @@ sensorSettings.accelerometer = Sensor3D();
sensorSettings.accelerometer.maxMeasurementRange = 16000; % 2000, 4000, 8000, 16000 in mg
sensorSettings.accelerometer.minMeasurementRange = -16000; % -2000, -4000, -8000, -16000 in mg
sensorSettings.accelerometer.bit = 16;
-
-% sensorSettings.accelerometer.noiseVariance = 10; % guess in mg
-
sensorSettings.accelerometer.offsetX = 0; % +-90 in mg
sensorSettings.accelerometer.offsetY = 0; % +-90 in mg
sensorSettings.accelerometer.offsetZ = 0; % +-90 in mg
@@ -129,9 +111,6 @@ sensorSettings.gyroscope = Sensor3D();
sensorSettings.gyroscope.maxMeasurementRange = 245e3; % 245e3, 500e3, 2000e3 in mdps
sensorSettings.gyroscope.minMeasurementRange = -245e3; % -245e3, -500e3, -2000e3 in mdps
sensorSettings.gyroscope.bit = 16;
-
-% sensorSettings.gyroscope.noiseVariance = 50; % guess in mdps 100 was original
-
sensorSettings.gyroscope.offsetX = 0; % +-30e3 in mdps
sensorSettings.gyroscope.offsetY = 0; % +-30e3 in mdps
sensorSettings.gyroscope.offsetZ = 0; % +-30e3 in mdps
@@ -171,12 +150,8 @@ sensorSettings.spheroid = wgs84Ellipsoid;
% NOTE: pressure in mbar, temp should be in C°;
% check 2D offset for chamber pressure sensor
sensorSettings.comb_chamber = Sensor1D();
-
-% sensorSettings.comb_chamber.noiseVariance = 60000; % mbar
-
sensorSettings.comb_chamber.maxMeasurementRange = 40000; % 1100, 1300 in mbar
sensorSettings.comb_chamber.minMeasurementRange = 0; % 300, 10 in mbar
-% sensorSettings.comb_chamber.error2dOffset = ep_data; % [p in mbar, T in Celsius, ep in mbar]
sensorSettings.comb_chamber.resolution = 1; % random value stolen from baro
sensorSettings.comb_chamber.offset = 0;
@@ -189,9 +164,6 @@ sensorSettings.pitot_static = Sensor1D();
sensorSettings.pitot_static.maxMeasurementRange = 1034.21; % mbar (15 psi)
sensorSettings.pitot_static.minMeasurementRange = 0;
sensorSettings.pitot_static.bit = 12;
-
-% sensorSettings.pitot_static.noiseVariance = 0.043043; % from flight logs
-
sensorSettings.pitot_static.update(Lyra_Port_sensor_vect, "payload_Payload_StaticPressureData.csv", 1);
% total pressure
@@ -199,8 +171,6 @@ sensorSettings.pitot_total = Sensor1D();
sensorSettings.pitot_total.maxMeasurementRange = 2*1034.21; % mbar (30 psi)
sensorSettings.pitot_total.minMeasurementRange = 0;
sensorSettings.pitot_total.bit = 12;
-% sensorSettings.pitot_total.noiseVariance = 2*0.043043; % from flight logs
-
sensorSettings.pitot_total.update(Lyra_Port_sensor_vect, "payload_Payload_StaticPressureData.csv", 1);
%% total sensor initialization
@@ -208,49 +178,3 @@ sensorSettings.pitot_total.update(Lyra_Port_sensor_vect, "payload_Payload_Static
% now is in std_setInitialParams.m
%
-
-%% Functions
-
-function [obj] = loadSensorNoiseData(obj, vect, name, number)
-
-len = length(vect);
-
-for ii = 1:len
- found = strcmp(name, vect(ii).name);
- if found
- if number>1
- number = number - 1;
- else
- break
- end
- end
-end
-
-if found
- obj.noiseType = vect(ii).noise_type;
-
- if strcmp("Sensor1D", class(obj)) || strcmp("SensorFault", class(obj))
- obj.noiseDataTrack1 = vect(ii).track1;
- obj.noiseFactor = vect(ii).factor;
- elseif strcmp("Sensor3D", class(obj)) || strcmp("SensorGPS", class(obj))
- obj.noiseDataTrack1 = vect(ii).track1;
- obj.noiseDataTrack2 = vect(ii).track2;
- obj.noiseDataTrack3 = vect(ii).track3;
- obj.noiseFactor = vect(ii).factor;
- else
- error("Sensor not defined")
- end
-else
- if strcmp("Sensor1D", class(obj)) || strcmp("SensorFault", class(obj))
- obj.noiseDataTrack1 = [];
- elseif strcmp("Sensor3D", class(obj)) || strcmp("SensorGPS", class(obj))
- obj.noiseDataTrack1 = [];
- obj.noiseDataTrack2 = [];
- obj.noiseDataTrack3 = [];
- else
- error("Sensor not defined")
- end
-end
-
-end
-
--
GitLab