From f7d457c3ca11111eef499ef5f32f8089f85fee9b Mon Sep 17 00:00:00 2001 From: Rick Szcodronski Date: Fri, 11 Oct 2024 13:56:18 -0700 Subject: [PATCH 1/2] Add types of dampers and fans --- .../Backdraft/BackdraftDamper.json | 0 .../Backdraft/BarometricReliefDamper.json | 0 .../Backdraft/ReliefDamper.json | 0 .../Bypass/BypassDamper.json} | 4 ++-- .../Economizer/EconomizerDamper.json | 0 .../Exhaust/ExhaustDamper.json | 0 .../Face and Bypass/FaceAndBypassDamper.json | 0 .../Fire Smoke/FireDamper.json | 0 .../Fire Smoke/FireSmokeDamper.json | 0 .../Fire Smoke/SmokeDamper.json | 0 .../{Damper Equipment => Damper}/HVACDamper.json | 0 .../Inlet/ColdDeckInletDamper.json | 0 .../Inlet/HotDeckInletDamper.json | 0 .../Inlet/InletDamper.json | 0 .../Damper/Min Outside/MinOutsideAirDamper.json | 15 +++++++++++++++ .../Mixed/MixedDamper.json | 0 .../Outside/OutsideAirDamper.json} | 4 ++-- .../Return/ReturnDamper.json | 0 .../Equipment/HVAC/Damper/Zone/ZoneDamper.json | 15 +++++++++++++++ .../Asset/Equipment/HVAC/Fan/BoosterFan.json | 15 +++++++++++++++ .../Pressurization/ElevatorPressurizationFan.json | 15 +++++++++++++++ .../Fan/Pressurization/PressurizationFan.json | 15 +++++++++++++++ .../StairPressurizationFan.json | 2 +- 23 files changed, 80 insertions(+), 5 deletions(-) rename Ontology/Willow/Asset/Equipment/HVAC/{Damper Equipment => Damper}/Backdraft/BackdraftDamper.json (100%) rename Ontology/Willow/Asset/Equipment/HVAC/{Damper Equipment => Damper}/Backdraft/BarometricReliefDamper.json (100%) rename Ontology/Willow/Asset/Equipment/HVAC/{Damper Equipment => Damper}/Backdraft/ReliefDamper.json (100%) rename Ontology/Willow/Asset/Equipment/HVAC/{Damper Equipment/Outside/OutsideDamper.json => Damper/Bypass/BypassDamper.json} (70%) rename Ontology/Willow/Asset/Equipment/HVAC/{Damper Equipment => Damper}/Economizer/EconomizerDamper.json (100%) rename Ontology/Willow/Asset/Equipment/HVAC/{Damper Equipment => Damper}/Exhaust/ExhaustDamper.json (100%) rename Ontology/Willow/Asset/Equipment/HVAC/{Damper Equipment => Damper}/Face and Bypass/FaceAndBypassDamper.json (100%) rename Ontology/Willow/Asset/Equipment/HVAC/{Damper Equipment => Damper}/Fire Smoke/FireDamper.json (100%) rename Ontology/Willow/Asset/Equipment/HVAC/{Damper Equipment => Damper}/Fire Smoke/FireSmokeDamper.json (100%) rename Ontology/Willow/Asset/Equipment/HVAC/{Damper Equipment => Damper}/Fire Smoke/SmokeDamper.json (100%) rename Ontology/Willow/Asset/Equipment/HVAC/{Damper Equipment => Damper}/HVACDamper.json (100%) rename Ontology/Willow/Asset/Equipment/HVAC/{Damper Equipment => Damper}/Inlet/ColdDeckInletDamper.json (100%) rename Ontology/Willow/Asset/Equipment/HVAC/{Damper Equipment => Damper}/Inlet/HotDeckInletDamper.json (100%) rename Ontology/Willow/Asset/Equipment/HVAC/{Damper Equipment => Damper}/Inlet/InletDamper.json (100%) create mode 100644 Ontology/Willow/Asset/Equipment/HVAC/Damper/Min Outside/MinOutsideAirDamper.json rename Ontology/Willow/Asset/Equipment/HVAC/{Damper Equipment => Damper}/Mixed/MixedDamper.json (100%) rename Ontology/Willow/Asset/Equipment/HVAC/{Damper Equipment/Min Outside/MinOutsideDamper.json => Damper/Outside/OutsideAirDamper.json} (68%) rename Ontology/Willow/Asset/Equipment/HVAC/{Damper Equipment => Damper}/Return/ReturnDamper.json (100%) create mode 100644 Ontology/Willow/Asset/Equipment/HVAC/Damper/Zone/ZoneDamper.json create mode 100644 Ontology/Willow/Asset/Equipment/HVAC/Fan/BoosterFan.json create mode 100644 Ontology/Willow/Asset/Equipment/HVAC/Fan/Pressurization/ElevatorPressurizationFan.json create mode 100644 Ontology/Willow/Asset/Equipment/HVAC/Fan/Pressurization/PressurizationFan.json rename Ontology/Willow/Asset/Equipment/HVAC/Fan/{ => Pressurization}/StairPressurizationFan.json (83%) diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Backdraft/BackdraftDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Backdraft/BackdraftDamper.json similarity index 100% rename from Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Backdraft/BackdraftDamper.json rename to Ontology/Willow/Asset/Equipment/HVAC/Damper/Backdraft/BackdraftDamper.json diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Backdraft/BarometricReliefDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Backdraft/BarometricReliefDamper.json similarity index 100% rename from Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Backdraft/BarometricReliefDamper.json rename to Ontology/Willow/Asset/Equipment/HVAC/Damper/Backdraft/BarometricReliefDamper.json diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Backdraft/ReliefDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Backdraft/ReliefDamper.json similarity index 100% rename from Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Backdraft/ReliefDamper.json rename to Ontology/Willow/Asset/Equipment/HVAC/Damper/Backdraft/ReliefDamper.json diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Outside/OutsideDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Bypass/BypassDamper.json similarity index 70% rename from Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Outside/OutsideDamper.json rename to Ontology/Willow/Asset/Equipment/HVAC/Damper/Bypass/BypassDamper.json index 77b4acf9..265e9461 100644 --- a/Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Outside/OutsideDamper.json +++ b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Bypass/BypassDamper.json @@ -1,8 +1,8 @@ { - "@id": "dtmi:com:willowinc:OutsideDamper;1", + "@id": "dtmi:com:willowinc:BypassDamper;1", "@type": "Interface", "displayName": { - "en": "Outside Damper" + "en": "Bypass Damper" }, "extends" : [ "dtmi:com:willowinc:HVACDamper;1" diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Economizer/EconomizerDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Economizer/EconomizerDamper.json similarity index 100% rename from Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Economizer/EconomizerDamper.json rename to Ontology/Willow/Asset/Equipment/HVAC/Damper/Economizer/EconomizerDamper.json diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Exhaust/ExhaustDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Exhaust/ExhaustDamper.json similarity index 100% rename from Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Exhaust/ExhaustDamper.json rename to Ontology/Willow/Asset/Equipment/HVAC/Damper/Exhaust/ExhaustDamper.json diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Face and Bypass/FaceAndBypassDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Face and Bypass/FaceAndBypassDamper.json similarity index 100% rename from Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Face and Bypass/FaceAndBypassDamper.json rename to Ontology/Willow/Asset/Equipment/HVAC/Damper/Face and Bypass/FaceAndBypassDamper.json diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Fire Smoke/FireDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Fire Smoke/FireDamper.json similarity index 100% rename from Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Fire Smoke/FireDamper.json rename to Ontology/Willow/Asset/Equipment/HVAC/Damper/Fire Smoke/FireDamper.json diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Fire Smoke/FireSmokeDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Fire Smoke/FireSmokeDamper.json similarity index 100% rename from Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Fire Smoke/FireSmokeDamper.json rename to Ontology/Willow/Asset/Equipment/HVAC/Damper/Fire Smoke/FireSmokeDamper.json diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Fire Smoke/SmokeDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Fire Smoke/SmokeDamper.json similarity index 100% rename from Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Fire Smoke/SmokeDamper.json rename to Ontology/Willow/Asset/Equipment/HVAC/Damper/Fire Smoke/SmokeDamper.json diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/HVACDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/HVACDamper.json similarity index 100% rename from Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/HVACDamper.json rename to Ontology/Willow/Asset/Equipment/HVAC/Damper/HVACDamper.json diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Inlet/ColdDeckInletDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Inlet/ColdDeckInletDamper.json similarity index 100% rename from Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Inlet/ColdDeckInletDamper.json rename to Ontology/Willow/Asset/Equipment/HVAC/Damper/Inlet/ColdDeckInletDamper.json diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Inlet/HotDeckInletDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Inlet/HotDeckInletDamper.json similarity index 100% rename from Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Inlet/HotDeckInletDamper.json rename to Ontology/Willow/Asset/Equipment/HVAC/Damper/Inlet/HotDeckInletDamper.json diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Inlet/InletDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Inlet/InletDamper.json similarity index 100% rename from Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Inlet/InletDamper.json rename to Ontology/Willow/Asset/Equipment/HVAC/Damper/Inlet/InletDamper.json diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper/Min Outside/MinOutsideAirDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Min Outside/MinOutsideAirDamper.json new file mode 100644 index 00000000..63ea7f01 --- /dev/null +++ b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Min Outside/MinOutsideAirDamper.json @@ -0,0 +1,15 @@ +{ + "@id": "dtmi:com:willowinc:MinOutsideAirDamper;1", + "@type": "Interface", + "displayName": { + "en": "Min Outside Air Damper" + }, + "extends" : [ + "dtmi:com:willowinc:HVACDamper;1" + ], + "contents": [ + ], + "@context": [ + "dtmi:dtdl:context;3" + ] +} diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Mixed/MixedDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Mixed/MixedDamper.json similarity index 100% rename from Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Mixed/MixedDamper.json rename to Ontology/Willow/Asset/Equipment/HVAC/Damper/Mixed/MixedDamper.json diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Min Outside/MinOutsideDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Outside/OutsideAirDamper.json similarity index 68% rename from Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Min Outside/MinOutsideDamper.json rename to Ontology/Willow/Asset/Equipment/HVAC/Damper/Outside/OutsideAirDamper.json index 14ddda81..41abe61a 100644 --- a/Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Min Outside/MinOutsideDamper.json +++ b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Outside/OutsideAirDamper.json @@ -1,8 +1,8 @@ { - "@id": "dtmi:com:willowinc:MinOutsideDamper;1", + "@id": "dtmi:com:willowinc:OutsideAirDamper;1", "@type": "Interface", "displayName": { - "en": "Min Outside Damper" + "en": "Outside Air Damper" }, "extends" : [ "dtmi:com:willowinc:HVACDamper;1" diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Return/ReturnDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Return/ReturnDamper.json similarity index 100% rename from Ontology/Willow/Asset/Equipment/HVAC/Damper Equipment/Return/ReturnDamper.json rename to Ontology/Willow/Asset/Equipment/HVAC/Damper/Return/ReturnDamper.json diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper/Zone/ZoneDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Zone/ZoneDamper.json new file mode 100644 index 00000000..bd01fb40 --- /dev/null +++ b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Zone/ZoneDamper.json @@ -0,0 +1,15 @@ +{ + "@id": "dtmi:com:willowinc:ZoneDamper;1", + "@type": "Interface", + "displayName": { + "en": "Zone Damper" + }, + "extends" : [ + "dtmi:com:willowinc:HVACDamper;1" + ], + "contents": [ + ], + "@context": [ + "dtmi:dtdl:context;3" + ] +} diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Fan/BoosterFan.json b/Ontology/Willow/Asset/Equipment/HVAC/Fan/BoosterFan.json new file mode 100644 index 00000000..039ecc56 --- /dev/null +++ b/Ontology/Willow/Asset/Equipment/HVAC/Fan/BoosterFan.json @@ -0,0 +1,15 @@ +{ + "@id": "dtmi:com:willowinc:BoosterFan;1", + "@type": "Interface", + "displayName": { + "en": "Booster Fan" + }, + "extends" : [ + "dtmi:com:willowinc:HVACFan;1" + ], + "contents": [ + ], + "@context": [ + "dtmi:dtdl:context;3" + ] +} diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Fan/Pressurization/ElevatorPressurizationFan.json b/Ontology/Willow/Asset/Equipment/HVAC/Fan/Pressurization/ElevatorPressurizationFan.json new file mode 100644 index 00000000..2bcaa4f9 --- /dev/null +++ b/Ontology/Willow/Asset/Equipment/HVAC/Fan/Pressurization/ElevatorPressurizationFan.json @@ -0,0 +1,15 @@ +{ + "@id": "dtmi:com:willowinc:ElevatorPressurizationFan;1", + "@type": "Interface", + "displayName": { + "en": "Elevator Pressurization Fan" + }, + "extends" : [ + "dtmi:com:willowinc:PressurizationFan;1" + ], + "contents": [ + ], + "@context": [ + "dtmi:dtdl:context;3" + ] +} diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Fan/Pressurization/PressurizationFan.json b/Ontology/Willow/Asset/Equipment/HVAC/Fan/Pressurization/PressurizationFan.json new file mode 100644 index 00000000..a7d5e17d --- /dev/null +++ b/Ontology/Willow/Asset/Equipment/HVAC/Fan/Pressurization/PressurizationFan.json @@ -0,0 +1,15 @@ +{ + "@id": "dtmi:com:willowinc:PressurizationFan;1", + "@type": "Interface", + "displayName": { + "en": "Pressurization Fan" + }, + "extends" : [ + "dtmi:com:willowinc:HVACFan;1" + ], + "contents": [ + ], + "@context": [ + "dtmi:dtdl:context;3" + ] +} diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Fan/StairPressurizationFan.json b/Ontology/Willow/Asset/Equipment/HVAC/Fan/Pressurization/StairPressurizationFan.json similarity index 83% rename from Ontology/Willow/Asset/Equipment/HVAC/Fan/StairPressurizationFan.json rename to Ontology/Willow/Asset/Equipment/HVAC/Fan/Pressurization/StairPressurizationFan.json index 459511ec..e679f37a 100644 --- a/Ontology/Willow/Asset/Equipment/HVAC/Fan/StairPressurizationFan.json +++ b/Ontology/Willow/Asset/Equipment/HVAC/Fan/Pressurization/StairPressurizationFan.json @@ -5,7 +5,7 @@ "en": "Stair Pressurization Fan" }, "extends" : [ - "dtmi:com:willowinc:HVACFan;1" + "dtmi:com:willowinc:PressurizationFan;1" ], "contents": [ ], From 45b910ed15fd9def03d9e7613396aed712643b7c Mon Sep 17 00:00:00 2001 From: Rick Szcodronski Date: Fri, 11 Oct 2024 13:57:29 -0700 Subject: [PATCH 2/2] Update folder name to align with file name --- .../{Min Outside => Min Outside Air}/MinOutsideAirDamper.json | 0 .../HVAC/Damper/{Outside => Outside Air}/OutsideAirDamper.json | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename Ontology/Willow/Asset/Equipment/HVAC/Damper/{Min Outside => Min Outside Air}/MinOutsideAirDamper.json (100%) rename Ontology/Willow/Asset/Equipment/HVAC/Damper/{Outside => Outside Air}/OutsideAirDamper.json (100%) diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper/Min Outside/MinOutsideAirDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Min Outside Air/MinOutsideAirDamper.json similarity index 100% rename from Ontology/Willow/Asset/Equipment/HVAC/Damper/Min Outside/MinOutsideAirDamper.json rename to Ontology/Willow/Asset/Equipment/HVAC/Damper/Min Outside Air/MinOutsideAirDamper.json diff --git a/Ontology/Willow/Asset/Equipment/HVAC/Damper/Outside/OutsideAirDamper.json b/Ontology/Willow/Asset/Equipment/HVAC/Damper/Outside Air/OutsideAirDamper.json similarity index 100% rename from Ontology/Willow/Asset/Equipment/HVAC/Damper/Outside/OutsideAirDamper.json rename to Ontology/Willow/Asset/Equipment/HVAC/Damper/Outside Air/OutsideAirDamper.json