From 0b12340dfc6a7b1afd9582ebb9b6d520bdf158ae Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 29 Jun 2017 19:39:33 +0200 Subject: [PATCH] opal: update project and model files to MATLAB 2014b --- .../configurations/aliases/Aliases.json | 17 + .../models/send_receive/send_receive.llm | 37 +-- .../models/send_receive/send_receive.mdl | 300 ++++++++++-------- .../models/send_receive/send_receive.probe | 4 +- clients/opal/villas_udp/villas_udp.llp | 10 +- 5 files changed, 218 insertions(+), 150 deletions(-) create mode 100644 clients/opal/villas_udp/configurations/aliases/Aliases.json diff --git a/clients/opal/villas_udp/configurations/aliases/Aliases.json b/clients/opal/villas_udp/configurations/aliases/Aliases.json new file mode 100644 index 000000000..059265889 --- /dev/null +++ b/clients/opal/villas_udp/configurations/aliases/Aliases.json @@ -0,0 +1,17 @@ +[ + {"version":2}, + { + "Opal::Simulation::SerializeableAliasList": + { + "copyOnWrite":0, + "locked":0, + "name":"D804207F-3D61-429A-9CBD-659A211EF103", + "versioned":0, + "aliasSets": + [ + ], + "history":"", + "parent":"/" + } + } +] \ No newline at end of file diff --git a/clients/opal/villas_udp/models/send_receive/send_receive.llm b/clients/opal/villas_udp/models/send_receive/send_receive.llm index 62ff29129..4700cdc23 100644 --- a/clients/opal/villas_udp/models/send_receive/send_receive.llm +++ b/clients/opal/villas_udp/models/send_receive/send_receive.llm @@ -21,12 +21,12 @@ MONITORING=ON MONITORING_BLOCK=OFF MONITORING_DISPLAY=ALL MSG_PRECISION_FACTOR=0 -MaxDynamicSignals=2/0/100/24/44/ +MaxDynamicSignals=2/0/100/24/100/ NB_STEP_WITHOUT_OVERRUNS=10 OPAL_DEBUG=OFF -OP_MATLABR2013A=1 +OP_MATLABR2014B=1 OS_COMPILE_RELEASE=2.6.29.6-opalrt-5 -PRINT_LOG_LEVEL=DEBUG_ALL +PRINT_LOG_LEVEL=DEBUG_RUN RESET_IO_MISSING=ON SYSNAME=linux USER_INCS= @@ -34,7 +34,7 @@ USER_SRCS= WATCHDOG_TIMEOUT=5000 [EnvVars_REDHAWK_DYN_1] INTERNAL_IGN_SOURCE_FILE=sfun_gen_async_ctrl.c sfun_recv_async.c sfun_send_async.c -INTERNAL_LIBRARY2=-lOpalAsyncApiR2013a +INTERNAL_LIBRARY2=-lOpalAsyncApiR2014b INTERNAL_LIBRARY3=-lOpalAsyncApiCore [ExtraGetFilesComp_1_RT_LAB] AsyncIP=Binary|Async_Proc @@ -51,35 +51,36 @@ src\msg.c=Ascii src\socket.c=Ascii src\utils.c=Ascii [ExtraPutFilesComp_1_RT_LAB] -C:\OPAL-RT\RT-LAB\v11.0.2.410\common\lib\redhawk\libOpalAsyncApiCore.a=Binary|Other +C:\OPAL-RT\RT-LAB\v11.0.8.13\common\lib\redhawk\libOpalAsyncApiCore.a=Binary|Other [ExtraPutFilesLoad_1_RT_LAB] .\send_receive_sm_model\OpREDHAWKtarget\AsyncIP=Binary|Async_Proc [General] -ATT_CHECKSUM1=1015056539 -ATT_CHECKSUM2=1816632134 -ATT_CHECKSUM3=3154910365 -ATT_CHECKSUM4=1473207731 +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=opal-user -ATT_LAST_SAVED_ON=Tue Apr 25 15:37:56 2017 +ATT_LAST_SAVED_BY=svo +ATT_LAST_SAVED_ON=Tue Jun 27 10:20:09 2017 ATT_REFERENCE_MDL_PATHS= -ATT_REVISION=1.451 +ATT_REVISION=1.453 AutoRetrieveFiles=ON AutoRetrieveRtlab=ON CompilerVersion=AUTOMATIC DESCRIPTION= DinamoFlag=OFF -FILENAME=C:\Users\opal-user\OPAL-RT\msv-ufa\villas_udp\models\send_receive\send_receive.mdl +FILENAME=C:\Users\svo\workspace\villas\node\clients\opal\villas_udp\models\send_receive\send_receive.mdl FORCE_RECOMPILE=0 IMPORTED_GLOBAL_VARIABLES=1 -LastCompileRtlabVersion=v11.0.2.410 -LastMatlabUsed=24 -LastMatlabUsedName=v8.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= @@ -92,7 +93,7 @@ RetrieveRootDir= SimulationMode=2 TLC=Automatic TMF=Automatic -TRANSFERFILE_AT_LOAD=OFF +TRANSFERFILE_AT_LOAD=ON TargetCompileCmd=/usr/bin/make -f /usr/opalrt/common/bin/opalmodelmk TargetPlatform=REDHAWK TimeFactor=1.000000000000000 @@ -114,4 +115,4 @@ sm_send_receive_CPU=-1 sm_send_receive_DEBUG=OFF sm_send_receive_XHP_ENABLE=FALSE [UserEnvVars] -PROTOCOL=GTNET_SKT +PROTOCOL=VILLAS diff --git a/clients/opal/villas_udp/models/send_receive/send_receive.mdl b/clients/opal/villas_udp/models/send_receive/send_receive.mdl index 9c7c97f29..b232db8ff 100644 --- a/clients/opal/villas_udp/models/send_receive/send_receive.mdl +++ b/clients/opal/villas_udp/models/send_receive/send_receive.mdl @@ -1,18 +1,17 @@ # $Revision: 1.1 $ Model { Name "send_receive" - Version 8.1 + Version 8.4 MdlSubVersion 0 + SavedCharacterEncoding "windows-1252" GraphicalInterface { NumRootInports 0 NumRootOutports 0 ParameterArgumentNames "" - ComputedModelVersion "1.451" + ComputedModelVersion "1.453" NumModelReferences 0 NumTestPointedSignals 0 } - SavedCharacterEncoding "windows-1252" - SaveDefaultBlockParams on ScopeRefreshTime 0.035000 OverrideScopeRefreshTime on DisableAllScopes off @@ -26,85 +25,50 @@ Model { $PropName "BdWindowsInfo" $ObjectID 1 $ClassName "Simulink.BDWindowsInfo" - Array { - Type "Simulink.WindowInfo" - Dimension 2 + Object { + $PropName "WindowsInfo" + $ObjectID 2 + $ClassName "Simulink.WindowInfo" + IsActive [1] + Location [16.0, 52.0, 1452.0, 912.0] Object { - $ObjectID 2 + $PropName "ModelBrowserInfo" + $ObjectID 3 + $ClassName "Simulink.ModelBrowserInfo" + Visible [0] + DockPosition "Left" + Width [50] + Height [50] + Filter [9] + } + Object { + $PropName "ExplorerBarInfo" + $ObjectID 4 + $ClassName "Simulink.ExplorerBarInfo" + Visible [1] + } + Object { + $PropName "EditorsInfo" + $ObjectID 5 + $ClassName "Simulink.EditorInfo" IsActive [1] - Location [16.0, 52.0, 1452.0, 912.0] - Object { - $PropName "ModelBrowserInfo" - $ObjectID 3 - $ClassName "Simulink.ModelBrowserInfo" - Visible [0] - DockPosition "Left" - Width [50] - Height [50] - Filter [9] - } - Object { - $PropName "ExplorerBarInfo" - $ObjectID 4 - $ClassName "Simulink.ExplorerBarInfo" - Visible [1] - } - Object { - $PropName "EditorsInfo" - $ObjectID 5 - $ClassName "Simulink.EditorInfo" - IsActive [1] - ViewObjType "SimulinkSubsys" - LoadSaveID "13" - Extents [1402.0, 738.0] - ZoomFactor [1.6] - Offset [94.375, -58.375] - } + ViewObjType "SimulinkSubsys" + LoadSaveID "13" + Extents [1402.0, 738.0] + ZoomFactor [1.6] + Offset [94.375, -58.375] } - Object { - $ObjectID 6 - IsActive [0] - Location [346.0, 78.0, 876.0, 912.0] - Object { - $PropName "ModelBrowserInfo" - $ObjectID 7 - $ClassName "Simulink.ModelBrowserInfo" - Visible [0] - DockPosition "Left" - Width [50] - Height [50] - Filter [9] - } - Object { - $PropName "ExplorerBarInfo" - $ObjectID 8 - $ClassName "Simulink.ExplorerBarInfo" - Visible [1] - } - Object { - $PropName "EditorsInfo" - $ObjectID 9 - $ClassName "Simulink.EditorInfo" - IsActive [1] - ViewObjType "SimulinkTopLevel" - LoadSaveID "0" - Extents [826.0, 738.0] - ZoomFactor [1.0] - Offset [0.0, 0.0] - } - } - PropName "WindowsInfo" } } Created "Thu Apr 15 08:21:54 1999" Creator "jwu" UpdateHistory "UpdateHistoryNever" ModifiedByFormat "%" - LastModifiedBy "opal-user" + LastModifiedBy "svo" ModifiedDateFormat "%" - LastModifiedDate "Tue Apr 25 15:37:56 2017" - RTWModifiedTimeStamp 415035473 - ModelVersionFormat "1.%" + LastModifiedDate "Tue Jun 27 10:20:09 2017" + RTWModifiedTimeStamp 420459603 + ModelVersionFormat "1.%" ConfigurationManager "none" SampleTimeColors off SampleTimeAnnotations off @@ -122,6 +86,7 @@ Model { SortedOrder off ExecutionContextIcon off ShowLinearizationAnnotations on + ShowMarkup on BlockNameDataTip off BlockParametersDataTip on BlockDescriptionStringDataTip off @@ -130,6 +95,11 @@ Model { BrowserShowLibraryLinks off BrowserLookUnderMasks off SimulationMode "normal" + PauseTimes "5" + NumberOfSteps 1 + SnapshotBufferSize 10 + SnapshotInterval 10 + NumberOfLastSnapshots 0 LinearizationMsg "none" Profile off ParamWorkspaceSource "MATLABWorkspace" @@ -139,7 +109,7 @@ Model { TryForcingSFcnDF off Object { $PropName "DataLoggingOverride" - $ObjectID 10 + $ObjectID 6 $ClassName "Simulink.SimulationData.ModelLoggingInfo" model_ "send_receive" Array { @@ -162,6 +132,7 @@ Model { CovNameIncrementing off CovHtmlReporting on CovForceBlockReductionOff on + CovEnableCumulative on covSaveCumulativeToWorkspaceVar on CovSaveSingleToWorkspaceVar on CovCumulativeVarName "covCumulativeData" @@ -169,6 +140,12 @@ Model { CovReportOnPause on CovModelRefEnable "Off" CovExternalEMLEnable off + CovSFcnEnable off + CovBoundaryAbsTol 0.000010 + CovBoundaryRelTol 0.010000 + CovUseTimeInterval off + CovStartTime 0 + CovStopTime 0 ExtModeBatchMode off ExtModeEnableFloating on ExtModeTrigType "manual" @@ -197,14 +174,14 @@ Model { Type "Handle" Dimension 1 Simulink.ConfigSet { - $ObjectID 11 - Version "1.13.0" + $ObjectID 7 + Version "1.14.3" Array { Type "Handle" Dimension 8 Simulink.SolverCC { - $ObjectID 12 - Version "1.13.0" + $ObjectID 8 + Version "1.14.3" StartTime "0.0" StopTime "inf" AbsTol "1e-6" @@ -238,8 +215,8 @@ Model { InsertRTBMode "Whenever possible" } Simulink.DataIOCC { - $ObjectID 13 - Version "1.13.0" + $ObjectID 9 + Version "1.14.3" Decimation "1" ExternalInput "[]" FinalStateName "xFinal" @@ -257,6 +234,7 @@ Model { SignalLogging on DSMLogging on InspectSignalLogs off + VisualizeSimOutput on SaveTime off ReturnWorkspaceOutputs off StateSaveName "xout" @@ -270,8 +248,8 @@ Model { Refine "1" } Simulink.OptimizationCC { - $ObjectID 14 - Version "1.13.0" + $ObjectID 10 + Version "1.14.3" Array { Type "Cell" Dimension 4 @@ -285,13 +263,16 @@ Model { BooleanDataType off ConditionallyExecuteInputs on InlineParams off - UseIntDivNetSlope off + UseDivisionForNetSlopeComputation "Off" UseFloatMulNetSlope off + DefaultUnderspecifiedDataType "double" UseSpecifiedMinMax off InlineInvariantSignals off OptimizeBlockIOStorage off BufferReuse off EnhancedBackFolding off + CachingGlobalReferences off + GlobalBufferReuse off StrengthReduction off ExpressionFolding off BooleansAsBitfields off @@ -306,6 +287,7 @@ Model { SystemCodeInlineAuto off StateBitsets off DataBitsets off + ActiveStateOutputEnumStorageType "Native Integer" UseTempVars off ZeroExternalMemoryAtStartup on ZeroInternalMemoryAtStartup on @@ -322,8 +304,8 @@ Model { ParallelExecutionInRapidAccelerator on } Simulink.DebuggingCC { - $ObjectID 15 - Version "1.13.0" + $ObjectID 11 + Version "1.14.3" RTPrefix "error" ConsistencyChecking "none" ArrayBoundsChecking "none" @@ -410,10 +392,11 @@ Model { SFUnconditionalTransitionShadowingDiag "warning" SFUndirectedBroadcastEventsDiag "warning" SFTransitionActionBeforeConditionDiag "warning" + IntegerSaturationMsg "warning" } Simulink.HardwareCC { - $ObjectID 16 - Version "1.13.0" + $ObjectID 12 + Version "1.14.3" ProdBitPerChar 8 ProdBitPerShort 16 ProdBitPerInt 32 @@ -453,8 +436,8 @@ Model { ProdEqTarget on } Simulink.ModelReferenceCC { - $ObjectID 17 - Version "1.13.0" + $ObjectID 13 + Version "1.14.3" UpdateModelReferenceTargets "IfOutOfDateOrStructuralChange" CheckModelReferenceTargetMessage "error" EnableParallelModelReferenceBuilds off @@ -468,8 +451,8 @@ Model { SupportModelReferenceSimTargetCustomCode off } Simulink.SFSimCC { - $ObjectID 18 - Version "1.13.0" + $ObjectID 14 + Version "1.14.3" SFSimEnableDebug on SFSimOverflowDetection on SFSimEcho on @@ -480,11 +463,12 @@ Model { SimUseLocalCustomCode off SimParseCustomCode on SimBuildMode "sf_incremental_build" + SimGenImportedTypeDefs off } Simulink.RTWCC { $BackupClass "Simulink.RTWCC" - $ObjectID 19 - Version "1.13.0" + $ObjectID 15 + Version "1.14.3" Array { Type "Cell" Dimension 1 @@ -492,11 +476,15 @@ Model { PropName "DisabledProps" } SystemTargetFile "grt.tlc" + TLCOptions "" GenCodeOnly off MakeCommand "make_rtw" GenerateMakefile on PackageGeneratedCodeAndArtifacts off + PackageName "" TemplateMakefile "grt_default_tmf" + PostCodeGenCommand "" + Description "" GenerateReport off SaveLog off RTWVerbose on @@ -507,13 +495,23 @@ Model { TLCAssert off ProcessScriptMode "Default" ConfigurationMode "Optimized" + ProcessScript "" + ConfigurationScript "" ConfigAtBuild off RTWUseLocalCustomCode off RTWUseSimCustomCode off + CustomSourceCode "" + CustomHeaderCode "" + CustomInclude "" + CustomSource "" + CustomLibrary "" + CustomInitializer "" + CustomTerminator "" + Toolchain "Automatically locate an installed toolchain" + BuildConfiguration "Faster Builds" IncludeHyperlinkInReport off LaunchReport off PortableWordSizes off - GenerateErtSFunction off CreateSILPILBlock "None" CodeExecutionProfiling off CodeExecutionProfileVariable "executionProfile" @@ -533,14 +531,17 @@ Model { GenerateCodeMetricsReport off GenerateCodeReplacementReport off RTWCompilerOptimization "Off" + RTWCustomCompilerOptimizations "" CheckMdlBeforeBuild "Off" CustomRebuildMode "OnUpdate" + DataInitializer "" + SharedConstantsCachingThreshold 1024 Array { Type "Handle" Dimension 2 Simulink.CodeAppCC { - $ObjectID 20 - Version "1.13.0" + $ObjectID 16 + Version "1.14.3" Array { Type "Cell" Dimension 16 @@ -564,6 +565,7 @@ Model { } ForceParamTrailComments off GenerateComments on + CommentStyle "Auto" IgnoreCustomStorageClasses off IgnoreTestpoints off IncHierarchyInIds off @@ -586,6 +588,7 @@ Model { CustomSymbolStrBlkIO "rtb_$N$M" CustomSymbolStrTmpVar "$N$M" CustomSymbolStrMacro "$R$N$M" + CustomSymbolStrUtil "$N$C" DefineNamingRule "None" ParamNamingRule "None" SignalNamingRule "None" @@ -601,13 +604,13 @@ Model { } Simulink.GRTTargetCC { $BackupClass "Simulink.TargetCC" - $ObjectID 21 - Version "1.13.0" + $ObjectID 17 + Version "1.14.3" Array { Type "Cell" - Dimension 12 + Dimension 11 Cell "IncludeMdlTerminateFcn" - Cell "CombineOutputUpdateFcns" + Cell "GenerateAllocFcn" Cell "SuppressErrorStatus" Cell "ERTCustomFileBanners" Cell "GenerateSampleERTMain" @@ -617,13 +620,14 @@ Model { Cell "SupportNonInlinedSFcns" Cell "SupportComplex" Cell "SupportAbsoluteTime" - Cell "GenerateAllocFcn" PropName "DisabledProps" } TargetFcnLib "ansi_tfl_tmw.mat" TargetLibSuffix "" TargetPreCompLibLocation "" - CodeReplacementLibrary "ANSI_C" + GenFloatMathFcnCalls "NOT IN USE" + TargetLangStandard "C89/C90 (ANSI)" + CodeReplacementLibrary "None" UtilityFuncGeneration "Auto" ERTMultiwordTypeDef "System defined" ERTMultiwordLength 256 @@ -631,7 +635,6 @@ Model { GenerateFullHeader on GenerateSampleERTMain off GenerateTestInterfaces off - IsPILTarget off ModelReferenceCompliant on ParMdlRefBuildCompliant on CompOptLevelCompliant on @@ -648,6 +651,7 @@ Model { LogVarNameModifier "rt_" MatFileLogging on MultiInstanceERTCode off + CodeInterfacePackaging "Nonreusable function" SupportNonFinite on SupportComplex on PurelyIntegerCode off @@ -656,12 +660,14 @@ Model { SupportVariableSizeSignals off EnableShiftOperators on ParenthesesLevel "Nominal" + CastingMode "Nominal" MATLABClassNameForMDSCustomization "Simulink.SoftwareTarget.GRTCustomization" ModelStepFunctionPrototypeControlCompliant off - CPPClassGenCompliant off + CPPClassGenCompliant on AutosarCompliant off GRTInterface on GenerateAllocFcn off + GenerateSharedConstants on UseMalloc off ExtMode off ExtModeStaticAlloc off @@ -675,6 +681,7 @@ Model { RTWCAPIStates off RTWCAPIRootIO off GenerateASAP2 off + MultiInstanceErrorCode "Error" } PropName "Components" } @@ -689,11 +696,11 @@ Model { } Simulink.ConfigSet { $PropName "ActiveConfigurationSet" - $ObjectID 11 + $ObjectID 7 } Object { $PropName "DataTransfer" - $ObjectID 22 + $ObjectID 18 $ClassName "Simulink.GlobalDataTransfer" DefaultTransitionBetweenSyncTasks "Ensure deterministic transfer (maximum delay)" DefaultTransitionBetweenAsyncTasks "Ensure data integrity only" @@ -788,6 +795,7 @@ Model { Format "short" Decimation "10" Floating off + Lockdown off SampleTime "-1" } Block { @@ -870,11 +878,15 @@ Model { Permissions "ReadWrite" PermitHierarchicalResolution "All" TreatAsAtomicUnit off + MinAlgLoopOccurrences off + PropExecContextOutsideSubsystem off CheckFcnCallInpInsideContextMsg off SystemSampleTime "-1" + RTWSystemCode "Auto" RTWFcnNameOpts "Auto" RTWFileNameOpts "Auto" FunctionInterfaceSpec "void_void" + FunctionWithSeparateData off RTWMemSecFuncInitTerm "Inherit from model" RTWMemSecFuncExecute "Inherit from model" RTWMemSecDataConstants "Inherit from model" @@ -884,9 +896,12 @@ Model { DataTypeOverride "UseLocalSettings" DataTypeOverrideAppliesTo "AllNumericTypes" MinMaxOverflowLogging "UseLocalSettings" + Opaque off + MaskHideContents off SFBlockType "NONE" Variant off GeneratePreprocessorConditionals off + ContentPreviewEnabled off } Block { BlockType Sum @@ -908,7 +923,7 @@ Model { System { Name "send_receive" Location [346, 78, 1222, 990] - Open on + Open off ModelBrowserVisibility off ModelBrowserWidth 247 ScreenColor "white" @@ -930,13 +945,7 @@ Model { Position [410, 98, 610, 192] ZOrder -1 BackgroundColor "lightBlue" - MinAlgLoopOccurrences off - PropExecContextOutsideSubsystem off - RTWSystemCode "Auto" - FunctionWithSeparateData off - Opaque off RequestExecContextInheritance off - MaskHideContents off System { Name "sc_console" Location [16, 52, 1715, 1151] @@ -1035,6 +1044,7 @@ Model { LibraryVersion "1.471" SourceBlock "rtlab/OpComm" SourceType "RT-LAB OpComm" + ContentPreviewEnabled off nbport "3" groupe_acq "1" subsys_rate "0" @@ -1074,7 +1084,6 @@ Model { FontName "Arial" FontSize 8 Decimation "1" - Lockdown off } Block { BlockType Scope @@ -1108,6 +1117,7 @@ Model { SaveName "ScopeData1" DataFormat "StructureWithTime" SampleTime "0" + ScrollMode off } Block { BlockType Scope @@ -1140,6 +1150,7 @@ Model { YMax "4" DataFormat "StructureWithTime" SampleTime "0" + ScrollMode off } Block { BlockType Scope @@ -1173,6 +1184,7 @@ Model { SaveName "ScopeData2" DataFormat "StructureWithTime" SampleTime "0" + ScrollMode off } Block { BlockType Scope @@ -1206,6 +1218,7 @@ Model { SaveName "ScopeData3" DataFormat "StructureWithTime" SampleTime "0" + ScrollMode off } Block { BlockType Display @@ -1218,9 +1231,9 @@ Model { FontName "Arial" FontSize 8 Decimation "1" - Lockdown off } Line { + ZOrder 1 SrcBlock "errors_status" SrcPort 1 Points [25, 0; 0, 15] @@ -1228,27 +1241,32 @@ Model { DstPort 1 } Line { + ZOrder 2 SrcBlock "OpComm" SrcPort 2 Points [45, 0; 0, 80] Branch { + ZOrder 3 Labels [1, 0] DstBlock "Demux1" DstPort 1 } Branch { + ZOrder 4 Points [0, -80] DstBlock "message 1" DstPort 1 } } Line { + ZOrder 5 SrcBlock "data recv" SrcPort 1 DstBlock "OpComm" DstPort 2 } Line { + ZOrder 6 SrcBlock "OpComm" SrcPort 1 Points [10, 0] @@ -1256,6 +1274,7 @@ Model { DstPort 1 } Line { + ZOrder 7 SrcBlock "Demux" SrcPort 1 Points [45, 0; 0, -30] @@ -1263,12 +1282,14 @@ Model { DstPort 1 } Line { + ZOrder 8 SrcBlock "Demux" SrcPort 2 DstBlock "reception status" DstPort 1 } Line { + ZOrder 9 Labels [0, 0] SrcBlock "Mux" SrcPort 1 @@ -1276,6 +1297,7 @@ Model { DstPort 1 } Line { + ZOrder 10 SrcBlock "data send" SrcPort 1 Points [25, 0; 0, -15] @@ -1283,50 +1305,60 @@ Model { DstPort 3 } Line { + ZOrder 11 SrcBlock "OpComm" SrcPort 3 Points [25, 0; 0, 150] Branch { + ZOrder 12 Points [0, 0] DstBlock "Demux2" DstPort 1 } Branch { + ZOrder 13 Points [0, 55] DstBlock "message 3" DstPort 1 } } Line { + ZOrder 14 SrcBlock "Subtract" SrcPort 1 DstBlock "message 4" DstPort 1 } Line { + ZOrder 15 SrcBlock "Demux2" SrcPort 5 Points [40, 0; 0, -45] Branch { + ZOrder 16 Points [0, -70] DstBlock "Mux" DstPort 2 } Branch { + ZOrder 17 DstBlock "Subtract" DstPort 2 } } Line { + ZOrder 18 SrcBlock "Demux1" SrcPort 5 Points [25, 0] Branch { + ZOrder 19 Points [0, -40] DstBlock "Mux" DstPort 1 } Branch { + ZOrder 20 Points [0, 35] DstBlock "Subtract" DstPort 1 @@ -1335,7 +1367,10 @@ Model { Annotation { SID "45" Name "Simple analysis of round trip time" - Position [273, 42] + Position [273, 42, 535, 61] + InternalMargins [0, 0, 0, 0] + FixedHeight off + FixedWidth off ZOrder -1 FontName "Verdana" FontSize 14 @@ -1351,13 +1386,7 @@ Model { Position [55, 97, 235, 193] ZOrder -2 BackgroundColor "lightBlue" - MinAlgLoopOccurrences off - PropExecContextOutsideSubsystem off - RTWSystemCode "Auto" - FunctionWithSeparateData off - Opaque off RequestExecContextInheritance off - MaskHideContents off System { Name "sm_model" Location [16, 52, 1468, 964] @@ -1408,9 +1437,9 @@ Model { SourceType "OpAsyncIPCtrl" ctl_id "1" proto "UDP/IP" - ip_addr_remote "134.130.169.31" + ip_addr_remote "134.130.169.32" ip_port_remote "12000" - ip_port_local "12001" + ip_port_local "12000" ip_addr_mcast "0.0.0.0" exe_name "AsyncIP" } @@ -1458,6 +1487,7 @@ Model { LibraryVersion "1.471" SourceBlock "rtlab/Communication/Asynchronous/OpAsyncRecv" SourceType "OpAsyncRecv" + ContentPreviewEnabled off ctl_id "1" recv_id "1" enable_param off @@ -1482,6 +1512,7 @@ Model { LibraryVersion "1.471" SourceBlock "rtlab/Communication/Asynchronous/OpAsyncSend" SourceType "OpAsyncSend" + ContentPreviewEnabled off ctl_id "1" send_id "1" mode "DONT_NEED_REPLY" @@ -1543,36 +1574,42 @@ Model { IconDisplay "Port number" } Line { + ZOrder 1 SrcBlock "receive message 1" SrcPort 3 DstBlock "set width" DstPort 1 } Line { + ZOrder 2 SrcBlock "receive message 1" SrcPort 1 DstBlock "Mux" DstPort 2 } Line { + ZOrder 3 SrcBlock "receive message 1" SrcPort 2 DstBlock "Mux" DstPort 3 } Line { + ZOrder 4 SrcBlock "timeout" SrcPort 1 DstBlock "receive message 1" DstPort 1 } Line { + ZOrder 5 SrcBlock "send message 1" SrcPort 1 DstBlock "Mux" DstPort 1 } Line { + ZOrder 6 SrcBlock "Mux" SrcPort 1 Points [0, -15] @@ -1580,40 +1617,47 @@ Model { DstPort 1 } Line { + ZOrder 7 SrcBlock "set width" SrcPort 1 DstBlock "data recv" DstPort 1 } Line { + ZOrder 8 SrcBlock "constants" SrcPort 1 DstBlock "Mux1" DstPort 1 } Line { + ZOrder 9 Labels [0, 0] SrcBlock "Mux1" SrcPort 1 Points [45, 0] Branch { + ZOrder 10 Points [0, -80] DstBlock "send message 1" DstPort 2 } Branch { + ZOrder 11 Labels [1, 0] DstBlock "data send" DstPort 1 } } Line { + ZOrder 12 SrcBlock "data ready 2 kHz" SrcPort 1 DstBlock "send message 1" DstPort 1 } Line { + ZOrder 13 SrcBlock "Pulse\nGenerator" SrcPort 1 DstBlock "Mux1" @@ -1622,7 +1666,10 @@ Model { Annotation { SID "46" Name "Simple VILLASnode to OPAL test using UDP messages" - Position [288, 52] + Position [318, 57, 739, 76] + InternalMargins [0, 0, 0, 0] + FixedHeight off + FixedWidth off ZOrder -1 FontName "Verdana" FontSize 14 @@ -1631,18 +1678,21 @@ Model { } } Line { + ZOrder 1 SrcBlock "sm_model" SrcPort 1 DstBlock "sc_console" DstPort 1 } Line { + ZOrder 2 SrcBlock "sm_model" SrcPort 2 DstBlock "sc_console" DstPort 2 } Line { + ZOrder 3 Labels [0, 0] SrcBlock "sm_model" SrcPort 3 diff --git a/clients/opal/villas_udp/models/send_receive/send_receive.probe b/clients/opal/villas_udp/models/send_receive/send_receive.probe index 6095b7f63..70c59d2f7 100644 --- a/clients/opal/villas_udp/models/send_receive/send_receive.probe +++ b/clients/opal/villas_udp/models/send_receive/send_receive.probe @@ -36,7 +36,7 @@ duration=0.005000 dynSignalsList=0 fileLimit=0 level=0.000000 -maxDynSignals=44 +maxDynSignals=100 newMemSize=100 nodeId=158494572 numValues=100 @@ -44,7 +44,7 @@ offset=0 rearmDelay=0.000000 repetitive=1 signalName= -signalNameId=1023 +signalNameId=1818584175 trigSigNameId=1866690149 trigSignalName= trigType=0 diff --git a/clients/opal/villas_udp/villas_udp.llp b/clients/opal/villas_udp/villas_udp.llp index df1351c57..99730593a 100644 --- a/clients/opal/villas_udp/villas_udp.llp +++ b/clients/opal/villas_udp/villas_udp.llp @@ -3,17 +3,17 @@ villas_udp This is a project! - 134.130.169.16:25252 - 7B042784-8CF2-444A-92E3-8457E429E28A + 134.130.169.120:25251 + FC70D2D4-2B11-40E7-8317-6C0EB3BB3182 ON - C:\Users\opal-user\OPAL-RT\msv-ufa\villas_udp\villas_udp.llp + C:\Users\svo\workspace\villas\node\clients\opal\villas_udp\villas_udp.llp models/send_receive/send_receive.mdl - C:/Users/opal-user/OPAL-RT/msv-ufa/villas_udp/models/send_receive/send_receive.mdl - C:/Users/opal-user/OPAL-RT/msv-ufa/villas_udp/models/send_receive/send_receive.mdl + C:/Users/svo/workspace/villas/node/clients/opal/villas_udp/models/send_receive/send_receive.mdl + C:/Users/svo/workspace/villas/node/clients/opal/villas_udp/models/send_receive/send_receive.mdl