From 8568f9148284b7282233caaca2ea9e7dca3b2706 Mon Sep 17 00:00:00 2001
From: UpstreamData <brett@upstreamdata.ca>
Date: Thu, 12 May 2022 13:20:57 -0600
Subject: [PATCH] added btminer board data

---
 miners/btminer.py        | 23 ++++++++++++++++++++++-
 miners/whatsminer/M20.py |  1 +
 miners/whatsminer/M21.py |  2 +-
 miners/whatsminer/M31.py |  2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/miners/btminer.py b/miners/btminer.py
index c3e25613..69ff9cc9 100644
--- a/miners/btminer.py
+++ b/miners/btminer.py
@@ -84,7 +84,13 @@ class BTMiner(BaseMiner):
             "Temperature": 0,
             "Pool User": "Unknown",
             "Wattage": 0,
-            "Split": 0,
+            "Total": 0,
+            "Ideal": self.nominal_chips * 3,
+            "Left Board": 0,
+            "Center Board": 0,
+            "Right Board": 0,
+            "Nominal": False,
+            "Split": "0",
             "Pool 1": "Unknown",
             "Pool 1 User": "Unknown",
             "Pool 2": "",
@@ -133,6 +139,21 @@ class BTMiner(BaseMiner):
                         data["Temperature"] = round(temp)
                         break
 
+        if devs:
+            boards = devs.get("DEVS")
+            if boards:
+                if len(boards) > 0:
+                    board_map = {0: "Left Board", 1: "Center Board", 2: "Right Board"}
+                    offset = boards[0]["ID"]
+                    for board in boards:
+                        id = board["ID"] - offset
+                        chips = board["Effective Chips"]
+                        data["Total"] += chips
+                        data[board_map[id]] = chips
+
+        if data["Total"] == data["Ideal"]:
+            data["Nominal"] = True
+
         if pools:
             pool_1 = None
             pool_2 = None
diff --git a/miners/whatsminer/M20.py b/miners/whatsminer/M20.py
index 682fe048..a781ef09 100644
--- a/miners/whatsminer/M20.py
+++ b/miners/whatsminer/M20.py
@@ -4,6 +4,7 @@ from miners.btminer import BTMiner
 class BTMinerM20(BTMiner):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
+        self.nominal_chips = 66
 
     def __repr__(self) -> str:
         return f"M20 - BTMiner: {str(self.ip)}"
diff --git a/miners/whatsminer/M21.py b/miners/whatsminer/M21.py
index 148284e7..92834dc0 100644
--- a/miners/whatsminer/M21.py
+++ b/miners/whatsminer/M21.py
@@ -4,7 +4,7 @@ from miners.btminer import BTMiner
 class BTMinerM21(BTMiner):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
-        self.nominal_chips = [105, 66]
+        self.nominal_chips = 105
 
     def __repr__(self) -> str:
         return f"M21 - BTMiner: {str(self.ip)}"
diff --git a/miners/whatsminer/M31.py b/miners/whatsminer/M31.py
index d527b16d..f69df916 100644
--- a/miners/whatsminer/M31.py
+++ b/miners/whatsminer/M31.py
@@ -4,7 +4,7 @@ from miners.btminer import BTMiner
 class BTMinerM31(BTMiner):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
-        self.nominal_chips = [78]
+        self.nominal_chips = 78
 
     def __repr__(self) -> str:
         return f"M31 - BTMiner: {str(self.ip)}"