diff --git a/.travis.yml b/.travis.yml index a658f5c0a6b..7d92bab96fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,9 @@ env: - TEST_ARG="make test-dymola PACKAGE=\"Buildings.{Air,Examples}\"" - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.{Air,Examples}\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.{Air,Examples}\"" + - TEST_ARG="make test-dymola PACKAGE=\"Buildings.Controls\"" + - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Controls\"" + - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Controls\"" - TEST_ARG="make test-dymola PACKAGE=\"Buildings.ThermalZones.EnergyPlus_24_2_0\"" - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.ThermalZones.EnergyPlus_24_2_0\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.ThermalZones.EnergyPlus_24_2_0\"" @@ -95,9 +98,9 @@ env: - TEST_ARG="make test-dymola PACKAGE=\"Buildings.Electrical\"" - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.Electrical\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.Electrical\"" - - TEST_ARG="make test-dymola PACKAGE=\"Buildings.{Airflow,BoundaryConditions,Controls}\"" - - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.{Airflow,BoundaryConditions,Controls}\"" - - TEST_ARG="make test-optimica PACKAGE=\"Buildings.{Airflow,BoundaryConditions,Controls}\"" + - TEST_ARG="make test-dymola PACKAGE=\"Buildings.{Airflow,BoundaryConditions}\"" + - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.{Airflow,BoundaryConditions}\"" + - TEST_ARG="make test-optimica PACKAGE=\"Buildings.{Airflow,BoundaryConditions}\"" - TEST_ARG="make test-dymola PACKAGE=\"Buildings.HeatTransfer\"" - TEST_ARG="make test-openmodelica PACKAGE=\"Buildings.HeatTransfer\"" - TEST_ARG="make test-optimica PACKAGE=\"Buildings.HeatTransfer\"" diff --git a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/TuningMonitor.mo b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/TuningMonitor.mo index efaee3a1775..fdc56579b1d 100644 --- a/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/TuningMonitor.mo +++ b/Buildings/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/TuningMonitor.mo @@ -39,13 +39,17 @@ protected Buildings.Controls.OBC.CDL.Discrete.TriggeredSampler samAddtOntOff "Sample the minimum period when the minimum period is greater than 0" annotation (Placement(transformation(extent={{-40,-20},{-20,0}}))); - Buildings.Controls.OBC.CDL.Reals.Greater tInc + Buildings.Controls.OBC.CDL.Reals.Greater tInc( + u1(unit="s"), + u2(unit="s")) "Check if either the length for the on period or the length for the off period increases after they both become positive" annotation (Placement(transformation(extent={{40,20},{60,40}}))); Buildings.Controls.OBC.CDL.Reals.Add addtOntOff "Block that calculates the sum of the length for the on period and the length for the off period" annotation (Placement(transformation(extent={{-130,-20},{-110,0}}))); - Buildings.Controls.OBC.CDL.Reals.Greater tDec + Buildings.Controls.OBC.CDL.Reals.Greater tDec( + u1(unit="s"), + u2(unit="s")) "Check if either the length for the on period or the length for the off period decreases after they both become positive" annotation (Placement(transformation(extent={{40,-70},{60,-50}}))); Buildings.Controls.OBC.CDL.Logical.Or tCha @@ -146,6 +150,11 @@ annotation (defaultComponentName = "tunMon", Documentation(revisions="