Merge pull request #563 from iea-annex60/issue562_PID

Corrected annotation, and made rendering conditional.
ibpsa · Nov 3, 2016 · 7be4362 · 7be4362
2 parents 314dd1c + 8c17f25
commit 7be4362
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Annex60/Utilities/Math/IntegratorWithReset.mo b/Annex60/Utilities/Math/IntegratorWithReset.mo
@@ -22,7 +22,7 @@ block IntegratorWithReset "Output the integral of the input signal"
     "Value to which integrator is reset, used if reset = Annex60.Types.Reset.Parameter"
     annotation(Evaluate=true,
                Dialog(
-                 enable=reset == Annex60.Types.Reset.Input.Parameter,
+                 enable=reset == Annex60.Types.Reset.Parameter,
                  group="Integrator reset"));
 
   Modelica.Blocks.Interfaces.RealInput y_reset_in if
@@ -125,6 +125,13 @@ has been copied into this model rather than extended.
 </html>", revisions="<html>
 <ul>
 <li>
+November 1, 2016, by Michael Wetter:<br/>
+Corrected wrong annotation for <code>y_reset</code>,
+and made rendering of <code>y_reset_in</code> conditional.<br/>
+This is for
+<a href=\"https://github.com/iea-annex60/modelica-annex60/issues/562\">#562</a>.
+</li>
+<li>
 September 29, 2016, by Michael Wetter:<br/>
 Refactored model to use a <code>type</code> for configuration
 of the integrator reset.
@@ -151,7 +158,8 @@ Icon(coordinateSystem(
           Text(
             extent={{-88,-94},{212,-54}},
           lineColor={0,0,0},
-          textString="y_reset",
+          textString="y_reset_in",
+          visible=reset == Annex60.Types.Reset.Input,
           horizontalAlignment=TextAlignment.Left),
         Bitmap(extent={{-54,-50},{60,50}}, fileName=
               "modelica://Annex60/Resources/Images/Utilities/Math/int.png"),