diff --git a/hardware_in_the_loop/HILconfig.m b/hardware_in_the_loop/HILconfig.m index 1a3cd885ffba592ff9517ab14c9ada07da3e0990..442175614d5303cba272d4ac092aecc7c6f95c33 100644 --- a/hardware_in_the_loop/HILconfig.m +++ b/hardware_in_the_loop/HILconfig.m @@ -16,7 +16,8 @@ Release date: 10/03/2021 % Windows, e.g. "COM6" % Linux, e.g. "/dev/ttyACM0" % hil_settings.serial_port = "/dev/tty.usbserial-DN037JYN"; -hil_settings.serial_port_main = 'COM5'; +[~, cmdout] = system('ls /dev | grep ttyUSB | cat'); +hil_settings.serial_port_main = strcat('/dev/', strip(cmdout)); hil_settings.serial_port_payload= 'COM5'; hil_settings.serial_port_motor = 'COM5'; diff --git a/hardware_in_the_loop/old-serialbridge b/hardware_in_the_loop/old-serialbridge new file mode 160000 index 0000000000000000000000000000000000000000..0a3b08bff8640802ff1da2879120c91b5225b495 --- /dev/null +++ b/hardware_in_the_loop/old-serialbridge @@ -0,0 +1 @@ +Subproject commit 0a3b08bff8640802ff1da2879120c91b5225b495 diff --git a/hardware_in_the_loop/serialbridge b/hardware_in_the_loop/serialbridge index 0a3b08bff8640802ff1da2879120c91b5225b495..5b7cf79a9e0cd7e61075dc3b913ca717f7a208b4 160000 --- a/hardware_in_the_loop/serialbridge +++ b/hardware_in_the_loop/serialbridge @@ -1 +1 @@ -Subproject commit 0a3b08bff8640802ff1da2879120c91b5225b495 +Subproject commit 5b7cf79a9e0cd7e61075dc3b913ca717f7a208b4 diff --git a/simulator/configs/configFlags.m b/simulator/configs/configFlags.m index 1dfbd3051d5d613a6495c3f39ef0e6ec4ce312de..d16ca4c9c1799d93264293c3471fd0a24c918d49 100644 --- a/simulator/configs/configFlags.m +++ b/simulator/configs/configFlags.m @@ -29,7 +29,7 @@ scenarios explanation: % scenario configuration conf.scenario = "full flight"; settings.board = "main"; % Either "main" or "payload" or "full_hil" -conf.HIL = false; +conf.HIL = true; % WIP flags settings.machControlActive = false; % Switch on the mach control in ascentControl.m diff --git a/simulator/src/std_run_parts/run_MAIN_HIL.m b/simulator/src/std_run_parts/run_MAIN_HIL.m index 67a7c7cb02d9e737171e81d4b91740bc490efa37..daf4abd4e2d4258d353e3fb1a8affe48ebf120a7 100644 --- a/simulator/src/std_run_parts/run_MAIN_HIL.m +++ b/simulator/src/std_run_parts/run_MAIN_HIL.m @@ -74,11 +74,17 @@ OUTPUTS: arrayToBeSent = single(vertcat(arrayToBeSent)); % sending sensor data over the serial port + % java.lang.Thread.sleep(100); serialbridge('Write','main', arrayToBeSent); + if dataToBeSent.signal == 1 + pause(10.0); + end + % waiting for the response of the obsw % Receive data from serial comunication obswVals = serialbridge('Read','main', 26); + % obswVals = zeros(26,1); actuatorData.ada.mslAltitude = obswVals(1); actuatorData.ada.aglAltitude = obswVals(2);