Demos: Update description files

- Fix inconsistent model identifier - Use "::" in names as it is currently defined in the standard - Use fixed schema location
modelica · Nov 30, 2023 · 93acab3 · 93acab3
1 parent 8bb7b57
commit 93acab3
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 28 deletions.
diff --git a/ls-bus-guide/demos/can-bus-simulation/description/buildDescription.xml b/ls-bus-guide/demos/can-bus-simulation/description/buildDescription.xml
@@ -2,7 +2,7 @@
 <fmiBuildDescription fmiVersion="3.0"
                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                      xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/modelica/fmi-standard/v3.0.1/schema/fmi3BuildDescription.xsd">
-  <BuildConfiguration modelIdentifier="DemoBusSimulation">
+  <BuildConfiguration modelIdentifier="DemoCanBusSimulation">
     <SourceFileSet language="C99">
       <SourceFile name="App.c"/>
       <SourceFile name="Fmu.c"/>

diff --git a/ls-bus-guide/demos/can-bus-simulation/description/fmi-ls-manifest.xml b/ls-bus-guide/demos/can-bus-simulation/description/fmi-ls-manifest.xml
@@ -5,4 +5,4 @@
 		fmi-ls:fmi-ls-version="1.0.0"
 		fmi-ls:fmi-ls-description="Layered Standard for the simulation of bus communication on a signal or network abstraction based level."
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../../../Fmi3LsBus/schemas/fmi3LayeredStandardBusManifest.xsd"/>
+    xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/modelica/fmi-ls-bus/473bd5b80730c47373bf41f1c31d44f50de82dd0/schema/fmi3LayeredStandardBusManifest.xsd"/>
diff --git a/ls-bus-guide/demos/can-bus-simulation/description/modelDescription.xml b/ls-bus-guide/demos/can-bus-simulation/description/modelDescription.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
     fmiVersion="3.0"
-    modelName="DemoBusSimulation"
+    modelName="DemoCanBusSimulation"
     instantiationToken=""
     variableNamingConvention="structured"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/modelica/fmi-standard/v3.0.1/schema/fmi3ModelDescription.xsd">
 
   <CoSimulation
-      modelIdentifier="DemoTriggeredOutput"
+      modelIdentifier="DemoCanBusSimulation"
       needsExecutionTool="false"
       canGetAndSetFMUState="false"
       canSerializeFMUState="false"
@@ -43,7 +43,7 @@
   <ModelVariables>
     <Float64 name="time" valueReference="1024" causality="independent" variability="continuous" description="Simulation time" />
 
-    <Binary name="Node1.Rx_Data"
+    <Binary name="Node1::Rx_Data"
         valueReference="0"
         causality="input"
         variability="discrete"
@@ -55,7 +55,7 @@
         <Start value="" />
     </Binary>
 
-    <Binary name="Node1.Tx_Data"
+    <Binary name="Node1::Tx_Data"
         valueReference="1"
         causality="output"
         variability="discrete"
@@ -65,10 +65,10 @@
         mimeType="org.fmi-standard.fmi-ls-bus.v1.can">
     </Binary>
 
-    <Clock name="Node1.Rx_Clock" valueReference="2" causality="input" intervalVariability="triggered" />
-    <Clock name="Node1.Tx_Clock" valueReference="3" causality="input" intervalVariability="countdown" />
+    <Clock name="Node1::Rx_Clock" valueReference="2" causality="input" intervalVariability="triggered" />
+    <Clock name="Node1::Tx_Clock" valueReference="3" causality="input" intervalVariability="countdown" />
 
-    <Binary name="Node2.Rx_Data"
+    <Binary name="Node2::Rx_Data"
             valueReference="4"
             causality="input"
             variability="discrete"
@@ -80,7 +80,7 @@
       <Start value="" />
     </Binary>
 
-    <Binary name="Node2.Tx_Data"
+    <Binary name="Node2::Tx_Data"
             valueReference="5"
             causality="output"
             variability="discrete"
@@ -90,8 +90,8 @@
             mimeType="org.fmi-standard.fmi-ls-bus.v1.can">
     </Binary>
 
-    <Clock name="Node2.Rx_Clock" valueReference="6" causality="input" intervalVariability="triggered" />
-    <Clock name="Node2.Tx_Clock" valueReference="7" causality="input" intervalVariability="countdown" />
+    <Clock name="Node2::Rx_Clock" valueReference="6" causality="input" intervalVariability="triggered" />
+    <Clock name="Node2::Tx_Clock" valueReference="7" causality="input" intervalVariability="countdown" />
   </ModelVariables>
 
   <ModelStructure>

diff --git a/ls-bus-guide/demos/can-bus-simulation/description/terminalsAndIcons.xml b/ls-bus-guide/demos/can-bus-simulation/description/terminalsAndIcons.xml
@@ -8,33 +8,33 @@
               name="Node1"
               description="CAN bus terminal definition">
       <TerminalMemberVariable variableKind="signal"
-                              variableName="Node1.Rx_Clock"
+                              variableName="Node1::Rx_Clock"
                               memberName="Rx_Clock" />
       <TerminalMemberVariable variableKind="signal"
