diff --git a/src/xeto/ashrae.g36/vavs.xeto b/src/xeto/ashrae.g36/vavs.xeto index 55eb19b..21e9b1e 100644 --- a/src/xeto/ashrae.g36/vavs.xeto +++ b/src/xeto/ashrae.g36/vavs.xeto @@ -31,7 +31,7 @@ G36FanPoweredTerminalUnit : G36Vav { DischargeFanRunSensor DischargeFanRunCmd DischargeDamperCmd - HotWaterValveCmd + HotWaterValveModulatingCmd DischargeAirFlowSensor DischargeAirTempSensor } @@ -65,7 +65,7 @@ G36ReheatVav : G36Vav { hotWaterHeating singleDuct points: { - HotWaterValveCmd + HotWaterValveModulatingCmd DischargeDamperCmd DischargeAirFlowSensor DischargeAirTempSensor diff --git a/src/xeto/doc.xeto/Sugar.md b/src/xeto/doc.xeto/Sugar.md index be1d710..bfbc641 100644 --- a/src/xeto/doc.xeto/Sugar.md +++ b/src/xeto/doc.xeto/Sugar.md @@ -247,7 +247,7 @@ sugar spec: +StandardVav { hotWaterHeating points: { - HotWaterValveCmd + HotWaterValveModulatingCmd } } diff --git a/src/xeto/ph.points/actuator.xeto b/src/xeto/ph.points/actuator.xeto new file mode 100644 index 0000000..38462b3 --- /dev/null +++ b/src/xeto/ph.points/actuator.xeto @@ -0,0 +1,16 @@ +// +// Copyright (c) 2026, Project-Haystack +// Licensed under the Academic Free License version 3.0 +// +// History: +// 26 Aug 2026 Rick Jennings Creation +// + +// Sensor for modulating actuator position. Position is measured as a +// percentage where 0% is closed and 100% is fully open. +ActuatorModulatingSensor : ModulatingSensor { actuator } + +// Command for modulating actuator position. Position is measured as a +// percentage where 0% is closed and 100% is fully open. +ActuatorModulatingCmd : ModulatingCmd { actuator } + diff --git a/src/xeto/ph.points/valve.xeto b/src/xeto/ph.points/valve.xeto index e963ffb..a816c0f 100644 --- a/src/xeto/ph.points/valve.xeto +++ b/src/xeto/ph.points/valve.xeto @@ -6,35 +6,34 @@ // 3 Nov 2022 Brian Frank Creation // -// Point associated with a valve; 0% is fully closed and 100% is fully open. -ValvePoint : NumberPoint { - valve - unit: Unit "%" -} +// Sensor for modulating valve position. Position is measured as a +// percentage where 0% is closed and 100% is fully open. +ValveModulatingSensor : ActuatorModulatingSensor { valve } -// Valve position sensor; 0% is fully closed and 100% is fully open. -ValveSensor : ValvePoint & SensorPoint - -// Valve position command; 0% is fully closed and 100% is fully open. -ValveCmd : ValvePoint & CmdPoint +// Command for modulating valve position. Position is measured as a +// percentage where 0% is closed and 100% is fully open. +ValveModulatingCmd : ActuatorModulatingCmd { valve } ////////////////////////////////////////////////////////////////////////// // Chilled Water ////////////////////////////////////////////////////////////////////////// -// Valve sensor for chilled water -ChilledWaterValveSensor : ValveSensor { chilled, water } +// Sensor for chilled water modulating valve position. Position is +// measured as a percentage where 0% is closed and 100% is fully open. +ChilledWaterValveModulatingSensor : ValveModulatingSensor { chilled, water } -// Valve commad for hot water -ChilledWaterValveCmd : ValveCmd { chilled, water } +// Command for chilled water modulating valve position. Position is +// measured as a percentage where 0% is closed and 100% is fully open. +ChilledWaterValveModulatingCmd : ValveModulatingCmd { chilled, water } ////////////////////////////////////////////////////////////////////////// // Hot Water ////////////////////////////////////////////////////////////////////////// -// Valve sensor for hot water -HotWaterValveSensor : ValveSensor { hot, water } - -// Valve commad for hot water -HotWaterValveCmd : ValveCmd { hot, water } +// Sensor for hot water modulating valve position. Position is +// measured as a percentage where 0% is closed and 100% is fully open. +HotWaterValveModulatingSensor : ValveModulatingSensor { hot, water } +// Command for hot water modulating valve position. Position is +// measured as a percentage where 0% is closed and 100% is fully open. +HotWaterValveModulatingCmd : ValveModulatingCmd { hot, water }