Merge pull request #272 from Windham-High-School/release-1.6.4

Release 1.6.4
Windham-High-School · May 13, 2023 · abb868f · abb868f
2 parents a9ba3be + 56e68ee
commit abb868f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/src/CubeServer-api/cubeserver_api/_version.py b/src/CubeServer-api/cubeserver_api/_version.py
@@ -1 +1 @@
-__version__ = "1.6.3"
+__version__ = "1.6.4"
diff --git a/src/CubeServer-app/cubeserver_app/_version.py b/src/CubeServer-app/cubeserver_app/_version.py
@@ -1 +1 @@
-__version__ = "1.6.3"
+__version__ = "1.6.4"
diff --git a/src/CubeServer-beaconserver/cubeserver_beaconserver/_version.py b/src/CubeServer-beaconserver/cubeserver_beaconserver/_version.py
@@ -1 +1 @@
-__version__ = "1.6.3"
+__version__ = "1.6.4"
diff --git a/src/CubeServer-common/cubeserver_common/_version.py b/src/CubeServer-common/cubeserver_common/_version.py
@@ -1 +1 @@
-__version__ = "1.6.3"
+__version__ = "1.6.4"
diff --git a/src/CubeServer-common/cubeserver_common/models/datapoint.py b/src/CubeServer-common/cubeserver_common/models/datapoint.py
@@ -21,7 +21,8 @@ class DataClass(Enum):
     PRESSURE = "pressure"
     COMMENT = "comment"
     SIGNAL_LIGHT = "signal"
-    BATTERY_REMAINING = "remaining battery"
+    BATTERY_REMAINING = "remaining battery"  # Deprecated
+    BATTERY_VOLTAGE = "battery voltage"
     BEACON_CHALLENGE = "beacon challenge"
 
     @property
@@ -33,6 +34,7 @@ def datatype(self) -> type:
             DataClass.COMMENT: str,
             DataClass.SIGNAL_LIGHT: bool,
             DataClass.BATTERY_REMAINING: int,
+            DataClass.BATTERY_VOLTAGE: float,
             DataClass.BEACON_CHALLENGE: str
         }[self]
 
@@ -46,7 +48,8 @@ def unit(self) -> str:
             DataClass.COMMENT: "",
             DataClass.BEACON_CHALLENGE: "",
             DataClass.SIGNAL_LIGHT: "",
-            DataClass.BATTERY_REMAINING: "%"
+            DataClass.BATTERY_REMAINING: "%",
+            DataClass.BATTERY_VOLTAGE: "V"
         }[self]
 
     @classmethod

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.6.3
+1.6.4