Skip to content

Commit b5f0a5a

Browse files
briansfrankbriansfrank
committed
Rework children prototypes to be Dict[] instead of zinc Str
1 parent 080ea38 commit b5f0a5a

22 files changed

+263
-232
lines changed

‎src/docHaystack/doc/ChangeLog.fandoc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
**Version 3.9.8 (working)**
1010
- Rename lib includes to depends
11+
- Rework children to be lists of dicts instead of Zinc strings
1112

1213
**Version 3.9.7 (3 Oct 2019)**
1314
- Cleanup relationship defs

‎src/ph/lib/meta.trio‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ tagOn: ^lib
2222
doc: "Base URI for normalizing relative URIs"
2323
--------------------------------------------------------------------------
2424
def: ^children
25-
is: ^str
25+
is: ^list
26+
of: ^dict
2627
doc:
27-
Prototypes contained by this entity. The value is a string where
28-
each line defines a child prototype dict encoded as [Zinc]`docHaystack::Zinc`.
28+
List of prototypes contained by this entity.
2929
See [Protos chatper]`docHaystack::Protos` for more details.
3030
--------------------------------------------------------------------------
3131
def: ^childrenFlatten

‎src/phIct/lib/dataCenter.trio‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ def: ^dataCenter
1111
is: ^space
1212
doc: "Space used to house computer and networking gear."
1313
wikipedia: `https://en.wikipedia.org/wiki/Data_center`
14-
children:
15-
rack equip
16-
crac fcu equip
14+
children: [
15+
{rack equip},
16+
{crac fcu equip},
17+
]
1718
--------------------------------------------------------------------------
1819
def: ^rack
1920
is: ^equip
@@ -23,9 +24,10 @@ doc:
2324
Devices are mounted to rails of a standard width, typically 19 or 23
2425
inches. Height is measured in *rack units* where one 1U is 1.75 inches.
2526
A full rack has a height of 42U.
26-
children:
27-
server device
28-
networking device
27+
children: [
28+
{server device},
29+
{networking device},
30+
]
2931
--------------------------------------------------------------------------
3032

3133

‎src/phIct/lib/equip.trio‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
def: ^controls-panel
1111
is: ^panel
1212
doc: "Panel housing controllers and networking gear"
13-
children:
14-
controller device
15-
networking device
13+
children: [
14+
{controller device},
15+
{networking device},
16+
]
1617
--------------------------------------------------------------------------
1718

1819

‎src/phIoT/lib/actuator.trio‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ ductSection: ^ductSectionType
3535
childrenFlatten: [^ductSectionType]
3636
wikipedia: `https://en.wikipedia.org/wiki/Damper_(flow)`
3737
doc: "Actuator to regulate the flow of air."
38-
children:
39-
damper cmd point
40-
damper sensor point
38+
children: [
39+
{damper cmd point},
40+
{damper sensor point},
41+
]
4142
--------------------------------------------------------------------------
4243

4344
//////////////////////////////////////////////////////////////////////////
@@ -57,8 +58,9 @@ pipeSection: ^pipeSectionType
5758
childrenFlatten: [^fluid, ^pipeSectionType]
5859
wikipedia: `https://en.wikipedia.org/wiki/Valve`
5960
doc: "Actuator to regulate the flow of fluid."
60-
children:
61-
valve cmd point
62-
valve sensor point
61+
children: [
62+
{valve cmd point},
63+
{valve sensor point},
64+
]
6365
--------------------------------------------------------------------------
6466

‎src/phIoT/lib/ahu.trio‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,20 @@ doc:
2525
HVAC equipment that conditions and delivers air via one or more fans.
2626
Conditioning of air includes heating, cooling, humidificiation,
2727
dehumidification, and ventilation.
28-
children:
29-
thermostat equip
30-
discharge duct equip
31-
exhaust duct equip
32-
mixed duct equip
33-
outside duct equip
34-
return duct equip
35-
thermostat equip
36-
freezeStat sensor point
37-
heatWheel cmd point
38-
faceBypass cmd point
39-
bypass damper cmd point
28+
children: [
29+
{thermostat equip},
30+
{discharge duct equip},
31+
{exhaust duct equip},
32+
{mixed duct equip},
33+
{outside duct equip},
34+
{return duct equip},
35+
{thermostat equip},
36+
{filter sensor point},
37+
{freezeStat sensor point},
38+
{heatWheel cmd point},
39+
{faceBypass cmd point},
40+
{bypass damper cmd point},
41+
]
4042
--------------------------------------------------------------------------
4143
def: ^ahu
4244
is: ^airHandlingEquip

‎src/phIoT/lib/airTerminalUnit.trio‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,11 @@ doc:
1515
Terminal units receive air from `airHandlingEquip` which have the
1616
primarily responsibility to condition air. Terminal units are primarily
1717
responsible for delivery of air to the space and tempering the temperature.
18-
children:
19-
thermostat equip
20-
discharge duct equip
21-
inlet duct equip
22-
thermostat equip
18+
children: [
19+
{thermostat equip},
20+
{discharge duct equip},
21+
{inlet duct equip},
22+
{thermostat equip},
23+
]
2324
--------------------------------------------------------------------------
2425

