diff --git a/hardware_in_the_loop/readControlOutputFromSerial.m b/hardware_in_the_loop/readControlOutputFromSerial.m index 5fbce823d0dc8e08cd9235e3f2e600996067c15e..8cec8d3cd56caace9dbeff05054197f860c6f10b 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 a1e40adb0cc3eb7da992288f858bd9680d71d7f5..6c67665e3c128bf5711f1705557af842dbc533eb 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 f2323f78fc10a346e8ef6fec3545366e5839ea01..b3ba394b097c373cd651e5a8c73f3722b8598bd1 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");