Bläddra i källkod

make series attribute overwritable

subDesTagesMitExtraKaese 2 år sedan
förälder
incheckning
0da3472a8d

+ 1 - 1
box-pc/plc-connector/structures/common.py

@@ -6,4 +6,4 @@ from typing import Hashable
 class BaseMeasurement(Hashable):
   timestamp: datetime
   source: str
-  series: str
+  #series: str = field(init=False)

+ 5 - 5
box-pc/plc-connector/structures/measurement.py

@@ -4,8 +4,6 @@ from .common import BaseMeasurement
 
 @dataclass(frozen=True)
 class Measurement24v(BaseMeasurement):
-  series: str = field(default="24v", init=False)
-
   current: tuple # [float, ...]
   status: tuple # [bool, ...]
   overload: tuple # [bool, ...]
@@ -14,10 +12,12 @@ class Measurement24v(BaseMeasurement):
   pushbutton: tuple # [bool, ...]
   voltage: float
 
+  series: str = field(default="24v")
+
 @dataclass(frozen=True)
 class Measurement480v(BaseMeasurement):
-  series: str = field(default="480v", init=False)
-
   voltage: tuple # [float, ...]
   current: tuple # [float, ...]
-  phase: tuple # [float, ...]
+  phase: tuple # [float, ...]
+
+  series: str = field(default="480v")

+ 5 - 5
box-pc/plc-connector/structures/plant.py

@@ -4,8 +4,6 @@ from .common import BaseMeasurement
 
 @dataclass(frozen=True)
 class CompactLogixState(BaseMeasurement):
-  series: str = field(default="plant", init=False)
-
   ejector_move_down: int
   ejector_move_up: int
   carriage_move_out: int
@@ -69,10 +67,10 @@ class CompactLogixState(BaseMeasurement):
   vertical_mixer_sand_slide_gate_open: int
   sand_sender: int
 
+  series: str = field(default="plant")
+
 @dataclass(frozen=True)
 class S7State(BaseMeasurement):
-  series: str = field(default="plant", init=False)
-
   cpu_running: bool
   
   unterteil_faehrt_aus: bool
@@ -116,4 +114,6 @@ class S7State(BaseMeasurement):
   hubtisch_senken: bool
   hubtisch_heben: bool
   oberteil_heben: bool
-  oberteil_senken: bool
+  oberteil_senken: bool
+
+  series: str = field(default="plant", init=False)