‎src/phIoT/lib/boiler.trio‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,27 @@ is: ^boiler
1919
heats: ^hot-water
2020
produces: ^hot-water
2121
doc: "Boiler which outputs hot water"
22-
children:
23-
hot water leaving pipe equip
24-
hot water entering pipe equip
25-
makeup water entering pipe equip
26-
circ pipe equip
27-
outside duct equip
28-
flue duct equip
22+
children: [
23+
{hot water leaving pipe equip},
24+
{hot water entering pipe equip},
25+
{makeup water entering pipe equip},
26+
{circ pipe equip},
27+
{outside duct equip},
28+
{flue duct equip},
29+
]
2930
--------------------------------------------------------------------------
3031
def: ^steam-boiler
3132
is: ^boiler
3233
heats: ^steam
3334
produces: ^steam
3435
doc: "Boiler which outputs steam"
35-
children:
36-
steam leaving pipe equip
37-
condensate entering pipe equip
38-
makeup water entering pipe equip
39-
circ pipe equip
40-
outside duct equip
41-
flue duct equip
36+
children: [
37+
{steam leaving pipe equip},
38+
{condensate entering pipe equip},
39+
{makeup water entering pipe equip},
40+
{circ pipe equip},
41+
{outside duct equip},
42+
{flue duct equip},
43+
]
4244
--------------------------------------------------------------------------
4345

‎src/phIoT/lib/chiller.trio‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,29 @@ wikipedia: `https://en.wikipedia.org/wiki/Chiller`
1515
doc:
1616
Equipment to remove heat from a liquid. Chillers typically use a vapor
1717
compression or an absorption refrigeration cycle.
18-
children:
19-
run state point
20-
enable state point
21-
load cmd point
22-
load sensor point
23-
efficiency sensor point
18+
children: [
19+
{run state point},
20+
{enable state point},
21+
{load cmd point},
22+
{load sensor point},
23+
{efficiency sensor point},
2424

25-
chilled water leaving pipe equip
26-
chilled water entering pipe equip
27-
chilled water delta temp sensor point
28-
chilled water delta flow sensor point
29-
chilled water valve isolation cmd point
25+
{chilled water leaving pipe equip},
26+
{chilled water entering pipe equip},
27+
{chilled water delta temp sensor point},
28+
{chilled water delta flow sensor point},
29+
{chilled water valve isolation cmd point},
3030

31-
condenser water leaving pipe equip
32-
condenser water entering pipe equip
33-
condenser water valve isolation cmd point
31+
{condenser water leaving pipe equip},
32+
{condenser water entering pipe equip},
33+
{condenser water valve isolation cmd point},
3434

35-
condenser run state point
36-
condenser refrig temp sensor point
37-
condenser refrig pressure sensor point
38-
evaporator refrig temp sensor point
39-
evaporator refrig pressure sensor point
35+
{condenser run state point},
36+
{condenser refrig temp sensor point},
37+
{condenser refrig pressure sensor point},
38+
{evaporator refrig temp sensor point},
39+
{evaporator refrig pressure sensor point},
40+
]
4041
--------------------------------------------------------------------------
4142

4243
//////////////////////////////////////////////////////////////////////////

‎src/phIoT/lib/conduit.trio‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ pipeSection: ^pipeSectionType
1919
wikipedia: `https://en.wikipedia.org/wiki/Pipe_(fluid_conveyance)`
2020
doc: "Conduit used to convey a fluid"
2121
childrenFlatten: [^fluid, ^pipeSectionType]
22-
children:
23-
pump motor equip
24-
valve actuator equip
25-
flow point
26-
pressure point
27-
temp point
22+
children: [
23+
{pump motor equip},
24+
{valve actuator equip},
25+
{flow point},
26+
{pressure point},
27+
{temp point},
28+
]
2829
--------------------------------------------------------------------------
2930
def: ^duct
3031
is: ^conduit
@@ -34,16 +35,17 @@ ductSection: ^ductSectionType
3435
wikipedia: `https://en.wikipedia.org/wiki/Duct_(flow)`
3536
doc: "Conduit used to convey air for HVAC"
3637
childrenFlatten: [^ductDeckType, ^ductSectionType]
37-
children:
38-
damper actuator equip
39-
fan motor equip
40-
coolingCoil equip
41-
heatingCoil equip
42-
air co2 point
43-
air flow point
44-
air humidity point
45-
air pressure point
46-
air temp point
38+
children: [
39+
{damper actuator equip},
40+
{fan motor equip},
41+
{coolingCoil equip},
42+
{heatingCoil equip},
43+
{air co2 point},
44+
{air flow point},
45+
{air humidity point},
46+
{air pressure point},
47+
{air temp point},
48+
]
4749
--------------------------------------------------------------------------
4850
def: ^wire
4951
is: ^conduit

0 commit comments

Comments
 (0)