Merge pull request #49 from DLR-SR/master

Franciscus van der Linden · web-flow · commit 89687bce9253 · 2017-01-12T16:08:37.000+01:00
Update to Modelica 3.2.2
diff --git a/FaultTriggering/UsersGuide/ReleaseNotes/Version_0_6_6.mo b/FaultTriggering/UsersGuide/ReleaseNotes/Version_0_6_6.mo
@@ -0,0 +1,16 @@
+within FaultTriggering.UsersGuide.ReleaseNotes;
+class Version_0_6_6 "Version 0.6.6 (2017-01-12)"
+  extends Modelica.Icons.ReleaseNotes;
+
+    annotation (Documentation(info="<html>
+<p>Added functionality that generates a populated FaultTrigger Block</p>
+<p>Update to Modelica 2.2</p>
+</html>",
+revisions="<html><table border=0 cellspacing=0 cellpadding=0>
+  <tr><td valign=\"center\"> <img src=\"modelica://FaultTriggering/Resources/Documentation/Images/logo_dlr.png\" ></td>
+  <td valign=\"center\"> <b>Copyright &copy; 1999-2013, DLR Institute of System Dynamics and Control <b> </td>
+  </tr>
+ </table>
+</html>"));
+
+end Version_0_6_6;
diff --git a/FaultTriggering/UsersGuide/ReleaseNotes/package.order b/FaultTriggering/UsersGuide/ReleaseNotes/package.order
@@ -4,3 +4,4 @@ Version_0_3_0
 Version_0_3_1
 Version_0_4_0
 Version_0_5_0
+Version_0_6_6
diff --git a/FaultTriggering/libraryinfo.mos b/FaultTriggering/libraryinfo.mos
@@ -4,10 +4,10 @@ LibraryInfoMenuSeparator(
 
 LibraryInfoMenuCommand(
   category="libraries",
-  text="FaultTriggering 0.6.5",
+  text="FaultTriggering 0.6.6",
   reference="FaultTriggering",
-  version="0.6.5",
+  version="0.6.6",
   isModel=true,
-  description="FaultTriggering Library 0.6.5 (for Modelica 3.2.1)",
-  ModelicaVersion="3.2.1",
+  description="FaultTriggering Library 0.6.6",
+  ModelicaVersion="3.2.2",
   pos=1111)
diff --git a/FaultTriggering/package.mo b/FaultTriggering/package.mo
@@ -7,8 +7,12 @@ package FaultTriggering "Library for Fault Triggering"
   import Modelica.Utilities.Strings;
 
 
-  annotation (uses(Modelica(version="3.2.1")),
-    version="0.6.5", conversion(from(version="0.6.4", to="0.6.5", script="modelica://FaultTriggering/Resources/Scripts/Convert_from_0.6.4_to_0.6.5.mos")),
+
+
+
+
+  annotation (uses(Modelica(version="3.2.2")),
+    version="0.6.6", conversion(from(version="0.6.4", to="0.6.5", script="modelica://FaultTriggering/Resources/Scripts/Convert_from_0.6.4_to_0.6.5.mos")),
     versionDate="2015-07-15",
 preferredView="info",
    Documentation(info="<html>
