Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reverse adding Relay to ActorClass enum #141

Merged
merged 1 commit into from
Apr 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "gridworks-protocol"
version = "0.4.4"
version = "0.4.5"
description = "Gridworks Protocol"
authors = ["Jessica Millar <jmillar@gridworks-consulting.com>"]
license = "MIT"
Expand Down
2 changes: 0 additions & 2 deletions src/gwproto/enums/actor_class.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ class ActorClass(StrEnum):
* SimpleSensor (dae4b2f0, 000): A SpaceheatNode representing a sensor that measures a single category of quantity (for example, temperature) for a single object (for example, on a pipe).. [More Info](https://gridworks-protocol.readthedocs.io/en/latest/simple-sensor.html).
* MultipurposeSensor (7c483ad0, 000): A sensor that either reads multiple kinds of readings from the same sensing device (for example reads current and voltage), reads multiple different objects (temperature from two different thermisters) or both.. [More Info](https://gridworks-protocol.readthedocs.io/en/latest/multipurpose-sensor.html).
* Thermostat (4a9c1785, 000): A SpaceheatNode representing a thermostat.
* Relay (311835f6, 001): A SpaceheatNode representing an electric relay
"""
NoActor = auto()
Scada = auto()
Expand All @@ -32,7 +31,6 @@ class ActorClass(StrEnum):
SimpleSensor = auto()
MultipurposeSensor = auto()
Thermostat = auto()
Relay = auto()

@classmethod
def default(cls) -> "ActorClass":
Expand Down
4 changes: 0 additions & 4 deletions src/gwproto/types/spaceheat_node_gt.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ class ShActorClass000SchemaEnum:
"dae4b2f0",
"7c483ad0",
"4a9c1785",
"311835f6",
]

@classmethod
Expand All @@ -51,7 +50,6 @@ class ShActorClass000(StrEnum):
SimpleSensor = auto()
MultipurposeSensor = auto()
Thermostat = auto()
Relay = auto()

@classmethod
def default(cls) -> "ShActorClass000":
Expand Down Expand Up @@ -89,7 +87,6 @@ def local_to_type(cls, actor_class: EnumActorClass) -> str:
"dae4b2f0": ShActorClass000.SimpleSensor,
"7c483ad0": ShActorClass000.MultipurposeSensor,
"4a9c1785": ShActorClass000.Thermostat,
"311835f6": ShActorClass000.Relay,
}

versioned_enum_to_type_dict: Dict[ShActorClass000, str] = {
Expand All @@ -102,7 +99,6 @@ def local_to_type(cls, actor_class: EnumActorClass) -> str:
ShActorClass000.SimpleSensor: "dae4b2f0",
ShActorClass000.MultipurposeSensor: "7c483ad0",
ShActorClass000.Thermostat: "4a9c1785",
ShActorClass000.Relay: "311835f6",
}


Expand Down
1 change: 0 additions & 1 deletion tests/enums/actor_class_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ def test_actor_class() -> None:
"SimpleSensor",
"MultipurposeSensor",
"Thermostat",
"Relay",
}

assert ActorClass.default() == ActorClass.NoActor
Empty file added tests/test_misc/__init__.py
Empty file.
Loading