From 279532e74fcc2687e95dfc97a1353d6d7173a54b Mon Sep 17 00:00:00 2001
From: Cody Rose <rosecodym@gmail.com>
Date: Thu, 9 Mar 2023 15:31:04 -0500
Subject: [PATCH] Revert "Revert "Adds Setpoint Schedules to Library definition
 (#46)" (#50)"

This reverts commit 7ed2432e123f8cb72b43beb4b27b98805fd345aa.
---
 Controls/InterfaceModels/ZoneConditioning.cs | 14 ++++++++++++++
 Core/ZoneConditioning.cs                     | 12 ++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/Controls/InterfaceModels/ZoneConditioning.cs b/Controls/InterfaceModels/ZoneConditioning.cs
index f308ada..4b2a0a0 100644
--- a/Controls/InterfaceModels/ZoneConditioning.cs
+++ b/Controls/InterfaceModels/ZoneConditioning.cs
@@ -48,6 +48,14 @@ public class ZoneConditioning : LibraryComponent
         [DefaultValue(true)]
         public bool IsCoolingOn { get; set; } = true;
 
+        [SimulationSetting(DisplayName = "IsCoolingSetpointConstant")]
+        [DefaultValue(true)]
+        public bool IsCoolingSetpointConstant { get; set; } = true;
+
+        [SimulationSetting(DisplayName = "IsHeatingSetpointConstant")]
+        [DefaultValue(true)]
+        public bool IsHeatingSetpointConstant { get; set; } = true;
+
         [SimulationSetting(DisplayName = "Cooling setpoint", Units = "degC")]
         [DefaultValue(26)]
         public double CoolingSetpoint { get; set; } = 26;
@@ -55,6 +63,12 @@ public class ZoneConditioning : LibraryComponent
         [SimulationSetting(DisplayName = "Cooling schedule")]
         public YearSchedule CoolingSchedule { get; set; }
 
+        [SimulationSetting(DisplayName = "Cooling setpoint schedule")]
+        public YearSchedule CoolingSetpointSchedule { get; set; }
+
+        [SimulationSetting(DisplayName = "Heating setpoint schedule")]
+        public YearSchedule HeatingSetpointSchedule { get; set; }
+
         [SimulationSetting(DisplayName = "Cooling limit type")]
         [DefaultValue(IdealSystemLimit.NoLimit)]
         public IdealSystemLimit CoolingLimitType { get; set; } = IdealSystemLimit.NoLimit;
diff --git a/Core/ZoneConditioning.cs b/Core/ZoneConditioning.cs
index 86b30fc..5e502d5 100644
--- a/Core/ZoneConditioning.cs
+++ b/Core/ZoneConditioning.cs
@@ -11,6 +11,12 @@ public class ZoneConditioning : LibraryComponent
         [DataMember]
         public YearSchedule CoolingSchedule { get; set; }
 
+        [DataMember]
+        public YearSchedule CoolingSetpointSchedule { get; set; }
+
+        [DataMember]
+        public YearSchedule HeatingSetpointSchedule { get; set; }
+
         [DataMember]
         public double CoolingCoeffOfPerf { get; set; }
 
@@ -59,6 +65,12 @@ public class ZoneConditioning : LibraryComponent
         [DataMember, DefaultValue(true)]
         public bool IsMechVentOn { get; set; } = true;
 
+        [DataMember, DefaultValue(true)]
+        public bool IsCoolingSetpointConstant { get; set; } = true;
+
+        [DataMember, DefaultValue(true)]
+        public bool IsHeatingSetpointConstant { get; set; } = true;
+
         [DataMember, DefaultValue(100)]
         public double MaxCoolFlow { get; set; } = 100;