-                              variableName="Node1.Rx_Data"
+                              variableName="Node1::Rx_Data"
                               memberName="Rx_Data" />
       <TerminalMemberVariable variableKind="signal"
-                              variableName="Node1.Tx_Clock"
+                              variableName="Node1::Tx_Clock"
                               memberName="Tx_Clock" />
       <TerminalMemberVariable variableKind="signal"
-                              variableName="Node1.Tx_Data"
+                              variableName="Node1::Tx_Data"
                               memberName="Tx_Data" />
     </Terminal>
     <Terminal terminalKind="org.fmi-ls-bus.network-terminal"
               matchingRule="org.fmi-ls-bus.transceiver"
               name="Node2"
               description="CAN bus terminal definition">
       <TerminalMemberVariable variableKind="signal"
-                              variableName="Node2.Rx_Clock"
+                              variableName="Node2::Rx_Clock"
                               memberName="Rx_Clock" />
       <TerminalMemberVariable variableKind="signal"
-                              variableName="Node2.Rx_Data"
+                              variableName="Node2::Rx_Data"
                               memberName="Rx_Data" />
       <TerminalMemberVariable variableKind="signal"
-                              variableName="Node2.Tx_Clock"
+                              variableName="Node2::Tx_Clock"
                               memberName="Tx_Clock" />
       <TerminalMemberVariable variableKind="signal"
-                              variableName="Node2.Tx_Data"
+                              variableName="Node2::Tx_Data"
                               memberName="Tx_Data" />
     </Terminal>
   </Terminals>

diff --git a/ls-bus-guide/demos/can-node-triggered-output/description/buildDescription.xml b/ls-bus-guide/demos/can-node-triggered-output/description/buildDescription.xml
@@ -2,7 +2,7 @@
 <fmiBuildDescription fmiVersion="3.0"
                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                      xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/modelica/fmi-standard/v3.0.1/schema/fmi3BuildDescription.xsd">
-  <BuildConfiguration modelIdentifier="DemoTriggeredOutput">
+  <BuildConfiguration modelIdentifier="DemoCanNodeTriggeredOutput">
     <SourceFileSet language="C99">
       <SourceFile name="App.c"/>
       <SourceFile name="Fmu.c"/>

diff --git a/ls-bus-guide/demos/can-node-triggered-output/description/fmi-ls-manifest.xml b/ls-bus-guide/demos/can-node-triggered-output/description/fmi-ls-manifest.xml
@@ -5,4 +5,4 @@
 		fmi-ls:fmi-ls-version="1.0.0"
 		fmi-ls:fmi-ls-description="Layered Standard for the simulation of bus communication on a signal or network abstraction based level."
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../../../Fmi3LsBus/schemas/fmi3LayeredStandardBusManifest.xsd"/>
+    xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/modelica/fmi-ls-bus/473bd5b80730c47373bf41f1c31d44f50de82dd0/schema/fmi3LayeredStandardBusManifest.xsd"/>
diff --git a/ls-bus-guide/demos/can-node-triggered-output/description/modelDescription.xml b/ls-bus-guide/demos/can-node-triggered-output/description/modelDescription.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fmiModelDescription
     fmiVersion="3.0"
-    modelName="DemoTriggeredOutput"
+    modelName="DemoCanNodeTriggeredOutput"
     instantiationToken=""
     variableNamingConvention="structured"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/modelica/fmi-standard/v3.0.1/schema/fmi3ModelDescription.xsd">
 
   <CoSimulation
-      modelIdentifier="DemoTriggeredOutput"
+      modelIdentifier="DemoCanNodeTriggeredOutput"
       needsExecutionTool="false"
       canGetAndSetFMUState="false"
       canSerializeFMUState="false"
@@ -42,7 +42,7 @@
   <ModelVariables>
     <Float64 name="time" valueReference="1024" causality="independent" variability="continuous" description="Simulation time" />
 
-    <Binary name="CanChannel.Rx_Data"
+    <Binary name="CanChannel::Rx_Data"
         valueReference="0"
         causality="input"
         variability="discrete"
@@ -54,7 +54,7 @@
         <Start value="" />
     </Binary>
 
-    <Binary name="CanChannel.Tx_Data"
+    <Binary name="CanChannel::Tx_Data"
         valueReference="1"
         causality="output"
         variability="discrete"
@@ -64,8 +64,8 @@
         mimeType="org.fmi-standard.fmi-ls-bus.v1.can">
     </Binary>
 
-    <Clock name="CanChannel.Rx_Clock" valueReference="2" causality="input" intervalVariability="triggered" />
-    <Clock name="CanChannel.Tx_Clock" valueReference="3" causality="output" intervalVariability="triggered" />
+    <Clock name="CanChannel::Rx_Clock" valueReference="2" causality="input" intervalVariability="triggered" />
+    <Clock name="CanChannel::Tx_Clock" valueReference="3" causality="output" intervalVariability="triggered" />
 
     <Boolean name="org.fmi_standard.fmi_ls_bus.Can_BusNotifications" valueReference="128" causality="structuralParameter" variability="fixed" start="false" />
   </ModelVariables>