improved whatsminer handling, and added VF20 to miner dict

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_Plus import BTMinerM30SPlusPlusVG40, BTMinerM30SPlusPlusVG30
+from .M30S_Plus import BTMinerM30SPlus, BTMinerM30SPlusVF20, BTMinerM30SPlusVE40
+from .M30S_Plus_Plus import (
+    BTMinerM30SPlusPlus,
+    BTMinerM30SPlusPlusVG40,
+    BTMinerM30SPlusPlusVG30,
+)
 
 from .M31S import BTMinerM31S
 from .M31S_Plus import BTMinerM31SPlus, BTMinerM31SPlusVE20