From 06abda8648960d0231225e5606974111069f6e69 Mon Sep 17 00:00:00 2001 From: Rick Jennings Date: Wed, 2 Sep 2026 08:45:47 -0400 Subject: [PATCH] create ph.points.sugar lib and move water and air sugar specs to it --- src/xeto/ashrae.g36/lib.xeto | 7 +++-- src/xeto/ph.examples/lib.xeto | 7 +++-- .../air-flow.xeto | 28 +++++++++--------- .../air-humidity.xeto | 12 ++++---- .../air-pressure.xeto | 8 ++--- .../air-temp.xeto | 28 +++++++++--------- src/xeto/ph.points.sugar/lib.xeto | 29 +++++++++++++++++++ .../water-flow.xeto | 12 ++++---- .../water-pressure.xeto | 16 +++++----- .../water-temp.xeto | 18 ++++++------ .../water-volume.xeto | 4 +-- 11 files changed, 100 insertions(+), 69 deletions(-) rename src/xeto/{ph.points => ph.points.sugar}/air-flow.xeto (81%) rename src/xeto/{ph.points => ph.points.sugar}/air-humidity.xeto (72%) rename src/xeto/{ph.points => ph.points.sugar}/air-pressure.xeto (73%) rename src/xeto/{ph.points => ph.points.sugar}/air-temp.xeto (82%) create mode 100644 src/xeto/ph.points.sugar/lib.xeto rename src/xeto/{ph.points => ph.points.sugar}/water-flow.xeto (74%) rename src/xeto/{ph.points => ph.points.sugar}/water-pressure.xeto (61%) rename src/xeto/{ph.points => ph.points.sugar}/water-temp.xeto (67%) rename src/xeto/{ph.points => ph.points.sugar}/water-volume.xeto (77%) diff --git a/src/xeto/ashrae.g36/lib.xeto b/src/xeto/ashrae.g36/lib.xeto index 8a83405..1dafd4a 100644 --- a/src/xeto/ashrae.g36/lib.xeto +++ b/src/xeto/ashrae.g36/lib.xeto @@ -11,9 +11,10 @@ pragma: Lib < version: BuildVar "ph.version" maturity: BuildVar "ph.maturity" depends: { - { lib: "sys", versions: BuildVar "ph.depend" } - { lib: "ph", versions: BuildVar "ph.depend" } - { lib: "ph.points", versions: BuildVar "ph.depend" } + { lib: "sys", versions: BuildVar "ph.depend" } + { lib: "ph", versions: BuildVar "ph.depend" } + { lib: "ph.points", versions: BuildVar "ph.depend" } + { lib: "ph.points.sugar", versions: BuildVar "ph.depend" } } categories: {"ph", "hvac"} license: BuildVar "ph.license" diff --git a/src/xeto/ph.examples/lib.xeto b/src/xeto/ph.examples/lib.xeto index 67ed760..1892adf 100644 --- a/src/xeto/ph.examples/lib.xeto +++ b/src/xeto/ph.examples/lib.xeto @@ -12,9 +12,10 @@ pragma: Lib < version: BuildVar "ph.version" maturity: BuildVar "ph.maturity" depends: { - { lib: "sys", versions: BuildVar "ph.depend" } - { lib: "ph", versions: BuildVar "ph.depend" } - { lib: "ph.points", versions: BuildVar "ph.depend" } + { lib: "sys", versions: BuildVar "ph.depend" } + { lib: "ph", versions: BuildVar "ph.depend" } + { lib: "ph.points", versions: BuildVar "ph.depend" } + { lib: "ph.points.sugar", versions: BuildVar "ph.depend" } } categories: {"ph"} license: BuildVar "ph.license" diff --git a/src/xeto/ph.points/air-flow.xeto b/src/xeto/ph.points.sugar/air-flow.xeto similarity index 81% rename from src/xeto/ph.points/air-flow.xeto rename to src/xeto/ph.points.sugar/air-flow.xeto index 225479f..fec6c68 100644 --- a/src/xeto/ph.points/air-flow.xeto +++ b/src/xeto/ph.points.sugar/air-flow.xeto @@ -11,10 +11,10 @@ ////////////////////////////////////////////////////////////////////////// // Sensor for volumetric air flow in discharge duct -DischargeAirFlowSensor : AirFlowSensor { discharge } +DischargeAirFlowSensor : AirFlowSensor { discharge } // Setpoint for volumetric air flow in discharge duct -DischargeAirFlowSp : AirFlowSp { discharge } +DischargeAirFlowSp : AirFlowSp { discharge } ////////////////////////////////////////////////////////////////////////// // ColdDeck Discharge @@ -42,30 +42,30 @@ HotDeckDischargeAirFlowSp : DischargeAirFlowSp { hotDeck } // Sensor for volumetric air flow in economizing duct. // Used when there are separate ducts for minimum fresh air vs economizing. -EconomizingAirFlowSensor : AirFlowSensor { economizing } +EconomizingAirFlowSensor : AirFlowSensor { economizing } // Setpoint for volumetric air flow in economizing duct. -EconomizingAirFlowSp : AirFlowSp { economizing } +EconomizingAirFlowSp : AirFlowSp { economizing } ////////////////////////////////////////////////////////////////////////// // Exhaust ////////////////////////////////////////////////////////////////////////// // Sensor for volumetric air flow in exhaust duct -ExhaustAirFlowSensor : AirFlowSensor { exhaust } +ExhaustAirFlowSensor : AirFlowSensor { exhaust } // Setpoint for volumetric air flow in exhaust duct -ExhaustAirFlowSp : AirFlowSp { exhaust } +ExhaustAirFlowSp : AirFlowSp { exhaust } ////////////////////////////////////////////////////////////////////////// // Inlet ////////////////////////////////////////////////////////////////////////// // Sensor for volumetric air flow in inlet duct -InletAirFlowSensor : AirFlowSensor { inlet } +InletAirFlowSensor : AirFlowSensor { inlet } // Setpoint for volumetric air flow in inlet duct -InletAirFlowSp : AirFlowSp { inlet } +InletAirFlowSp : AirFlowSp { inlet } ////////////////////////////////////////////////////////////////////////// // Outside @@ -73,21 +73,21 @@ InletAirFlowSp : AirFlowSp { inlet } // Sensor for volumetric air flow in outside duct. // Used when there one duct for both minimum fresh air and economizing. -OutsideAirFlowSensor : AirFlowSensor { outside } +OutsideAirFlowSensor : AirFlowSensor { outside } // Setpoint for volumetric air flow in outside duct. // Used when there one duct for both minimum fresh air and economizing. -OutsideAirFlowSp : AirFlowSp { outside } +OutsideAirFlowSp : AirFlowSp { outside } ////////////////////////////////////////////////////////////////////////// // Return ////////////////////////////////////////////////////////////////////////// // Sensor for volumetric air flow in return duct -ReturnAirFlowSensor : AirFlowSensor { return } +ReturnAirFlowSensor : AirFlowSensor { return } // Setpoint for volumetric air flow in return duct -ReturnAirFlowSp : AirFlowSp { return } +ReturnAirFlowSp : AirFlowSp { return } ////////////////////////////////////////////////////////////////////////// // Ventilation @@ -95,9 +95,9 @@ ReturnAirFlowSp : AirFlowSp { return } // Sensor for volumetric air flow in ventilation or minimum fresh air duct. // Used when there are separate ducts for minimum fresh air vs economizing. -VentilationAirFlowSensor : AirFlowSensor { ventilation } +VentilationAirFlowSensor : AirFlowSensor { ventilation } // Setpoint for volumetric air flow in ventilation or minimum fresh air duct. // Used when there are separate ducts for minimum fresh air vs economizing. -VentilationAirFlowSp : AirFlowSp { ventilation } +VentilationAirFlowSp : AirFlowSp { ventilation } diff --git a/src/xeto/ph.points/air-humidity.xeto b/src/xeto/ph.points.sugar/air-humidity.xeto similarity index 72% rename from src/xeto/ph.points/air-humidity.xeto rename to src/xeto/ph.points.sugar/air-humidity.xeto index 23e4f4d..0104f00 100644 --- a/src/xeto/ph.points/air-humidity.xeto +++ b/src/xeto/ph.points.sugar/air-humidity.xeto @@ -11,28 +11,28 @@ ////////////////////////////////////////////////////////////////////////// // Sensor for relative humidity in discharge duct -DischargeAirHumiditySensor : AirHumiditySensor { discharge } +DischargeAirHumiditySensor : AirHumiditySensor { discharge } // Setpoint for relative humidity in discharge duct -DischargeAirHumiditySp : AirHumiditySp { discharge } +DischargeAirHumiditySp : AirHumiditySp { discharge } ////////////////////////////////////////////////////////////////////////// // Outdoor ////////////////////////////////////////////////////////////////////////// // Sensor for relative humidity in outside duct -OutsideAirHumiditySensor : AirHumiditySensor { outside } +OutsideAirHumiditySensor : AirHumiditySensor { outside } // Setpoint for relative humidity in outside duct -OutsideAirHumiditySp : AirHumiditySp { outside } +OutsideAirHumiditySp : AirHumiditySp { outside } ////////////////////////////////////////////////////////////////////////// // Zone ////////////////////////////////////////////////////////////////////////// // Sensor for relative humidity in the zone -ZoneAirHumiditySensor : AirHumiditySensor { zone } +ZoneAirHumiditySensor : AirHumiditySensor { zone } // Setpoint for relative humidity in the zone -ZoneAirHumiditySp : AirHumiditySp { zone } +ZoneAirHumiditySp : AirHumiditySp { zone } diff --git a/src/xeto/ph.points/air-pressure.xeto b/src/xeto/ph.points.sugar/air-pressure.xeto similarity index 73% rename from src/xeto/ph.points/air-pressure.xeto rename to src/xeto/ph.points.sugar/air-pressure.xeto index 9ca32cd..e65c396 100644 --- a/src/xeto/ph.points/air-pressure.xeto +++ b/src/xeto/ph.points.sugar/air-pressure.xeto @@ -11,18 +11,18 @@ ////////////////////////////////////////////////////////////////////////// // Sensor for static air pressure in discharge duct -DischargeAirPressureSensor : AirPressureSensor { discharge } +DischargeAirPressureSensor : AirPressureSensor { discharge } // Setpoint for static air pressure in discharge duct -DischargeAirPressureSp : AirPressureSp { discharge } +DischargeAirPressureSp : AirPressureSp { discharge } ////////////////////////////////////////////////////////////////////////// // Return ////////////////////////////////////////////////////////////////////////// // Sensor for static air pressure in return duct -ReturnAirPressureSensor : AirPressureSensor { return } +ReturnAirPressureSensor : AirPressureSensor { return } // Setpoint for static air pressure in return duct -ReturnAirPressureSp : AirPressureSp { return } +ReturnAirPressureSp : AirPressureSp { return } diff --git a/src/xeto/ph.points/air-temp.xeto b/src/xeto/ph.points.sugar/air-temp.xeto similarity index 82% rename from src/xeto/ph.points/air-temp.xeto rename to src/xeto/ph.points.sugar/air-temp.xeto index 99a0217..8619496 100644 --- a/src/xeto/ph.points/air-temp.xeto +++ b/src/xeto/ph.points.sugar/air-temp.xeto @@ -11,10 +11,10 @@ ////////////////////////////////////////////////////////////////////////// // Sensor for drybulb air temperature of discharge duct -DischargeAirTempSensor : AirTempSensor { discharge } +DischargeAirTempSensor : AirTempSensor { discharge } // Setpoint for drybulb air temperature of discharge duct -DischargeAirTempSp : AirTempSp { discharge } +DischargeAirTempSp : AirTempSp { discharge } ////////////////////////////////////////////////////////////////////////// // Economizing @@ -22,27 +22,27 @@ DischargeAirTempSp : AirTempSp { discharge } // Sensor for drybulb air temperature of economizing duct. // Used when there are separate ducts for minimum fresh air vs economizing. -EconomizingAirTempSensor : AirTempSensor { economizing } +EconomizingAirTempSensor : AirTempSensor { economizing } ////////////////////////////////////////////////////////////////////////// // Inlet ////////////////////////////////////////////////////////////////////////// // Sensor for drybulb air temperature of inlet duct -InletAirTempSensor : AirTempSensor { inlet } +InletAirTempSensor : AirTempSensor { inlet } // Setpoint for drybulb air temperature of inlet duct -InletAirTempSp : AirTempSp { inlet } +InletAirTempSp : AirTempSp { inlet } ////////////////////////////////////////////////////////////////////////// // Mixed ////////////////////////////////////////////////////////////////////////// // Sensor for drybulb air temperature of mixed duct -MixedAirTempSensor : AirTempSensor { mixed } +MixedAirTempSensor : AirTempSensor { mixed } // Setpoint for drybulb air temperature of mixed duct -MixedAirTempSp : AirTempSp { mixed } +MixedAirTempSp : AirTempSp { mixed } ////////////////////////////////////////////////////////////////////////// // Outside @@ -50,17 +50,17 @@ MixedAirTempSp : AirTempSp { mixed } // Sensor for drybulb air temperature of outside duct. // Used when there one duct for both minimum fresh air and economizing. -OutsideAirTempSensor : AirTempSensor { outside } +OutsideAirTempSensor : AirTempSensor { outside } ////////////////////////////////////////////////////////////////////////// // Return ////////////////////////////////////////////////////////////////////////// // Sensor for drybulb air temperature of return duct -ReturnAirTempSensor : AirTempSensor { return } +ReturnAirTempSensor : AirTempSensor { return } // Setpoint for drybulb air temperature of return duct -ReturnAirTempSp : AirTempSp { return } +ReturnAirTempSp : AirTempSp { return } ////////////////////////////////////////////////////////////////////////// // Ventilation @@ -68,17 +68,17 @@ ReturnAirTempSp : AirTempSp { return } // Sensor for drybulb air temperature of ventilation or minimum fresh duct. // Used when there are separate ducts for minimum fresh air vs economizing. -VentilationAirTempSensor : AirTempSensor { ventilation } +VentilationAirTempSensor : AirTempSensor { ventilation } ////////////////////////////////////////////////////////////////////////// // Zone ////////////////////////////////////////////////////////////////////////// // Drybulb air temperature sensor for zone -ZoneAirTempSensor : AirTempSensor { zone } +ZoneAirTempSensor : AirTempSensor { zone } // Setpoint for drybulb air temperature zone -ZoneAirTempSp : AirTempSp { zone } +ZoneAirTempSp : AirTempSp { zone } // Effective setpoint for drybulb air temperature a zone ZoneAirTempEffectiveSp : ZoneAirTempSp { effective } @@ -112,4 +112,4 @@ ZoneAirTempStandbyHeatingSp : ZoneAirTempHeatingSp { standby } ////////////////////////////////////////////////////////////////////////// // Sensor for air temperature inside an enclosure -EnclosureAirTempSensor : AirTempSensor { enclosure } +EnclosureAirTempSensor : AirTempSensor { enclosure } diff --git a/src/xeto/ph.points.sugar/lib.xeto b/src/xeto/ph.points.sugar/lib.xeto new file mode 100644 index 0000000..5e17165 --- /dev/null +++ b/src/xeto/ph.points.sugar/lib.xeto @@ -0,0 +1,29 @@ +// +// Copyright (c) 2026, Project-Haystack +// Licensed under the Academic Free License version 3.0 +// +// History: +// 1 Sep 2026 Rick Jennings Creation +// + +pragma: Lib < + doc: "Project haystack experimental points sugar library" + version: BuildVar "ph.version" + maturity: BuildVar "ph.maturity" + depends: { + { lib: "sys", versions: BuildVar "ph.depend" } + { lib: "ph", versions: BuildVar "ph.depend" } + { lib: "ph.points", versions: BuildVar "ph.depend" } + } + categories: {"ph"} + license: BuildVar "ph.license" + org: { + dis: BuildVar "ph.org.dis" + uri: BuildVar "ph.org.uri" + } + vcs: { + type: BuildVar "ph.vcs.type" + uri: BuildVar "ph.vcs.uri" + } +> + diff --git a/src/xeto/ph.points/water-flow.xeto b/src/xeto/ph.points.sugar/water-flow.xeto similarity index 74% rename from src/xeto/ph.points/water-flow.xeto rename to src/xeto/ph.points.sugar/water-flow.xeto index 8485440..8ae7bc4 100644 --- a/src/xeto/ph.points/water-flow.xeto +++ b/src/xeto/ph.points.sugar/water-flow.xeto @@ -11,27 +11,27 @@ ////////////////////////////////////////////////////////////////////////// // Sensor for volumetric flow of domestic water -DomesticWaterFlowSensor : WaterFlowSensor { domestic } +DomesticWaterFlowSensor : WaterFlowSensor { domestic } // Setpoint for volumetric flow of domestic water -DomesticWaterFlowSp : WaterFlowSp { domestic } +DomesticWaterFlowSp : WaterFlowSp { domestic } ////////////////////////////////////////////////////////////////////////// // Chilled Water ////////////////////////////////////////////////////////////////////////// // Sensor for volumetric flow of chilled water -ChilledWaterFlowSensor : WaterFlowSensor { chilled } +ChilledWaterFlowSensor : WaterFlowSensor { chilled } // Setpoint for volumetric flow of chilled water -ChilledWaterFlowSp : WaterFlowSp { chilled } +ChilledWaterFlowSp : WaterFlowSp { chilled } ////////////////////////////////////////////////////////////////////////// // Hot Water ////////////////////////////////////////////////////////////////////////// // Sensor for volumetric flow of hot water -HotWaterFlowSensor : WaterFlowSensor { hot } +HotWaterFlowSensor : WaterFlowSensor { hot } // Setpoint for volumetric flow of hot water -HotWaterFlowSp : WaterFlowSp { hot } +HotWaterFlowSp : WaterFlowSp { hot } diff --git a/src/xeto/ph.points/water-pressure.xeto b/src/xeto/ph.points.sugar/water-pressure.xeto similarity index 61% rename from src/xeto/ph.points/water-pressure.xeto rename to src/xeto/ph.points.sugar/water-pressure.xeto index d81c34f..046056b 100644 --- a/src/xeto/ph.points/water-pressure.xeto +++ b/src/xeto/ph.points.sugar/water-pressure.xeto @@ -11,29 +11,29 @@ ////////////////////////////////////////////////////////////////////////// // Sensor for chilled water leaving pressure -ChilledWaterLeavingPressureSensor : WaterPressureSensor { chilled, leaving } +ChilledWaterLeavingPressureSensor : WaterPressureSensor { chilled, leaving } // Sensor for chilled water entering pressure -ChilledWaterEnteringPressureSensor : WaterPressureSensor { chilled, entering } +ChilledWaterEnteringPressureSensor : WaterPressureSensor { chilled, entering } // Setpoint for chilled water leaving pressure -ChilledWaterLeavingPressureSp : WaterPressureSp { chilled, leaving } +ChilledWaterLeavingPressureSp : WaterPressureSp { chilled, leaving } // Setpoint for chilled water entering pressure -ChilledWaterEnteringPressureSp : WaterPressureSp { chilled, entering } +ChilledWaterEnteringPressureSp : WaterPressureSp { chilled, entering } ////////////////////////////////////////////////////////////////////////// // Hot Water Pressure ////////////////////////////////////////////////////////////////////////// // Sensor for hot water leaving pressure -HotWaterLeavingPressureSensor : WaterPressureSensor { hot, leaving } +HotWaterLeavingPressureSensor : WaterPressureSensor { hot, leaving } // Sensor for hot water entering pressure -HotWaterEnteringPressureSensor : WaterPressureSensor { hot, entering } +HotWaterEnteringPressureSensor : WaterPressureSensor { hot, entering } // Setpoint for hot water leaving pressure -HotWaterLeavingPressureSp : WaterPressureSp { hot, leaving } +HotWaterLeavingPressureSp : WaterPressureSp { hot, leaving } // Setpoint for hot water entering pressure -HotWaterEnteringPressureSp : WaterPressureSp { hot, entering } +HotWaterEnteringPressureSp : WaterPressureSp { hot, entering } diff --git a/src/xeto/ph.points/water-temp.xeto b/src/xeto/ph.points.sugar/water-temp.xeto similarity index 67% rename from src/xeto/ph.points/water-temp.xeto rename to src/xeto/ph.points.sugar/water-temp.xeto index b075df7..333b8a7 100644 --- a/src/xeto/ph.points/water-temp.xeto +++ b/src/xeto/ph.points.sugar/water-temp.xeto @@ -11,13 +11,13 @@ ////////////////////////////////////////////////////////////////////////// // Sensor for Hot Water Temperature Entering a component of a system -HotWaterEnteringTempSensor : WaterTempSensor { hot, entering } +HotWaterEnteringTempSensor : WaterTempSensor { hot, entering } // Sensor for Hot Water Temperature Leaving a component of a system -HotWaterLeavingTempSensor : WaterTempSensor { hot, leaving } +HotWaterLeavingTempSensor : WaterTempSensor { hot, leaving } // Setpoint for Hot Water Temperature Leaving a component of a system -HotWaterLeavingTempSp : WaterTempSp { hot, leaving } +HotWaterLeavingTempSp : WaterTempSp { hot, leaving } ////////////////////////////////////////////////////////////////////////// @@ -25,13 +25,13 @@ HotWaterLeavingTempSp : WaterTempSp { hot, leaving } ////////////////////////////////////////////////////////////////////////// // Sensor for Chilled Water Temperature Entering a component of a system -ChilledWaterEnteringTempSensor : WaterTempSensor { chilled, entering } +ChilledWaterEnteringTempSensor : WaterTempSensor { chilled, entering } // Sensor for Chilled Water Temperature Leaving a component of a system -ChilledWaterLeavingTempSensor : WaterTempSensor { chilled, leaving } +ChilledWaterLeavingTempSensor : WaterTempSensor { chilled, leaving } // Setpoint for Chilled Water Temperature Leaving a component of a system -ChilledWaterLeavingTempSp : WaterTempSp { chilled, leaving } +ChilledWaterLeavingTempSp : WaterTempSp { chilled, leaving } ////////////////////////////////////////////////////////////////////////// @@ -39,11 +39,11 @@ ChilledWaterLeavingTempSp : WaterTempSp { chilled, leaving } ////////////////////////////////////////////////////////////////////////// // Sensor for Condenser Water Temperature Entering a component of a system -CondenserWaterEnteringTempSensor : WaterTempSensor { condenser, entering } +CondenserWaterEnteringTempSensor : WaterTempSensor { condenser, entering } // Sensor for Condenser Water Temperature Leaving a component of a system -CondenserWaterLeavingTempSensor : WaterTempSensor { condenser, leaving } +CondenserWaterLeavingTempSensor : WaterTempSensor { condenser, leaving } // Setpoint for Condenser Water Temperature Leaving a component of a system -CondenserWaterLeavingTempSp : WaterTempSp { condenser, leaving } +CondenserWaterLeavingTempSp : WaterTempSp { condenser, leaving } diff --git a/src/xeto/ph.points/water-volume.xeto b/src/xeto/ph.points.sugar/water-volume.xeto similarity index 77% rename from src/xeto/ph.points/water-volume.xeto rename to src/xeto/ph.points.sugar/water-volume.xeto index da46beb..f3e53e8 100644 --- a/src/xeto/ph.points/water-volume.xeto +++ b/src/xeto/ph.points.sugar/water-volume.xeto @@ -11,8 +11,8 @@ ////////////////////////////////////////////////////////////////////////// // Sensor for volumetric consumption of domestic water -DomesticWaterVolumeSensor : WaterVolumeSensor { domestic } +DomesticWaterVolumeSensor : WaterVolumeSensor { domestic } // Setpoint for volumetric consumption of domestic water -DomesticWaterVolumeSp : WaterVolumeSp { domestic } +DomesticWaterVolumeSp : WaterVolumeSp { domestic }