changed the way antminers and whatsminers are handled in the factory to allow for more precision on chip counts

miners/whatsminer/__init__.py

@@ -0,0 +1 @@
+from .btminer import *

miners/whatsminer/btminer/M2X/M20S.py

@@ -1,10 +1,10 @@
 from miners.btminer import BTMiner
 
 
-class BTMinerM20(BTMiner):
+class BTMinerM20S(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)}"
+        return f"M20S - BTMiner: {str(self.ip)}"

miners/whatsminer/btminer/M2X/M20S_Plus.py

@@ -0,0 +1,10 @@
+from miners.btminer import BTMiner
+
+
+class BTMinerM20SPlus(BTMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.nominal_chips = 66
+
+    def __repr__(self) -> str:
+        return f"M20S+ - BTMiner: {str(self.ip)}"

miners/whatsminer/btminer/M2X/M21S.py

@@ -0,0 +1,10 @@
+from miners.btminer import BTMiner
+
+
+class BTMinerM21S(BTMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.nominal_chips = 105
+
+    def __repr__(self) -> str:
+        return f"M21S - BTMiner: {str(self.ip)}"

miners/whatsminer/btminer/M2X/M21S_Plus.py

@@ -0,0 +1,10 @@
+from miners.btminer import BTMiner
+
+
+class BTMinerM21SPlus(BTMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.nominal_chips = 105
+
+    def __repr__(self) -> str:
+        return f"M21S+ - BTMiner: {str(self.ip)}"

miners/whatsminer/btminer/M2X/__init__.py

@@ -0,0 +1,6 @@
+from .M20S import BTMinerM20S
+from .M20S_Plus import BTMinerM20SPlus
+
+from .M21 import BTMinerM21
+from .M21S import BTMinerM21S
+from .M21S_Plus import BTMinerM21SPlus

miners/whatsminer/btminer/M3X/M30S.py

@@ -1,9 +1,9 @@
 from miners.btminer import BTMiner
 
 
-class BTMinerM30(BTMiner):
+class BTMinerM30S(BTMiner):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
 
     def __repr__(self) -> str:
-        return f"M30- BTMiner: {str(self.ip)}"
+        return f"M30S - BTMiner: {str(self.ip)}"

miners/whatsminer/btminer/M3X/M30S_Plus.py

@@ -1,9 +1,9 @@
 from miners.btminer import BTMiner
 
 
-class BTMinerM32(BTMiner):
+class BTMinerM30SPlus(BTMiner):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
 
     def __repr__(self) -> str:
-        return f"M32 - BTMiner: {str(self.ip)}"
+        return f"M30S+ - BTMiner: {str(self.ip)}"

miners/whatsminer/btminer/M3X/M30S_Plus_Plus.py

@@ -0,0 +1,9 @@
+from miners.btminer import BTMiner
+
+
+class BTMinerM30SPlusPlus(BTMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+
+    def __repr__(self) -> str:
+        return f"M30S++ - BTMiner: {str(self.ip)}"

miners/whatsminer/btminer/M3X/M31S.py

@@ -1,10 +1,10 @@
 from miners.btminer import BTMiner
 
 
-class BTMinerM31(BTMiner):
+class BTMinerM31S(BTMiner):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)
         self.nominal_chips = 78
 
     def __repr__(self) -> str:
-        return f"M31 - BTMiner: {str(self.ip)}"
+        return f"M31S - BTMiner: {str(self.ip)}"

miners/whatsminer/btminer/M3X/M31S_Plus.py

@@ -0,0 +1,10 @@
+from miners.btminer import BTMiner
+
+
+class BTMinerM31SPlus(BTMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.nominal_chips = 78
+
+    def __repr__(self) -> str:
+        return f"M31S+ - BTMiner: {str(self.ip)}"

miners/whatsminer/btminer/M3X/M32S.py

@@ -0,0 +1,10 @@
+from miners.btminer import BTMiner
+
+
+class BTMinerM32S(BTMiner):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.nominal_chips = 78
+
+    def __repr__(self) -> str:
+        return f"M32S - BTMiner: {str(self.ip)}"

miners/whatsminer/btminer/M3X/__init__.py

@@ -0,0 +1,8 @@
+from .M30S import BTMinerM30S
+from .M30S_Plus import BTMinerM30SPlus
+from .M30S_Plus_Plus import BTMinerM30SPlusPlus
+
+from .M31S import BTMinerM31S
+from .M31S_Plus import BTMinerM31SPlus
+
+from .M32S import BTMinerM32S

miners/whatsminer/btminer/__init__.py

@@ -0,0 +1,2 @@
+from .M2X import *
+from .M3X import *