From 68d677de7a245822d42eed8938c0c8b690c5fc16 Mon Sep 17 00:00:00 2001 From: Giulia Facchi <giulia.facchi@skywarder.eu> Date: Sat, 16 Dec 2023 11:51:24 +0100 Subject: [PATCH] [HIL][Parafoil] Sending samples static and dynamic Pitot pressure --- hardware_in_the_loop/readControlOutputFromSerial.m | 2 ++ hardware_in_the_loop/sendDataOverSerial.m | 9 ++++++++- simulator/src/std_run_parts/run_PAY_HIL.m | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/hardware_in_the_loop/readControlOutputFromSerial.m b/hardware_in_the_loop/readControlOutputFromSerial.m index 5fbce823..8cec8d3c 100644 --- a/hardware_in_the_loop/readControlOutputFromSerial.m +++ b/hardware_in_the_loop/readControlOutputFromSerial.m @@ -95,3 +95,5 @@ switch board actuatorData.flags.flag_para1 = logical(obswVals(29)); actuatorData.flags.flag_para2 = logical(obswVals(30)); end + +end diff --git a/hardware_in_the_loop/sendDataOverSerial.m b/hardware_in_the_loop/sendDataOverSerial.m index a1e40adb..6c67665e 100644 --- a/hardware_in_the_loop/sendDataOverSerial.m +++ b/hardware_in_the_loop/sendDataOverSerial.m @@ -1,4 +1,4 @@ -function [] = sendDataOverSerial(sensorData, sensorSettings, frequencies, flags) +function [] = sendDataOverSerial(sensorData, sensorSettings, frequencies, flags, board) %{ -----------DESCRIPTION OF FUNCTION:------------------ @@ -57,6 +57,13 @@ INPUTS: dataToBeSent.chamberPressure = sensorData.chamberPressure.measures(1:num_data_chPress); % transforming from mBar to Bar end + if board == "payload" + dataToBeSent.pitot.dynamic = sensorData.pitot.pTotMeasures(1:num_data_pitot); + + dataToBeSent.pitot.static = sensorData.pitot.pStatMeasures(1:num_data_pitot); + end + + dataToBeSent.pitot.dp = sensorData.pitot.pTotMeasures(1:num_data_pitot) - sensorData.pitot.pStatMeasures(1:num_data_pitot); dataToBeSent.pitot.airspeed = sensorData.pitot.airspeed(1:num_data_pitot); diff --git a/simulator/src/std_run_parts/run_PAY_HIL.m b/simulator/src/std_run_parts/run_PAY_HIL.m index f2323f78..b3ba394b 100644 --- a/simulator/src/std_run_parts/run_PAY_HIL.m +++ b/simulator/src/std_run_parts/run_PAY_HIL.m @@ -32,7 +32,7 @@ OUTPUTS: sensorData.gps.nsat = 16; % sending sensor data over the serial port - sendDataOverSerial(sensorData, sensorSettings, frequencies, flagsArray); + sendDataOverSerial(sensorData, sensorSettings, frequencies, flagsArray,"payload"); % waiting for the response of the obsw actuatorData = readControlOutputFromSerial("payload"); -- GitLab