From f6d5674e35c4bd6f5958425ef03de100b0c6d34d Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 31 Oct 2024 12:51:13 +0100 Subject: [PATCH] fix(opal): Update RT-LAB project configs Signed-off-by: Steffen Vogel --- .../opal/models/send_receive/send_receive.llm | 136 ++++++++++-------- .../models/send_receive/send_receive.probe | 8 ++ clients/opal/villas_udp.llp | 24 ++-- 3 files changed, 98 insertions(+), 70 deletions(-) diff --git a/clients/opal/models/send_receive/send_receive.llm b/clients/opal/models/send_receive/send_receive.llm index 6244c5ac1..b7eab5220 100644 --- a/clients/opal/models/send_receive/send_receive.llm +++ b/clients/opal/models/send_receive/send_receive.llm @@ -26,8 +26,8 @@ MSG_PRECISION_FACTOR=0 MaxDynamicSignals=2/0/100/24/44/ NB_STEP_WITHOUT_OVERRUNS=10 OPAL_DEBUG=OFF -OP_MATLABR2014B=1 -OS_COMPILE_RELEASE=2.6.29.6-opalrt-5 +OP_MATLABR2021B=1 +OS_COMPILE_RELEASE=OPAL-RTLinux 3.5.4 (4.19.80) PRINT_LOG_LEVEL=DEBUG_RUN RESET_IO_MISSING=ON SYSNAME=linux @@ -38,6 +38,70 @@ WATCHDOG_TIMEOUT=5000 INTERNAL_IGN_SOURCE_FILE=sfun_gen_async_ctrl.c sfun_recv_async.c sfun_send_async.c INTERNAL_LIBRARY2=-lOpalAsyncApiR2014b INTERNAL_LIBRARY3=-lOpalAsyncApiCore +[General] +ATT_CHECKSUM1=4135475928 +ATT_CHECKSUM2=3941568524 +ATT_CHECKSUM3=2861311461 +ATT_CHECKSUM4=1582866546 +ATT_CREATED_BY=jwu +ATT_CREATED_ON=Thu Apr 15 08:21:54 1999 +ATT_ENABLE_PTA=OFF +ATT_HANDLE_CONSOLE=ON +ATT_LAST_SAVED_BY=SteffenVogel +ATT_LAST_SAVED_ON=Thu Oct 31 12:47:23 2024 +ATT_REFERENCE_MDL_PATHS= +ATT_REVISION=15.0 +AutoRetrieveFiles=ON +AutoRetrieveRtlab=ON +CompilerVersion=AUTOMATIC +DESCRIPTION= +DinamoFlag=OFF +EXATACPS_AUTORUN=FALSE +EXATACPS_AUTOSTOP=FALSE +EXATACPS_EXE= +EXATACPS_SCENARIO=::json:: +FILENAME=C:\Git\external\villas\node\clients\opal\models\send_receive\send_receive.mdl +FORCE_RECOMPILE=0 +IMPORTED_GLOBAL_VARIABLES=1 +LastCompileRtlabVersion=v2024.3.2.48 +LastMatlabUsed=169 +LastMatlabUsedName=v9.11 +MATLAB_USED_IN_MODEL=21 +Name=send_receive +PETALINUX_LAST_COMPILE_VERSION= +PRINT_CYCLE=OFF +PostBuildCmd= +PreBuildCmd= +QNX_LAST_COMPILE_VERSION= +RH64_LAST_COMPILE_VERSION=OPAL-RTLinux 3.5.4 (4.19.80) +RH_LAST_COMPILE_VERSION=2.6.29.6-opalrt-5 +ReportFileId= +RetrieveBuildTree=ON +RetrieveRootDir= +SimulationMode=2 +TLC=Automatic +TMF=Automatic +TRANSFERFILE_AT_LOAD=ON +TargetCompileCmd=/usr/bin/make -f /usr/opalrt/common/bin/opalmodelmk +TargetPlatform=REDHAWK64 +TimeFactor=1.000000000000000 +TimeStep=0.000050000000000 +sc_consoleTimeStep=-1.000000000000000 +sm_modelTimeStep=0.000049999998737 +sm_send_receiveTimeStep=0.000049999998737 +[NodeMapping] +sm_model=opalrtlinux +sm_model_CORE_ASSIGNATION=1 +sm_model_CPU=-1 +sm_model_DEBUG=OFF +sm_model_XHP_ENABLE=FALSE +sm_send_receive=ACS_OPAL_RT +sm_send_receive_CORE_ASSIGNATION=1 +sm_send_receive_CPU=-1 +sm_send_receive_DEBUG=OFF +sm_send_receive_XHP_ENABLE=FALSE +[UserEnvVars] +PROTOCOL=VILLAS [ExtraPutFilesComp] AsyncIP.mk=Ascii include\config.h=Ascii @@ -50,65 +114,13 @@ src\main.c=Ascii src\msg.c=Ascii src\socket.c=Ascii src\utils.c=Ascii -[General] -ATT_CHECKSUM1=2360032266 -ATT_CHECKSUM2=1041833943 -ATT_CHECKSUM3=842695092 -ATT_CHECKSUM4=2435976698 -ATT_CREATED_BY=jwu -ATT_CREATED_ON=Thu Apr 15 08:21:54 1999 -ATT_ENABLE_PTA=OFF -ATT_HANDLE_CONSOLE=ON -ATT_LAST_SAVED_BY=svo -ATT_LAST_SAVED_ON=Thu Jun 29 20:16:22 2017 -ATT_REFERENCE_MDL_PATHS= -ATT_REVISION=1.454 -AutoRetrieveFiles=ON -AutoRetrieveRtlab=ON -CompilerVersion=AUTOMATIC -DESCRIPTION= -DinamoFlag=OFF -FILENAME=C:\Users\svo\workspace\villas\node\clients\opal\models\send_receive\send_receive.mdl -FORCE_RECOMPILE=0 -IMPORTED_GLOBAL_VARIABLES=1 -LastCompileRtlabVersion=v11.0.8.13 -LastMatlabUsed=27 -LastMatlabUsedName=v8.4 -MATLAB_USED_IN_MODEL=21 -Name=send_receive -PETALINUX_LAST_COMPILE_VERSION= -PRINT_CYCLE=OFF -PostBuildCmd= -PreBuildCmd= -QNX_LAST_COMPILE_VERSION= -RH64_LAST_COMPILE_VERSION= -RH_LAST_COMPILE_VERSION=2.6.29.6-opalrt-5 -ReportFileId= -RetrieveBuildTree=ON -RetrieveRootDir= -SimulationMode=2 -TLC=Automatic -TMF=Automatic -TRANSFERFILE_AT_LOAD=OFF -TargetCompileCmd=/usr/bin/make -f /usr/opalrt/common/bin/opalmodelmk -TargetPlatform=REDHAWK -TimeFactor=1.000000000000000 -TimeStep=0.000050000000000 -sc_consoleTimeStep=-1.000000000000000 -sm_modelTimeStep=0.000049999998737 -sm_send_receiveTimeStep=0.000049999998737 +[ExtraGetFilesComp_1_RT_LAB] +AsyncIP=Binary|Async_Proc +[ExtraPutFilesLoad_1_RT_LAB] +.\send_receive_sm_model\OpREDHAWK64target\AsyncIP=Binary|Async_Proc +[EnvVars_REDHAWK64_DYN_1] +INTERNAL_IGN_SOURCE_FILE=sfun_gen_async_ctrl.c sfun_recv_async.c sfun_send_async.c +INTERNAL_LIBRARY2=-lOpalAsyncApiR2021B +INTERNAL_LIBRARY3=-lOpalAsyncApiCore [General_1] TargetPreCompileCmd=make -f /usr/opalrt/common/bin/opalmodelmk -[NodeMapping] -sm_model=ACS_OPAL_RT -sm_model_CORE_ASSIGNATION=1 -sm_model_CPU=-1 -sm_model_DEBUG=OFF -sm_model_XHP_ENABLE=FALSE -sm_send_receive=ACS_OPAL_RT -sm_send_receive_CORE_ASSIGNATION=1 -sm_send_receive_CPU=-1 -sm_send_receive_DEBUG=OFF -sm_send_receive_XHP_ENABLE=FALSE -[UserEnvVars] -PROTOCOL=VILLAS diff --git a/clients/opal/models/send_receive/send_receive.probe b/clients/opal/models/send_receive/send_receive.probe index 7f8547967..252bd2a0e 100644 --- a/clients/opal/models/send_receive/send_receive.probe +++ b/clients/opal/models/send_receive/send_receive.probe @@ -19,8 +19,12 @@ numValues=200 offset=0 rearmDelay=0.000000 repetitive=1 +signalId=0 +signalIndex=0 signalName= signalNameId=0 +trigSigId=0 +trigSigIndex=0 trigSigNameId=339755367 trigSignalName= trigType=0 @@ -45,8 +49,12 @@ numValues=100 offset=0 rearmDelay=0.000000 repetitive=1 +signalId=0 +signalIndex=0 signalName= signalNameId=1818584175 +trigSigId=0 +trigSigIndex=0 trigSigNameId=1866690149 trigSignalName= trigType=0 diff --git a/clients/opal/villas_udp.llp b/clients/opal/villas_udp.llp index 230f74e7b..e3a38c1fc 100644 --- a/clients/opal/villas_udp.llp +++ b/clients/opal/villas_udp.llp @@ -1,24 +1,32 @@ - + villas_udp This is a project! - 134.130.169.120:25251 - 7CA55C76-B20E-414C-93F2-A1858B0095F3 + 10.208.16.93:25251 + 1D336193-6957-4E55-B7F9-1E9E09E9BE58 ON - C:\Users\svo\workspace\villas\node\clients\opal\villas_udp.llp + 0 + C:\Git\external\villas\node\clients\opal\villas_udp.llp + + 0 + OFF + FALSE + models/send_receive/send_receive.mdl - C:/Users/svo/workspace/villas/node/clients/opal/models/send_receive/send_receive.mdl - C:/Users/svo/workspace/villas/node/clients/opal/models/send_receive/send_receive.mdl + + C:/Git/external/villas/node/clients/opal/models/send_receive/send_receive.mdl + C:/Git/external/villas/node/clients/opal/models/send_receive/send_receive.mdl - + \ No newline at end of file