feature: finish support for most whatsminer subtypes.

pyasic/miners/miner_factory.py

@@ -113,6 +113,8 @@ MINER_CLASSES = {
         "M29V10": BTMinerM29V10,
         "M30V10": BTMinerM30V10,
         "M30V20": BTMinerM30V20,
+        "M30KV10": BTMinerM30KV10,
+        "M30LV10": BTMinerM30LV10,
         "M30SV10": BTMinerM30SV10,
         "M30SV20": BTMinerM30SV20,
         "M30SV30": BTMinerM30SV30,
@@ -162,6 +164,7 @@ MINER_CLASSES = {
         "M30S+VE100": BTMinerM30SPlusVE100,
         "M30S+VF20": BTMinerM30SPlusVF20,
         "M30S+VF30": BTMinerM30SPlusVF30,
+        "M30S+VG20": BTMinerM30SPlusVG20,
         "M30S+VG30": BTMinerM30SPlusVG30,
         "M30S+VG40": BTMinerM30SPlusVG40,
         "M30S+VG50": BTMinerM30SPlusVG50,
@@ -195,6 +198,9 @@ MINER_CLASSES = {
         "M30S++VJ30": BTMinerM30SPlusPlusVJ30,
         "M31V10": BTMinerM31V10,
         "M31V20": BTMinerM31V20,
+        "M31HV10": BTMinerM31HV10,
+        "M31HV40": BTMinerM31HV40,
+        "M31LV10": BTMinerM31LV10,
         "M31SV10": BTMinerM31SV10,
         "M31SV20": BTMinerM31SV20,
         "M31SV30": BTMinerM31SV30,
@@ -210,7 +216,6 @@ MINER_CLASSES = {
         "M31SEV10": BTMinerM31SEV10,
         "M31SEV20": BTMinerM31SEV20,
         "M31SEV30": BTMinerM31SEV30,
-        "M31HV40": BTMinerM31HV40,
         "M31S+V10": BTMinerM31SPlusV10,
         "M31S+V20": BTMinerM31SPlusV20,
         "M31S+V30": BTMinerM31SPlusV30,
@@ -237,6 +242,7 @@ MINER_CLASSES = {
         "M33V20": BTMinerM33V20,
         "M33V30": BTMinerM33V30,
         "M33SVG30": BTMinerM33SVG30,
+        "M33S+VG20": BTMinerM33SPlusVG20,
         "M33S+VH20": BTMinerM33SPlusVH20,
         "M33S+VH30": BTMinerM33SPlusVH30,
         "M33S++VH20": BTMinerM33SPlusPlusVH20,
@@ -246,7 +252,10 @@ MINER_CLASSES = {
         "M36SVE10": BTMinerM36SVE10,
         "M36S+VG30": BTMinerM36SPlusVG30,
         "M36S++VH30": BTMinerM36SPlusPlusVH30,
+        "M39V10": BTMinerM39V10,
         "M39V20": BTMinerM39V20,
+        "M39V30": BTMinerM39V30,
+        "M50VE30": BTMinerM50VE30,
         "M50VG30": BTMinerM50VG30,
         "M50VH10": BTMinerM50VH10,
         "M50VH20": BTMinerM50VH20,

pyasic/miners/whatsminer/btminer/M3X/M30K.py

@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.backends import M3X
+from pyasic.miners.types import M30KV10
+
+
+class BTMinerM30KV10(M3X, M30KV10):
+    pass

pyasic/miners/whatsminer/btminer/M3X/M30L.py

@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.backends import M3X
+from pyasic.miners.types import M30LV10
+
+
+class BTMinerM30LV10(M3X, M30LV10):
+    pass

pyasic/miners/whatsminer/btminer/M3X/M30S_Plus.py

@@ -36,6 +36,7 @@ from pyasic.miners.types import (
     M30SPlusVE100,
     M30SPlusVF20,
     M30SPlusVF30,
+    M30SPlusVG20,
     M30SPlusVG30,
     M30SPlusVG40,
     M30SPlusVG50,
@@ -46,7 +47,6 @@ from pyasic.miners.types import (
     M30SPlusVH40,
     M30SPlusVH50,
     M30SPlusVH60,
-    M36SPlusVG30,
 )
 
 
@@ -130,7 +130,7 @@ class BTMinerM30SPlusVF30(M3X, M30SPlusVF30):
     pass
 
 
-class BTMinerM36SPlusVG30(M3X, M36SPlusVG30):
+class BTMinerM30SPlusVG20(M3X, M30SPlusVG20):
     pass
 
 

pyasic/miners/whatsminer/btminer/M3X/M31H.py

@@ -15,7 +15,11 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import M3X
-from pyasic.miners.types import M31HV40
+from pyasic.miners.types import M31HV10, M31HV40
+
+
+class BTMinerM31HV10(M3X, M31HV10):
+    pass
 
 
 class BTMinerM31HV40(M3X, M31HV40):

pyasic/miners/whatsminer/btminer/M3X/M31L.py

@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+
+from pyasic.miners.backends import M3X
+from pyasic.miners.types import M30LV10
+
+
+class BTMinerM31LV10(M3X, M30LV10):
+    pass

pyasic/miners/whatsminer/btminer/M3X/M33S_Plus.py

@@ -15,7 +15,11 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import M3X
-from pyasic.miners.types import M33SPlusVH20, M33SPlusVH30
+from pyasic.miners.types import M33SPlusVG20, M33SPlusVH20, M33SPlusVH30
+
+
+class BTMinerM33SPlusVG20(M3X, M33SPlusVG20):
+    pass
 
 
 class BTMinerM33SPlusVH20(M3X, M33SPlusVH20):

pyasic/miners/whatsminer/btminer/M3X/M39.py

@@ -15,8 +15,16 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import M3X
-from pyasic.miners.types import M39V20
+from pyasic.miners.types import M39V10, M39V20, M39V30
+
+
+class BTMinerM39V10(M3X, M39V10):
+    pass
 
 
 class BTMinerM39V20(M3X, M39V20):
     pass
+
+
+class BTMinerM39V30(M3X, M39V30):
+    pass

pyasic/miners/whatsminer/btminer/M3X/__init__.py

@@ -15,6 +15,8 @@
 # ------------------------------------------------------------------------------
 
 from .M30 import BTMinerM30V10, BTMinerM30V20
+from .M30K import BTMinerM30KV10
+from .M30L import BTMinerM30LV10
 from .M30S import (
     BTMinerM30SV10,
     BTMinerM30SV20,
@@ -67,6 +69,7 @@ from .M30S_Plus import (
     BTMinerM30SPlusVE100,
     BTMinerM30SPlusVF20,
     BTMinerM30SPlusVF30,
+    BTMinerM30SPlusVG20,
     BTMinerM30SPlusVG30,
     BTMinerM30SPlusVG40,
     BTMinerM30SPlusVG50,
@@ -77,7 +80,6 @@ from .M30S_Plus import (
     BTMinerM30SPlusVH40,
     BTMinerM30SPlusVH50,
     BTMinerM30SPlusVH60,
-    BTMinerM36SPlusVG30,
 )
 from .M30S_Plus_Plus import (
     BTMinerM30SPlusPlusV10,
@@ -103,7 +105,8 @@ from .M30S_Plus_Plus import (
     BTMinerM30SPlusPlusVJ30,
 )
 from .M31 import BTMinerM31V10, BTMinerM31V20
-from .M31H import BTMinerM31HV40
+from .M31H import BTMinerM31HV10, BTMinerM31HV40
+from .M31L import BTMinerM31LV10
 from .M31S import (
     BTMinerM31SV10,
     BTMinerM31SV20,
@@ -145,7 +148,7 @@ from .M32 import BTMinerM32V10, BTMinerM32V20
 from .M32S import BTMinerM32S
 from .M33 import BTMinerM33V10, BTMinerM33V20, BTMinerM33V30
 from .M33S import BTMinerM33SVG30
-from .M33S_Plus import BTMinerM33SPlusVH20, BTMinerM33SPlusVH30
+from .M33S_Plus import BTMinerM33SPlusVG20, BTMinerM33SPlusVH20, BTMinerM33SPlusVH30
 from .M33S_Plus_Plus import (
     BTMinerM33SPlusPlusVG40,
     BTMinerM33SPlusPlusVH20,
@@ -155,4 +158,4 @@ from .M34S_Plus import BTMinerM34SPlusVE10
 from .M36S import BTMinerM36SVE10
 from .M36S_Plus import BTMinerM36SPlusVG30
 from .M36S_Plus_Plus import BTMinerM36SPlusPlusVH30
-from .M39 import BTMinerM39V20
+from .M39 import BTMinerM39V10, BTMinerM39V20, BTMinerM39V30

pyasic/miners/whatsminer/btminer/M5X/M50.py

@@ -16,6 +16,7 @@
 
 from pyasic.miners.backends import M5X
 from pyasic.miners.types import (
+    M50VE30,
     M50VG30,
     M50VH10,
     M50VH20,
@@ -31,6 +32,10 @@ from pyasic.miners.types import (
 )
 
 
+class BTMinerM50VE30(M5X, M50VE30):
+    pass
+
+
 class BTMinerM50VG30(M5X, M50VG30):
     pass
 

pyasic/miners/whatsminer/btminer/M5X/__init__.py

@@ -15,6 +15,7 @@
 # ------------------------------------------------------------------------------
 
 from .M50 import (
+    BTMinerM50VE30,
     BTMinerM50VG30,
     BTMinerM50VH10,
     BTMinerM50VH20,