improved whatsminer handling, and added VF20 to miner dict

miners/_types/whatsminer/M2X/M21S.py

@@ -1,6 +1,15 @@
 from miners import BaseMiner
 
 
+class M21S(BaseMiner):
+    def __init__(self, ip: str):
+        super().__init__()
+        self.ip = ip
+        self.model = "M21S"
+        self.nominal_chips = 66
+        self.fan_count = 2
+
+
 class M21SV60(BaseMiner):
     def __init__(self, ip: str):
         super().__init__()

miners/_types/whatsminer/M2X/__init__.py

@@ -2,5 +2,5 @@ from .M20S import M20S
 from .M20S_Plus import M20SPlus
 
 from .M21 import M21
-from .M21S import M21SV20, M21SV60
+from .M21S import M21S, M21SV20, M21SV60
 from .M21S_Plus import M21SPlus

miners/_types/whatsminer/M3X/M30S_Plus_Plus.py

@@ -1,6 +1,15 @@
 from miners import BaseMiner
 
 
+class M30SPlusPlus(BaseMiner):
+    def __init__(self, ip: str):
+        super().__init__()
+        self.ip = ip
+        self.model = "M30S++"
+        self.nominal_chips = 111
+        self.fan_count = 2
+
+
 class M30SPlusPlusVG30(BaseMiner):
     def __init__(self, ip: str):
         super().__init__()

miners/_types/whatsminer/M3X/__init__.py

@@ -1,6 +1,6 @@
 from .M30S import M30S, M30SV50
 from .M30S_Plus import M30SPlus, M30SPlusVE40, M30SPlusVF20
-from .M30S_Plus_Plus import M30SPlusPlusVG30, M30SPlusPlusVG40
+from .M30S_Plus_Plus import M30SPlusPlus, M30SPlusPlusVG30, M30SPlusPlusVG40
 
 from .M31S import M31S
 from .M31S_Plus import M31SPlus, M31SPlusVE20

miners/miner_factory.py

@@ -133,8 +133,8 @@ MINER_CLASSES = {
         "BTMiner": BTMinerM21,
     },
     "M21S": {
-        "Default": BTMinerM21SV60,
+        "Default": BTMinerM21S,
-        "BTMiner": BTMinerM21SV60,
+        "BTMiner": BTMinerM21S,
         "60": BTMinerM21SV60,
         "20": BTMinerM21SV20,
     },
@@ -150,11 +150,12 @@ MINER_CLASSES = {
     "M30S+": {
         "Default": BTMinerM30SPlus,
         "BTMiner": BTMinerM30SPlus,
+        "F20": BTMinerM30SPlusVF20,
         "E40": BTMinerM30SPlusVE40,
     },
     "M30S++": {
-        "Default": BTMinerM30SPlusPlusVG40,
+        "Default": BTMinerM30SPlusPlus,
-        "BTMiner": BTMinerM30SPlusPlusVG40,
+        "BTMiner": BTMinerM30SPlusPlus,
         "G40": BTMinerM30SPlusPlusVG40,
         "G30": BTMinerM30SPlusPlusVG30,
     },

miners/whatsminer/btminer/M2X/M21S.py

@@ -2,6 +2,12 @@ from miners._backends import BTMiner  # noqa - Ignore access to _module
 from miners._types import M21SV20, M21SV60  # noqa - Ignore access to _module
 
 
+class BTMinerM21S(BTMiner, M21S):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.ip = ip
+
+
 class BTMinerM21SV20(BTMiner, M21SV20):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)

miners/whatsminer/btminer/M2X/__init__.py

@@ -2,5 +2,5 @@ from .M20S import BTMinerM20S
 from .M20S_Plus import BTMinerM20SPlus
 
 from .M21 import BTMinerM21
-from .M21S import BTMinerM21SV20, BTMinerM21SV60
+from .M21S import BTMinerM21S, BTMinerM21SV20, BTMinerM21SV60
 from .M21S_Plus import BTMinerM21SPlus

miners/whatsminer/btminer/M3X/M30S_Plus_Plus.py

@@ -1,10 +1,17 @@
 from miners._backends import BTMiner  # noqa - Ignore access to _module
 from miners._types import (  # noqa - Ignore access to _module
+    M30SPlusPlus,
     M30SPlusPlusVG40,
     M30SPlusPlusVG30,
 )
 
 
+class BTMinerM30SPlusPlus(BTMiner, M30SPlusPlus):
+    def __init__(self, ip: str) -> None:
+        super().__init__(ip)
+        self.ip = ip
+
+
 class BTMinerM30SPlusPlusVG40(BTMiner, M30SPlusPlusVG40):
     def __init__(self, ip: str) -> None:
         super().__init__(ip)

miners/whatsminer/btminer/M3X/__init__.py

@@ -1,6 +1,10 @@
 from .M30S import BTMinerM30S, BTMinerM30SV50
-from .M30S_Plus import BTMinerM30SPlus, BTMinerM30SPlusVE40
+from .M30S_Plus import BTMinerM30SPlus, BTMinerM30SPlusVF20, BTMinerM30SPlusVE40
-from .M30S_Plus_Plus import BTMinerM30SPlusPlusVG40, BTMinerM30SPlusPlusVG30
+from .M30S_Plus_Plus import (
+    BTMinerM30SPlusPlus,
+    BTMinerM30SPlusPlusVG40,
+    BTMinerM30SPlusPlusVG30,
+)
 
 from .M31S import BTMinerM31S
 from .M31S_Plus import BTMinerM31SPlus, BTMinerM31SPlusVE20