Skip to content

Commit

Permalink
Update ActorClass w PumpDoctor & DefrostManager
Browse files Browse the repository at this point in the history
  • Loading branch information
jessicamillar committed Dec 15, 2024
1 parent 7cfa136 commit f8c880a
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 109 deletions.
6 changes: 1 addition & 5 deletions src/gwproto/enums/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@
from gwproto.enums.hz_calc_method import HzCalcMethod
from gwproto.enums.kind_of_param import KindOfParam
from gwproto.enums.make_model import MakeModel
from gwproto.enums.market_price_unit import MarketPriceUnit
from gwproto.enums.market_quantity_unit import MarketQuantityUnit
from gwproto.enums.primary_pump_control import PrimaryPumpControl
from gwproto.enums.relay_closed_or_open import RelayClosedOrOpen
from gwproto.enums.relay_energization_state import RelayEnergizationState
Expand All @@ -67,7 +65,7 @@
from gwproto.enums.unit import Unit

__all__ = [
"ActorClass", # [sh.actor.class.004](https://gridworks-type-registry.readthedocs.io/en/latest/enums.html#shactorclass)
"ActorClass", # [sh.actor.class.005](https://gridworks-type-registry.readthedocs.io/en/latest/enums.html#shactorclass)
"AdminEvent", # [admin.event.000](https://gridworks-type-registry.readthedocs.io/en/latest/enums.html#adminevent)
"AdminState", # [admin.state.000](https://gridworks-type-registry.readthedocs.io/en/latest/enums.html#adminstate)
"AlertPriority", # [alert.priority.000](https://gridworks-type-registry.readthedocs.io/en/latest/enums.html#alertpriority)
Expand All @@ -89,8 +87,6 @@
"HzCalcMethod", # [hz.calc.method.000](https://gridworks-type-registry.readthedocs.io/en/latest/enums.html#hzcalcmethod)
"KindOfParam", # [spaceheat.kind.of.param.000](https://gridworks-type-registry.readthedocs.io/en/latest/enums.html#spaceheatkindofparam)
"MakeModel", # [spaceheat.make.model.004](https://gridworks-type-registry.readthedocs.io/en/latest/enums.html#spaceheatmakemodel)
"MarketPriceUnit", # [market.price.unit.000](https://gridworks-type-registry.readthedocs.io/en/latest/enums.html#marketpriceunit)
"MarketQuantityUnit", # [market.quantity.unit.000](https://gridworks-type-registry.readthedocs.io/en/latest/enums.html#marketquantityunit)
"PrimaryPumpControl", # [primary.pump.control.000](https://gridworks-type-registry.readthedocs.io/en/latest/enums.html#primarypumpcontrol)
"RelayClosedOrOpen", # [relay.closed.or.open.000](https://gridworks-type-registry.readthedocs.io/en/latest/enums.html#relayclosedoropen)
"RelayEnergizationState", # [relay.energization.state.000](https://gridworks-type-registry.readthedocs.io/en/latest/enums.html#relayenergizationstate)
Expand Down
6 changes: 5 additions & 1 deletion src/gwproto/enums/actor_class.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ class ActorClass(GwStrEnum):
- AtomicAlly: Direct report of Atn when the Scada is in Atn mode.
- SynthGenerator
- FakeAtn
- PumpDoctor: An actor that monitors and resets pumps if necessary
- DefrostManager: Actor that handles the defrost cycle of a heat pump.
For more information:
- [ASLs](https://gridworks-type-registry.readthedocs.io/en/latest/)
Expand Down Expand Up @@ -108,6 +110,8 @@ class ActorClass(GwStrEnum):
AtomicAlly = auto()
SynthGenerator = auto()
FakeAtn = auto()
PumpDoctor = auto()
DefrostManager = auto()

@classmethod
def default(cls) -> "ActorClass":
Expand All @@ -123,4 +127,4 @@ def enum_name(cls) -> str:

@classmethod
def enum_version(cls) -> str:
return "004"
return "005"
34 changes: 0 additions & 34 deletions src/gwproto/enums/market_price_unit.py

This file was deleted.

36 changes: 0 additions & 36 deletions src/gwproto/enums/market_quantity_unit.py

This file was deleted.

6 changes: 4 additions & 2 deletions tests/enums/actor_class_test.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
Tests for enum sh.actor.class.004 from the GridWorks Type Registry.
Tests for enum sh.actor.class.005 from the GridWorks Type Registry.
"""

from gwproto.enums import ActorClass
Expand Down Expand Up @@ -35,8 +35,10 @@ def test_actor_class() -> None:
"AtomicAlly",
"SynthGenerator",
"FakeAtn",
"PumpDoctor",
"DefrostManager",
}

assert ActorClass.default() == ActorClass.NoActor
assert ActorClass.enum_name() == "sh.actor.class"
assert ActorClass.enum_version() == "004"
assert ActorClass.enum_version() == "005"
15 changes: 0 additions & 15 deletions tests/enums/market_price_unit_test.py

This file was deleted.

16 changes: 0 additions & 16 deletions tests/enums/market_quantity_unit_test.py

This file was deleted.

0 comments on commit f8c880a

Please sign in to comment.