From 6eb9cdce90344163dddf883cfcabf2ca3658c4c1 Mon Sep 17 00:00:00 2001
From: Upstream Data <brett@upstreamdata.ca>
Date: Fri, 4 Nov 2022 19:55:13 -0600
Subject: [PATCH] feature: add `left_chips`, `center_chips`, and `right_chips`
 to `MinerData` as properties that compute the correct board position from
 hashboards.

---
 pyasic/data/__init__.py | 68 +++++++++++++++++++++++++----------------
 1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/pyasic/data/__init__.py b/pyasic/data/__init__.py
index a18edb94..0ec05a53 100644
--- a/pyasic/data/__init__.py
+++ b/pyasic/data/__init__.py
@@ -102,9 +102,9 @@ class MinerData:
     fan_3: int = -1
     fan_4: int = -1
     fan_psu: int = -1
-    left_chips: int = 0
-    center_chips: int = 0
-    right_chips: int = 0
+    left_chips: int = field(init=False)
+    center_chips: int = field(init=False)
+    right_chips: int = field(init=False)
     total_chips: int = field(init=False)
     ideal_chips: int = 1
     percent_ideal: float = field(init=False)
@@ -176,18 +176,48 @@ class MinerData:
                 setattr(cp, key, item & other_item)
         return cp
 
-    @property
-    def old_total_chips(self):  # noqa - Skip PyCharm inspection
-        return self.right_chips + self.center_chips + self.left_chips
-
     @property
     def total_chips(self):  # noqa - Skip PyCharm inspection
-        return reduce(lambda x, y: x + y, [board.chips for board in self.hashboards])
+        return reduce(lambda x, y: x + y, [hb.chips for hb in self.hashboards])
 
     @total_chips.setter
     def total_chips(self, val):
         pass
 
+    @property
+    def left_chips(self):  # noqa - Skip PyCharm inspection
+        if len(self.hashboards) in [2, 3]:
+            return self.hashboards[0].chips
+        return 0
+
+    @left_chips.setter
+    def left_chips(self, val):
+        pass
+
+    @property
+    def center_chips(self):  # noqa - Skip PyCharm inspection
+        if len(self.hashboards) == 1:
+            return self.hashboards[0].chips
+        if len(self.hashboards) == 3:
+            return self.hashboards[1].chips
+        return 0
+
+    @center_chips.setter
+    def center_chips(self, val):
+        pass
+
+    @property
+    def right_chips(self):  # noqa - Skip PyCharm inspection
+        if len(self.hashboards) == 2:
+            return self.hashboards[1].chips
+        if len(self.hashboards) == 3:
+            return self.hashboards[2].chips
+        return 0
+
+    @right_chips.setter
+    def right_chips(self, val):
+        pass
+
     @property
     def nominal(self):  # noqa - Skip PyCharm inspection
         return self.ideal_chips == self.total_chips
@@ -204,29 +234,13 @@ class MinerData:
     def percent_ideal(self, val):
         pass
 
-    @property
-    def old_temperature_avg(self):  # noqa - Skip PyCharm inspection
-        total_temp = 0
-        temp_count = 0
-        for temp in [
-            self.left_board_chip_temp,
-            self.center_board_chip_temp,
-            self.right_board_chip_temp,
-        ]:
-            if temp and not temp == -1:
-                total_temp += temp
-                temp_count += 1
-        if not temp_count > 0:
-            return 0
-        return round(total_temp / temp_count)
-
     @property
     def temperature_avg(self):  # noqa - Skip PyCharm inspection
         total_temp = 0
         temp_count = 0
-        for temp in self.hashboards:
-            if temp.temp and not temp.temp == -1:
-                total_temp += temp.temp
+        for hb in self.hashboards:
+            if hb.temp and not hb.temp == -1:
+                total_temp += hb.temp
                 temp_count += 1
         if not temp_count > 0:
             return 0