updated a bunch of miner chip counts, added S19a, and fixed a bug with whatsminer M30S++

miners/_backends/btminer.py

@@ -140,9 +140,13 @@ class BTMiner(BaseMiner):
             if boards:
                 if len(boards) > 0:
                     board_map = {0: "Left Board", 1: "Center Board", 2: "Right Board"}
-                    offset = boards[0]["ID"]
+                    if "ID" in boards[0].keys():
+                        id_key = "ID"
+                    else:
+                        id_key = "ASC"
+                    offset = boards[0][id_key]
                     for board in boards:
-                        id = board["ID"] - offset
+                        id = board[id_key] - offset
                         chips = board["Effective Chips"]
                         data["Total"] += chips
                         data[board_map[id]] = chips

miners/_types/antminer/X17/S17.py

@@ -6,4 +6,4 @@ class S17(BaseMiner):
         super().__init__()
         self.ip = ip
         self.model = "S17"
-        self.nominal_chips = 65
+        self.nominal_chips = 48

miners/_types/antminer/X17/S17_Pro.py

@@ -6,4 +6,4 @@ class S17Pro(BaseMiner):
         super().__init__()
         self.ip = ip
         self.model = "S17 Pro"
-        self.nominal_chips = 65
+        self.nominal_chips = 48

miners/_types/antminer/X17/S17e.py

@@ -6,4 +6,4 @@ class S17e(BaseMiner):
         super().__init__()
         self.ip = ip
         self.model = "S17e"
-        self.nominal_chips = 65
+        self.nominal_chips = 135

miners/_types/antminer/X17/T17.py

@@ -6,4 +6,4 @@ class T17(BaseMiner):
         super().__init__()
         self.ip = ip
         self.model = "T17"
-        self.nominal_chips = 65
+        self.nominal_chips = 30

miners/_types/antminer/X17/T17_Plus.py

@@ -6,4 +6,4 @@ class T17Plus(BaseMiner):
         super().__init__()
         self.ip = ip
         self.model = "T17+"
-        self.nominal_chips = 65
+        self.nominal_chips = 44

miners/_types/antminer/X17/T17e.py

@@ -6,4 +6,4 @@ class T17e(BaseMiner):
         super().__init__()
         self.ip = ip
         self.model = "T17e"
-        self.nominal_chips = 65
+        self.nominal_chips = 78

miners/_types/antminer/X19/S19.py

@@ -6,4 +6,4 @@ class S19(BaseMiner):
         super().__init__()
         self.ip = ip
         self.model = "S19"
-        self.nominal_chips = 114
+        self.nominal_chips = 76

miners/_types/antminer/X19/S19a.py

@@ -0,0 +1,9 @@
+from miners import BaseMiner
+
+
+class S19a(BaseMiner):
+    def __init__(self, ip: str):
+        super().__init__()
+        self.ip = ip
+        self.model = "S19a"
+        self.nominal_chips = 72

miners/_types/antminer/X19/S19j_Pro.py

@@ -6,4 +6,4 @@ class S19jPro(BaseMiner):
         super().__init__()
         self.ip = ip
         self.model = "S19j Pro"
-        self.nominal_chips = 114
+        self.nominal_chips = 126

miners/_types/antminer/X19/T19.py

@@ -6,4 +6,4 @@ class T19(BaseMiner):
         super().__init__()
         self.ip = ip
         self.model = "T19"
-        self.nominal_chips = 114
+        self.nominal_chips = 76

miners/_types/antminer/X19/__init__.py

@@ -4,4 +4,6 @@ from .S19_Pro import S19Pro
 from .S19j import S19j
 from .S19j_Pro import S19jPro
 
+from .S19a import S19a
+
 from .T19 import T19

miners/_types/antminer/X9/T9.py

@@ -6,4 +6,4 @@ class T9(BaseMiner):
         super().__init__()
         self.ip = ip
         self.model = "T9"
-        self.nominal_chips = 1
+        self.nominal_chips = 57

miners/_types/whatsminer/M3X/M30S_Plus.py

@@ -6,3 +6,4 @@ class M30SPlus(BaseMiner):
         super().__init__()
         self.ip = ip
         self.model = "M30S+"
+        self.nominal_chips = 156

miners/_types/whatsminer/M3X/M30S_Plus_Plus.py

@@ -6,3 +6,7 @@ class M30SPlusPlus(BaseMiner):
         super().__init__()
         self.ip = ip
         self.model = "M30S++"
+        self.nominal_chips = 117
+
+
+# TODO: handle different chip counts, 111, 117,(128)

miners/antminer/bmminer/X19/S19a.py

@@ -0,0 +1,8 @@
+from miners._backends import BMMiner
+from miners._types import S19a
+
+
+class BMMinerS19a(BMMiner, S19a):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.ip = ip

miners/antminer/bmminer/X19/__init__.py

@@ -4,4 +4,6 @@ from .S19_Pro import BMMinerS19Pro
 from .S19j import BMMinerS19j
 from .S19j_Pro import BMMinerS19jPro
 
+from .S19a import BMMinerS19a
+
 from .T19 import BMMinerT19

miners/miner_factory.py

@@ -93,6 +93,10 @@ MINER_CLASSES = {
         "BMMiner": BMMinerS19jPro,
         "CGMiner": CGMinerS19jPro,
     },
+    "Antminer S19a": {
+        "Default": BMMinerS19a,
+        "BMMiner": BMMinerS19a,
+    },
     "Antminer T19": {
         "Default": BMMinerT19,
         "BOSMiner": BOSMinerT19,

tools/cfg_util/ui.py

@@ -134,7 +134,6 @@ async def ui():
             _table = "boards_table"
             asyncio.create_task(btn_refresh(_table, value[_table]))
         if event == "boards_report_file":
-            print(value["boards_report_file"])
             if not value["boards_report_file"] == "":
                 asyncio.create_task(boards_report(value["boards_report_file"]))
                 window["boards_report_file"].update("")