Removing duplicities

FastyBird · Feb 1, 2022 · 8b80a3b · 8b80a3b
1 parent d885e9d
commit 8b80a3b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 36 deletions.
diff --git a/fastybird_fb_bus_connector/api/transformers.py b/fastybird_fb_bus_connector/api/transformers.py
@@ -117,7 +117,7 @@ def transform_for_device(device_state: ConnectionState) -> DeviceConnectionState
             return DeviceConnectionState.RUNNING
 
         if device_state == ConnectionState.STOPPED:
-            return DeviceConnectionState.STOPPED
+            return DeviceConnectionState.STOPPED_BY_OPERATOR
 
         # Unsupported state
         return DeviceConnectionState.UNKNOWN

diff --git a/fastybird_fb_bus_connector/registry/records.py b/fastybird_fb_bus_connector/registry/records.py
@@ -383,10 +383,18 @@ def format(
     @property
     def data_type_size(self) -> int:
         """Record data type bytes size"""
-        if self.data_type in (DataType.UCHAR, DataType.CHAR):
+        if self.data_type in (
+            DataType.UCHAR,
+            DataType.CHAR,
+            DataType.BUTTON,
+            DataType.SWITCH,
+        ):
             return 1
 
-        if self.data_type in (DataType.USHORT, DataType.SHORT):
+        if self.data_type in (
+            DataType.USHORT,
+            DataType.SHORT,
+        ):
             return 2
 
         if self.data_type in (
@@ -420,7 +428,7 @@ def queryable(self) -> bool:
     @property
     def actual_value(self) -> Union[str, int, float, bool, datetime, ButtonPayload, SwitchPayload, None]:
         """Register actual value"""
-        return normalize_value(data_type=self.data_type, value=self._actual_value)
+        return normalize_value(data_type=self.data_type, value=self._actual_value, value_format=self.format)
 
     # -----------------------------------------------------------------------------
 
@@ -438,7 +446,7 @@ def actual_value(self, value: Union[str, int, float, bool, datetime, ButtonPaylo
     @property
     def expected_value(self) -> Union[str, int, float, bool, datetime, ButtonPayload, SwitchPayload, None]:
         """Register expected value"""
-        return normalize_value(data_type=self.data_type, value=self._expected_value)
+        return normalize_value(data_type=self.data_type, value=self._expected_value, value_format=self.format)
 
     # -----------------------------------------------------------------------------
 
@@ -592,37 +600,6 @@ def name(self) -> Optional[str]:
 
     # -----------------------------------------------------------------------------
 
-    @property
-    def actual_value(self) -> Union[str, int, float, bool, datetime, ButtonPayload, SwitchPayload, None]:
-        """Register actual value"""
-        return normalize_value(data_type=self.data_type, value=self._actual_value, value_format=self.format)
-
-    # -----------------------------------------------------------------------------
-
-    @actual_value.setter
-    def actual_value(self, value: Union[str, int, float, bool, datetime, ButtonPayload, SwitchPayload]) -> None:
-        """Set register actual value"""
-        self._actual_value = value
-
-    # -----------------------------------------------------------------------------
-
-    @property
-    def expected_value(self) -> Union[str, int, float, bool, datetime, ButtonPayload, SwitchPayload, None]:
-        """Register expected value"""
-        return normalize_value(data_type=self.data_type, value=self._expected_value, value_format=self.format)
-
-    # -----------------------------------------------------------------------------
-
-    @expected_value.setter
-    def expected_value(
-        self,
-        value: Union[str, int, float, bool, datetime, ButtonPayload, SwitchPayload, None],
-    ) -> None:
-        """Set register expected value"""
-        self._expected_value = value
-
-    # -----------------------------------------------------------------------------
-
     @property
     def format(
         self,