version: bump version number.

feat: Add _get_pools method to BOSer backend class.

README.md

@@ -42,7 +42,7 @@ It is recommended to install `pyasic` in a [virtual environment](https://realpyt
 
 ##### Installing `pyasic`
 
-`python -m pip install .` or `poetry install`
+`python -m pip install pyasic` or `poetry install`
 
 ##### Additional Developer Setup
 ```
@@ -255,24 +255,30 @@ if __name__ == "__main__":
 ```python
 from pyasic import settings
 
-settings.update("default_antminer_password", "my_pwd")
+settings.update("default_antminer_web_password", "my_pwd")
 ```
 
 ##### Default values:
 ```
 "network_ping_retries": 1,
 "network_ping_timeout": 3,
-"network_scan_threads": 300,
+"network_scan_semaphore": None,
 "factory_get_retries": 1,
 "factory_get_timeout": 3,
 "get_data_retries": 1,
 "api_function_timeout": 5,
-"default_whatsminer_password": "admin",
-"default_innosilicon_password": "admin",
-"default_antminer_password": "root",
-"default_bosminer_password": "root",
-"default_vnish_password": "admin",
-"default_goldshell_password": "123456789",
+"antminer_mining_mode_as_str": False,
+"default_whatsminer_rpc_password": "admin",
+"default_innosilicon_web_password": "admin",
+"default_antminer_web_password": "root",
+"default_bosminer_web_password": "root",
+"default_vnish_web_password": "admin",
+"default_goldshell_web_password": "123456789",
+"default_auradine_web_password": "admin",
+"default_epic_web_password": "letmein",
+"default_hive_web_password": "admin",
+"default_antminer_ssh_password": "miner",
+"default_bosminer_ssh_password": "root",
 
 # ADVANCED
 # Only use this if you know what you are doing

docs/generate_miners.py

@@ -49,6 +49,8 @@ def backend_str(backend: MinerTypes) -> str:
             return "LuxOS Firmware Miners"
         case MinerTypes.MARATHON:
             return "Mara Firmware Miners"
+        case MinerTypes.BITAXE:
+            return "Stock Firmware BitAxe Miners"
 
 
 def create_url_str(mtype: str):

docs/index.md

@@ -41,7 +41,7 @@ It is recommended to install `pyasic` in a [virtual environment](https://realpyt
 
 ##### Installing `pyasic`
 
-`python -m pip install .` or `poetry install`
+`python -m pip install pyasic` or `poetry install`
 
 ---
 ## Getting started
@@ -249,25 +249,30 @@ if __name__ == "__main__":
 ```python
 from pyasic import settings
 
-settings.update("default_antminer_password", "my_pwd")
+settings.update("default_antminer_web_password", "my_pwd")
 ```
 
 ##### Default values:
 ```
 "network_ping_retries": 1,
 "network_ping_timeout": 3,
-"network_scan_threads": 300,
+"network_scan_semaphore": None,
 "factory_get_retries": 1,
 "factory_get_timeout": 3,
 "get_data_retries": 1,
 "api_function_timeout": 5,
 "antminer_mining_mode_as_str": False,
-"default_whatsminer_password": "admin",
-"default_innosilicon_password": "admin",
-"default_antminer_password": "root",
-"default_bosminer_password": "root",
-"default_vnish_password": "admin",
-"default_goldshell_password": "123456789",
+"default_whatsminer_rpc_password": "admin",
+"default_innosilicon_web_password": "admin",
+"default_antminer_web_password": "root",
+"default_bosminer_web_password": "root",
+"default_vnish_web_password": "admin",
+"default_goldshell_web_password": "123456789",
+"default_auradine_web_password": "admin",
+"default_epic_web_password": "letmein",
+"default_hive_web_password": "admin",
+"default_antminer_ssh_password": "miner",
+"default_bosminer_ssh_password": "root",
 
 # ADVANCED
 # Only use this if you know what you are doing

docs/miners/antminer/X15.md

@@ -1,7 +1,7 @@
 # pyasic
 ## X15 Models
 
-## Z15
+## Z15 (Stock)
 ::: pyasic.miners.antminer.cgminer.X15.Z15.CGMinerZ15
     handler: python
     options:

docs/miners/antminer/X17.md

@@ -1,49 +1,49 @@
 # pyasic
 ## X17 Models
 
-## S17
+## S17 (Stock)
 ::: pyasic.miners.antminer.bmminer.X17.S17.BMMinerS17
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S17+
+## S17+ (Stock)
 ::: pyasic.miners.antminer.bmminer.X17.S17.BMMinerS17Plus
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S17 Pro
+## S17 Pro (Stock)
 ::: pyasic.miners.antminer.bmminer.X17.S17.BMMinerS17Pro
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S17e
+## S17e (Stock)
 ::: pyasic.miners.antminer.bmminer.X17.S17.BMMinerS17e
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## T17
+## T17 (Stock)
 ::: pyasic.miners.antminer.bmminer.X17.T17.BMMinerT17
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## T17+
+## T17+ (Stock)
 ::: pyasic.miners.antminer.bmminer.X17.T17.BMMinerT17Plus
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## T17e
+## T17e (Stock)
 ::: pyasic.miners.antminer.bmminer.X17.T17.BMMinerT17e
     handler: python
     options:

docs/miners/antminer/X19.md

@@ -1,224 +1,231 @@
 # pyasic
 ## X19 Models
 
-## S19
+## S19 (Stock)
 ::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19L
+## S19L (Stock)
 ::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19L
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19 Pro
+## S19 Pro (Stock)
 ::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19Pro
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19j
+## S19j (Stock)
 ::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19j
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19i
+## S19i (Stock)
 ::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19i
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19+
+## S19+ (Stock)
 ::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19Plus
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19j No PIC
+## S19j No PIC (Stock)
 ::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19jNoPIC
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19 Pro+
+## S19 Pro+ (Stock)
 ::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19ProPlus
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19j Pro
+## S19j Pro (Stock)
 ::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19jPro
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19 XP
+## S19 XP (Stock)
 ::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19XP
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19a
+## S19a (Stock)
 ::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19a
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19a Pro
+## S19a Pro (Stock)
 ::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19aPro
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19 Hydro
+## S19 Hydro (Stock)
 ::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19Hydro
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19 Pro Hydro
+## S19 Pro Hydro (Stock)
 ::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19ProHydro
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19 Pro+ Hydro
+## S19 Pro+ Hydro (Stock)
 ::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19ProPlusHydro
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19K Pro
+## S19K Pro (Stock)
 ::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19KPro
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## T19
+## T19 (Stock)
 ::: pyasic.miners.antminer.bmminer.X19.T19.BMMinerT19
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19
+## S19 (BOS+)
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19+
+## S19+ (BOS+)
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19Plus
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19 Pro
+## S19 Pro (BOS+)
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19Pro
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19a
+## S19a (BOS+)
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19a
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19a Pro
+## S19a Pro (BOS+)
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19aPro
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19j
+## S19j (BOS+)
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19j
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19j No PIC
+## S19j No PIC (BOS+)
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19jNoPIC
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19j Pro
+## S19j Pro (BOS+)
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19jPro
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19j Pro No PIC
+## S19j Pro No PIC (BOS+)
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19jProNoPIC
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19j Pro+
+## S19j Pro+ (BOS+)
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19jProPlus
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19j Pro+
+## S19j Pro+ (BOS+)
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19jProPlus
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19j Pro+ No PIC
+## S19j Pro+ No PIC (BOS+)
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19jProPlusNoPIC
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19k Pro No PIC
+## S19k Pro No PIC (BOS+)
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19kProNoPIC
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S19 XP
+## S19k Pro No PIC (BOS+)
+::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19kProNoPIC
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19 XP (BOS+)
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19XP
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## T19
+## T19 (BOS+)
 ::: pyasic.miners.antminer.bosminer.X19.T19.BOSMinerT19
     handler: python
     options:

docs/miners/antminer/X21.md

@@ -1,27 +1,34 @@
 # pyasic
 ## X21 Models
 
-## S21
+## S21 (Stock)
 ::: pyasic.miners.antminer.bmminer.X21.S21.BMMinerS21
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## T21
+## T21 (Stock)
 ::: pyasic.miners.antminer.bmminer.X21.T21.BMMinerT21
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S21
+## S21 (BOS+)
 ::: pyasic.miners.antminer.bosminer.X21.S21.BOSMinerS21
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
+## S21 (VNish)
+::: pyasic.miners.antminer.vnish.X21.S21.VNishS21
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
 ## S21 (ePIC)
 ::: pyasic.miners.antminer.epic.X21.S21.ePICS21
     handler: python

docs/miners/antminer/X3.md

@@ -1,21 +1,21 @@
 # pyasic
 ## X3 Models
 
-## D3
+## D3 (Stock)
 ::: pyasic.miners.antminer.cgminer.X3.D3.CGMinerD3
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## HS3
+## HS3 (Stock)
 ::: pyasic.miners.antminer.bmminer.X3.HS3.BMMinerHS3
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## L3+
+## L3+ (Stock)
 ::: pyasic.miners.antminer.bmminer.X3.L3.BMMinerL3Plus
     handler: python
     options:

docs/miners/antminer/X5.md

@@ -1,7 +1,7 @@
 # pyasic
 ## X5 Models
 
-## DR5
+## DR5 (Stock)
 ::: pyasic.miners.antminer.cgminer.X5.DR5.CGMinerDR5
     handler: python
     options:

docs/miners/antminer/X7.md

@@ -1,7 +1,7 @@
 # pyasic
 ## X7 Models
 
-## L7
+## L7 (Stock)
 ::: pyasic.miners.antminer.bmminer.X7.L7.BMMinerL7
     handler: python
     options:

docs/miners/antminer/X9.md

@@ -1,35 +1,35 @@
 # pyasic
 ## X9 Models
 
-## E9Pro
+## E9Pro (Stock)
 ::: pyasic.miners.antminer.bmminer.X9.E9.BMMinerE9Pro
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S9
+## S9 (Stock)
 ::: pyasic.miners.antminer.bmminer.X9.S9.BMMinerS9
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S9i
+## S9i (Stock)
 ::: pyasic.miners.antminer.bmminer.X9.S9.BMMinerS9i
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## S9j
+## S9j (Stock)
 ::: pyasic.miners.antminer.bmminer.X9.S9.BMMinerS9j
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## T9
+## T9 (Stock)
 ::: pyasic.miners.antminer.bmminer.X9.T9.BMMinerT9
     handler: python
     options:
@@ -43,7 +43,7 @@
         show_root_heading: false
         heading_level: 4
 
-## T9 (Hive)
+## T9 (Stock)
 ::: pyasic.miners.antminer.hiveon.X9.T9.HiveonT9
     handler: python
     options:

docs/miners/auradine/AD.md

@@ -1,21 +1,21 @@
 # pyasic
 ## AD Models
 
-## AT1500
+## AT1500 (Stock)
 ::: pyasic.miners.auradine.flux.AD.AT1.AuradineFluxAT1500
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## AT2860
+## AT2860 (Stock)
 ::: pyasic.miners.auradine.flux.AD.AT2.AuradineFluxAT2860
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## AT2880
+## AT2880 (Stock)
 ::: pyasic.miners.auradine.flux.AD.AT2.AuradineFluxAT2880
     handler: python
     options:

docs/miners/auradine/AI.md

@@ -1,14 +1,14 @@
 # pyasic
 ## AI Models
 
-## AI2500
+## AI2500 (Stock)
 ::: pyasic.miners.auradine.flux.AI.AI2.AuradineFluxAI2500
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## AI3680
+## AI3680 (Stock)
 ::: pyasic.miners.auradine.flux.AI.AI3.AuradineFluxAI3680
     handler: python
     options:

docs/miners/auradine/AT.md

@@ -1,14 +1,14 @@
 # pyasic
 ## AT Models
 
-## AD2500
+## AD2500 (Stock)
 ::: pyasic.miners.auradine.flux.AT.AD2.AuradineFluxAD2500
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## AD3500
+## AD3500 (Stock)
 ::: pyasic.miners.auradine.flux.AT.AD3.AuradineFluxAD3500
     handler: python
     options:

docs/miners/avalonminer/A10X.md

@@ -1,21 +1,21 @@
 # pyasic
 ## A10X Models
 
-## Avalon 1026
+## Avalon 1026 (Stock)
 ::: pyasic.miners.avalonminer.cgminer.A10X.A1026.CGMinerAvalon1026
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## Avalon 1047
+## Avalon 1047 (Stock)
 ::: pyasic.miners.avalonminer.cgminer.A10X.A1047.CGMinerAvalon1047
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## Avalon 1066
+## Avalon 1066 (Stock)
 ::: pyasic.miners.avalonminer.cgminer.A10X.A1066.CGMinerAvalon1066
     handler: python
     options:

docs/miners/avalonminer/A11X.md

@@ -1,7 +1,7 @@
 # pyasic
 ## A11X Models
 
-## Avalon 1166 Pro
+## Avalon 1166 Pro (Stock)
 ::: pyasic.miners.avalonminer.cgminer.A11X.A1166.CGMinerAvalon1166Pro
     handler: python
     options:

docs/miners/avalonminer/A12X.md

@@ -1,7 +1,7 @@
 # pyasic
 ## A12X Models
 
-## Avalon 1246
+## Avalon 1246 (Stock)
 ::: pyasic.miners.avalonminer.cgminer.A12X.A1246.CGMinerAvalon1246
     handler: python
     options:

docs/miners/avalonminer/A7X.md

@@ -1,21 +1,21 @@
 # pyasic
 ## A7X Models
 
-## Avalon 721
+## Avalon 721 (Stock)
 ::: pyasic.miners.avalonminer.cgminer.A7X.A721.CGMinerAvalon721
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## Avalon 741
+## Avalon 741 (Stock)
 ::: pyasic.miners.avalonminer.cgminer.A7X.A741.CGMinerAvalon741
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## Avalon 761
+## Avalon 761 (Stock)
 ::: pyasic.miners.avalonminer.cgminer.A7X.A761.CGMinerAvalon761
     handler: python
     options:

docs/miners/avalonminer/A8X.md

@@ -1,21 +1,21 @@
 # pyasic
 ## A8X Models
 
-## Avalon 821
+## Avalon 821 (Stock)
 ::: pyasic.miners.avalonminer.cgminer.A8X.A821.CGMinerAvalon821
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## Avalon 841
+## Avalon 841 (Stock)
 ::: pyasic.miners.avalonminer.cgminer.A8X.A841.CGMinerAvalon841
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## Avalon 851
+## Avalon 851 (Stock)
 ::: pyasic.miners.avalonminer.cgminer.A8X.A851.CGMinerAvalon851
     handler: python
     options:

docs/miners/avalonminer/A9X.md

@@ -1,7 +1,7 @@
 # pyasic
 ## A9X Models
 
-## Avalon 921
+## Avalon 921 (Stock)
 ::: pyasic.miners.avalonminer.cgminer.A9X.A921.CGMinerAvalon921
     handler: python
     options:

docs/miners/bitaxe/BM.md

@@ -0,0 +1,24 @@
+# pyasic
+## BM Models
+
+## Supra (Stock)
+::: pyasic.miners.bitaxe.espminer.BM.BM1368.BitAxeSupra
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## Ultra (Stock)
+::: pyasic.miners.bitaxe.espminer.BM.BM1366.BitAxeUltra
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## Max (Stock)
+::: pyasic.miners.bitaxe.espminer.BM.BM1397.BitAxeMax
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+

docs/miners/blockminer/blockminer.md

@@ -0,0 +1,17 @@
+# pyasic
+## blockminer Models
+
+## BlockMiner 520i (ePIC)
+::: pyasic.miners.blockminer.epic.blockminer.blockminer.ePICBlockMiner520i
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## BlockMiner 720i (ePIC)
+::: pyasic.miners.blockminer.epic.blockminer.blockminer.ePICBlockMiner720i
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+

docs/miners/goldshell/X5.md

@@ -1,21 +1,21 @@
 # pyasic
 ## X5 Models
 
-## CK5
+## CK5 (Stock)
 ::: pyasic.miners.goldshell.bfgminer.X5.CK5.GoldshellCK5
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## HS5
+## HS5 (Stock)
 ::: pyasic.miners.goldshell.bfgminer.X5.HS5.GoldshellHS5
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## KD5
+## KD5 (Stock)
 ::: pyasic.miners.goldshell.bfgminer.X5.KD5.GoldshellKD5
     handler: python
     options:

docs/miners/goldshell/XBox.md

@@ -1,14 +1,14 @@
 # pyasic
 ## XBox Models
 
-## KD Box II
+## KD Box II (Stock)
 ::: pyasic.miners.goldshell.bfgminer.XBox.KDBox.GoldshellKDBoxII
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## KD Box Pro
+## KD Box Pro (Stock)
 ::: pyasic.miners.goldshell.bfgminer.XBox.KDBox.GoldshellKDBoxPro
     handler: python
     options:

docs/miners/goldshell/XMax.md

@@ -1,7 +1,7 @@
 # pyasic
 ## XMax Models
 
-## KD Max
+## KD Max (Stock)
 ::: pyasic.miners.goldshell.bfgminer.XMax.KDMax.GoldshellKDMax
     handler: python
     options:

docs/miners/innosilicon/A10X.md

@@ -1,7 +1,7 @@
 # pyasic
 ## A10X Models
 
-## A10X
+## A10X (Stock)
 ::: pyasic.miners.innosilicon.cgminer.A10X.A10X.InnosiliconA10X
     handler: python
     options:

docs/miners/innosilicon/T3X.md

@@ -1,7 +1,7 @@
 # pyasic
 ## T3X Models
 
-## T3H+
+## T3H+ (Stock)
 ::: pyasic.miners.innosilicon.cgminer.T3X.T3H.InnosiliconT3HPlus
     handler: python
     options:

docs/miners/supported_types.md

@@ -18,78 +18,78 @@ details {
         <details>
             <summary>X3 Series:</summary>
                 <ul>
-                    <li><a href="../antminer/X3#d3">D3</a></li>
-                    <li><a href="../antminer/X3#hs3">HS3</a></li>
-                    <li><a href="../antminer/X3#l3_1">L3+</a></li>
+                    <li><a href="../antminer/X3#d3-stock">D3 (Stock)</a></li>
+                    <li><a href="../antminer/X3#hs3-stock">HS3 (Stock)</a></li>
+                    <li><a href="../antminer/X3#l3_1-stock">L3+ (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>X5 Series:</summary>
                 <ul>
-                    <li><a href="../antminer/X5#dr5">DR5</a></li>
+                    <li><a href="../antminer/X5#dr5-stock">DR5 (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>X7 Series:</summary>
                 <ul>
-                    <li><a href="../antminer/X7#l7">L7</a></li>
+                    <li><a href="../antminer/X7#l7-stock">L7 (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>X9 Series:</summary>
                 <ul>
-                    <li><a href="../antminer/X9#e9pro">E9Pro</a></li>
-                    <li><a href="../antminer/X9#s9">S9</a></li>
-                    <li><a href="../antminer/X9#s9i">S9i</a></li>
-                    <li><a href="../antminer/X9#s9j">S9j</a></li>
-                    <li><a href="../antminer/X9#t9">T9</a></li>
+                    <li><a href="../antminer/X9#e9pro-stock">E9Pro (Stock)</a></li>
+                    <li><a href="../antminer/X9#s9-stock">S9 (Stock)</a></li>
+                    <li><a href="../antminer/X9#s9i-stock">S9i (Stock)</a></li>
+                    <li><a href="../antminer/X9#s9j-stock">S9j (Stock)</a></li>
+                    <li><a href="../antminer/X9#t9-stock">T9 (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>X15 Series:</summary>
                 <ul>
-                    <li><a href="../antminer/X15#z15">Z15</a></li>
+                    <li><a href="../antminer/X15#z15-stock">Z15 (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>X17 Series:</summary>
                 <ul>
-                    <li><a href="../antminer/X17#s17">S17</a></li>
-                    <li><a href="../antminer/X17#s17_1">S17+</a></li>
-                    <li><a href="../antminer/X17#s17-pro">S17 Pro</a></li>
-                    <li><a href="../antminer/X17#s17e">S17e</a></li>
-                    <li><a href="../antminer/X17#t17">T17</a></li>
-                    <li><a href="../antminer/X17#t17_1">T17+</a></li>
-                    <li><a href="../antminer/X17#t17e">T17e</a></li>
+                    <li><a href="../antminer/X17#s17-stock">S17 (Stock)</a></li>
+                    <li><a href="../antminer/X17#s17_1-stock">S17+ (Stock)</a></li>
+                    <li><a href="../antminer/X17#s17-pro-stock">S17 Pro (Stock)</a></li>
+                    <li><a href="../antminer/X17#s17e-stock">S17e (Stock)</a></li>
+                    <li><a href="../antminer/X17#t17-stock">T17 (Stock)</a></li>
+                    <li><a href="../antminer/X17#t17_1-stock">T17+ (Stock)</a></li>
+                    <li><a href="../antminer/X17#t17e-stock">T17e (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>X19 Series:</summary>
                 <ul>
-                    <li><a href="../antminer/X19#s19">S19</a></li>
-                    <li><a href="../antminer/X19#s19l">S19L</a></li>
-                    <li><a href="../antminer/X19#s19-pro">S19 Pro</a></li>
-                    <li><a href="../antminer/X19#s19j">S19j</a></li>
-                    <li><a href="../antminer/X19#s19i">S19i</a></li>
-                    <li><a href="../antminer/X19#s19_1">S19+</a></li>
-                    <li><a href="../antminer/X19#s19j-no-pic">S19j No PIC</a></li>
-                    <li><a href="../antminer/X19#s19-pro_1">S19 Pro+</a></li>
-                    <li><a href="../antminer/X19#s19j-pro">S19j Pro</a></li>
-                    <li><a href="../antminer/X19#s19-xp">S19 XP</a></li>
-                    <li><a href="../antminer/X19#s19a">S19a</a></li>
-                    <li><a href="../antminer/X19#s19a-pro">S19a Pro</a></li>
-                    <li><a href="../antminer/X19#s19-hydro">S19 Hydro</a></li>
-                    <li><a href="../antminer/X19#s19-pro-hydro">S19 Pro Hydro</a></li>
-                    <li><a href="../antminer/X19#s19-pro_1-hydro">S19 Pro+ Hydro</a></li>
-                    <li><a href="../antminer/X19#s19k-pro">S19K Pro</a></li>
-                    <li><a href="../antminer/X19#t19">T19</a></li>
+                    <li><a href="../antminer/X19#s19-stock">S19 (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19l-stock">S19L (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19-pro-stock">S19 Pro (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19j-stock">S19j (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19i-stock">S19i (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19_1-stock">S19+ (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19j-no-pic-stock">S19j No PIC (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19-pro_1-stock">S19 Pro+ (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19j-pro-stock">S19j Pro (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19-xp-stock">S19 XP (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19a-stock">S19a (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19a-pro-stock">S19a Pro (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19-hydro-stock">S19 Hydro (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19-pro-hydro-stock">S19 Pro Hydro (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19-pro_1-hydro-stock">S19 Pro+ Hydro (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19k-pro-stock">S19K Pro (Stock)</a></li>
+                    <li><a href="../antminer/X19#t19-stock">T19 (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>X21 Series:</summary>
                 <ul>
-                    <li><a href="../antminer/X21#s21">S21</a></li>
-                    <li><a href="../antminer/X21#t21">T21</a></li>
+                    <li><a href="../antminer/X21#s21-stock">S21 (Stock)</a></li>
+                    <li><a href="../antminer/X21#t21-stock">T21 (Stock)</a></li>
                 </ul>
         </details>
     </ul>
@@ -100,234 +100,234 @@ details {
         <details>
             <summary>M2X Series:</summary>
                 <ul>
-                    <li><a href="../whatsminer/M2X#m20-v10">M20 V10</a></li>
-                    <li><a href="../whatsminer/M2X#m20s-v10">M20S V10</a></li>
-                    <li><a href="../whatsminer/M2X#m20s-v20">M20S V20</a></li>
-                    <li><a href="../whatsminer/M2X#m20s-v30">M20S V30</a></li>
-                    <li><a href="../whatsminer/M2X#m20p-v10">M20P V10</a></li>
-                    <li><a href="../whatsminer/M2X#m20p-v30">M20P V30</a></li>
-                    <li><a href="../whatsminer/M2X#m20s_1-v30">M20S+ V30</a></li>
-                    <li><a href="../whatsminer/M2X#m21-v10">M21 V10</a></li>
-                    <li><a href="../whatsminer/M2X#m21s-v20">M21S V20</a></li>
-                    <li><a href="../whatsminer/M2X#m21s-v60">M21S V60</a></li>
-                    <li><a href="../whatsminer/M2X#m21s-v70">M21S V70</a></li>
-                    <li><a href="../whatsminer/M2X#m21s_1-v20">M21S+ V20</a></li>
-                    <li><a href="../whatsminer/M2X#m29-v10">M29 V10</a></li>
+                    <li><a href="../whatsminer/M2X#m20-v10-stock">M20 V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M2X#m20s-v10-stock">M20S V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M2X#m20s-v20-stock">M20S V20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M2X#m20s-v30-stock">M20S V30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M2X#m20p-v10-stock">M20P V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M2X#m20p-v30-stock">M20P V30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M2X#m20s_1-v30-stock">M20S+ V30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M2X#m21-v10-stock">M21 V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M2X#m21s-v20-stock">M21S V20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M2X#m21s-v60-stock">M21S V60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M2X#m21s-v70-stock">M21S V70 (Stock)</a></li>
+                    <li><a href="../whatsminer/M2X#m21s_1-v20-stock">M21S+ V20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M2X#m29-v10-stock">M29 V10 (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>M3X Series:</summary>
                 <ul>
-                    <li><a href="../whatsminer/M3X#m30-v10">M30 V10</a></li>
-                    <li><a href="../whatsminer/M3X#m30-v20">M30 V20</a></li>
-                    <li><a href="../whatsminer/M3X#m30k-v10">M30K V10</a></li>
-                    <li><a href="../whatsminer/M3X#m30l-v10">M30L V10</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-v10">M30S V10</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-v20">M30S V20</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-v30">M30S V30</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-v40">M30S V40</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-v50">M30S V50</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-v60">M30S V60</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-v70">M30S V70</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-v80">M30S V80</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-ve10">M30S VE10</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-ve20">M30S VE20</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-ve30">M30S VE30</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-ve40">M30S VE40</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-ve50">M30S VE50</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-ve60">M30S VE60</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-ve70">M30S VE70</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-vf10">M30S VF10</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-vf20">M30S VF20</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-vf30">M30S VF30</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-vg10">M30S VG10</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-vg20">M30S VG20</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-vg30">M30S VG30</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-vg40">M30S VG40</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-vh10">M30S VH10</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-vh20">M30S VH20</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-vh30">M30S VH30</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-vh40">M30S VH40</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-vh50">M30S VH50</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-vh60">M30S VH60</a></li>
-                    <li><a href="../whatsminer/M3X#m30s-vi20">M30S VI20</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-v10">M30S+ V10</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-v20">M30S+ V20</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-v30">M30S+ V30</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-v40">M30S+ V40</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-v50">M30S+ V50</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-v60">M30S+ V60</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-v70">M30S+ V70</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-v80">M30S+ V80</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-v90">M30S+ V90</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-v100">M30S+ V100</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-ve30">M30S+ VE30</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-ve40">M30S+ VE40</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-ve50">M30S+ VE50</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-ve60">M30S+ VE60</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-ve70">M30S+ VE70</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-ve80">M30S+ VE80</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-ve90">M30S+ VE90</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-ve100">M30S+ VE100</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-vf20">M30S+ VF20</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-vf30">M30S+ VF30</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-vg20">M30S+ VG20</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-vg30">M30S+ VG30</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-vg40">M30S+ VG40</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-vg50">M30S+ VG50</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-vg60">M30S+ VG60</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-vh10">M30S+ VH10</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-vh20">M30S+ VH20</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-vh30">M30S+ VH30</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-vh40">M30S+ VH40</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-vh50">M30S+ VH50</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1-vh60">M30S+ VH60</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-v10">M30S++ V10</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-v20">M30S++ V20</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-ve30">M30S++ VE30</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-ve40">M30S++ VE40</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-ve50">M30S++ VE50</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-vf40">M30S++ VF40</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-vg30">M30S++ VG30</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-vg40">M30S++ VG40</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-vg50">M30S++ VG50</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-vh10">M30S++ VH10</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-vh20">M30S++ VH20</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-vh30">M30S++ VH30</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-vh40">M30S++ VH40</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-vh50">M30S++ VH50</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-vh60">M30S++ VH60</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-vh70">M30S++ VH70</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-vh80">M30S++ VH80</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-vh90">M30S++ VH90</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-vh100">M30S++ VH100</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-vj20">M30S++ VJ20</a></li>
-                    <li><a href="../whatsminer/M3X#m30s_1_1-vj30">M30S++ VJ30</a></li>
-                    <li><a href="../whatsminer/M3X#m31-v10">M31 V10</a></li>
-                    <li><a href="../whatsminer/M3X#m31-v20">M31 V20</a></li>
-                    <li><a href="../whatsminer/M3X#m31h-v10">M31H V10</a></li>
-                    <li><a href="../whatsminer/M3X#m31h-v40">M31H V40</a></li>
-                    <li><a href="../whatsminer/M3X#m30l-v10">M30L V10</a></li>
-                    <li><a href="../whatsminer/M3X#m31s-v10">M31S V10</a></li>
-                    <li><a href="../whatsminer/M3X#m31s-v20">M31S V20</a></li>
-                    <li><a href="../whatsminer/M3X#m31s-v30">M31S V30</a></li>
-                    <li><a href="../whatsminer/M3X#m31s-v40">M31S V40</a></li>
-                    <li><a href="../whatsminer/M3X#m31s-v50">M31S V50</a></li>
-                    <li><a href="../whatsminer/M3X#m31s-v60">M31S V60</a></li>
-                    <li><a href="../whatsminer/M3X#m31s-v70">M31S V70</a></li>
-                    <li><a href="../whatsminer/M3X#m31s-v80">M31S V80</a></li>
-                    <li><a href="../whatsminer/M3X#m31s-v90">M31S V90</a></li>
-                    <li><a href="../whatsminer/M3X#m31s-ve10">M31S VE10</a></li>
-                    <li><a href="../whatsminer/M3X#m31s-ve20">M31S VE20</a></li>
-                    <li><a href="../whatsminer/M3X#m31s-ve30">M31S VE30</a></li>
-                    <li><a href="../whatsminer/M3X#m31se-v10">M31SE V10</a></li>
-                    <li><a href="../whatsminer/M3X#m31se-v20">M31SE V20</a></li>
-                    <li><a href="../whatsminer/M3X#m31se-v30">M31SE V30</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-v10">M31S+ V10</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-v20">M31S+ V20</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-v30">M31S+ V30</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-v40">M31S+ V40</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-v50">M31S+ V50</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-v60">M31S+ V60</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-v80">M31S+ V80</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-v90">M31S+ V90</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-v100">M31S+ V100</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-ve10">M31S+ VE10</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-ve20">M31S+ VE20</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-ve30">M31S+ VE30</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-ve40">M31S+ VE40</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-ve50">M31S+ VE50</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-ve60">M31S+ VE60</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-ve80">M31S+ VE80</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-vf20">M31S+ VF20</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-vf30">M31S+ VF30</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-vg20">M31S+ VG20</a></li>
-                    <li><a href="../whatsminer/M3X#m31s_1-vg30">M31S+ VG30</a></li>
-                    <li><a href="../whatsminer/M3X#m32-v10">M32 V10</a></li>
-                    <li><a href="../whatsminer/M3X#m32-v20">M32 V20</a></li>
-                    <li><a href="../whatsminer/M3X#m33-v10">M33 V10</a></li>
-                    <li><a href="../whatsminer/M3X#m33-v20">M33 V20</a></li>
-                    <li><a href="../whatsminer/M3X#m33-v30">M33 V30</a></li>
-                    <li><a href="../whatsminer/M3X#m33s-vg30">M33S VG30</a></li>
-                    <li><a href="../whatsminer/M3X#m33s_1-vg20">M33S+ VG20</a></li>
-                    <li><a href="../whatsminer/M3X#m33s_1-vh20">M33S+ VH20</a></li>
-                    <li><a href="../whatsminer/M3X#m33s_1-vh30">M33S+ VH30</a></li>
-                    <li><a href="../whatsminer/M3X#m33s_1_1-vh20">M33S++ VH20</a></li>
-                    <li><a href="../whatsminer/M3X#m33s_1_1-vh30">M33S++ VH30</a></li>
-                    <li><a href="../whatsminer/M3X#m33s_1_1-vg40">M33S++ VG40</a></li>
-                    <li><a href="../whatsminer/M3X#m34s_1-ve10">M34S+ VE10</a></li>
-                    <li><a href="../whatsminer/M3X#m36s-ve10">M36S VE10</a></li>
-                    <li><a href="../whatsminer/M3X#m36s_1-vg30">M36S+ VG30</a></li>
-                    <li><a href="../whatsminer/M3X#m36s_1_1-vh30">M36S++ VH30</a></li>
-                    <li><a href="../whatsminer/M3X#m39-v10">M39 V10</a></li>
-                    <li><a href="../whatsminer/M3X#m39-v20">M39 V20</a></li>
-                    <li><a href="../whatsminer/M3X#m39-v30">M39 V30</a></li>
+                    <li><a href="../whatsminer/M3X#m30-v10-stock">M30 V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30-v20-stock">M30 V20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30k-v10-stock">M30K V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30l-v10-stock">M30L V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-v10-stock">M30S V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-v20-stock">M30S V20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-v30-stock">M30S V30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-v40-stock">M30S V40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-v50-stock">M30S V50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-v60-stock">M30S V60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-v70-stock">M30S V70 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-v80-stock">M30S V80 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-ve10-stock">M30S VE10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-ve20-stock">M30S VE20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-ve30-stock">M30S VE30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-ve40-stock">M30S VE40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-ve50-stock">M30S VE50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-ve60-stock">M30S VE60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-ve70-stock">M30S VE70 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-vf10-stock">M30S VF10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-vf20-stock">M30S VF20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-vf30-stock">M30S VF30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-vg10-stock">M30S VG10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-vg20-stock">M30S VG20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-vg30-stock">M30S VG30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-vg40-stock">M30S VG40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-vh10-stock">M30S VH10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-vh20-stock">M30S VH20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-vh30-stock">M30S VH30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-vh40-stock">M30S VH40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-vh50-stock">M30S VH50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-vh60-stock">M30S VH60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s-vi20-stock">M30S VI20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-v10-stock">M30S+ V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-v20-stock">M30S+ V20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-v30-stock">M30S+ V30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-v40-stock">M30S+ V40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-v50-stock">M30S+ V50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-v60-stock">M30S+ V60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-v70-stock">M30S+ V70 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-v80-stock">M30S+ V80 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-v90-stock">M30S+ V90 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-v100-stock">M30S+ V100 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-ve30-stock">M30S+ VE30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-ve40-stock">M30S+ VE40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-ve50-stock">M30S+ VE50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-ve60-stock">M30S+ VE60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-ve70-stock">M30S+ VE70 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-ve80-stock">M30S+ VE80 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-ve90-stock">M30S+ VE90 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-ve100-stock">M30S+ VE100 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-vf20-stock">M30S+ VF20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-vf30-stock">M30S+ VF30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-vg20-stock">M30S+ VG20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-vg30-stock">M30S+ VG30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-vg40-stock">M30S+ VG40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-vg50-stock">M30S+ VG50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-vg60-stock">M30S+ VG60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-vh10-stock">M30S+ VH10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-vh20-stock">M30S+ VH20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-vh30-stock">M30S+ VH30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-vh40-stock">M30S+ VH40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-vh50-stock">M30S+ VH50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-vh60-stock">M30S+ VH60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-v10-stock">M30S++ V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-v20-stock">M30S++ V20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-ve30-stock">M30S++ VE30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-ve40-stock">M30S++ VE40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-ve50-stock">M30S++ VE50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vf40-stock">M30S++ VF40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vg30-stock">M30S++ VG30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vg40-stock">M30S++ VG40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vg50-stock">M30S++ VG50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vh10-stock">M30S++ VH10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vh20-stock">M30S++ VH20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vh30-stock">M30S++ VH30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vh40-stock">M30S++ VH40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vh50-stock">M30S++ VH50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vh60-stock">M30S++ VH60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vh70-stock">M30S++ VH70 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vh80-stock">M30S++ VH80 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vh90-stock">M30S++ VH90 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vh100-stock">M30S++ VH100 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vj20-stock">M30S++ VJ20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vj30-stock">M30S++ VJ30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31-v10-stock">M31 V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31-v20-stock">M31 V20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31h-v10-stock">M31H V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31h-v40-stock">M31H V40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30l-v10-stock">M30L V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s-v10-stock">M31S V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s-v20-stock">M31S V20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s-v30-stock">M31S V30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s-v40-stock">M31S V40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s-v50-stock">M31S V50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s-v60-stock">M31S V60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s-v70-stock">M31S V70 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s-v80-stock">M31S V80 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s-v90-stock">M31S V90 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s-ve10-stock">M31S VE10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s-ve20-stock">M31S VE20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s-ve30-stock">M31S VE30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31se-v10-stock">M31SE V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31se-v20-stock">M31SE V20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31se-v30-stock">M31SE V30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-v10-stock">M31S+ V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-v20-stock">M31S+ V20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-v30-stock">M31S+ V30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-v40-stock">M31S+ V40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-v50-stock">M31S+ V50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-v60-stock">M31S+ V60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-v80-stock">M31S+ V80 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-v90-stock">M31S+ V90 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-v100-stock">M31S+ V100 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-ve10-stock">M31S+ VE10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-ve20-stock">M31S+ VE20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-ve30-stock">M31S+ VE30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-ve40-stock">M31S+ VE40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-ve50-stock">M31S+ VE50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-ve60-stock">M31S+ VE60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-ve80-stock">M31S+ VE80 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-vf20-stock">M31S+ VF20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-vf30-stock">M31S+ VF30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-vg20-stock">M31S+ VG20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-vg30-stock">M31S+ VG30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m32-v10-stock">M32 V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m32-v20-stock">M32 V20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m33-v10-stock">M33 V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m33-v20-stock">M33 V20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m33-v30-stock">M33 V30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m33s-vg30-stock">M33S VG30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m33s_1-vg20-stock">M33S+ VG20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m33s_1-vh20-stock">M33S+ VH20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m33s_1-vh30-stock">M33S+ VH30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m33s_1_1-vh20-stock">M33S++ VH20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m33s_1_1-vh30-stock">M33S++ VH30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m33s_1_1-vg40-stock">M33S++ VG40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m34s_1-ve10-stock">M34S+ VE10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m36s-ve10-stock">M36S VE10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m36s_1-vg30-stock">M36S+ VG30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m36s_1_1-vh30-stock">M36S++ VH30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m39-v10-stock">M39 V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m39-v20-stock">M39 V20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m39-v30-stock">M39 V30 (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>M5X Series:</summary>
                 <ul>
-                    <li><a href="../whatsminer/M5X#m50-ve30">M50 VE30</a></li>
-                    <li><a href="../whatsminer/M5X#m50-vg30">M50 VG30</a></li>
-                    <li><a href="../whatsminer/M5X#m50-vh10">M50 VH10</a></li>
-                    <li><a href="../whatsminer/M5X#m50-vh20">M50 VH20</a></li>
-                    <li><a href="../whatsminer/M5X#m50-vh30">M50 VH30</a></li>
-                    <li><a href="../whatsminer/M5X#m50-vh40">M50 VH40</a></li>
-                    <li><a href="../whatsminer/M5X#m50-vh50">M50 VH50</a></li>
-                    <li><a href="../whatsminer/M5X#m50-vh60">M50 VH60</a></li>
-                    <li><a href="../whatsminer/M5X#m50-vh70">M50 VH70</a></li>
-                    <li><a href="../whatsminer/M5X#m50-vh80">M50 VH80</a></li>
-                    <li><a href="../whatsminer/M5X#m50-vj10">M50 VJ10</a></li>
-                    <li><a href="../whatsminer/M5X#m50-vj20">M50 VJ20</a></li>
-                    <li><a href="../whatsminer/M5X#m50-vj30">M50 VJ30</a></li>
-                    <li><a href="../whatsminer/M5X#m50s-vj10">M50S VJ10</a></li>
-                    <li><a href="../whatsminer/M5X#m50s-vj20">M50S VJ20</a></li>
-                    <li><a href="../whatsminer/M5X#m50s-vj30">M50S VJ30</a></li>
-                    <li><a href="../whatsminer/M5X#m50s-vh10">M50S VH10</a></li>
-                    <li><a href="../whatsminer/M5X#m50s-vh20">M50S VH20</a></li>
-                    <li><a href="../whatsminer/M5X#m50s-vh30">M50S VH30</a></li>
-                    <li><a href="../whatsminer/M5X#m50s-vh40">M50S VH40</a></li>
-                    <li><a href="../whatsminer/M5X#m50s-vh50">M50S VH50</a></li>
-                    <li><a href="../whatsminer/M5X#m50s_1-vh30">M50S+ VH30</a></li>
-                    <li><a href="../whatsminer/M5X#m50s_1-vh40">M50S+ VH40</a></li>
-                    <li><a href="../whatsminer/M5X#m50s_1-vj30">M50S+ VJ30</a></li>
-                    <li><a href="../whatsminer/M5X#m50s_1-vk20">M50S+ VK20</a></li>
-                    <li><a href="../whatsminer/M5X#m50s_1_1-vk10">M50S++ VK10</a></li>
-                    <li><a href="../whatsminer/M5X#m50s_1_1-vk20">M50S++ VK20</a></li>
-                    <li><a href="../whatsminer/M5X#m50s_1_1-vk30">M50S++ VK30</a></li>
-                    <li><a href="../whatsminer/M5X#m53-vh30">M53 VH30</a></li>
-                    <li><a href="../whatsminer/M5X#m53s-vh30">M53S VH30</a></li>
-                    <li><a href="../whatsminer/M5X#m53s-vj40">M53S VJ40</a></li>
-                    <li><a href="../whatsminer/M5X#m53s_1-vj30">M53S+ VJ30</a></li>
-                    <li><a href="../whatsminer/M5X#m53s_1_1-vk10">M53S++ VK10</a></li>
-                    <li><a href="../whatsminer/M5X#m56-vh30">M56 VH30</a></li>
-                    <li><a href="../whatsminer/M5X#m56s-vh30">M56S VH30</a></li>
-                    <li><a href="../whatsminer/M5X#m56s_1-vj30">M56S+ VJ30</a></li>
-                    <li><a href="../whatsminer/M5X#m59-vh30">M59 VH30</a></li>
+                    <li><a href="../whatsminer/M5X#m50-ve30-stock">M50 VE30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50-vg30-stock">M50 VG30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50-vh10-stock">M50 VH10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50-vh20-stock">M50 VH20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50-vh30-stock">M50 VH30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50-vh40-stock">M50 VH40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50-vh50-stock">M50 VH50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50-vh60-stock">M50 VH60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50-vh70-stock">M50 VH70 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50-vh80-stock">M50 VH80 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50-vj10-stock">M50 VJ10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50-vj20-stock">M50 VJ20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50-vj30-stock">M50 VJ30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s-vj10-stock">M50S VJ10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s-vj20-stock">M50S VJ20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s-vj30-stock">M50S VJ30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s-vh10-stock">M50S VH10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s-vh20-stock">M50S VH20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s-vh30-stock">M50S VH30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s-vh40-stock">M50S VH40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s-vh50-stock">M50S VH50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1-vh30-stock">M50S+ VH30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1-vh40-stock">M50S+ VH40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1-vj30-stock">M50S+ VJ30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1-vk20-stock">M50S+ VK20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1_1-vk10-stock">M50S++ VK10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1_1-vk20-stock">M50S++ VK20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1_1-vk30-stock">M50S++ VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53-vh30-stock">M53 VH30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53s-vh30-stock">M53S VH30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53s-vj40-stock">M53S VJ40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53s_1-vj30-stock">M53S+ VJ30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53s_1_1-vk10-stock">M53S++ VK10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m56-vh30-stock">M56 VH30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m56s-vh30-stock">M56S VH30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m56s_1-vj30-stock">M56S+ VJ30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m59-vh30-stock">M59 VH30 (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>M6X Series:</summary>
                 <ul>
-                    <li><a href="../whatsminer/M6X#m60-vk10">M60 VK10</a></li>
-                    <li><a href="../whatsminer/M6X#m60-vk20">M60 VK20</a></li>
-                    <li><a href="../whatsminer/M6X#m60-vk30">M60 VK30</a></li>
-                    <li><a href="../whatsminer/M6X#m60-vk40">M60 VK40</a></li>
-                    <li><a href="../whatsminer/M6X#m60s-vk10">M60S VK10</a></li>
-                    <li><a href="../whatsminer/M6X#m60s-vk20">M60S VK20</a></li>
-                    <li><a href="../whatsminer/M6X#m60s-vk30">M60S VK30</a></li>
-                    <li><a href="../whatsminer/M6X#m60s-vk40">M60S VK40</a></li>
-                    <li><a href="../whatsminer/M6X#m63-vk10">M63 VK10</a></li>
-                    <li><a href="../whatsminer/M6X#m63-vk20">M63 VK20</a></li>
-                    <li><a href="../whatsminer/M6X#m63-vk30">M63 VK30</a></li>
-                    <li><a href="../whatsminer/M6X#m63s-vk10">M63S VK10</a></li>
-                    <li><a href="../whatsminer/M6X#m63s-vk20">M63S VK20</a></li>
-                    <li><a href="../whatsminer/M6X#m63s-vk30">M63S VK30</a></li>
-                    <li><a href="../whatsminer/M6X#m66-vk20">M66 VK20</a></li>
-                    <li><a href="../whatsminer/M6X#m66-vk30">M66 VK30</a></li>
-                    <li><a href="../whatsminer/M6X#m66s-vk20">M66S VK20</a></li>
-                    <li><a href="../whatsminer/M6X#m66s-vk30">M66S VK30</a></li>
-                    <li><a href="../whatsminer/M6X#m66s-vk40">M66S VK40</a></li>
+                    <li><a href="../whatsminer/M6X#m60-vk10-stock">M60 VK10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60-vk20-stock">M60 VK20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60-vk30-stock">M60 VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60-vk40-stock">M60 VK40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s-vk10-stock">M60S VK10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s-vk20-stock">M60S VK20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s-vk30-stock">M60S VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s-vk40-stock">M60S VK40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m63-vk10-stock">M63 VK10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m63-vk20-stock">M63 VK20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m63-vk30-stock">M63 VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m63s-vk10-stock">M63S VK10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m63s-vk20-stock">M63S VK20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m63s-vk30-stock">M63S VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m66-vk20-stock">M66 VK20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m66-vk30-stock">M66 VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m66s-vk20-stock">M66S VK20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m66s-vk30-stock">M66S VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m66s-vk40-stock">M66S VK40 (Stock)</a></li>
                 </ul>
         </details>
     </ul>
@@ -338,43 +338,43 @@ details {
         <details>
             <summary>A7X Series:</summary>
                 <ul>
-                    <li><a href="../avalonminer/A7X#avalon-721">Avalon 721</a></li>
-                    <li><a href="../avalonminer/A7X#avalon-741">Avalon 741</a></li>
-                    <li><a href="../avalonminer/A7X#avalon-761">Avalon 761</a></li>
+                    <li><a href="../avalonminer/A7X#avalon-721-stock">Avalon 721 (Stock)</a></li>
+                    <li><a href="../avalonminer/A7X#avalon-741-stock">Avalon 741 (Stock)</a></li>
+                    <li><a href="../avalonminer/A7X#avalon-761-stock">Avalon 761 (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>A8X Series:</summary>
                 <ul>
-                    <li><a href="../avalonminer/A8X#avalon-821">Avalon 821</a></li>
-                    <li><a href="../avalonminer/A8X#avalon-841">Avalon 841</a></li>
-                    <li><a href="../avalonminer/A8X#avalon-851">Avalon 851</a></li>
+                    <li><a href="../avalonminer/A8X#avalon-821-stock">Avalon 821 (Stock)</a></li>
+                    <li><a href="../avalonminer/A8X#avalon-841-stock">Avalon 841 (Stock)</a></li>
+                    <li><a href="../avalonminer/A8X#avalon-851-stock">Avalon 851 (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>A9X Series:</summary>
                 <ul>
-                    <li><a href="../avalonminer/A9X#avalon-921">Avalon 921</a></li>
+                    <li><a href="../avalonminer/A9X#avalon-921-stock">Avalon 921 (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>A10X Series:</summary>
                 <ul>
-                    <li><a href="../avalonminer/A10X#avalon-1026">Avalon 1026</a></li>
-                    <li><a href="../avalonminer/A10X#avalon-1047">Avalon 1047</a></li>
-                    <li><a href="../avalonminer/A10X#avalon-1066">Avalon 1066</a></li>
+                    <li><a href="../avalonminer/A10X#avalon-1026-stock">Avalon 1026 (Stock)</a></li>
+                    <li><a href="../avalonminer/A10X#avalon-1047-stock">Avalon 1047 (Stock)</a></li>
+                    <li><a href="../avalonminer/A10X#avalon-1066-stock">Avalon 1066 (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>A11X Series:</summary>
                 <ul>
-                    <li><a href="../avalonminer/A11X#avalon-1166-pro">Avalon 1166 Pro</a></li>
+                    <li><a href="../avalonminer/A11X#avalon-1166-pro-stock">Avalon 1166 Pro (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>A12X Series:</summary>
                 <ul>
-                    <li><a href="../avalonminer/A12X#avalon-1246">Avalon 1246</a></li>
+                    <li><a href="../avalonminer/A12X#avalon-1246-stock">Avalon 1246 (Stock)</a></li>
                 </ul>
         </details>
     </ul>
@@ -385,13 +385,13 @@ details {
         <details>
             <summary>T3X Series:</summary>
                 <ul>
-                    <li><a href="../innosilicon/T3X#t3h_1">T3H+</a></li>
+                    <li><a href="../innosilicon/T3X#t3h_1-stock">T3H+ (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>A10X Series:</summary>
                 <ul>
-                    <li><a href="../innosilicon/A10X#a10x">A10X</a></li>
+                    <li><a href="../innosilicon/A10X#a10x-stock">A10X (Stock)</a></li>
                 </ul>
         </details>
     </ul>
@@ -402,22 +402,22 @@ details {
         <details>
             <summary>X5 Series:</summary>
                 <ul>
-                    <li><a href="../goldshell/X5#ck5">CK5</a></li>
-                    <li><a href="../goldshell/X5#hs5">HS5</a></li>
-                    <li><a href="../goldshell/X5#kd5">KD5</a></li>
+                    <li><a href="../goldshell/X5#ck5-stock">CK5 (Stock)</a></li>
+                    <li><a href="../goldshell/X5#hs5-stock">HS5 (Stock)</a></li>
+                    <li><a href="../goldshell/X5#kd5-stock">KD5 (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>XMax Series:</summary>
                 <ul>
-                    <li><a href="../goldshell/XMax#kd-max">KD Max</a></li>
+                    <li><a href="../goldshell/XMax#kd-max-stock">KD Max (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>XBox Series:</summary>
                 <ul>
-                    <li><a href="../goldshell/XBox#kd-box-ii">KD Box II</a></li>
-                    <li><a href="../goldshell/XBox#kd-box-pro">KD Box Pro</a></li>
+                    <li><a href="../goldshell/XBox#kd-box-ii-stock">KD Box II (Stock)</a></li>
+                    <li><a href="../goldshell/XBox#kd-box-pro-stock">KD Box Pro (Stock)</a></li>
                 </ul>
         </details>
     </ul>
@@ -446,27 +446,28 @@ details {
         <details>
             <summary>X19 Series:</summary>
                 <ul>
-                    <li><a href="../antminer/X19#s19">S19</a></li>
-                    <li><a href="../antminer/X19#s19_1">S19+</a></li>
-                    <li><a href="../antminer/X19#s19-pro">S19 Pro</a></li>
-                    <li><a href="../antminer/X19#s19a">S19a</a></li>
-                    <li><a href="../antminer/X19#s19a-pro">S19a Pro</a></li>
-                    <li><a href="../antminer/X19#s19j">S19j</a></li>
-                    <li><a href="../antminer/X19#s19j-no-pic">S19j No PIC</a></li>
-                    <li><a href="../antminer/X19#s19j-pro">S19j Pro</a></li>
-                    <li><a href="../antminer/X19#s19j-pro-no-pic">S19j Pro No PIC</a></li>
-                    <li><a href="../antminer/X19#s19j-pro_1">S19j Pro+</a></li>
-                    <li><a href="../antminer/X19#s19j-pro_1">S19j Pro+</a></li>
-                    <li><a href="../antminer/X19#s19j-pro_1-no-pic">S19j Pro+ No PIC</a></li>
-                    <li><a href="../antminer/X19#s19k-pro-no-pic">S19k Pro No PIC</a></li>
-                    <li><a href="../antminer/X19#s19-xp">S19 XP</a></li>
-                    <li><a href="../antminer/X19#t19">T19</a></li>
+                    <li><a href="../antminer/X19#s19-bos_1">S19 (BOS+)</a></li>
+                    <li><a href="../antminer/X19#s19_1-bos_1">S19+ (BOS+)</a></li>
+                    <li><a href="../antminer/X19#s19-pro-bos_1">S19 Pro (BOS+)</a></li>
+                    <li><a href="../antminer/X19#s19a-bos_1">S19a (BOS+)</a></li>
+                    <li><a href="../antminer/X19#s19a-pro-bos_1">S19a Pro (BOS+)</a></li>
+                    <li><a href="../antminer/X19#s19j-bos_1">S19j (BOS+)</a></li>
+                    <li><a href="../antminer/X19#s19j-no-pic-bos_1">S19j No PIC (BOS+)</a></li>
+                    <li><a href="../antminer/X19#s19j-pro-bos_1">S19j Pro (BOS+)</a></li>
+                    <li><a href="../antminer/X19#s19j-pro-no-pic-bos_1">S19j Pro No PIC (BOS+)</a></li>
+                    <li><a href="../antminer/X19#s19j-pro_1-bos_1">S19j Pro+ (BOS+)</a></li>
+                    <li><a href="../antminer/X19#s19j-pro_1-bos_1">S19j Pro+ (BOS+)</a></li>
+                    <li><a href="../antminer/X19#s19j-pro_1-no-pic-bos_1">S19j Pro+ No PIC (BOS+)</a></li>
+                    <li><a href="../antminer/X19#s19k-pro-no-pic-bos_1">S19k Pro No PIC (BOS+)</a></li>
+                    <li><a href="../antminer/X19#s19k-pro-no-pic-bos_1">S19k Pro No PIC (BOS+)</a></li>
+                    <li><a href="../antminer/X19#s19-xp-bos_1">S19 XP (BOS+)</a></li>
+                    <li><a href="../antminer/X19#t19-bos_1">T19 (BOS+)</a></li>
                 </ul>
         </details>
         <details>
             <summary>X21 Series:</summary>
                 <ul>
-                    <li><a href="../antminer/X21#s21">S21</a></li>
+                    <li><a href="../antminer/X21#s21-bos_1">S21 (BOS+)</a></li>
                 </ul>
         </details>
     </ul>
@@ -507,6 +508,12 @@ details {
                     <li><a href="../antminer/X19#t19-vnish">T19 (VNish)</a></li>
                 </ul>
         </details>
+        <details>
+            <summary>X21 Series:</summary>
+                <ul>
+                    <li><a href="../antminer/X21#s21-vnish">S21 (VNish)</a></li>
+                </ul>
+        </details>
     </ul>
 </details>
 <details>
@@ -546,7 +553,7 @@ details {
         <details>
             <summary>X9 Series:</summary>
                 <ul>
-                    <li><a href="../antminer/X9#t9-hive">T9 (Hive)</a></li>
+                    <li><a href="../antminer/X9#t9-stock">T9 (Stock)</a></li>
                 </ul>
         </details>
     </ul>
@@ -586,23 +593,23 @@ details {
         <details>
             <summary>AD Series:</summary>
                 <ul>
-                    <li><a href="../auradine/AD#at1500">AT1500</a></li>
-                    <li><a href="../auradine/AD#at2860">AT2860</a></li>
-                    <li><a href="../auradine/AD#at2880">AT2880</a></li>
+                    <li><a href="../auradine/AD#at1500-stock">AT1500 (Stock)</a></li>
+                    <li><a href="../auradine/AD#at2860-stock">AT2860 (Stock)</a></li>
+                    <li><a href="../auradine/AD#at2880-stock">AT2880 (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>AI Series:</summary>
                 <ul>
-                    <li><a href="../auradine/AI#ai2500">AI2500</a></li>
-                    <li><a href="../auradine/AI#ai3680">AI3680</a></li>
+                    <li><a href="../auradine/AI#ai2500-stock">AI2500 (Stock)</a></li>
+                    <li><a href="../auradine/AI#ai3680-stock">AI3680 (Stock)</a></li>
                 </ul>
         </details>
         <details>
             <summary>AT Series:</summary>
                 <ul>
-                    <li><a href="../auradine/AT#ad2500">AD2500</a></li>
-                    <li><a href="../auradine/AT#ad3500">AD3500</a></li>
+                    <li><a href="../auradine/AT#ad2500-stock">AD2500 (Stock)</a></li>
+                    <li><a href="../auradine/AT#ad3500-stock">AD3500 (Stock)</a></li>
                 </ul>
         </details>
     </ul>
@@ -630,4 +637,17 @@ details {
                 </ul>
         </details>
     </ul>
+</details>
+<details>
+<summary>Stock Firmware BitAxe Miners:</summary>
+    <ul>
+        <details>
+            <summary>BM Series:</summary>
+                <ul>
+                    <li><a href="../bitaxe/BM#supra-stock">Supra (Stock)</a></li>
+                    <li><a href="../bitaxe/BM#ultra-stock">Ultra (Stock)</a></li>
+                    <li><a href="../bitaxe/BM#max-stock">Max (Stock)</a></li>
+                </ul>
+        </details>
+    </ul>
 </details>

docs/miners/whatsminer/M2X.md

@@ -1,91 +1,91 @@
 # pyasic
 ## M2X Models
 
-## M20 V10
+## M20 V10 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M2X.M20.BTMinerM20V10
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M20S V10
+## M20S V10 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M2X.M20S.BTMinerM20SV10
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M20S V20
+## M20S V20 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M2X.M20S.BTMinerM20SV20
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M20S V30
+## M20S V30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M2X.M20S.BTMinerM20SV30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M20P V10
+## M20P V10 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M2X.M20P.BTMinerM20PV10
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M20P V30
+## M20P V30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M2X.M20P.BTMinerM20PV30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M20S+ V30
+## M20S+ V30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M2X.M20S_Plus.BTMinerM20SPlusV30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M21 V10
+## M21 V10 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M2X.M21.BTMinerM21V10
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M21S V20
+## M21S V20 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M2X.M21S.BTMinerM21SV20
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M21S V60
+## M21S V60 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M2X.M21S.BTMinerM21SV60
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M21S V70
+## M21S V70 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M2X.M21S.BTMinerM21SV70
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M21S+ V20
+## M21S+ V20 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M2X.M21S_Plus.BTMinerM21SPlusV20
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M29 V10
+## M29 V10 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M2X.M29.BTMinerM29V10
     handler: python
     options:

docs/miners/whatsminer/M5X.md

@@ -1,259 +1,259 @@
 # pyasic
 ## M5X Models
 
-## M50 VE30
+## M50 VE30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VE30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50 VG30
+## M50 VG30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VG30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50 VH10
+## M50 VH10 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH10
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50 VH20
+## M50 VH20 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH20
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50 VH30
+## M50 VH30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50 VH40
+## M50 VH40 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH40
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50 VH50
+## M50 VH50 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH50
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50 VH60
+## M50 VH60 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH60
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50 VH70
+## M50 VH70 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH70
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50 VH80
+## M50 VH80 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH80
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50 VJ10
+## M50 VJ10 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VJ10
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50 VJ20
+## M50 VJ20 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VJ20
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50 VJ30
+## M50 VJ30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VJ30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50S VJ10
+## M50S VJ10 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVJ10
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50S VJ20
+## M50S VJ20 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVJ20
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50S VJ30
+## M50S VJ30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVJ30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50S VH10
+## M50S VH10 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVH10
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50S VH20
+## M50S VH20 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVH20
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50S VH30
+## M50S VH30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVH30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50S VH40
+## M50S VH40 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVH40
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50S VH50
+## M50S VH50 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVH50
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50S+ VH30
+## M50S+ VH30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVH30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50S+ VH40
+## M50S+ VH40 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVH40
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50S+ VJ30
+## M50S+ VJ30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVJ30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50S+ VK20
+## M50S+ VK20 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVK20
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50S++ VK10
+## M50S++ VK10 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus_Plus.BTMinerM50SPlusPlusVK10
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50S++ VK20
+## M50S++ VK20 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus_Plus.BTMinerM50SPlusPlusVK20
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M50S++ VK30
+## M50S++ VK30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus_Plus.BTMinerM50SPlusPlusVK30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M53 VH30
+## M53 VH30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M53.BTMinerM53VH30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M53S VH30
+## M53S VH30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S.BTMinerM53SVH30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M53S VJ40
+## M53S VJ40 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S.BTMinerM53SVJ40
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M53S+ VJ30
+## M53S+ VJ30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S_Plus.BTMinerM53SPlusVJ30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M53S++ VK10
+## M53S++ VK10 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S_Plus_Plus.BTMinerM53SPlusPlusVK10
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M56 VH30
+## M56 VH30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M56.BTMinerM56VH30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M56S VH30
+## M56S VH30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M56S.BTMinerM56SVH30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M56S+ VJ30
+## M56S+ VJ30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M56S_Plus.BTMinerM56SPlusVJ30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M59 VH30
+## M59 VH30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M5X.M59.BTMinerM59VH30
     handler: python
     options:

docs/miners/whatsminer/M6X.md

@@ -1,133 +1,133 @@
 # pyasic
 ## M6X Models
 
-## M60 VK10
+## M60 VK10 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VK10
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M60 VK20
+## M60 VK20 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VK20
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M60 VK30
+## M60 VK30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VK30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M60 VK40
+## M60 VK40 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VK40
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M60S VK10
+## M60S VK10 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVK10
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M60S VK20
+## M60S VK20 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVK20
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M60S VK30
+## M60S VK30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVK30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M60S VK40
+## M60S VK40 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVK40
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M63 VK10
+## M63 VK10 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M6X.M63.BTMinerM63VK10
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M63 VK20
+## M63 VK20 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M6X.M63.BTMinerM63VK20
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M63 VK30
+## M63 VK30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M6X.M63.BTMinerM63VK30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M63S VK10
+## M63S VK10 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M6X.M63S.BTMinerM63SVK10
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M63S VK20
+## M63S VK20 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M6X.M63S.BTMinerM63SVK20
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M63S VK30
+## M63S VK30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M6X.M63S.BTMinerM63SVK30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M66 VK20
+## M66 VK20 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M6X.M66.BTMinerM66VK20
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M66 VK30
+## M66 VK30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M6X.M66.BTMinerM66VK30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M66S VK20
+## M66S VK20 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S.BTMinerM66SVK20
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M66S VK30
+## M66S VK30 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S.BTMinerM66SVK30
     handler: python
     options:
         show_root_heading: false
         heading_level: 4
 
-## M66S VK40
+## M66S VK40 (Stock)
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S.BTMinerM66SVK40
     handler: python
     options:

docs/requirements.txt

@@ -1,3 +1,4 @@
 jinja2<3.1.4
 mkdocs
 mkdocstrings[python]
+zipp>=3.19.1 # not directly required, pinned by Snyk to avoid a vulnerability

docs/settings/settings.md

@@ -13,12 +13,17 @@ Settings options:
 - `get_data_retries`
 - `api_function_timeout`
 - `antminer_mining_mode_as_str`
-- `default_whatsminer_password`
-- `default_innosilicon_password`
-- `default_antminer_password`
-- `default_bosminer_password`
-- `default_vnish_password`
-- `default_goldshell_password`
+- `default_whatsminer_rpc_password`
+- `default_innosilicon_web_password`
+- `default_antminer_web_password`
+- `default_bosminer_web_password`
+- `default_vnish_web_password`
+- `default_goldshell_web_password`
+- `default_auradine_web_password`
+- `default_epic_web_password`
+- `default_hive_web_password`
+- `default_antminer_ssh_password`
+- `default_bosminer_ssh_password`
 - `socket_linger_time`
 
 

mkdocs.yml

@@ -68,6 +68,8 @@ nav:
         - Auradine AD: "miners/auradine/AD.md"
         - Auradine AI: "miners/auradine/AI.md"
         - Auradine AT: "miners/auradine/AT.md"
+        - Blockminer: "miners/blockminer/blockminer.md"
+        - BitAxe BM: "miners/bitaxe/BM.md"
     - Base Miner: "miners/base_miner.md"
 - Settings:
       - Settings: "settings/settings.md"

poetry.lock

@@ -1,5 +1,16 @@
 # This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand.
 
+[[package]]
+name = "aiofiles"
+version = "23.2.1"
+description = "File support for asyncio."
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "aiofiles-23.2.1-py3-none-any.whl", hash = "sha256:19297512c647d4b27a2cf7c34caa7e405c0d60b5560618a29a9fe027b18b0107"},
+    {file = "aiofiles-23.2.1.tar.gz", hash = "sha256:84ec2218d8419404abcb9f0c02df3f34c6e0a68ed41072acfb1cef5cbc29051a"},
+]
+
 [[package]]
 name = "anyio"
 version = "4.3.0"
@@ -1177,4 +1188,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.8"
-content-hash = "b2b3bd7e96e830fbad7f57ea91d517400a500ec3686ceda841d07f8d34efd52b"
+content-hash = "ff43cde4f74ab7226ad3eb5f6af1c2e9bc2387e95653f77cffa480d51e2f2417"

pyasic/config/__init__.py

@@ -17,8 +17,8 @@ from dataclasses import asdict, dataclass, field
 
 from pyasic.config.fans import FanModeConfig
 from pyasic.config.mining import MiningModeConfig
+from pyasic.config.mining.scaling import ScalingConfig
 from pyasic.config.pools import PoolConfig
-from pyasic.config.power_scaling import PowerScalingConfig
 from pyasic.config.temperature import TemperatureConfig
 from pyasic.misc import merge_dicts
 
@@ -32,9 +32,6 @@ class MinerConfig:
     fan_mode: FanModeConfig = field(default_factory=FanModeConfig.default)
     temperature: TemperatureConfig = field(default_factory=TemperatureConfig.default)
     mining_mode: MiningModeConfig = field(default_factory=MiningModeConfig.default)
-    power_scaling: PowerScalingConfig = field(
-        default_factory=PowerScalingConfig.default
-    )
 
     def __getitem__(self, item):
         try:
@@ -54,7 +51,6 @@ class MinerConfig:
             **self.mining_mode.as_am_modern(),
             **self.pools.as_am_modern(user_suffix=user_suffix),
             **self.temperature.as_am_modern(),
-            **self.power_scaling.as_am_modern(),
         }
 
     def as_wm(self, user_suffix: str = None) -> dict:
@@ -64,7 +60,6 @@ class MinerConfig:
             **self.mining_mode.as_wm(),
             **self.pools.as_wm(user_suffix=user_suffix),
             **self.temperature.as_wm(),
-            **self.power_scaling.as_wm(),
         }
 
     def as_am_old(self, user_suffix: str = None) -> dict:
@@ -74,7 +69,6 @@ class MinerConfig:
             **self.mining_mode.as_am_old(),
             **self.pools.as_am_old(user_suffix=user_suffix),
             **self.temperature.as_am_old(),
-            **self.power_scaling.as_am_old(),
         }
 
     def as_goldshell(self, user_suffix: str = None) -> dict:
@@ -84,7 +78,6 @@ class MinerConfig:
             **self.mining_mode.as_goldshell(),
             **self.pools.as_goldshell(user_suffix=user_suffix),
             **self.temperature.as_goldshell(),
-            **self.power_scaling.as_goldshell(),
         }
 
     def as_avalon(self, user_suffix: str = None) -> dict:
@@ -94,7 +87,6 @@ class MinerConfig:
             **self.mining_mode.as_avalon(),
             **self.pools.as_avalon(user_suffix=user_suffix),
             **self.temperature.as_avalon(),
-            **self.power_scaling.as_avalon(),
         }
 
     def as_inno(self, user_suffix: str = None) -> dict:
@@ -104,7 +96,6 @@ class MinerConfig:
             **self.mining_mode.as_inno(),
             **self.pools.as_inno(user_suffix=user_suffix),
             **self.temperature.as_inno(),
-            **self.power_scaling.as_inno(),
         }
 
     def as_bosminer(self, user_suffix: str = None) -> dict:
@@ -113,7 +104,6 @@ class MinerConfig:
             **merge_dicts(self.fan_mode.as_bosminer(), self.temperature.as_bosminer()),
             **self.mining_mode.as_bosminer(),
             **self.pools.as_bosminer(user_suffix=user_suffix),
-            **self.power_scaling.as_bosminer(),
         }
 
     def as_boser(self, user_suffix: str = None) -> dict:
@@ -123,7 +113,6 @@ class MinerConfig:
             **self.temperature.as_boser(),
             **self.mining_mode.as_boser(),
             **self.pools.as_boser(user_suffix=user_suffix),
-            **self.power_scaling.as_boser(),
         }
 
     def as_epic(self, user_suffix: str = None) -> dict:
@@ -132,7 +121,6 @@ class MinerConfig:
             **merge_dicts(self.fan_mode.as_epic(), self.temperature.as_epic()),
             **self.mining_mode.as_epic(),
             **self.pools.as_epic(user_suffix=user_suffix),
-            **self.power_scaling.as_epic(),
         }
 
     def as_auradine(self, user_suffix: str = None) -> dict:
@@ -142,7 +130,6 @@ class MinerConfig:
             **self.temperature.as_auradine(),
             **self.mining_mode.as_auradine(),
             **self.pools.as_auradine(user_suffix=user_suffix),
-            **self.power_scaling.as_auradine(),
         }
 
     def as_mara(self, user_suffix: str = None) -> dict:
@@ -151,7 +138,14 @@ class MinerConfig:
             **self.temperature.as_mara(),
             **self.mining_mode.as_mara(),
             **self.pools.as_mara(user_suffix=user_suffix),
-            **self.power_scaling.as_mara(),
+        }
+
+    def as_bitaxe(self, user_suffix: str = None) -> dict:
+        return {
+            **self.fan_mode.as_bitaxe(),
+            **self.temperature.as_bitaxe(),
+            **self.mining_mode.as_bitaxe(),
+            **self.pools.as_bitaxe(user_suffix=user_suffix),
         }
 
     @classmethod
@@ -162,7 +156,6 @@ class MinerConfig:
             mining_mode=MiningModeConfig.from_dict(dict_conf.get("mining_mode")),
             fan_mode=FanModeConfig.from_dict(dict_conf.get("fan_mode")),
             temperature=TemperatureConfig.from_dict(dict_conf.get("temperature")),
-            power_scaling=PowerScalingConfig.from_dict(dict_conf.get("power_scaling")),
         )
 
     @classmethod
@@ -202,7 +195,6 @@ class MinerConfig:
             mining_mode=MiningModeConfig.from_bosminer(toml_conf),
             fan_mode=FanModeConfig.from_bosminer(toml_conf),
             temperature=TemperatureConfig.from_bosminer(toml_conf),
-            power_scaling=PowerScalingConfig.from_bosminer(toml_conf),
         )
 
     @classmethod
@@ -213,7 +205,6 @@ class MinerConfig:
             mining_mode=MiningModeConfig.from_boser(grpc_miner_conf),
             fan_mode=FanModeConfig.from_boser(grpc_miner_conf),
             temperature=TemperatureConfig.from_boser(grpc_miner_conf),
-            power_scaling=PowerScalingConfig.from_boser(grpc_miner_conf),
         )
 
     @classmethod
@@ -252,3 +243,10 @@ class MinerConfig:
             fan_mode=FanModeConfig.from_mara(web_miner_config),
             mining_mode=MiningModeConfig.from_mara(web_miner_config),
         )
+
+    @classmethod
+    def from_bitaxe(cls, web_system_info: dict) -> "MinerConfig":
+        return cls(
+            pools=PoolConfig.from_bitaxe(web_system_info),
+            fan_mode=FanModeConfig.from_bitaxe(web_system_info),
+        )

pyasic/config/base.py

@@ -46,7 +46,7 @@ class MinerConfigOption(Enum):
         return self.value.as_bosminer()
 
     def as_boser(self) -> dict:
-        return self.value.as_boser()
+        return self.value.as_boser
 
     def as_epic(self) -> dict:
         return self.value.as_epic()
@@ -60,6 +60,9 @@ class MinerConfigOption(Enum):
     def as_mara(self) -> dict:
         return self.value.as_mara()
 
+    def as_bitaxe(self) -> dict:
+        return self.value.as_bitaxe()
+
     def __call__(self, *args, **kwargs):
         return self.value(*args, **kwargs)
 
@@ -74,7 +77,6 @@ class MinerConfigOption(Enum):
             raise KeyError
 
 
-
 @dataclass
 class MinerConfigValue:
     @classmethod
@@ -120,6 +122,9 @@ class MinerConfigValue:
     def as_mara(self) -> dict:
         return {}
 
+    def as_bitaxe(self) -> dict:
+        return {}
+
     def __getitem__(self, item):
         try:
             return getattr(self, item)

pyasic/config/fans.py

@@ -80,6 +80,9 @@ class FanModeNormal(MinerConfigValue):
             },
         }
 
+    def as_bitaxe(self) -> dict:
+        return {"autoFanspeed": 1}
+
 
 @dataclass
 class FanModeManual(MinerConfigValue):
@@ -138,6 +141,9 @@ class FanModeManual(MinerConfigValue):
             },
         }
 
+    def as_bitaxe(self) -> dict:
+        return {"autoFanspeed": 0, "fanspeed": self.speed}
+
 
 @dataclass
 class FanModeImmersion(MinerConfigValue):
@@ -291,3 +297,10 @@ class FanModeConfig(MinerConfigOption):
         except LookupError:
             pass
         return cls.default()
+
+    @classmethod
+    def from_bitaxe(cls, web_system_info: dict):
+        if web_system_info["autofanspeed"] == 1:
+            return cls.normal()
+        else:
+            return cls.manual(speed=web_system_info["fanspeed"])

pyasic/config/mining/__init__.py

@@ -20,16 +20,23 @@ from dataclasses import dataclass, field
 from pyasic import settings
 from pyasic.config.base import MinerConfigOption, MinerConfigValue
 from pyasic.web.braiins_os.proto.braiins.bos.v1 import (
+    DpsHashrateTarget,
+    DpsPowerTarget,
+    DpsTarget,
     HashrateTargetMode,
     PerformanceMode,
     Power,
     PowerTargetMode,
     SaveAction,
+    SetDpsRequest,
     SetPerformanceModeRequest,
     TeraHashrate,
     TunerPerformanceMode,
 )
 
+from .algo import TunerAlgo
+from .scaling import ScalingConfig
+
 
 @dataclass
 class MiningModeNormal(MinerConfigValue):
@@ -140,56 +147,12 @@ class MiningModeHPM(MinerConfigValue):
         return {"mode": {"mode": "turbo"}}
 
 
-@dataclass
-class StandardTuneAlgo(MinerConfigValue):
-    mode: str = field(init=False, default="standard")
-
-    def as_epic(self) -> str:
-        return VOptAlgo().as_epic()
-
-
-@dataclass
-class VOptAlgo(MinerConfigValue):
-    mode: str = field(init=False, default="voltage_optimizer")
-
-    def as_epic(self) -> str:
-        return "VoltageOptimizer"
-
-
-@dataclass
-class ChipTuneAlgo(MinerConfigValue):
-    mode: str = field(init=False, default="chip_tune")
-
-    def as_epic(self) -> str:
-        return "ChipTune"
-
-
-@dataclass
-class TunerAlgo(MinerConfigOption):
-    standard = StandardTuneAlgo
-    voltage_optimizer = VOptAlgo
-    chip_tune = ChipTuneAlgo
-
-    @classmethod
-    def default(cls):
-        return cls.standard()
-
-    @classmethod
-    def from_dict(cls, dict_conf: dict | None):
-        mode = dict_conf.get("mode")
-        if mode is None:
-            return cls.default()
-
-        cls_attr = getattr(cls, mode)
-        if cls_attr is not None:
-            return cls_attr().from_dict(dict_conf)
-
-
 @dataclass
 class MiningModePowerTune(MinerConfigValue):
     mode: str = field(init=False, default="power_tuning")
     power: int = None
     algo: TunerAlgo = field(default_factory=TunerAlgo.default)
+    scaling: ScalingConfig = None
 
     @classmethod
     def from_dict(cls, dict_conf: dict | None) -> "MiningModePowerTune":
@@ -198,6 +161,8 @@ class MiningModePowerTune(MinerConfigValue):
             cls_conf["power"] = dict_conf["power"]
         if dict_conf.get("algo"):
             cls_conf["algo"] = TunerAlgo.from_dict(dict_conf["algo"])
+        if dict_conf.get("scaling"):
+            cls_conf["scaling"] = ScalingConfig.from_dict(dict_conf["scaling"])
 
         return cls(**cls_conf)
 
@@ -212,13 +177,26 @@ class MiningModePowerTune(MinerConfigValue):
         return {}
 
     def as_bosminer(self) -> dict:
-        conf = {"enabled": True, "mode": "power_target"}
+        tuning_cfg = {"enabled": True, "mode": "power_target"}
         if self.power is not None:
-            conf["power_target"] = self.power
-        return {"autotuning": conf}
+            tuning_cfg["power_target"] = self.power
+
+        cfg = {"autotuning": tuning_cfg}
+
+        if self.scaling is not None:
+            scaling_cfg = {"enabled": True}
+            if self.scaling.step is not None:
+                scaling_cfg["power_step"] = self.scaling.step
+            if self.scaling.minimum is not None:
+                scaling_cfg["min_power_target"] = self.scaling.minimum
+            if self.scaling.shutdown is not None:
+                scaling_cfg = {**scaling_cfg, **self.scaling.shutdown.as_bosminer()}
+            cfg["performance_scaling"] = scaling_cfg
+
+        return cfg
 
     def as_boser(self) -> dict:
-        return {
+        cfg = {
             "set_performance_mode": SetPerformanceModeRequest(
                 save_action=SaveAction.SAVE_ACTION_SAVE_AND_APPLY,
                 mode=PerformanceMode(
@@ -230,6 +208,23 @@ class MiningModePowerTune(MinerConfigValue):
                 ),
             ),
         }
+        if self.scaling is not None:
+            sd_cfg = {}
+            if self.scaling.shutdown is not None:
+                sd_cfg = self.scaling.shutdown.as_boser()
+            cfg["set_dps"] = (
+                SetDpsRequest(
+                    enable=True,
+                    **sd_cfg,
+                    target=DpsTarget(
+                        power_target=DpsPowerTarget(
+                            power_step=Power(self.scaling.step),
+                            min_power_target=Power(self.scaling.minimum),
+                        )
+                    ),
+                ),
+            )
+        return cfg
 
     def as_auradine(self) -> dict:
         return {"mode": {"mode": "custom", "tune": "power", "power": self.power}}
@@ -250,21 +245,18 @@ class MiningModePowerTune(MinerConfigValue):
 class MiningModeHashrateTune(MinerConfigValue):
     mode: str = field(init=False, default="hashrate_tuning")
     hashrate: int = None
-    throttle_limit: int = None
-    throttle_step: int = None
     algo: TunerAlgo = field(default_factory=TunerAlgo.default)
+    scaling: ScalingConfig = None
 
     @classmethod
     def from_dict(cls, dict_conf: dict | None) -> "MiningModeHashrateTune":
         cls_conf = {}
         if dict_conf.get("hashrate"):
             cls_conf["hashrate"] = dict_conf["hashrate"]
-        if dict_conf.get("throttle_limit"):
-            cls_conf["throttle_limit"] = dict_conf["throttle_limit"]
-        if dict_conf.get("throttle_step"):
-            cls_conf["throttle_step"] = dict_conf["throttle_step"]
         if dict_conf.get("algo"):
             cls_conf["algo"] = TunerAlgo.from_dict(dict_conf["algo"])
+        if dict_conf.get("scaling"):
+            cls_conf["scaling"] = ScalingConfig.from_dict(dict_conf["scaling"])
 
         return cls(**cls_conf)
 
@@ -279,8 +271,9 @@ class MiningModeHashrateTune(MinerConfigValue):
             conf["hashrate_target"] = self.hashrate
         return {"autotuning": conf}
 
+    @property
     def as_boser(self) -> dict:
-        return {
+        cfg = {
             "set_performance_mode": SetPerformanceModeRequest(
                 save_action=SaveAction.SAVE_ACTION_SAVE_AND_APPLY,
                 mode=PerformanceMode(
@@ -294,6 +287,23 @@ class MiningModeHashrateTune(MinerConfigValue):
                 ),
             )
         }
+        if self.scaling is not None:
+            sd_cfg = {}
+            if self.scaling.shutdown is not None:
+                sd_cfg = self.scaling.shutdown.as_boser()
+            cfg["set_dps"] = (
+                SetDpsRequest(
+                    enable=True,
+                    **sd_cfg,
+                    target=DpsTarget(
+                        hashrate_target=DpsHashrateTarget(
+                            hashrate_step=TeraHashrate(self.scaling.step),
+                            min_hashrate_target=TeraHashrate(self.scaling.minimum),
+                        )
+                    ),
+                ),
+            )
+        return cfg
 
     def as_auradine(self) -> dict:
         return {"mode": {"mode": "custom", "tune": "ths", "ths": self.hashrate}}
@@ -305,10 +315,11 @@ class MiningModeHashrateTune(MinerConfigValue):
                 "target": self.hashrate,
             }
         }
-        if self.throttle_limit is not None:
-            mode["ptune"]["min_throttle"] = self.throttle_limit
-        if self.throttle_step is not None:
-            mode["ptune"]["throttle_step"] = self.throttle_step
+        if self.scaling is not None:
+            if self.scaling.minimum is not None:
+                mode["ptune"]["min_throttle"] = self.scaling.minimum
+            if self.scaling.step is not None:
+                mode["ptune"]["throttle_step"] = self.scaling.step
         return mode
 
     def as_mara(self) -> dict:
@@ -373,6 +384,24 @@ class MiningModeManual(MinerConfigValue):
         }
         return cls(global_freq=freq, global_volt=voltage, boards=boards)
 
+    @classmethod
+    def from_epic(cls, epic_conf: dict) -> "MiningModeManual":
+        voltage = 0
+        freq = 0
+        if epic_conf.get("HwConfig") is not None:
+            freq = epic_conf["HwConfig"]["Boards Target Clock"][0]["Data"]
+        if epic_conf.get("Power Supply Stats") is not None:
+            voltage = epic_conf["Power Supply Stats"]["Target Voltage"]
+        boards = {}
+        if epic_conf.get("HBs") is not None:
+            boards = {
+                board["Index"]: ManualBoardSettings(
+                    freq=board["Core Clock Avg"], volt=board["Input Voltage"]
+                )
+                for board in epic_conf["HBs"]
+            }
+        return cls(global_freq=freq, global_volt=voltage, boards=boards)
+
     def as_mara(self) -> dict:
         return {
             "mode": {
@@ -432,15 +461,32 @@ class MiningModeConfig(MinerConfigOption):
             if tuner_running:
                 algo_info = web_conf["PerpetualTune"]["Algorithm"]
                 if algo_info.get("VoltageOptimizer") is not None:
+                    scaling_cfg = None
+                    if "Throttle Step" in algo_info["VoltageOptimizer"]:
+                        scaling_cfg = ScalingConfig(
+                            minimum=algo_info["VoltageOptimizer"].get(
+                                "Min Throttle Target"
+                            ),
+                            step=algo_info["VoltageOptimizer"].get("Throttle Step"),
+                        )
+
                     return cls.hashrate_tuning(
                         hashrate=algo_info["VoltageOptimizer"].get("Target"),
-                        throttle_limit=algo_info["VoltageOptimizer"].get(
-                            "Min Throttle Target"
-                        ),
-                        throttle_step=algo_info["VoltageOptimizer"].get(
-                            "Throttle Step"
-                        ),
                         algo=TunerAlgo.voltage_optimizer(),
+                        scaling=scaling_cfg,
+                    )
+                elif algo_info.get("BoardTune") is not None:
+                    scaling_cfg = None
+                    if "Throttle Step" in algo_info["BoardTune"]:
+                        scaling_cfg = ScalingConfig(
+                            minimum=algo_info["BoardTune"].get("Min Throttle Target"),
+                            step=algo_info["BoardTune"].get("Throttle Step"),
+                        )
+
+                    return cls.hashrate_tuning(
+                        hashrate=algo_info["BoardTune"].get("Target"),
+                        algo=TunerAlgo.board_tune(),
+                        scaling=scaling_cfg,
                     )
                 else:
                     return cls.hashrate_tuning(
@@ -448,7 +494,7 @@ class MiningModeConfig(MinerConfigOption):
                         algo=TunerAlgo.chip_tune(),
                     )
             else:
-                return cls.normal()
+                return MiningModeManual.from_epic(web_conf)
         except KeyError:
             return cls.default()
 
@@ -465,18 +511,31 @@ class MiningModeConfig(MinerConfigOption):
 
         if autotuning_conf.get("psu_power_limit") is not None:
             # old autotuning conf
-            return cls.power_tuning(autotuning_conf["psu_power_limit"])
+            return cls.power_tuning(
+                autotuning_conf["psu_power_limit"],
+                scaling=ScalingConfig.from_bosminer(toml_conf, mode="power"),
+            )
         if autotuning_conf.get("mode") is not None:
             # new autotuning conf
             mode = autotuning_conf["mode"]
             if mode == "power_target":
                 if autotuning_conf.get("power_target") is not None:
-                    return cls.power_tuning(autotuning_conf["power_target"])
-                return cls.power_tuning()
+                    return cls.power_tuning(
+                        autotuning_conf["power_target"],
+                        scaling=ScalingConfig.from_bosminer(toml_conf, mode="power"),
+                    )
+                return cls.power_tuning(
+                    scaling=ScalingConfig.from_bosminer(toml_conf, mode="power"),
+                )
             if mode == "hashrate_target":
                 if autotuning_conf.get("hashrate_target") is not None:
-                    return cls.hashrate_tuning(autotuning_conf["hashrate_target"])
-                return cls.hashrate_tuning()
+                    return cls.hashrate_tuning(
+                        autotuning_conf["hashrate_target"],
+                        scaling=ScalingConfig.from_bosminer(toml_conf, mode="hashrate"),
+                    )
+                return cls.hashrate_tuning(
+                    scaling=ScalingConfig.from_bosminer(toml_conf, mode="hashrate"),
+                )
 
     @classmethod
     def from_vnish(cls, web_settings: dict):
@@ -502,24 +561,40 @@ class MiningModeConfig(MinerConfigOption):
         if tuner_conf.get("tunerMode") is not None:
             if tuner_conf["tunerMode"] == 1:
                 if tuner_conf.get("powerTarget") is not None:
-                    return cls.power_tuning(tuner_conf["powerTarget"]["watt"])
-                return cls.power_tuning()
+                    return cls.power_tuning(
+                        tuner_conf["powerTarget"]["watt"],
+                        scaling=ScalingConfig.from_boser(grpc_miner_conf, mode="power"),
+                    )
+                return cls.power_tuning(
+                    scaling=ScalingConfig.from_boser(grpc_miner_conf, mode="power")
+                )
 
             if tuner_conf["tunerMode"] == 2:
                 if tuner_conf.get("hashrateTarget") is not None:
                     return cls.hashrate_tuning(
-                        int(tuner_conf["hashrateTarget"]["terahashPerSecond"])
+                        int(tuner_conf["hashrateTarget"]["terahashPerSecond"]),
+                        scaling=ScalingConfig.from_boser(
+                            grpc_miner_conf, mode="hashrate"
+                        ),
                     )
-                return cls.hashrate_tuning()
+                return cls.hashrate_tuning(
+                    scaling=ScalingConfig.from_boser(grpc_miner_conf, mode="hashrate"),
+                )
 
         if tuner_conf.get("powerTarget") is not None:
-            return cls.power_tuning(tuner_conf["powerTarget"]["watt"])
+            return cls.power_tuning(
+                tuner_conf["powerTarget"]["watt"],
+                scaling=ScalingConfig.from_boser(grpc_miner_conf, mode="power"),
+            )
 
         if tuner_conf.get("hashrateTarget") is not None:
             return cls.hashrate_tuning(
-                int(tuner_conf["hashrateTarget"]["terahashPerSecond"])
+                int(tuner_conf["hashrateTarget"]["terahashPerSecond"]),
+                scaling=ScalingConfig.from_boser(grpc_miner_conf, mode="hashrate"),
             )
 
+        return cls.default()
+
     @classmethod
     def from_auradine(cls, web_mode: dict):
         try:

pyasic/config/mining/algo.py

@@ -0,0 +1,59 @@
+from __future__ import annotations
+
+from dataclasses import dataclass, field
+
+from pyasic.config.base import MinerConfigOption, MinerConfigValue
+
+
+@dataclass
+class StandardTuneAlgo(MinerConfigValue):
+    mode: str = field(init=False, default="standard")
+
+    def as_epic(self) -> str:
+        return VOptAlgo().as_epic()
+
+
+@dataclass
+class VOptAlgo(MinerConfigValue):
+    mode: str = field(init=False, default="voltage_optimizer")
+
+    def as_epic(self) -> str:
+        return "VoltageOptimizer"
+
+
+@dataclass
+class BoardTuneAlgo(MinerConfigValue):
+    mode: str = field(init=False, default="board_tune")
+
+    def as_epic(self) -> str:
+        return "BoardTune"
+
+
+@dataclass
+class ChipTuneAlgo(MinerConfigValue):
+    mode: str = field(init=False, default="chip_tune")
+
+    def as_epic(self) -> str:
+        return "ChipTune"
+
+
+@dataclass
+class TunerAlgo(MinerConfigOption):
+    standard = StandardTuneAlgo
+    voltage_optimizer = VOptAlgo
+    board_tune = BoardTuneAlgo
+    chip_tune = ChipTuneAlgo
+
+    @classmethod
+    def default(cls):
+        return cls.standard()
+
+    @classmethod
+    def from_dict(cls, dict_conf: dict | None):
+        mode = dict_conf.get("mode")
+        if mode is None:
+            return cls.default()
+
+        cls_attr = getattr(cls, mode)
+        if cls_attr is not None:
+            return cls_attr().from_dict(dict_conf)

pyasic/config/mining/scaling.py

@@ -0,0 +1,128 @@
+# ------------------------------------------------------------------------------
+#  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 __future__ import annotations
+
+from dataclasses import dataclass
+
+from pyasic.config.base import MinerConfigValue
+
+
+@dataclass
+class ScalingShutdown(MinerConfigValue):
+    enabled: bool = False
+    duration: int = None
+
+    @classmethod
+    def from_dict(cls, dict_conf: dict | None) -> "ScalingShutdown":
+        return cls(
+            enabled=dict_conf.get("enabled", False), duration=dict_conf.get("duration")
+        )
+
+    @classmethod
+    def from_bosminer(cls, power_scaling_conf: dict):
+        sd_enabled = power_scaling_conf.get("shutdown_enabled")
+        if sd_enabled is not None:
+            return cls(sd_enabled, power_scaling_conf.get("shutdown_duration"))
+        return None
+
+    @classmethod
+    def from_boser(cls, power_scaling_conf: dict):
+        sd_enabled = power_scaling_conf.get("shutdownEnabled")
+        if sd_enabled is not None:
+            try:
+                return cls(sd_enabled, power_scaling_conf["shutdownDuration"]["hours"])
+            except KeyError:
+                return cls(sd_enabled)
+        return None
+
+    def as_bosminer(self) -> dict:
+        cfg = {"shutdown_enabled": self.enabled}
+
+        if self.duration is not None:
+            cfg["shutdown_duration"] = self.duration
+
+        return cfg
+
+    def as_boser(self) -> dict:
+        return {"enable_shutdown": self.enabled, "shutdown_duration": self.duration}
+
+
+@dataclass
+class ScalingConfig(MinerConfigValue):
+    step: int = None
+    minimum: int = None
+    shutdown: ScalingShutdown = None
+
+    @classmethod
+    def from_dict(cls, dict_conf: dict | None) -> "ScalingConfig":
+        cls_conf = {
+            "step": dict_conf.get("step"),
+            "minimum": dict_conf.get("minimum"),
+        }
+        shutdown = dict_conf.get("shutdown")
+        if shutdown is not None:
+            cls_conf["shutdown"] = ScalingShutdown.from_dict(shutdown)
+        return cls(**cls_conf)
+
+    @classmethod
+    def from_bosminer(cls, toml_conf: dict, mode: str = None):
+        if mode == "power":
+            return cls._from_bosminer_power(toml_conf)
+        if mode == "hashrate":
+            # not implemented yet
+            pass
+
+    @classmethod
+    def _from_bosminer_power(cls, toml_conf: dict):
+        power_scaling = toml_conf.get("power_scaling")
+        if power_scaling is None:
+            power_scaling = toml_conf.get("performance_scaling")
+        if power_scaling is not None:
+            enabled = power_scaling.get("enabled")
+            if not enabled:
+                return None
+            power_step = power_scaling.get("power_step")
+            min_power = power_scaling.get("min_psu_power_limit")
+            if min_power is None:
+                min_power = power_scaling.get("min_power_target")
+            sd_mode = ScalingShutdown.from_bosminer(power_scaling)
+
+            return cls(step=power_step, minimum=min_power, shutdown=sd_mode)
+
+    @classmethod
+    def from_boser(cls, grpc_miner_conf: dict, mode: str = None):
+        if mode == "power":
+            return cls._from_boser_power(grpc_miner_conf)
+        if mode == "hashrate":
+            # not implemented yet
+            pass
+
+    @classmethod
+    def _from_boser_power(cls, grpc_miner_conf: dict):
+        try:
+            dps_conf = grpc_miner_conf["dps"]
+            if not dps_conf.get("enabled", False):
+                return None
+        except LookupError:
+            return None
+
+        conf = {"shutdown": ScalingShutdown.from_boser(dps_conf)}
+
+        if dps_conf.get("minPowerTarget") is not None:
+            conf["minimum"] = dps_conf["minPowerTarget"]["watt"]
+        if dps_conf.get("powerStep") is not None:
+            conf["step"] = dps_conf["powerStep"]["watt"]
+        return cls(**conf)

pyasic/config/pools.py

@@ -21,6 +21,13 @@ from dataclasses import dataclass, field
 from typing import List
 
 from pyasic.config.base import MinerConfigValue
+from pyasic.web.braiins_os.proto.braiins.bos.v1 import (
+    PoolConfiguration,
+    PoolGroupConfiguration,
+    Quota,
+    SaveAction,
+    SetPoolGroupsRequest,
+)
 
 
 @dataclass
@@ -127,6 +134,18 @@ class Pool(MinerConfigValue):
             }
         return {"url": self.url, "user": self.user, "pass": self.password}
 
+    def as_bitaxe(self, user_suffix: str = None) -> dict:
+        return {
+            "stratumURL": self.url,
+            "stratumUser": f"{self.user}{user_suffix}",
+            "stratumPassword": self.password,
+        }
+
+    def as_boser(self) -> PoolConfiguration:
+        return PoolConfiguration(
+            url=self.url, user=self.user, password=self.password, enabled=True
+        )
+
     @classmethod
     def from_dict(cls, dict_conf: dict | None) -> "Pool":
         return cls(
@@ -194,6 +213,15 @@ class Pool(MinerConfigValue):
             password=web_pool["pass"],
         )
 
+    @classmethod
+    def from_bitaxe(cls, web_system_info: dict) -> "Pool":
+        url = f"stratum+tcp://{web_system_info['stratumURL']}:{web_system_info['stratumPort']}"
+        return cls(
+            url=url,
+            user=web_system_info["stratumUser"],
+            password=web_system_info.get("stratumPassword", ""),
+        )
+
 
 @dataclass
 class PoolGroup(MinerConfigValue):
@@ -287,6 +315,16 @@ class PoolGroup(MinerConfigValue):
     def as_mara(self, user_suffix: str = None) -> list:
         return [p.as_mara(user_suffix=user_suffix) for p in self.pools]
 
+    def as_bitaxe(self, user_suffix: str = None) -> dict:
+        return self.pools[0].as_bitaxe(user_suffix=user_suffix)
+
+    def as_boser(self, user_suffix: str = None) -> PoolGroupConfiguration:
+        return PoolGroupConfiguration(
+            name=self.name,
+            quota=Quota(value=self.quota),
+            pools=[p.as_boser() for p in self.pools],
+        )
+
     @classmethod
     def from_dict(cls, dict_conf: dict | None) -> "PoolGroup":
         cls_conf = {}
@@ -360,6 +398,10 @@ class PoolGroup(MinerConfigValue):
     def from_mara(cls, web_config_pools: dict) -> "PoolGroup":
         return cls(pools=[Pool.from_mara(pool_conf) for pool_conf in web_config_pools])
 
+    @classmethod
+    def from_bitaxe(cls, web_system_info: dict) -> "PoolGroup":
+        return cls(pools=[Pool.from_bitaxe(web_system_info)])
+
 
 @dataclass
 class PoolConfig(MinerConfigValue):
@@ -423,7 +465,12 @@ class PoolConfig(MinerConfigValue):
         return {"group": [PoolGroup().as_bosminer()]}
 
     def as_boser(self, user_suffix: str = None) -> dict:
-        return {}
+        return {
+            "set_pool_groups": SetPoolGroupsRequest(
+                save_action=SaveAction.SAVE_ACTION_SAVE_AND_APPLY,
+                pool_groups=[g.as_boser(user_suffix=user_suffix) for g in self.groups],
+            )
+        }
 
     def as_auradine(self, user_suffix: str = None) -> dict:
         if len(self.groups) > 0:
@@ -456,6 +503,9 @@ class PoolConfig(MinerConfigValue):
             return {"pools": self.groups[0].as_mara(user_suffix=user_suffix)}
         return {"pools": []}
 
+    def as_bitaxe(self, user_suffix: str = None) -> dict:
+        return self.groups[0].as_bitaxe(user_suffix=user_suffix)
+
     @classmethod
     def from_api(cls, api_pools: dict) -> "PoolConfig":
         try:
@@ -514,3 +564,7 @@ class PoolConfig(MinerConfigValue):
     @classmethod
     def from_mara(cls, web_config: dict) -> "PoolConfig":
         return cls(groups=[PoolGroup.from_mara(web_config["pools"])])
+
+    @classmethod
+    def from_bitaxe(cls, web_system_info: dict) -> "PoolConfig":
+        return cls(groups=[PoolGroup.from_bitaxe(web_system_info)])

pyasic/config/power_scaling.py

@@ -1,221 +0,0 @@
-# ------------------------------------------------------------------------------
-#  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 __future__ import annotations
-
-from dataclasses import dataclass, field
-
-from pyasic.config.base import MinerConfigOption, MinerConfigValue
-from pyasic.web.braiins_os.proto.braiins.bos.v1 import (
-    DpsPowerTarget,
-    DpsTarget,
-    Power,
-    SetDpsRequest,
-)
-
-
-@dataclass
-class PowerScalingShutdownEnabled(MinerConfigValue):
-    mode: str = field(init=False, default="enabled")
-    duration: int = None
-
-    @classmethod
-    def from_dict(cls, dict_conf: dict | None) -> "PowerScalingShutdownEnabled":
-        return cls(duration=dict_conf.get("duration"))
-
-    def as_bosminer(self) -> dict:
-        cfg = {"shutdown_enabled": True}
-
-        if self.duration is not None:
-            cfg["shutdown_duration"] = self.duration
-
-        return cfg
-
-    def as_boser(self) -> dict:
-        return {"enable_shutdown": True, "shutdown_duration": self.duration}
-
-
-@dataclass
-class PowerScalingShutdownDisabled(MinerConfigValue):
-    mode: str = field(init=False, default="disabled")
-
-    @classmethod
-    def from_dict(cls, dict_conf: dict | None) -> "PowerScalingShutdownDisabled":
-        return cls()
-
-    def as_bosminer(self) -> dict:
-        return {"shutdown_enabled": False}
-
-    def as_boser(self) -> dict:
-        return {"enable_shutdown ": False}
-
-
-class PowerScalingShutdown(MinerConfigOption):
-    enabled = PowerScalingShutdownEnabled
-    disabled = PowerScalingShutdownDisabled
-
-    @classmethod
-    def from_dict(cls, dict_conf: dict | None):
-        if dict_conf is None:
-            return cls.default()
-
-        mode = dict_conf.get("mode")
-        if mode is None:
-            return cls.default()
-
-        clsattr = getattr(cls, mode)
-        if clsattr is not None:
-            return clsattr().from_dict(dict_conf)
-
-    @classmethod
-    def from_bosminer(cls, power_scaling_conf: dict):
-        sd_enabled = power_scaling_conf.get("shutdown_enabled")
-        if sd_enabled is not None:
-            if sd_enabled:
-                return cls.enabled(power_scaling_conf.get("shutdown_duration"))
-            else:
-                return cls.disabled()
-        return None
-
-    @classmethod
-    def from_boser(cls, power_scaling_conf: dict):
-        sd_enabled = power_scaling_conf.get("shutdownEnabled")
-        if sd_enabled is not None:
-            if sd_enabled:
-                try:
-                    return cls.enabled(power_scaling_conf["shutdownDuration"]["hours"])
-                except KeyError:
-                    return cls.enabled()
-            else:
-                return cls.disabled()
-        return None
-
-
-@dataclass
-class PowerScalingEnabled(MinerConfigValue):
-    mode: str = field(init=False, default="enabled")
-    power_step: int = None
-    minimum_power: int = None
-    shutdown_enabled: PowerScalingShutdownEnabled | PowerScalingShutdownDisabled = None
-
-    @classmethod
-    def from_bosminer(cls, power_scaling_conf: dict) -> "PowerScalingEnabled":
-        power_step = power_scaling_conf.get("power_step")
-        min_power = power_scaling_conf.get("min_psu_power_limit")
-        if min_power is None:
-            min_power = power_scaling_conf.get("min_power_target")
-        sd_mode = PowerScalingShutdown.from_bosminer(power_scaling_conf)
-
-        return cls(
-            power_step=power_step, minimum_power=min_power, shutdown_enabled=sd_mode
-        )
-
-    @classmethod
-    def from_dict(cls, dict_conf: dict | None) -> "PowerScalingEnabled":
-        cls_conf = {
-            "power_step": dict_conf.get("power_step"),
-            "minimum_power": dict_conf.get("minimum_power"),
-        }
-        shutdown_enabled = dict_conf.get("shutdown_enabled")
-        if shutdown_enabled is not None:
-            cls_conf["shutdown_enabled"] = PowerScalingShutdown.from_dict(
-                shutdown_enabled
-            )
-        return cls(**cls_conf)
-
-    def as_bosminer(self) -> dict:
-        cfg = {"enabled": True}
-        if self.power_step is not None:
-            cfg["power_step"] = self.power_step
-        if self.minimum_power is not None:
-            cfg["min_power_target"] = self.minimum_power
-
-        if self.shutdown_enabled is not None:
-            cfg = {**cfg, **self.shutdown_enabled.as_bosminer()}
-
-        return {"performance_scaling": cfg}
-
-    def as_boser(self) -> dict:
-        return {
-            "set_dps": SetDpsRequest(
-                enable=True,
-                **self.shutdown_enabled.as_boser(),
-                target=DpsTarget(
-                    power_target=DpsPowerTarget(
-                        power_step=Power(self.power_step),
-                        min_power_target=Power(self.minimum_power),
-                    )
-                ),
-            ),
-        }
-
-
-@dataclass
-class PowerScalingDisabled(MinerConfigValue):
-    mode: str = field(init=False, default="disabled")
-
-
-class PowerScalingConfig(MinerConfigOption):
-    enabled = PowerScalingEnabled
-    disabled = PowerScalingDisabled
-
-    @classmethod
-    def default(cls):
-        return cls.disabled()
-
-    @classmethod
-    def from_dict(cls, dict_conf: dict | None):
-        if dict_conf is None:
-            return cls.default()
-
-        mode = dict_conf.get("mode")
-        if mode is None:
-            return cls.default()
-
-        clsattr = getattr(cls, mode)
-        if clsattr is not None:
-            return clsattr().from_dict(dict_conf)
-
-    @classmethod
-    def from_bosminer(cls, toml_conf: dict):
-        power_scaling = toml_conf.get("power_scaling")
-        if power_scaling is None:
-            power_scaling = toml_conf.get("performance_scaling")
-        if power_scaling is not None:
-            enabled = power_scaling.get("enabled")
-            if enabled is not None:
-                if enabled:
-                    return cls.enabled().from_bosminer(power_scaling)
-                else:
-                    return cls.disabled()
-
-        return cls.default()
-
-    @classmethod
-    def from_boser(cls, grpc_miner_conf: dict):
-        try:
-            dps_conf = grpc_miner_conf["dps"]
-            if not dps_conf.get("enabled", False):
-                return cls.disabled()
-        except LookupError:
-            return cls.default()
-
-        conf = {"shutdown_enabled": PowerScalingShutdown.from_boser(dps_conf)}
-
-        if dps_conf.get("minPowerTarget") is not None:
-            conf["minimum_power"] = dps_conf["minPowerTarget"]["watt"]
-        if dps_conf.get("powerStep") is not None:
-            conf["power_step"] = dps_conf["powerStep"]["watt"]
-        return cls.enabled(**conf)

pyasic/data/boards.py

@@ -33,6 +33,9 @@ class HashBoard:
         expected_chips: The expected chip count of the board as an int.
         serial_number: The serial number of the board.
         missing: Whether the board is returned from the miners data as a bool.
+        tuned: Whether the board is tuned as a bool.
+        active: Whether the board is currently tuning as a bool.
+        voltage: Current input voltage of the board as a float.
     """
 
     slot: int = 0
@@ -43,6 +46,9 @@ class HashBoard:
     expected_chips: int = None
     serial_number: str = None
     missing: bool = True
+    tuned: bool = None
+    active: bool = None
+    voltage: float = None
 
     def get(self, __key: str, default: Any = None):
         try:

pyasic/data/pools.py

@@ -1,4 +1,35 @@
 from dataclasses import dataclass, field
+from enum import Enum
+from typing import Optional
+from urllib.parse import urlparse
+
+
+class Scheme(Enum):
+    STRATUM_V1 = "stratum+tcp"
+    STRATUM_V2 = "stratum2+tcp"
+
+
+@dataclass
+class PoolUrl:
+    scheme: Scheme
+    host: str
+    port: int
+    pubkey: Optional[str] = None
+
+    def __str__(self) -> str:
+        if self.scheme == Scheme.STRATUM_V2 and self.pubkey:
+            return f"{self.scheme.value}://{self.host}:{self.port}/{self.pubkey}"
+        else:
+            return f"{self.scheme.value}://{self.host}:{self.port}"
+
+    @classmethod
+    def from_str(cls, url: str) -> "PoolUrl":
+        parsed_url = urlparse(url)
+        scheme = Scheme(parsed_url.scheme)
+        host = parsed_url.hostname
+        port = parsed_url.port
+        pubkey = parsed_url.path.lstrip("/") if scheme == Scheme.STRATUM_V2 else None
+        return cls(scheme=scheme, host=host, port=port, pubkey=pubkey)
 
 
 @dataclass
@@ -19,13 +50,13 @@ class PoolMetrics:
     pool_stale_percent: Percentage of stale shares by the pool.
     """
 
+    url: PoolUrl
     accepted: int = None
     rejected: int = None
     get_failures: int = None
     remote_failures: int = None
     active: bool = None
     alive: bool = None
-    url: str = None
     index: int = None
     user: str = None
     pool_rejected_percent: float = field(init=False)

pyasic/device/makes.py

@@ -25,6 +25,7 @@ class MinerMake(str, Enum):
     GOLDSHELL = "Goldshell"
     AURADINE = "Auradine"
     EPIC = "ePIC"
+    BITAXE = "BitAxe"
 
     def __str__(self):
         return self.value

pyasic/device/models.py

@@ -329,6 +329,15 @@ class AuradineModels(str, Enum):
         return self.value
 
 
+class BitAxeModels(str, Enum):
+    BM1366 = "Ultra"
+    BM1368 = "Supra"
+    BM1397 = "Max"
+
+    def __str__(self):
+        return self.value
+
+
 class MinerModel:
     ANTMINER = AntminerModels
     WHATSMINER = WhatsminerModels
@@ -337,3 +346,4 @@ class MinerModel:
     GOLDSHELL = GoldshellModels
     AURADINE = AuradineModels
     EPIC = ePICModels
+    BITAXE = BitAxeModels

pyasic/miners/antminer/bosminer/X19/S19.py

@@ -29,6 +29,7 @@ from pyasic.miners.device.models import (
     S19kProNoPIC,
     S19Plus,
     S19Pro,
+    S19ProPlusHydro,
 )
 
 
@@ -82,3 +83,7 @@ class BOSMinerS19jProPlusNoPIC(BOSer, S19jProPlusNoPIC):
 
 class BOSMinerS19XP(BOSer, S19XP):
     pass
+
+
+class BOSMinerS19ProPlusHydro(BOSer, S19ProPlusHydro):
+    pass

pyasic/miners/antminer/bosminer/X19/__init__.py

@@ -27,6 +27,7 @@ from .S19 import (
     BOSMinerS19kProNoPIC,
     BOSMinerS19Plus,
     BOSMinerS19Pro,
+    BOSMinerS19ProPlusHydro,
     BOSMinerS19XP,
 )
 from .T19 import BOSMinerT19

pyasic/miners/antminer/vnish/X19/S19.py

@@ -24,6 +24,7 @@ from pyasic.miners.device.models import (
     S19jPro,
     S19NoPIC,
     S19Pro,
+    S19ProHydro,
 )
 
 
@@ -57,3 +58,7 @@ class VNishS19j(VNish, S19j):
 
 class VNishS19jPro(VNish, S19jPro):
     pass
+
+
+class VNishS19ProHydro(VNish, S19ProHydro):
+    pass

pyasic/miners/antminer/vnish/X19/__init__.py

@@ -22,6 +22,7 @@ from .S19 import (
     VNishS19jPro,
     VNishS19NoPIC,
     VNishS19Pro,
+    VNishS19ProHydro,
     VNishS19XP,
 )
 from .T19 import VNishT19

pyasic/miners/backends/antminer.py

@@ -19,6 +19,8 @@ from typing import List, Optional, Union
 from pyasic.config import MinerConfig, MiningModeConfig
 from pyasic.data import AlgoHashRate, Fan, HashBoard, HashUnit
 from pyasic.data.error_codes import MinerErrorData, X19Error
+from pyasic.data.pools import PoolMetrics, PoolUrl
+from pyasic.errors import APIError
 from pyasic.miners.backends.bmminer import BMMiner
 from pyasic.miners.backends.cgminer import CGMiner
 from pyasic.miners.data import (
@@ -31,8 +33,6 @@ from pyasic.miners.data import (
 from pyasic.rpc.antminer import AntminerRPCAPI
 from pyasic.ssh.antminer import AntminerModernSSH
 from pyasic.web.antminer import AntminerModernWebAPI, AntminerOldWebAPI
-from pyasic.data.pools import PoolMetrics
-from pyasic.errors import APIError
 
 ANTMINER_MODERN_DATA_LOC = DataLocations(
     **{
@@ -95,7 +95,7 @@ class AntminerModern(BMMiner):
     web: AntminerModernWebAPI
 
     _rpc_cls = AntminerRPCAPI
-    web: AntminerRPCAPI
+    rpc: AntminerRPCAPI
 
     _ssh_cls = AntminerModernSSH
     ssh: AntminerModernSSH
@@ -156,7 +156,7 @@ class AntminerModern(BMMiner):
         await self.send_config(cfg)
         return True
 
-    async def _get_hostname(self, web_get_system_info: dict = None) -> Union[str, None]:
+    async def _get_hostname(self, web_get_system_info: dict = None) -> Optional[str]:
         if web_get_system_info is None:
             try:
                 web_get_system_info = await self.web.get_system_info()
@@ -169,7 +169,7 @@ class AntminerModern(BMMiner):
             except KeyError:
                 pass
 
-    async def _get_mac(self, web_get_system_info: dict = None) -> Union[str, None]:
+    async def _get_mac(self, web_get_system_info: dict = None) -> Optional[str]:
         if web_get_system_info is None:
             try:
                 web_get_system_info = await self.web.get_system_info()
@@ -264,7 +264,9 @@ class AntminerModern(BMMiner):
                 pass
         return self.light
 
-    async def _get_expected_hashrate(self, rpc_stats: dict = None) -> Optional[float]:
+    async def _get_expected_hashrate(
+        self, rpc_stats: dict = None
+    ) -> Optional[AlgoHashRate]:
         if rpc_stats is None:
             try:
                 rpc_stats = await self.rpc.stats()
@@ -368,6 +370,8 @@ class AntminerModern(BMMiner):
             try:
                 pools = rpc_pools.get("POOLS", [])
                 for pool_info in pools:
+                    url = pool_info.get("URL")
+                    pool_url = PoolUrl.from_str(url) if url else None
                     pool_data = PoolMetrics(
                         accepted=pool_info.get("Accepted"),
                         rejected=pool_info.get("Rejected"),
@@ -375,10 +379,9 @@ class AntminerModern(BMMiner):
                         remote_failures=pool_info.get("Remote Failures"),
                         active=pool_info.get("Stratum Active"),
                         alive=pool_info.get("Status") == "Alive",
-                        url=pool_info.get("URL"),
+                        url=pool_url,
                         user=pool_info.get("User"),
-                        index=pool_info.get("POOL")
-
+                        index=pool_info.get("POOL"),
                     )
                     pools_data.append(pool_data)
             except LookupError:
@@ -446,7 +449,7 @@ class AntminerOld(CGMiner):
         self.config = config
         await self.web.set_miner_conf(config.as_am_old(user_suffix=user_suffix))
 
-    async def _get_mac(self) -> Union[str, None]:
+    async def _get_mac(self) -> Optional[str]:
         try:
             data = await self.web.get_system_info()
             if data:

pyasic/miners/backends/auradine.py

@@ -236,7 +236,7 @@ class Auradine(StockFirmware):
             except LookupError:
                 pass
 
-    async def _get_hashrate(self, rpc_summary: dict = None) -> Optional[float]:
+    async def _get_hashrate(self, rpc_summary: dict = None) -> Optional[AlgoHashRate]:
         if rpc_summary is None:
             try:
                 rpc_summary = await self.rpc.summary()

pyasic/miners/backends/avalonminer.py

@@ -173,7 +173,7 @@ class AvalonMiner(CGMiner):
             except (KeyError, ValueError):
                 pass
 
-    async def _get_hashrate(self, rpc_devs: dict = None) -> Optional[float]:
+    async def _get_hashrate(self, rpc_devs: dict = None) -> Optional[AlgoHashRate]:
         if rpc_devs is None:
             try:
                 rpc_devs = await self.rpc.devs()
@@ -238,7 +238,9 @@ class AvalonMiner(CGMiner):
 
         return hashboards
 
-    async def _get_expected_hashrate(self, rpc_stats: dict = None) -> Optional[float]:
+    async def _get_expected_hashrate(
+        self, rpc_stats: dict = None
+    ) -> Optional[AlgoHashRate]:
         if rpc_stats is None:
             try:
                 rpc_stats = await self.rpc.stats()

pyasic/miners/backends/bfgminer.py

@@ -105,7 +105,7 @@ class BFGMiner(StockFirmware):
 
         return self.fw_ver
 
-    async def _get_hashrate(self, rpc_summary: dict = None) -> Optional[float]:
+    async def _get_hashrate(self, rpc_summary: dict = None) -> Optional[AlgoHashRate]:
         # get hr from API
         if rpc_summary is None:
             try:
@@ -207,7 +207,9 @@ class BFGMiner(StockFirmware):
 
         return fans
 
-    async def _get_expected_hashrate(self, rpc_stats: dict = None) -> Optional[float]:
+    async def _get_expected_hashrate(
+        self, rpc_stats: dict = None
+    ) -> Optional[AlgoHashRate]:
         # X19 method, not sure compatibility
         if rpc_stats is None:
             try:

pyasic/miners/backends/bitaxe.py

@@ -0,0 +1,189 @@
+from typing import List, Optional
+
+from pyasic import APIError, MinerConfig
+from pyasic.data import AlgoHashRate, Fan, HashBoard, HashUnit
+from pyasic.device import MinerFirmware
+from pyasic.miners.base import BaseMiner
+from pyasic.miners.data import DataFunction, DataLocations, DataOptions, WebAPICommand
+from pyasic.web.bitaxe import BitAxeWebAPI
+
+BITAXE_DATA_LOC = DataLocations(
+    **{
+        str(DataOptions.HASHRATE): DataFunction(
+            "_get_hashrate",
+            [WebAPICommand("web_system_info", "system/info")],
+        ),
+        str(DataOptions.WATTAGE): DataFunction(
+            "_get_wattage",
+            [WebAPICommand("web_system_info", "system/info")],
+        ),
+        str(DataOptions.UPTIME): DataFunction(
+            "_get_uptime",
+            [WebAPICommand("web_system_info", "system/info")],
+        ),
+        str(DataOptions.HASHBOARDS): DataFunction(
+            "_get_hashboards",
+            [WebAPICommand("web_system_info", "system/info")],
+        ),
+        str(DataOptions.HOSTNAME): DataFunction(
+            "_get_hostname",
+            [WebAPICommand("web_system_info", "system/info")],
+        ),
+        str(DataOptions.FANS): DataFunction(
+            "_get_fans",
+            [WebAPICommand("web_system_info", "system/info")],
+        ),
+        str(DataOptions.FW_VERSION): DataFunction(
+            "_get_fw_ver",
+            [WebAPICommand("web_system_info", "system/info")],
+        ),
+        str(DataOptions.API_VERSION): DataFunction(
+            "_get_api_ver",
+            [WebAPICommand("web_system_info", "system/info")],
+        ),
+    }
+)
+
+
+class BitAxe(BaseMiner):
+    """Handler for BitAxe"""
+
+    web: BitAxeWebAPI
+    _web_cls = BitAxeWebAPI
+
+    firmware = MinerFirmware.STOCK
+
+    data_locations = BITAXE_DATA_LOC
+
+    async def reboot(self) -> bool:
+        await self.web.restart()
+        return True
+
+    async def get_config(self) -> MinerConfig:
+        web_system_info = await self.web.system_info()
+        return MinerConfig.from_bitaxe(web_system_info)
+
+    async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
+        await self.web.update_settings(**config.as_bitaxe())
+
+    async def _get_wattage(self, web_system_info: dict = None) -> Optional[int]:
+        if web_system_info is None:
+            try:
+                web_system_info = await self.web.system_info()
+            except APIError:
+                pass
+        if web_system_info is not None:
+            try:
+                return round(web_system_info["power"])
+            except KeyError:
+                pass
+
+    async def _get_hashrate(
+        self, web_system_info: dict = None
+    ) -> Optional[AlgoHashRate]:
+        if web_system_info is None:
+            try:
+                web_system_info = await self.web.system_info()
+            except APIError:
+                pass
+
+        if web_system_info is not None:
+            try:
+                return AlgoHashRate.SHA256(
+                    web_system_info["hashRate"], HashUnit.SHA256.GH
+                ).into(self.algo.unit.default)
+            except KeyError:
+                pass
+
+    async def _get_uptime(self, web_system_info: dict = None) -> Optional[int]:
+        if web_system_info is None:
+            try:
+                web_system_info = await self.web.system_info()
+            except APIError:
+                pass
+
+        if web_system_info is not None:
+            try:
+                return web_system_info["uptimeSeconds"]
+            except KeyError:
+                pass
+
+    async def _get_hashboards(self, web_system_info: dict = None) -> List[HashBoard]:
+        if web_system_info is None:
+            try:
+                web_system_info = await self.web.system_info()
+            except APIError:
+                pass
+
+        if web_system_info is not None:
+            try:
+                return [
+                    HashBoard(
+                        hashrate=AlgoHashRate.SHA256(
+                            web_system_info["hashRate"], HashUnit.SHA256.GH
+                        ).into(self.algo.unit.default),
+                        chip_temp=web_system_info.get("temp"),
+                        temp=web_system_info.get("vrTemp"),
+                        chips=web_system_info.get("asicCount", 1),
+                        expected_chips=self.expected_chips,
+                        missing=False,
+                        active=True,
+                        voltage=web_system_info.get("voltage"),
+                    )
+                ]
+            except KeyError:
+                pass
+        return []
+
+    async def _get_fans(self, web_system_info: dict = None) -> List[Fan]:
+        if web_system_info is None:
+            try:
+                web_system_info = await self.web.system_info()
+            except APIError:
+                pass
+
+        if web_system_info is not None:
+            try:
+                return [Fan(speed=web_system_info["fanrpm"])]
+            except KeyError:
+                pass
+        return []
+
+    async def _get_hostname(self, web_system_info: dict = None) -> Optional[str]:
+        if web_system_info is None:
+            try:
+                web_system_info = await self.web.system_info()
+            except APIError:
+                pass
+
+        if web_system_info is not None:
+            try:
+                return web_system_info["hostname"]
+            except KeyError:
+                pass
+
+    async def _get_api_ver(self, web_system_info: dict = None) -> Optional[str]:
+        if web_system_info is None:
+            try:
+                web_system_info = await self.web.system_info()
+            except APIError:
+                pass
+
+        if web_system_info is not None:
+            try:
+                return web_system_info["version"]
+            except KeyError:
+                pass
+
+    async def _get_fw_ver(self, web_system_info: dict = None) -> Optional[str]:
+        if web_system_info is None:
+            try:
+                web_system_info = await self.web.system_info()
+            except APIError:
+                pass
+
+        if web_system_info is not None:
+            try:
+                return web_system_info["version"]
+            except KeyError:
+                pass

pyasic/miners/backends/bmminer.py

@@ -109,7 +109,7 @@ class BMMiner(StockFirmware):
 
         return self.fw_ver
 
-    async def _get_hashrate(self, rpc_summary: dict = None) -> Optional[float]:
+    async def _get_hashrate(self, rpc_summary: dict = None) -> Optional[AlgoHashRate]:
         # get hr from API
         if rpc_summary is None:
             try:
@@ -223,7 +223,9 @@ class BMMiner(StockFirmware):
 
         return fans
 
-    async def _get_expected_hashrate(self, rpc_stats: dict = None) -> Optional[float]:
+    async def _get_expected_hashrate(
+        self, rpc_stats: dict = None
+    ) -> Optional[AlgoHashRate]:
         # X19 method, not sure compatibility
         if rpc_stats is None:
             try:

pyasic/miners/backends/braiins_os.py

@@ -13,16 +13,20 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
+import base64
 import logging
 import time
+from pathlib import Path
 from typing import List, Optional, Union
 
+import aiofiles
 import toml
 
 from pyasic.config import MinerConfig
 from pyasic.config.mining import MiningModePowerTune
 from pyasic.data import AlgoHashRate, Fan, HashBoard, HashUnit
 from pyasic.data.error_codes import BraiinsOSError, MinerErrorData
+from pyasic.data.pools import PoolMetrics, PoolUrl
 from pyasic.errors import APIError
 from pyasic.miners.data import (
     DataFunction,
@@ -91,6 +95,10 @@ BOSMINER_DATA_LOC = DataLocations(
             "_get_uptime",
             [RPCAPICommand("rpc_summary", "summary")],
         ),
+        str(DataOptions.POOLS): DataFunction(
+            "_get_pools",
+            [RPCAPICommand("rpc_pools", "pools")],
+        ),
     }
 )
 
@@ -181,7 +189,6 @@ class BOSMiner(BraiinsOSFirmware):
 
     async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
         self.config = config
-        print(config)
         parsed_cfg = config.as_bosminer(user_suffix=user_suffix)
 
         toml_conf = toml.dumps(
@@ -341,7 +348,7 @@ class BOSMiner(BraiinsOSFirmware):
             return None
         return hostname
 
-    async def _get_hashrate(self, rpc_summary: dict = None) -> Optional[float]:
+    async def _get_hashrate(self, rpc_summary: dict = None) -> Optional[AlgoHashRate]:
         if rpc_summary is None:
             try:
                 rpc_summary = await self.rpc.summary()
@@ -517,7 +524,9 @@ class BOSMiner(BraiinsOSFirmware):
         except (TypeError, AttributeError):
             return self.light
 
-    async def _get_expected_hashrate(self, rpc_devs: dict = None) -> Optional[float]:
+    async def _get_expected_hashrate(
+        self, rpc_devs: dict = None
+    ) -> Optional[AlgoHashRate]:
         if rpc_devs is None:
             try:
                 rpc_devs = await self.rpc.devs()
@@ -570,6 +579,85 @@ class BOSMiner(BraiinsOSFirmware):
             except LookupError:
                 pass
 
+    async def _get_pools(self, rpc_pools: dict = None) -> List[PoolMetrics]:
+        if rpc_pools is None:
+            try:
+                rpc_pools = await self.rpc.pools()
+            except APIError:
+                pass
+
+        pools_data = []
+        if rpc_pools is not None:
+            try:
+                pools = rpc_pools.get("POOLS", [])
+                for pool_info in pools:
+                    url = pool_info.get("URL")
+                    pool_url = PoolUrl.from_str(url) if url else None
+                    pool_data = PoolMetrics(
+                        accepted=pool_info.get("Accepted"),
+                        rejected=pool_info.get("Rejected"),
+                        get_failures=pool_info.get("Get Failures"),
+                        remote_failures=pool_info.get("Remote Failures"),
+                        active=pool_info.get("Stratum Active"),
+                        alive=pool_info.get("Status") == "Alive",
+                        url=pool_url,
+                        user=pool_info.get("User"),
+                        index=pool_info.get("POOL"),
+                    )
+                    pools_data.append(pool_data)
+            except LookupError:
+                pass
+        return pools_data
+
+    async def upgrade_firmware(self, file: Path):
+        """
+        Upgrade the firmware of the BOSMiner device.
+
+        Args:
+            file (Path): The local file path of the firmware to be uploaded.
+
+        Returns:
+            str: Confirmation message after upgrading the firmware.
+        """
+        try:
+            logging.info("Starting firmware upgrade process.")
+
+            if not file:
+                raise ValueError("File location must be provided for firmware upgrade.")
+
+            # Read the firmware file contents
+            async with aiofiles.open(file, "rb") as f:
+                upgrade_contents = await f.read()
+
+            # Encode the firmware contents in base64
+            encoded_contents = base64.b64encode(upgrade_contents).decode("utf-8")
+
+            # Upload the firmware file to the BOSMiner device
+            logging.info(f"Uploading firmware file from {file} to the device.")
+            await self.ssh.send_command(
+                f"echo {encoded_contents} | base64 -d > /tmp/firmware.tar && sysupgrade /tmp/firmware.tar"
+            )
+
+            logging.info("Firmware upgrade process completed successfully.")
+            return "Firmware upgrade completed successfully."
+        except FileNotFoundError as e:
+            logging.error(f"File not found during the firmware upgrade process: {e}")
+            raise
+        except ValueError as e:
+            logging.error(
+                f"Validation error occurred during the firmware upgrade process: {e}"
+            )
+            raise
+        except OSError as e:
+            logging.error(f"OS error occurred during the firmware upgrade process: {e}")
+            raise
+        except Exception as e:
+            logging.error(
+                f"An unexpected error occurred during the firmware upgrade process: {e}",
+                exc_info=True,
+            )
+            raise
+
 
 BOSER_DATA_LOC = DataLocations(
     **{
@@ -633,6 +721,10 @@ BOSER_DATA_LOC = DataLocations(
             "_get_uptime",
             [RPCAPICommand("rpc_summary", "summary")],
         ),
+        str(DataOptions.POOLS): DataFunction(
+            "_get_pools",
+            [WebAPICommand("grpc_pool_groups", "get_pool_groups")]
+        )
     }
 )
 
@@ -694,6 +786,11 @@ class BOSer(BraiinsOSFirmware):
 
         return MinerConfig.from_boser(grpc_conf)
 
+    async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
+        boser_cfg = config.as_boser(user_suffix=user_suffix)
+        for key in boser_cfg:
+            await self.web.send_command(key, message=boser_cfg[key])
+
     async def set_power_limit(self, wattage: int) -> bool:
         try:
             result = await self.web.set_power_target(
@@ -779,7 +876,7 @@ class BOSer(BraiinsOSFirmware):
             except LookupError:
                 pass
 
-    async def _get_hashrate(self, rpc_summary: dict = None) -> Optional[float]:
+    async def _get_hashrate(self, rpc_summary: dict = None) -> Optional[AlgoHashRate]:
         if rpc_summary is None:
             try:
                 rpc_summary = await self.rpc.summary()
@@ -796,7 +893,7 @@ class BOSer(BraiinsOSFirmware):
 
     async def _get_expected_hashrate(
         self, grpc_miner_details: dict = None
-    ) -> Optional[float]:
+    ) -> Optional[AlgoHashRate]:
         if grpc_miner_details is None:
             try:
                 grpc_miner_details = await self.web.get_miner_details()
@@ -971,3 +1068,27 @@ class BOSer(BraiinsOSFirmware):
                 return int(rpc_summary["SUMMARY"][0]["Elapsed"])
             except LookupError:
                 pass
+
+    async def _get_pools(self, grpc_pool_groups: dict = None) -> List[PoolMetrics]:
+        if grpc_pool_groups is None:
+            try:
+                grpc_pool_groups = await self.web.get_pool_groups()
+            except APIError:
+                return []
+        pools_data = []
+        for group in grpc_pool_groups["poolGroups"]:
+            for idx, pool_info in enumerate(group["pools"]):
+                pool_data = PoolMetrics(
+                    url=pool_info["url"],
+                    user=pool_info["user"],
+                    index=idx,
+                    accepted=pool_info["stats"]["acceptedShares"],
+                    rejected=pool_info["stats"]["rejectedShares"],
+                    get_failures=pool_info["stats"]["stale_shares"],
+                    remote_failures=0,
+                    active=pool_info["active"],
+                    alive=pool_info["alive"]
+                )
+                pools_data.append(pool_data)
+
+        return pools_data

pyasic/miners/backends/btminer.py

@@ -15,8 +15,11 @@
 # ------------------------------------------------------------------------------
 
 import logging
+from pathlib import Path
 from typing import List, Optional
 
+import aiofiles
+
 from pyasic.config import MinerConfig, MiningModeConfig
 from pyasic.data import AlgoHashRate, Fan, HashBoard, HashUnit
 from pyasic.data.error_codes import MinerErrorData, WhatsminerError
@@ -386,7 +389,7 @@ class BTMiner(StockFirmware):
 
         return hostname
 
-    async def _get_hashrate(self, rpc_summary: dict = None) -> Optional[float]:
+    async def _get_hashrate(self, rpc_summary: dict = None) -> Optional[AlgoHashRate]:
         if rpc_summary is None:
             try:
                 rpc_summary = await self.rpc.summary()
@@ -562,7 +565,9 @@ class BTMiner(StockFirmware):
                 pass
         return errors
 
-    async def _get_expected_hashrate(self, rpc_summary: dict = None) -> Optional[float]:
+    async def _get_expected_hashrate(
+        self, rpc_summary: dict = None
+    ) -> Optional[AlgoHashRate]:
         if rpc_summary is None:
             try:
                 rpc_summary = await self.rpc.summary()
@@ -649,3 +654,48 @@ class BTMiner(StockFirmware):
                 return int(rpc_summary["SUMMARY"][0]["Elapsed"])
             except LookupError:
                 pass
+
+    async def upgrade_firmware(self, file: Path, token: str):
+        """
+        Upgrade the firmware of the Whatsminer device.
+
+        Args:
+            file (Path): The local file path of the firmware to be uploaded.
+            token (str): The authentication token for the firmware upgrade.
+
+        Returns:
+            str: Confirmation message after upgrading the firmware.
+        """
+        try:
+            logging.info("Starting firmware upgrade process for Whatsminer.")
+
+            if not file:
+                raise ValueError("File location must be provided for firmware upgrade.")
+
+            # Read the firmware file contents
+            async with aiofiles.open(file, "rb") as f:
+                upgrade_contents = await f.read()
+
+            result = await self.rpc.update_firmware(upgrade_contents)
+
+            logging.info(
+                "Firmware upgrade process completed successfully for Whatsminer."
+            )
+            return result
+        except FileNotFoundError as e:
+            logging.error(f"File not found during the firmware upgrade process: {e}")
+            raise
+        except ValueError as e:
+            logging.error(
+                f"Validation error occurred during the firmware upgrade process: {e}"
+            )
+            raise
+        except OSError as e:
+            logging.error(f"OS error occurred during the firmware upgrade process: {e}")
+            raise
+        except Exception as e:
+            logging.error(
+                f"An unexpected error occurred during the firmware upgrade process: {e}",
+                exc_info=True,
+            )
+            raise

pyasic/miners/backends/cgminer.py

@@ -109,7 +109,7 @@ class CGMiner(StockFirmware):
 
         return self.fw_ver
 
-    async def _get_hashrate(self, rpc_summary: dict = None) -> Optional[float]:
+    async def _get_hashrate(self, rpc_summary: dict = None) -> Optional[AlgoHashRate]:
         if rpc_summary is None:
             try:
                 rpc_summary = await self.rpc.summary()

pyasic/miners/backends/epic.py

@@ -14,11 +14,13 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
+from pathlib import Path
 from typing import List, Optional
 
 from pyasic.config import MinerConfig
 from pyasic.data import AlgoHashRate, Fan, HashBoard, HashUnit
 from pyasic.data.error_codes import MinerErrorData, X19Error
+from pyasic.data.pools import PoolMetrics
 from pyasic.errors import APIError
 from pyasic.logger import logger
 from pyasic.miners.data import DataFunction, DataLocations, DataOptions, WebAPICommand
@@ -58,10 +60,6 @@ EPIC_DATA_LOC = DataLocations(
             "_get_wattage",
             [WebAPICommand("web_summary", "summary")],
         ),
-        str(DataOptions.VOLTAGE): DataFunction(
-            "_get_voltage",
-            [WebAPICommand("web_summary", "summary")],
-        ),
         str(DataOptions.FANS): DataFunction(
             "_get_fans",
             [WebAPICommand("web_summary", "summary")],
@@ -82,6 +80,10 @@ EPIC_DATA_LOC = DataLocations(
             "_is_mining",
             [WebAPICommand("web_summary", "summary")],
         ),
+        str(DataOptions.POOLS): DataFunction(
+            "_get_pools",
+            [WebAPICommand("web_summary", "summary")],
+        ),
     }
 )
 
@@ -219,21 +221,7 @@ class ePIC(ePICFirmware):
             except KeyError:
                 pass
 
-    async def _get_voltage(self, web_summary: dict = None) -> Optional[float]:
-        if web_summary is None:
-            try:
-                web_summary = await self.web.summary()
-            except APIError:
-                pass
-
-        if web_summary is not None:
-            try:
-                voltage = web_summary["Power Supply Stats"]["Output Voltage"]
-                return voltage
-            except KeyError:
-                pass
-
-    async def _get_hashrate(self, web_summary: dict = None) -> Optional[float]:
+    async def _get_hashrate(self, web_summary: dict = None) -> Optional[AlgoHashRate]:
         if web_summary is None:
             try:
                 web_summary = await self.web.summary()
@@ -252,7 +240,9 @@ class ePIC(ePICFirmware):
             except (LookupError, ValueError, TypeError):
                 pass
 
-    async def _get_expected_hashrate(self, web_summary: dict = None) -> Optional[float]:
+    async def _get_expected_hashrate(
+        self, web_summary: dict = None
+    ) -> Optional[AlgoHashRate]:
         if web_summary is None:
             try:
                 web_summary = await self.web.summary()
@@ -323,6 +313,24 @@ class ePIC(ePICFirmware):
             except APIError:
                 pass
 
+        tuned = True
+        active = False
+        if web_summary is not None:
+            tuner_running = web_summary["PerpetualTune"]["Running"]
+            if tuner_running:
+                active = True
+                algo_info = web_summary["PerpetualTune"]["Algorithm"]
+                if algo_info.get("VoltageOptimizer") is not None:
+                    tuned = algo_info["VoltageOptimizer"].get("Optimized")
+                elif algo_info.get("BoardTune") is not None:
+                    tuned = algo_info["BoardTune"].get("Optimized")
+                else:
+                    tuned = algo_info["ChipTune"].get("Optimized")
+
+            # To be extra detailed, also ensure the miner is in "Mining" state
+            tuned = tuned and web_summary["Status"]["Operating State"] == "Mining"
+            active = active and web_summary["Status"]["Operating State"] == "Mining"
+
         hb_list = [
             HashBoard(slot=i, expected_chips=self.expected_chips)
             for i in range(self.expected_hashboards)
@@ -349,6 +357,9 @@ class ePIC(ePICFirmware):
                     ).into(self.algo.unit.default)
                     hb_list[hb["Index"]].chips = num_of_chips
                     hb_list[hb["Index"]].temp = hb["Temperature"]
+                    hb_list[hb["Index"]].tuned = tuned
+                    hb_list[hb["Index"]].active = active
+                    hb_list[hb["Index"]].voltage = hb["Input Voltage"]
             return hb_list
 
     async def _is_mining(self, web_summary, *args, **kwargs) -> Optional[bool]:
@@ -411,3 +422,48 @@ class ePIC(ePICFirmware):
             except KeyError:
                 pass
         return errors
+
+    async def _get_pools(self, web_summary: dict = None) -> List[PoolMetrics]:
+        if web_summary is None:
+            try:
+                web_summary = await self.web.summary()
+            except APIError:
+                pass
+
+        pool_data = []
+        try:
+            if web_summary is not None:
+                if (
+                    web_summary.get("Session") is not None
+                    and web_summary.get("Stratum") is not None
+                ):
+                    pool_data.append(
+                        PoolMetrics(
+                            accepted=web_summary["Session"].get("Accepted"),
+                            rejected=web_summary["Session"].get("Rejected"),
+                            get_failures=0,
+                            remote_failures=0,
+                            active=web_summary["Stratum"].get("IsPoolConnected"),
+                            alive=web_summary["Stratum"].get("IsPoolConnected"),
+                            url=web_summary["Stratum"].get("Current Pool"),
+                            user=web_summary["Stratum"].get("Current User"),
+                            index=web_summary["Stratum"].get("Config Id"),
+                        )
+                    )
+                return pool_data
+        except LookupError:
+            pass
+
+    async def upgrade_firmware(self, file: Path | str, keep_settings: bool = True) -> bool:
+
+        """
+        Upgrade the firmware of the ePIC miner device.
+
+        Args:
+            file (Path | str): The local file path of the firmware to be uploaded.
+            keep_settings (bool): Whether to keep the current settings after the update.
+
+        Returns:
+            bool: Whether the firmware update succeeded.
+        """
+        return await self.web.system_update(file=file, keep_settings=keep_settings)

pyasic/miners/backends/innosilicon.py

@@ -29,6 +29,7 @@ from pyasic.miners.data import (
     WebAPICommand,
 )
 from pyasic.web.innosilicon import InnosiliconWebAPI
+from pyasic.data.pools import PoolMetrics, PoolUrl
 
 INNOSILICON_DATA_LOC = DataLocations(
     **{
@@ -90,6 +91,10 @@ INNOSILICON_DATA_LOC = DataLocations(
             "_get_uptime",
             [RPCAPICommand("rpc_stats", "stats")],
         ),
+        str(DataOptions.POOLS): DataFunction(
+            "_get_pools",
+            [RPCAPICommand("rpc_pools", "pools")]
+        )
     }
 )
 
@@ -111,7 +116,7 @@ class Innosilicon(CGMiner):
         except APIError:
             return self.config
 
-        self.config = MinerConfig.from_inno(pools)
+        self.config = MinerConfig.from_inno([pools])
         return self.config
 
     async def reboot(self) -> bool:
@@ -169,7 +174,7 @@ class Innosilicon(CGMiner):
 
     async def _get_hashrate(
         self, rpc_summary: dict = None, web_get_all: dict = None
-    ) -> Optional[float]:
+    ) -> Optional[AlgoHashRate]:
         if web_get_all:
             web_get_all = web_get_all["all"]
 
@@ -365,3 +370,33 @@ class Innosilicon(CGMiner):
                 level = int(level)
                 limit = 1250 + (250 * level)
                 return limit
+
+    async def _get_pools(self, rpc_pools: dict = None) -> List[PoolMetrics]:
+        if rpc_pools is None:
+            try:
+                rpc_pools = await self.rpc.pools()
+            except APIError:
+                pass
+
+        pools_data = []
+        if rpc_pools is not None:
+            try:
+                pools = rpc_pools.get("POOLS", [])
+                for pool_info in pools:
+                    url = pool_info.get("URL")
+                    pool_url = PoolUrl.from_str(url) if url else None
+                    pool_data = PoolMetrics(
+                        accepted=pool_info.get("Accepted"),
+                        rejected=pool_info.get("Rejected"),
+                        get_failures=pool_info.get("Get Failures"),
+                        remote_failures=pool_info.get("Remote Failures"),
+                        active=pool_info.get("Stratum Active"),
+                        alive=pool_info.get("Status") == "Alive",
+                        url=pool_url,
+                        user=pool_info.get("User"),
+                        index=pool_info.get("POOL"),
+                    )
+                    pools_data.append(pool_data)
+            except LookupError:
+                pass
+        return pools_data

pyasic/miners/backends/luxminer.py

@@ -17,6 +17,7 @@ from typing import List, Optional
 
 from pyasic.config import MinerConfig
 from pyasic.data import AlgoHashRate, Fan, HashBoard, HashUnit
+from pyasic.data.pools import PoolMetrics, PoolUrl
 from pyasic.errors import APIError
 from pyasic.miners.data import DataFunction, DataLocations, DataOptions, RPCAPICommand
 from pyasic.miners.device.firmware import LuxOSFirmware
@@ -51,6 +52,9 @@ LUXMINER_DATA_LOC = DataLocations(
         str(DataOptions.UPTIME): DataFunction(
             "_get_uptime", [RPCAPICommand("rpc_stats", "stats")]
         ),
+        str(DataOptions.POOLS): DataFunction(
+            "_get_pools", [RPCAPICommand("rpc_pools", "pools")]
+        ),
     }
 )
 
@@ -162,7 +166,7 @@ class LUXMiner(LuxOSFirmware):
 
         return mac
 
-    async def _get_hashrate(self, rpc_summary: dict = None) -> Optional[float]:
+    async def _get_hashrate(self, rpc_summary: dict = None) -> Optional[AlgoHashRate]:
         if rpc_summary is None:
             try:
                 rpc_summary = await self.rpc.summary()
@@ -263,7 +267,9 @@ class LUXMiner(LuxOSFirmware):
                     fans.append(Fan())
         return fans
 
-    async def _get_expected_hashrate(self, rpc_stats: dict = None) -> Optional[float]:
+    async def _get_expected_hashrate(
+        self, rpc_stats: dict = None
+    ) -> Optional[AlgoHashRate]:
         if rpc_stats is None:
             try:
                 rpc_stats = await self.rpc.stats()
@@ -295,3 +301,33 @@ class LUXMiner(LuxOSFirmware):
                 return int(rpc_stats["STATS"][1]["Elapsed"])
             except LookupError:
                 pass
+
+    async def _get_pools(self, rpc_pools: dict = None) -> List[PoolMetrics]:
+        if rpc_pools is None:
+            try:
+                rpc_pools = await self.rpc.pools()
+            except APIError:
+                pass
+
+        pools_data = []
+        if rpc_pools is not None:
+            try:
+                pools = rpc_pools.get("POOLS", [])
+                for pool_info in pools:
+                    url = pool_info.get("URL")
+                    pool_url = PoolUrl.from_str(url) if url else None
+                    pool_data = PoolMetrics(
+                        accepted=pool_info.get("Accepted"),
+                        rejected=pool_info.get("Rejected"),
+                        get_failures=pool_info.get("Get Failures"),
+                        remote_failures=pool_info.get("Remote Failures"),
+                        active=pool_info.get("Stratum Active"),
+                        alive=pool_info.get("Status") == "Alive",
+                        url=pool_url,
+                        user=pool_info.get("User"),
+                        index=pool_info.get("POOL"),
+                    )
+                    pools_data.append(pool_data)
+            except LookupError:
+                pass
+        return pools_data

pyasic/miners/backends/marathon.py

@@ -225,7 +225,7 @@ class MaraMiner(MaraFirmware):
             except LookupError:
                 pass
 
-    async def _get_hashrate(self, web_brief: dict = None) -> Optional[float]:
+    async def _get_hashrate(self, web_brief: dict = None) -> Optional[AlgoHashRate]:
         if web_brief is None:
             try:
                 web_brief = await self.web.brief()
@@ -271,7 +271,9 @@ class MaraMiner(MaraFirmware):
                 pass
         return False
 
-    async def _get_expected_hashrate(self, web_brief: dict = None) -> Optional[float]:
+    async def _get_expected_hashrate(
+        self, web_brief: dict = None
+    ) -> Optional[AlgoHashRate]:
         if web_brief is None:
             try:
                 web_brief = await self.web.brief()
@@ -288,7 +290,7 @@ class MaraMiner(MaraFirmware):
 
     async def _get_wattage_limit(
         self, web_miner_config: dict = None
-    ) -> Optional[float]:
+    ) -> Optional[AlgoHashRate]:
         if web_miner_config is None:
             try:
                 web_miner_config = await self.web.get_miner_config()

pyasic/miners/backends/unknown.py

@@ -15,7 +15,7 @@
 from typing import List, Optional, Tuple
 
 from pyasic.config import MinerConfig
-from pyasic.data import Fan, HashBoard
+from pyasic.data import AlgoHashRate, Fan, HashBoard
 from pyasic.data.error_codes import MinerErrorData
 from pyasic.miners.base import BaseMiner
 from pyasic.rpc.unknown import UnknownRPCAPI
@@ -80,7 +80,7 @@ class UnknownMiner(BaseMiner):
     async def _get_hostname(self) -> Optional[str]:
         return None
 
-    async def _get_hashrate(self) -> Optional[float]:
+    async def _get_hashrate(self) -> Optional[AlgoHashRate]:
         return None
 
     async def _get_hashboards(self) -> List[HashBoard]:
@@ -113,7 +113,7 @@ class UnknownMiner(BaseMiner):
     async def _get_fault_light(self) -> bool:
         return False
 
-    async def _get_expected_hashrate(self) -> Optional[float]:
+    async def _get_expected_hashrate(self) -> Optional[AlgoHashRate]:
         return None
 
     async def _is_mining(self, *args, **kwargs) -> Optional[bool]:

pyasic/miners/backends/vnish.py

@@ -193,7 +193,7 @@ class VNish(VNishFirmware, BMMiner):
             except KeyError:
                 pass
 
-    async def _get_hashrate(self, rpc_summary: dict = None) -> Optional[float]:
+    async def _get_hashrate(self, rpc_summary: dict = None) -> Optional[AlgoHashRate]:
         # get hr from API
         if rpc_summary is None:
             try:

pyasic/miners/base.py

@@ -19,7 +19,7 @@ import warnings
 from typing import List, Optional, Protocol, Tuple, Type, TypeVar, Union
 
 from pyasic.config import MinerConfig
-from pyasic.data import Fan, HashBoard, MinerData
+from pyasic.data import AlgoHashRate, Fan, HashBoard, MinerData
 from pyasic.data.device import DeviceInfo
 from pyasic.data.error_codes import MinerErrorData
 from pyasic.data.pools import PoolMetrics
@@ -238,7 +238,7 @@ class MinerProtocol(Protocol):
         """
         return await self._get_hostname()
 
-    async def get_hashrate(self) -> Optional[float]:
+    async def get_hashrate(self) -> Optional[AlgoHashRate]:
         """Get the hashrate of the miner and return it as a float in TH/s.
 
         Returns:
@@ -318,7 +318,7 @@ class MinerProtocol(Protocol):
         """
         return await self._get_fault_light()
 
-    async def get_expected_hashrate(self) -> Optional[float]:
+    async def get_expected_hashrate(self) -> Optional[AlgoHashRate]:
         """Get the nominal hashrate from factory if available.
 
         Returns:
@@ -362,7 +362,7 @@ class MinerProtocol(Protocol):
     async def _get_hostname(self) -> Optional[str]:
         pass
 
-    async def _get_hashrate(self) -> Optional[float]:
+    async def _get_hashrate(self) -> Optional[AlgoHashRate]:
         pass
 
     async def _get_hashboards(self) -> List[HashBoard]:
@@ -392,7 +392,7 @@ class MinerProtocol(Protocol):
     async def _get_fault_light(self) -> Optional[bool]:
         pass
 
-    async def _get_expected_hashrate(self) -> Optional[float]:
+    async def _get_expected_hashrate(self) -> Optional[AlgoHashRate]:
         pass
 
     async def _is_mining(self) -> Optional[bool]:

pyasic/miners/bitaxe/__init__.py

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

pyasic/miners/bitaxe/espminer/BM/BM1366.py

@@ -0,0 +1,6 @@
+from pyasic.miners.backends.bitaxe import BitAxe
+from pyasic.miners.device.models.bitaxe import Ultra
+
+
+class BitAxeUltra(BitAxe, Ultra):
+    pass

pyasic/miners/bitaxe/espminer/BM/BM1368.py

@@ -0,0 +1,6 @@
+from pyasic.miners.backends.bitaxe import BitAxe
+from pyasic.miners.device.models.bitaxe import Supra
+
+
+class BitAxeSupra(BitAxe, Supra):
+    pass

pyasic/miners/bitaxe/espminer/BM/BM1397.py

@@ -0,0 +1,6 @@
+from pyasic.miners.backends.bitaxe import BitAxe
+from pyasic.miners.device.models.bitaxe import Max
+
+
+class BitAxeMax(BitAxe, Max):
+    pass

pyasic/miners/bitaxe/espminer/BM/__init__.py

@@ -0,0 +1,3 @@
+from .BM1366 import BitAxeUltra
+from .BM1368 import BitAxeSupra
+from .BM1397 import BitAxeMax

pyasic/miners/bitaxe/espminer/__init__.py

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

pyasic/miners/data.py

@@ -37,7 +37,6 @@ class DataOptions(Enum):
     IS_MINING = "is_mining"
     UPTIME = "uptime"
     CONFIG = "config"
-    VOLTAGE = "voltage"
     POOLS = "pools"
 
     def __str__(self):

pyasic/miners/device/makes.py

@@ -44,3 +44,7 @@ class AuradineMake(BaseMiner):
 
 class ePICMake(BaseMiner):
     make = MinerMake.EPIC
+
+
+class BitAxeMake(BaseMiner):
+    make = MinerMake.BITAXE

pyasic/miners/device/models/antminer/X3/L3.py

@@ -18,6 +18,6 @@ from pyasic.miners.device.makes import AntMinerMake
 
 
 class L3Plus(AntMinerMake):
-    raw_model = MinerModel.ANTMINER
+    raw_model = MinerModel.ANTMINER.L3Plus
 
     expected_chips = 72

pyasic/miners/device/models/bitaxe/BM/BM1366.py

@@ -0,0 +1,10 @@
+from pyasic.device.models import MinerModel
+from pyasic.miners.device.makes import BitAxeMake
+
+
+class Ultra(BitAxeMake):
+    raw_model = MinerModel.BITAXE.BM1366
+
+    expected_hashboards = 1
+    expected_chips = 1
+    expected_fans = 1

pyasic/miners/device/models/bitaxe/BM/BM1368.py

@@ -0,0 +1,10 @@
+from pyasic.device.models import MinerModel
+from pyasic.miners.device.makes import BitAxeMake
+
+
+class Supra(BitAxeMake):
+    raw_model = MinerModel.BITAXE.BM1368
+
+    expected_hashboards = 1
+    expected_chips = 1
+    expected_fans = 1

pyasic/miners/device/models/bitaxe/BM/BM1397.py

@@ -0,0 +1,10 @@
+from pyasic.device.models import MinerModel
+from pyasic.miners.device.makes import BitAxeMake
+
+
+class Max(BitAxeMake):
+    raw_model = MinerModel.BITAXE.BM1397
+
+    expected_hashboards = 1
+    expected_chips = 1
+    expected_fans = 1

pyasic/miners/device/models/bitaxe/BM/__init__.py

@@ -0,0 +1,3 @@
+from .BM1366 import Ultra
+from .BM1368 import Supra
+from .BM1397 import Max

pyasic/miners/device/models/bitaxe/__init__.py

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

pyasic/miners/factory.py

@@ -31,8 +31,10 @@ from pyasic.miners.antminer import *
 from pyasic.miners.auradine import *
 from pyasic.miners.avalonminer import *
 from pyasic.miners.backends import *
+from pyasic.miners.backends.bitaxe import BitAxe
 from pyasic.miners.backends.unknown import UnknownMiner
 from pyasic.miners.base import AnyMiner
+from pyasic.miners.bitaxe import *
 from pyasic.miners.blockminer import *
 from pyasic.miners.device.makes import *
 from pyasic.miners.goldshell import *
@@ -53,6 +55,7 @@ class MinerTypes(enum.Enum):
     EPIC = 9
     AURADINE = 10
     MARATHON = 11
+    BITAXE = 12
 
 
 MINER_CLASSES = {
@@ -366,6 +369,7 @@ MINER_CLASSES = {
         "ANTMINER S19K PRO NOPIC": BOSMinerS19kProNoPIC,
         "ANTMINER S19K PRO": BOSMinerS19kProNoPIC,
         "ANTMINER S19 XP": BOSMinerS19XP,
+        "ANTMINER S19 PRO+ HYD.": BOSMinerS19ProPlusHydro,
         "ANTMINER T19": BOSMinerT19,
         "ANTMINER S21": BOSMinerS21,
     },
@@ -383,6 +387,7 @@ MINER_CLASSES = {
         "ANTMINER S19J PRO": VNishS19jPro,
         "ANTMINER S19A": VNishS19a,
         "ANTMINER S19A PRO": VNishS19aPro,
+        "ANTMINER S19 PRO HYD.": VNishS19ProHydro,
         "ANTMINER T19": VNishT19,
         "ANTMINER S21": VNishS21,
     },
@@ -438,6 +443,12 @@ MINER_CLASSES = {
         "ANTMINER S21": MaraS21,
         "ANTMINER T21": MaraT21,
     },
+    MinerTypes.BITAXE: {
+        None: BitAxe,
+        "BM1368": BitAxeSupra,
+        "BM1366": BitAxeUltra,
+        "BM1397": BitAxeMax,
+    },
 }
 
 
@@ -514,6 +525,7 @@ class MinerFactory:
                 MinerTypes.LUX_OS: self.get_miner_model_luxos,
                 MinerTypes.AURADINE: self.get_miner_model_auradine,
                 MinerTypes.MARATHON: self.get_miner_model_marathon,
+                MinerTypes.BITAXE: self.get_miner_model_bitaxe,
             }
             fn = miner_model_fns.get(miner_type)
 
@@ -595,6 +607,8 @@ class MinerFactory:
                 return MinerTypes.WHATSMINER
         if "Braiins OS" in web_text:
             return MinerTypes.BRAIINS_OS
+        if "AxeOS" in web_text:
+            return MinerTypes.BITAXE
         if "cloud-box" in web_text:
             return MinerTypes.GOLDSHELL
         if "AnthillOS" in web_text:
@@ -820,7 +834,9 @@ class MinerFactory:
 
     async def _get_model_antminer_web(self, ip: str) -> str | None:
         # last resort, this is slow
-        auth = httpx.DigestAuth("root", "root")
+        auth = httpx.DigestAuth(
+            "root", settings.get("default_antminer_web_password", "root")
+        )
         web_json_data = await self.send_web_command(
             ip, "/cgi-bin/get_system_info.cgi", auth=auth
         )
@@ -1008,6 +1024,18 @@ class MinerFactory:
         except (TypeError, LookupError):
             pass
 
+    async def get_miner_model_bitaxe(self, ip: str) -> str | None:
+        web_json_data = await self.send_web_command(ip, "/api/system/info")
+
+        try:
+            miner_model = web_json_data["ASICModel"]
+            if miner_model == "":
+                return None
+
+            return miner_model
+        except (TypeError, LookupError):
+            pass
+
 
 miner_factory = MinerFactory()
 

pyasic/rpc/btminer.py

@@ -23,6 +23,7 @@ import json
 import logging
 import re
 from typing import Literal, Union
+import struct
 
 import httpx
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
@@ -559,11 +560,24 @@ class BTMinerRPCAPI(BaseMinerRPCAPI):
         """
         return await self.send_privileged_command("set_normal_power")
 
-    async def update_firmware(self):  # noqa - static
-        """Not implemented."""
-        # to be determined if this will be added later
-        # requires a file stream in bytes
-        return NotImplementedError
+    async def update_firmware(self, firmware: bytes):
+        """Upgrade the firmware running on the miner and using the firmware passed in bytes.
+
+        Parameters:
+            firmware (bytes): The firmware binary data to be uploaded.
+
+        Returns:
+            bool: A boolean indicating the success of the firmware upgrade.
+
+        Raises:
+            APIError: If the miner is not ready for firmware update.
+        """
+        ready = await self.send_privileged_command("upgrade_firmware")
+        if not ready.get("Msg") == "ready":
+            raise APIError(f"Not ready for firmware update: {self}")
+        file_size = struct.pack("<I", len(firmware))
+        await self._send_bytes(file_size + firmware)
+        return True
 
     async def reboot(self, timeout: int = 10) -> dict:
         """Reboot the miner using the API.

pyasic/web/bitaxe.py

@@ -0,0 +1,96 @@
+from __future__ import annotations
+
+import asyncio
+import json
+from typing import Any
+
+import httpx
+
+from pyasic import APIError, settings
+from pyasic.web.base import BaseWebAPI
+
+
+class BitAxeWebAPI(BaseWebAPI):
+    async def send_command(
+        self,
+        command: str | bytes,
+        ignore_errors: bool = False,
+        allow_warning: bool = True,
+        privileged: bool = False,
+        **parameters: Any,
+    ) -> dict:
+        url = f"http://{self.ip}:{self.port}/api/{command}"
+        try:
+            async with httpx.AsyncClient(
+                transport=settings.transport(),
+            ) as client:
+                if parameters.get("post", False):
+                    parameters.pop("post")
+                    data = await client.post(
+                        url,
+                        timeout=settings.get("api_function_timeout", 3),
+                        json=parameters,
+                    )
+                elif parameters.get("patch", False):
+                    parameters.pop("patch")
+                    data = await client.patch(
+                        url,
+                        timeout=settings.get("api_function_timeout", 3),
+                        json=parameters,
+                    )
+                else:
+                    data = await client.get(url)
+        except httpx.HTTPError:
+            pass
+        else:
+            if data.status_code == 200:
+                try:
+                    return data.json()
+                except json.decoder.JSONDecodeError:
+                    pass
+
+    async def multicommand(
+        self, *commands: str, ignore_errors: bool = False, allow_warning: bool = True
+    ) -> dict:
+        """Execute multiple commands simultaneously on the BitAxe miner.
+
+        Args:
+            *commands (str): Commands to execute.
+            ignore_errors (bool): Whether to ignore errors during command execution.
+            allow_warning (bool): Whether to proceed despite warnings.
+
+        Returns:
+            dict: A dictionary containing responses for all commands executed.
+        """
+        tasks = {}
+        # send all commands individually
+        for cmd in commands:
+            tasks[cmd] = asyncio.create_task(
+                self.send_command(cmd, allow_warning=allow_warning)
+            )
+
+        await asyncio.gather(*[tasks[cmd] for cmd in tasks], return_exceptions=True)
+
+        data = {"multicommand": True}
+        for cmd in tasks:
+            try:
+                result = tasks[cmd].result()
+                if result is None or result == {}:
+                    result = {}
+                data[cmd] = result
+            except APIError:
+                pass
+
+        return data
+
+    async def system_info(self):
+        return await self.send_command("system/info")
+
+    async def swarm_info(self):
+        return await self.send_command("swarm/info")
+
+    async def restart(self):
+        return await self.send_command("system/restart", post=True)
+
+    async def update_settings(self, **config):
+        return await self.send_command("system", patch=True, **config)

pyasic/web/braiins_os/boser.py

@@ -414,15 +414,6 @@ class BOSerWebAPI(BaseWebAPI):
             "get_pool_groups", message=GetPoolGroupsRequest(), privileged=True
         )
 
-    async def create_pool_group(self) -> dict:
-        raise NotImplementedError
-
-    async def update_pool_group(self) -> dict:
-        raise NotImplementedError
-
-    async def remove_pool_group(self) -> dict:
-        raise NotImplementedError
-
     async def get_miner_configuration(self) -> dict:
         return await self.send_command(
             "get_miner_configuration",
@@ -490,3 +481,15 @@ class BOSerWebAPI(BaseWebAPI):
             ),
             privileged=True,
         )
+
+    async def set_pool_groups(
+        self,
+        pool_groups: List[PoolGroupConfiguration],
+        save_action: SaveAction = SaveAction.SAVE_ACTION_SAVE_AND_APPLY,
+    ) -> dict:
+        return await self.send_command(
+            "set_pool_groups",
+            message=SetPoolGroupsRequest(
+                save_action=save_action, pool_groups=pool_groups
+            ),
+        )

pyasic/web/braiins_os/proto/braiins/bos/__init__.py

@@ -18,7 +18,7 @@ if TYPE_CHECKING:
 
 @dataclass(eq=False, repr=False)
 class ApiVersion(betterproto.Message):
-    """LATEST_API_VERSION=1.0.0-beta.4"""
+    """LATEST_API_VERSION=1.2.0"""
 
     major: int = betterproto.uint64_field(1)
     minor: int = betterproto.uint64_field(2)
@@ -52,6 +52,7 @@ class ApiVersionServiceStub(betterproto.ServiceStub):
 
 
 class ApiVersionServiceBase(ServiceBase):
+
     async def get_api_version(
         self, api_version_request: "ApiVersionRequest"
     ) -> "ApiVersion":

pyasic/web/braiins_os/proto/braiins/bos/v1/__init__.py

@@ -1,5 +1,5 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# sources: bos/v1/actions.proto, bos/v1/authentication.proto, bos/v1/common.proto, bos/v1/configuration.proto, bos/v1/constraints.proto, bos/v1/cooling.proto, bos/v1/license.proto, bos/v1/miner.proto, bos/v1/performance.proto, bos/v1/pool.proto, bos/v1/units.proto, bos/v1/work.proto
+# sources: bos/v1/actions.proto, bos/v1/authentication.proto, bos/v1/common.proto, bos/v1/configuration.proto, bos/v1/constraints.proto, bos/v1/cooling.proto, bos/v1/license.proto, bos/v1/miner.proto, bos/v1/network.proto, bos/v1/performance.proto, bos/v1/pool.proto, bos/v1/units.proto, bos/v1/work.proto
 # plugin: python-betterproto
 # This file has been @generated
 import warnings
@@ -69,6 +69,7 @@ class Platform(betterproto.Enum):
     PLATFORM_AM3_AML = 4
     PLATFORM_STM32MP157C_II1_AM2 = 5
     PLATFORM_CVITEK_BM1_AM2 = 6
+    PLATFORM_ZYNQ_BM3_AM2 = 7
 
 
 class BosMode(betterproto.Enum):
@@ -134,6 +135,12 @@ class SupportArchiveFormat(betterproto.Enum):
     """BOS custom format"""
 
 
+class NetworkProtocol(betterproto.Enum):
+    NETWORK_PROTOCOL_UNSPECIFIED = 0
+    NETWORK_PROTOCOL_DHCP = 1
+    NETWORK_PROTOCOL_STATIC = 2
+
+
 @dataclass(eq=False, repr=False)
 class StartRequest(betterproto.Message):
     """Request for start bosminer action."""
@@ -256,7 +263,14 @@ class LoginRequest(betterproto.Message):
 class LoginResponse(betterproto.Message):
     """Response for login action."""
 
-    pass
+    token: str = betterproto.string_field(1)
+    """Token to be used for authentication"""
+
+    timeout_s: int = betterproto.uint32_field(2)
+    """
+    Authentication token validity/timeout in seconds. Token validity refreshed
+    to this value with each request.
+    """
 
 
 @dataclass(eq=False, repr=False)
@@ -555,7 +569,16 @@ class TunerConfiguration(betterproto.Message):
 @dataclass(eq=False, repr=False)
 class TunerConstraints(betterproto.Message):
     power_target: "PowerConstraints" = betterproto.message_field(1)
+    """Tuner power target mode constraints"""
+
     hashrate_target: "HashrateConstraints" = betterproto.message_field(2)
+    """Tuner hashrate target mode constraints"""
+
+    enabled: "BooleanConstraint" = betterproto.message_field(3)
+    """Tuner enabled enabled default value"""
+
+    default_mode: "TunerMode" = betterproto.enum_field(4)
+    """Default tuner mode"""
 
 
 @dataclass(eq=False, repr=False)
@@ -618,6 +641,9 @@ class DpsConstraints(betterproto.Message):
     shutdown_duration: "DurationConstraints" = betterproto.message_field(6)
     """Dynamic Performance Scaling shutdown duration constraints"""
 
+    enabled: "BooleanConstraint" = betterproto.message_field(7)
+    """Dynamic Performance Scaling enabled default value"""
+
 
 @dataclass(eq=False, repr=False)
 class HashboardConstraints(betterproto.Message):
@@ -1104,6 +1130,11 @@ class PoolStats(betterproto.Message):
     generated_work: int = betterproto.uint64_field(6)
     """Generated work"""
 
+    last_share_time: Optional[datetime] = betterproto.message_field(
+        7, optional=True, group="_last_share_time"
+    )
+    """Last share time"""
+
 
 @dataclass(eq=False, repr=False)
 class GetPoolGroupsRequest(betterproto.Message):
@@ -1184,6 +1215,33 @@ class RemovePoolGroupResponse(betterproto.Message):
     pass
 
 
+@dataclass(eq=False, repr=False)
+class SetPoolGroupsRequest(betterproto.Message):
+    """Request for setting pool groups"""
+
+    save_action: "SaveAction" = betterproto.enum_field(1)
+    """
+    Save action SAVE just update config but changes will not be applied
+    SAVE_AND_APPLY and SAVE_AND_FORCE_APPLY are equal for this method. Pools
+    config will be updated and changes will be applied that will trigger
+    restart.
+    """
+
+    pool_groups: List["PoolGroupConfiguration"] = betterproto.message_field(2)
+    """
+    Pool groups configuration `uid` must not be specified (it will be
+    generated)
+    """
+
+
+@dataclass(eq=False, repr=False)
+class SetPoolGroupsResponse(betterproto.Message):
+    """Response on setting pool groups"""
+
+    pool_groups: List["PoolGroupConfiguration"] = betterproto.message_field(1)
+    """Configured pool groups"""
+
+
 @dataclass(eq=False, repr=False)
 class GetMinerConfigurationRequest(betterproto.Message):
     pass
@@ -1234,8 +1292,9 @@ class NoneLicense(betterproto.Message):
     time_to_restricted: int = betterproto.uint32_field(1)
     """
     BOS Initialization timeout - number of seconds elapsed since bosminer start
-    i.e., number of seconds BOS will start mining in restricted mode burning
-    15% of hashrate
+    i.e., number of seconds BOS will start mining in restricted mode burning 5%
+    of hashrate For more, see Section 3.10 of
+    https://braiins.com/os/plus/license
     """
 
 
@@ -1350,6 +1409,27 @@ class BosVersion(betterproto.Message):
     bos_plus: bool = betterproto.bool_field(3)
 
 
+@dataclass(eq=False, repr=False)
+class ErrorCode(betterproto.Message):
+    code: str = betterproto.string_field(1)
+    reason: str = betterproto.string_field(2)
+    hint: str = betterproto.string_field(3)
+
+
+@dataclass(eq=False, repr=False)
+class Component(betterproto.Message):
+    name: str = betterproto.string_field(1)
+    index: int = betterproto.uint32_field(2)
+
+
+@dataclass(eq=False, repr=False)
+class MinerError(betterproto.Message):
+    timestamp: str = betterproto.string_field(1)
+    message: str = betterproto.string_field(2)
+    error_codes: List["ErrorCode"] = betterproto.message_field(3)
+    components: List["Component"] = betterproto.message_field(4)
+
+
 @dataclass(eq=False, repr=False)
 class GetMinerStatusRequest(betterproto.Message):
     pass
@@ -1402,6 +1482,12 @@ class GetMinerDetailsResponse(betterproto.Message):
     system_uptime_s: int = betterproto.uint64_field(11)
     """System uptime"""
 
+    status: "MinerStatus" = betterproto.enum_field(12)
+    """Miner status"""
+
+    kernel_version: str = betterproto.string_field(13)
+    """Kernel version"""
+
     def __post_init__(self) -> None:
         super().__post_init__()
         if self.is_set("system_uptime"):
@@ -1437,6 +1523,17 @@ class GetMinerStatsResponse(betterproto.Message):
     """Miner power stats"""
 
 
+@dataclass(eq=False, repr=False)
+class GetErrorsRequest(betterproto.Message):
+    pass
+
+
+@dataclass(eq=False, repr=False)
+class GetErrorsResponse(betterproto.Message):
+    errors: List["MinerError"] = betterproto.message_field(1)
+    """Array of errors"""
+
+
 @dataclass(eq=False, repr=False)
 class Hashboard(betterproto.Message):
     """Structure to handle HB details"""
@@ -1467,6 +1564,9 @@ class Hashboard(betterproto.Message):
     stats: "WorkSolverStats" = betterproto.message_field(8)
     """Hashboard stats"""
 
+    model: Optional[str] = betterproto.string_field(9, optional=True, group="_model")
+    """Hashboard model"""
+
 
 @dataclass(eq=False, repr=False)
 class GetSupportArchiveRequest(betterproto.Message):
@@ -1530,6 +1630,108 @@ class HashboardEnableState(betterproto.Message):
     """Flag if hashboard is enabled or not"""
 
 
+@dataclass(eq=False, repr=False)
+class GetNetworkConfigurationRequest(betterproto.Message):
+    pass
+
+
+@dataclass(eq=False, repr=False)
+class GetNetworkConfigurationResponse(betterproto.Message):
+    network: "NetworkConfiguration" = betterproto.message_field(1)
+
+
+@dataclass(eq=False, repr=False)
+class SetNetworkConfigurationRequest(betterproto.Message):
+    dhcp: "Dhcp" = betterproto.message_field(1, group="protocol")
+    static: "Static" = betterproto.message_field(2, group="protocol")
+    hostname: Optional[str] = betterproto.string_field(
+        3, optional=True, group="_hostname"
+    )
+    """Hostname. Existing value will be preserved if this field is not set."""
+
+
+@dataclass(eq=False, repr=False)
+class SetNetworkConfigurationResponse(betterproto.Message):
+    network: "NetworkConfiguration" = betterproto.message_field(1)
+
+
+@dataclass(eq=False, repr=False)
+class NetworkConfiguration(betterproto.Message):
+    dhcp: "Dhcp" = betterproto.message_field(1, group="protocol")
+    static: "Static" = betterproto.message_field(2, group="protocol")
+    hostname: str = betterproto.string_field(3)
+    """Hostname"""
+
+
+@dataclass(eq=False, repr=False)
+class Dhcp(betterproto.Message):
+    pass
+
+
+@dataclass(eq=False, repr=False)
+class Static(betterproto.Message):
+    address: str = betterproto.string_field(1)
+    """IP address"""
+
+    netmask: str = betterproto.string_field(2)
+    """Netmask"""
+
+    gateway: str = betterproto.string_field(3)
+    """Gateway"""
+
+    dns_servers: List[str] = betterproto.string_field(4)
+    """DNS servers"""
+
+
+@dataclass(eq=False, repr=False)
+class GetNetworkInfoRequest(betterproto.Message):
+    pass
+
+
+@dataclass(eq=False, repr=False)
+class GetNetworkInfoResponse(betterproto.Message):
+    """
+    Response message for GetCurrentNetworkConfiguration Represents the current
+    network configuration for the default network interface. Only IPv4 is
+    supported.
+    """
+
+    name: str = betterproto.string_field(1)
+    """Name of the network interface"""
+
+    mac_address: Optional[str] = betterproto.string_field(
+        2, optional=True, group="_mac_address"
+    )
+    """MAC address of the network interface"""
+
+    hostname: Optional[str] = betterproto.string_field(
+        3, optional=True, group="_hostname"
+    )
+    """Miner hostname"""
+
+    protocol: Optional["NetworkProtocol"] = betterproto.enum_field(
+        4, optional=True, group="_protocol"
+    )
+    """Network protocol"""
+
+    dns_servers: List[str] = betterproto.string_field(5)
+    """List of configured DNS servers"""
+
+    networks: List["IpNetwork"] = betterproto.message_field(6)
+    """List of assigned IP addresses"""
+
+    default_gateway: Optional[str] = betterproto.string_field(
+        7, optional=True, group="_default_gateway"
+    )
+    """Default gateway/route for the interface"""
+
+
+@dataclass(eq=False, repr=False)
+class IpNetwork(betterproto.Message):
+    address: str = betterproto.string_field(1)
+    netmask: str = betterproto.string_field(2)
+
+
 class ActionsServiceStub(betterproto.ServiceStub):
     async def start(
         self,
@@ -2049,6 +2251,23 @@ class PoolServiceStub(betterproto.ServiceStub):
             metadata=metadata,
         )
 
+    async def set_pool_groups(
+        self,
+        set_pool_groups_request: "SetPoolGroupsRequest",
+        *,
+        timeout: Optional[float] = None,
+        deadline: Optional["Deadline"] = None,
+        metadata: Optional["MetadataLike"] = None
+    ) -> "SetPoolGroupsResponse":
+        return await self._unary_unary(
+            "/braiins.bos.v1.PoolService/SetPoolGroups",
+            set_pool_groups_request,
+            SetPoolGroupsResponse,
+            timeout=timeout,
+            deadline=deadline,
+            metadata=metadata,
+        )
+
 
 class ConfigurationServiceStub(betterproto.ServiceStub):
     async def get_miner_configuration(
@@ -2158,6 +2377,23 @@ class MinerServiceStub(betterproto.ServiceStub):
             metadata=metadata,
         )
 
+    async def get_errors(
+        self,
+        get_errors_request: "GetErrorsRequest",
+        *,
+        timeout: Optional[float] = None,
+        deadline: Optional["Deadline"] = None,
+        metadata: Optional["MetadataLike"] = None
+    ) -> "GetErrorsResponse":
+        return await self._unary_unary(
+            "/braiins.bos.v1.MinerService/GetErrors",
+            get_errors_request,
+            GetErrorsResponse,
+            timeout=timeout,
+            deadline=deadline,
+            metadata=metadata,
+        )
+
     async def get_hashboards(
         self,
         get_hashboards_request: "GetHashboardsRequest",
@@ -2228,7 +2464,61 @@ class MinerServiceStub(betterproto.ServiceStub):
         )
 
 
+class NetworkServiceStub(betterproto.ServiceStub):
+    async def get_network_configuration(
+        self,
+        get_network_configuration_request: "GetNetworkConfigurationRequest",
+        *,
+        timeout: Optional[float] = None,
+        deadline: Optional["Deadline"] = None,
+        metadata: Optional["MetadataLike"] = None
+    ) -> "GetNetworkConfigurationResponse":
+        return await self._unary_unary(
+            "/braiins.bos.v1.NetworkService/GetNetworkConfiguration",
+            get_network_configuration_request,
+            GetNetworkConfigurationResponse,
+            timeout=timeout,
+            deadline=deadline,
+            metadata=metadata,
+        )
+
+    async def set_network_configuration(
+        self,
+        set_network_configuration_request: "SetNetworkConfigurationRequest",
+        *,
+        timeout: Optional[float] = None,
+        deadline: Optional["Deadline"] = None,
+        metadata: Optional["MetadataLike"] = None
+    ) -> "SetNetworkConfigurationResponse":
+        return await self._unary_unary(
+            "/braiins.bos.v1.NetworkService/SetNetworkConfiguration",
+            set_network_configuration_request,
+            SetNetworkConfigurationResponse,
+            timeout=timeout,
+            deadline=deadline,
+            metadata=metadata,
+        )
+
+    async def get_network_info(
+        self,
+        get_network_info_request: "GetNetworkInfoRequest",
+        *,
+        timeout: Optional[float] = None,
+        deadline: Optional["Deadline"] = None,
+        metadata: Optional["MetadataLike"] = None
+    ) -> "GetNetworkInfoResponse":
+        return await self._unary_unary(
+            "/braiins.bos.v1.NetworkService/GetNetworkInfo",
+            get_network_info_request,
+            GetNetworkInfoResponse,
+            timeout=timeout,
+            deadline=deadline,
+            metadata=metadata,
+        )
+
+
 class ActionsServiceBase(ServiceBase):
+
     async def start(self, start_request: "StartRequest") -> "StartResponse":
         raise grpclib.GRPCError(grpclib.const.Status.UNIMPLEMENTED)
 
@@ -2357,26 +2647,23 @@ class ActionsServiceBase(ServiceBase):
                 RebootRequest,
                 RebootResponse,
             ),
-            "/braiins.bos.v1.ActionsService/SetLocateDeviceStatus": (
-                grpclib.const.Handler(
-                    self.__rpc_set_locate_device_status,
-                    grpclib.const.Cardinality.UNARY_UNARY,
-                    SetLocateDeviceStatusRequest,
-                    LocateDeviceStatusResponse,
-                )
+            "/braiins.bos.v1.ActionsService/SetLocateDeviceStatus": grpclib.const.Handler(
+                self.__rpc_set_locate_device_status,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                SetLocateDeviceStatusRequest,
+                LocateDeviceStatusResponse,
             ),
-            "/braiins.bos.v1.ActionsService/GetLocateDeviceStatus": (
-                grpclib.const.Handler(
-                    self.__rpc_get_locate_device_status,
-                    grpclib.const.Cardinality.UNARY_UNARY,
-                    GetLocateDeviceStatusRequest,
-                    LocateDeviceStatusResponse,
-                )
+            "/braiins.bos.v1.ActionsService/GetLocateDeviceStatus": grpclib.const.Handler(
+                self.__rpc_get_locate_device_status,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                GetLocateDeviceStatusRequest,
+                LocateDeviceStatusResponse,
             ),
         }
 
 
 class AuthenticationServiceBase(ServiceBase):
+
     async def login(self, login_request: "LoginRequest") -> "LoginResponse":
         raise grpclib.GRPCError(grpclib.const.Status.UNIMPLEMENTED)
 
@@ -2417,6 +2704,7 @@ class AuthenticationServiceBase(ServiceBase):
 
 
 class CoolingServiceBase(ServiceBase):
+
     async def get_cooling_state(
         self, get_cooling_state_request: "GetCoolingStateRequest"
     ) -> "GetCoolingStateResponse":
@@ -2461,6 +2749,7 @@ class CoolingServiceBase(ServiceBase):
 
 
 class PerformanceServiceBase(ServiceBase):
+
     async def get_tuner_state(
         self, get_tuner_state_request: "GetTunerStateRequest"
     ) -> "GetTunerStateResponse":
@@ -2648,21 +2937,17 @@ class PerformanceServiceBase(ServiceBase):
                 GetTunerStateRequest,
                 GetTunerStateResponse,
             ),
-            "/braiins.bos.v1.PerformanceService/ListTargetProfiles": (
-                grpclib.const.Handler(
-                    self.__rpc_list_target_profiles,
-                    grpclib.const.Cardinality.UNARY_UNARY,
-                    ListTargetProfilesRequest,
-                    ListTargetProfilesResponse,
-                )
+            "/braiins.bos.v1.PerformanceService/ListTargetProfiles": grpclib.const.Handler(
+                self.__rpc_list_target_profiles,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                ListTargetProfilesRequest,
+                ListTargetProfilesResponse,
             ),
-            "/braiins.bos.v1.PerformanceService/SetDefaultPowerTarget": (
-                grpclib.const.Handler(
-                    self.__rpc_set_default_power_target,
-                    grpclib.const.Cardinality.UNARY_UNARY,
-                    SetDefaultPowerTargetRequest,
-                    SetPowerTargetResponse,
-                )
+            "/braiins.bos.v1.PerformanceService/SetDefaultPowerTarget": grpclib.const.Handler(
+                self.__rpc_set_default_power_target,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                SetDefaultPowerTargetRequest,
+                SetPowerTargetResponse,
             ),
             "/braiins.bos.v1.PerformanceService/SetPowerTarget": grpclib.const.Handler(
                 self.__rpc_set_power_target,
@@ -2670,53 +2955,41 @@ class PerformanceServiceBase(ServiceBase):
                 SetPowerTargetRequest,
                 SetPowerTargetResponse,
             ),
-            "/braiins.bos.v1.PerformanceService/IncrementPowerTarget": (
-                grpclib.const.Handler(
-                    self.__rpc_increment_power_target,
-                    grpclib.const.Cardinality.UNARY_UNARY,
-                    IncrementPowerTargetRequest,
-                    SetPowerTargetResponse,
-                )
+            "/braiins.bos.v1.PerformanceService/IncrementPowerTarget": grpclib.const.Handler(
+                self.__rpc_increment_power_target,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                IncrementPowerTargetRequest,
+                SetPowerTargetResponse,
             ),
-            "/braiins.bos.v1.PerformanceService/DecrementPowerTarget": (
-                grpclib.const.Handler(
-                    self.__rpc_decrement_power_target,
-                    grpclib.const.Cardinality.UNARY_UNARY,
-                    DecrementPowerTargetRequest,
-                    SetPowerTargetResponse,
-                )
+            "/braiins.bos.v1.PerformanceService/DecrementPowerTarget": grpclib.const.Handler(
+                self.__rpc_decrement_power_target,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                DecrementPowerTargetRequest,
+                SetPowerTargetResponse,
             ),
-            "/braiins.bos.v1.PerformanceService/SetDefaultHashrateTarget": (
-                grpclib.const.Handler(
-                    self.__rpc_set_default_hashrate_target,
-                    grpclib.const.Cardinality.UNARY_UNARY,
-                    SetDefaultHashrateTargetRequest,
-                    SetHashrateTargetResponse,
-                )
+            "/braiins.bos.v1.PerformanceService/SetDefaultHashrateTarget": grpclib.const.Handler(
+                self.__rpc_set_default_hashrate_target,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                SetDefaultHashrateTargetRequest,
+                SetHashrateTargetResponse,
             ),
-            "/braiins.bos.v1.PerformanceService/SetHashrateTarget": (
-                grpclib.const.Handler(
-                    self.__rpc_set_hashrate_target,
-                    grpclib.const.Cardinality.UNARY_UNARY,
-                    SetHashrateTargetRequest,
-                    SetHashrateTargetResponse,
-                )
+            "/braiins.bos.v1.PerformanceService/SetHashrateTarget": grpclib.const.Handler(
+                self.__rpc_set_hashrate_target,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                SetHashrateTargetRequest,
+                SetHashrateTargetResponse,
             ),
-            "/braiins.bos.v1.PerformanceService/IncrementHashrateTarget": (
-                grpclib.const.Handler(
-                    self.__rpc_increment_hashrate_target,
-                    grpclib.const.Cardinality.UNARY_UNARY,
-                    IncrementHashrateTargetRequest,
-                    SetHashrateTargetResponse,
-                )
+            "/braiins.bos.v1.PerformanceService/IncrementHashrateTarget": grpclib.const.Handler(
+                self.__rpc_increment_hashrate_target,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                IncrementHashrateTargetRequest,
+                SetHashrateTargetResponse,
             ),
-            "/braiins.bos.v1.PerformanceService/DecrementHashrateTarget": (
-                grpclib.const.Handler(
-                    self.__rpc_decrement_hashrate_target,
-                    grpclib.const.Cardinality.UNARY_UNARY,
-                    DecrementHashrateTargetRequest,
-                    SetHashrateTargetResponse,
-                )
+            "/braiins.bos.v1.PerformanceService/DecrementHashrateTarget": grpclib.const.Handler(
+                self.__rpc_decrement_hashrate_target,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                DecrementHashrateTargetRequest,
+                SetHashrateTargetResponse,
             ),
             "/braiins.bos.v1.PerformanceService/SetDPS": grpclib.const.Handler(
                 self.__rpc_set_dps,
@@ -2724,34 +2997,29 @@ class PerformanceServiceBase(ServiceBase):
                 SetDpsRequest,
                 SetDpsResponse,
             ),
-            "/braiins.bos.v1.PerformanceService/SetPerformanceMode": (
-                grpclib.const.Handler(
-                    self.__rpc_set_performance_mode,
-                    grpclib.const.Cardinality.UNARY_UNARY,
-                    SetPerformanceModeRequest,
-                    PerformanceMode,
-                )
+            "/braiins.bos.v1.PerformanceService/SetPerformanceMode": grpclib.const.Handler(
+                self.__rpc_set_performance_mode,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                SetPerformanceModeRequest,
+                PerformanceMode,
             ),
-            "/braiins.bos.v1.PerformanceService/GetActivePerformanceMode": (
-                grpclib.const.Handler(
-                    self.__rpc_get_active_performance_mode,
-                    grpclib.const.Cardinality.UNARY_UNARY,
-                    GetPerformanceModeRequest,
-                    PerformanceMode,
-                )
+            "/braiins.bos.v1.PerformanceService/GetActivePerformanceMode": grpclib.const.Handler(
+                self.__rpc_get_active_performance_mode,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                GetPerformanceModeRequest,
+                PerformanceMode,
             ),
-            "/braiins.bos.v1.PerformanceService/RemoveTunedProfiles": (
-                grpclib.const.Handler(
-                    self.__rpc_remove_tuned_profiles,
-                    grpclib.const.Cardinality.UNARY_UNARY,
-                    RemoveTunedProfilesRequest,
-                    RemoveTunedProfilesResponse,
-                )
+            "/braiins.bos.v1.PerformanceService/RemoveTunedProfiles": grpclib.const.Handler(
+                self.__rpc_remove_tuned_profiles,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                RemoveTunedProfilesRequest,
+                RemoveTunedProfilesResponse,
             ),
         }
 
 
 class PoolServiceBase(ServiceBase):
+
     async def get_pool_groups(
         self, get_pool_groups_request: "GetPoolGroupsRequest"
     ) -> "GetPoolGroupsResponse":
@@ -2772,6 +3040,11 @@ class PoolServiceBase(ServiceBase):
     ) -> "RemovePoolGroupResponse":
         raise grpclib.GRPCError(grpclib.const.Status.UNIMPLEMENTED)
 
+    async def set_pool_groups(
+        self, set_pool_groups_request: "SetPoolGroupsRequest"
+    ) -> "SetPoolGroupsResponse":
+        raise grpclib.GRPCError(grpclib.const.Status.UNIMPLEMENTED)
+
     async def __rpc_get_pool_groups(
         self,
         stream: "grpclib.server.Stream[GetPoolGroupsRequest, GetPoolGroupsResponse]",
@@ -2804,6 +3077,14 @@ class PoolServiceBase(ServiceBase):
         response = await self.remove_pool_group(request)
         await stream.send_message(response)
 
+    async def __rpc_set_pool_groups(
+        self,
+        stream: "grpclib.server.Stream[SetPoolGroupsRequest, SetPoolGroupsResponse]",
+    ) -> None:
+        request = await stream.recv_message()
+        response = await self.set_pool_groups(request)
+        await stream.send_message(response)
+
     def __mapping__(self) -> Dict[str, grpclib.const.Handler]:
         return {
             "/braiins.bos.v1.PoolService/GetPoolGroups": grpclib.const.Handler(
@@ -2830,10 +3111,17 @@ class PoolServiceBase(ServiceBase):
                 RemovePoolGroupRequest,
                 RemovePoolGroupResponse,
             ),
+            "/braiins.bos.v1.PoolService/SetPoolGroups": grpclib.const.Handler(
+                self.__rpc_set_pool_groups,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                SetPoolGroupsRequest,
+                SetPoolGroupsResponse,
+            ),
         }
 
 
 class ConfigurationServiceBase(ServiceBase):
+
     async def get_miner_configuration(
         self, get_miner_configuration_request: "GetMinerConfigurationRequest"
     ) -> "GetMinerConfigurationResponse":
@@ -2862,26 +3150,23 @@ class ConfigurationServiceBase(ServiceBase):
 
     def __mapping__(self) -> Dict[str, grpclib.const.Handler]:
         return {
-            "/braiins.bos.v1.ConfigurationService/GetMinerConfiguration": (
-                grpclib.const.Handler(
-                    self.__rpc_get_miner_configuration,
-                    grpclib.const.Cardinality.UNARY_UNARY,
-                    GetMinerConfigurationRequest,
-                    GetMinerConfigurationResponse,
-                )
+            "/braiins.bos.v1.ConfigurationService/GetMinerConfiguration": grpclib.const.Handler(
+                self.__rpc_get_miner_configuration,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                GetMinerConfigurationRequest,
+                GetMinerConfigurationResponse,
             ),
-            "/braiins.bos.v1.ConfigurationService/GetConstraints": (
-                grpclib.const.Handler(
-                    self.__rpc_get_constraints,
-                    grpclib.const.Cardinality.UNARY_UNARY,
-                    GetConstraintsRequest,
-                    GetConstraintsResponse,
-                )
+            "/braiins.bos.v1.ConfigurationService/GetConstraints": grpclib.const.Handler(
+                self.__rpc_get_constraints,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                GetConstraintsRequest,
+                GetConstraintsResponse,
             ),
         }
 
 
 class LicenseServiceBase(ServiceBase):
+
     async def get_license_state(
         self, get_license_state_request: "GetLicenseStateRequest"
     ) -> "GetLicenseStateResponse":
@@ -2907,6 +3192,7 @@ class LicenseServiceBase(ServiceBase):
 
 
 class MinerServiceBase(ServiceBase):
+
     async def get_miner_status(
         self, get_miner_status_request: "GetMinerStatusRequest"
     ) -> AsyncIterator["GetMinerStatusResponse"]:
@@ -2923,6 +3209,11 @@ class MinerServiceBase(ServiceBase):
     ) -> "GetMinerStatsResponse":
         raise grpclib.GRPCError(grpclib.const.Status.UNIMPLEMENTED)
 
+    async def get_errors(
+        self, get_errors_request: "GetErrorsRequest"
+    ) -> "GetErrorsResponse":
+        raise grpclib.GRPCError(grpclib.const.Status.UNIMPLEMENTED)
+
     async def get_hashboards(
         self, get_hashboards_request: "GetHashboardsRequest"
     ) -> "GetHashboardsResponse":
@@ -2971,6 +3262,13 @@ class MinerServiceBase(ServiceBase):
         response = await self.get_miner_stats(request)
         await stream.send_message(response)
 
+    async def __rpc_get_errors(
+        self, stream: "grpclib.server.Stream[GetErrorsRequest, GetErrorsResponse]"
+    ) -> None:
+        request = await stream.recv_message()
+        response = await self.get_errors(request)
+        await stream.send_message(response)
+
     async def __rpc_get_hashboards(
         self,
         stream: "grpclib.server.Stream[GetHashboardsRequest, GetHashboardsResponse]",
@@ -3026,6 +3324,12 @@ class MinerServiceBase(ServiceBase):
                 GetMinerStatsRequest,
                 GetMinerStatsResponse,
             ),
+            "/braiins.bos.v1.MinerService/GetErrors": grpclib.const.Handler(
+                self.__rpc_get_errors,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                GetErrorsRequest,
+                GetErrorsResponse,
+            ),
             "/braiins.bos.v1.MinerService/GetHashboards": grpclib.const.Handler(
                 self.__rpc_get_hashboards,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -3051,3 +3355,67 @@ class MinerServiceBase(ServiceBase):
                 DisableHashboardsResponse,
             ),
         }
+
+
+class NetworkServiceBase(ServiceBase):
+
+    async def get_network_configuration(
+        self, get_network_configuration_request: "GetNetworkConfigurationRequest"
+    ) -> "GetNetworkConfigurationResponse":
+        raise grpclib.GRPCError(grpclib.const.Status.UNIMPLEMENTED)
+
+    async def set_network_configuration(
+        self, set_network_configuration_request: "SetNetworkConfigurationRequest"
+    ) -> "SetNetworkConfigurationResponse":
+        raise grpclib.GRPCError(grpclib.const.Status.UNIMPLEMENTED)
+
+    async def get_network_info(
+        self, get_network_info_request: "GetNetworkInfoRequest"
+    ) -> "GetNetworkInfoResponse":
+        raise grpclib.GRPCError(grpclib.const.Status.UNIMPLEMENTED)
+
+    async def __rpc_get_network_configuration(
+        self,
+        stream: "grpclib.server.Stream[GetNetworkConfigurationRequest, GetNetworkConfigurationResponse]",
+    ) -> None:
+        request = await stream.recv_message()
+        response = await self.get_network_configuration(request)
+        await stream.send_message(response)
+
+    async def __rpc_set_network_configuration(
+        self,
+        stream: "grpclib.server.Stream[SetNetworkConfigurationRequest, SetNetworkConfigurationResponse]",
+    ) -> None:
+        request = await stream.recv_message()
+        response = await self.set_network_configuration(request)
+        await stream.send_message(response)
+
+    async def __rpc_get_network_info(
+        self,
+        stream: "grpclib.server.Stream[GetNetworkInfoRequest, GetNetworkInfoResponse]",
+    ) -> None:
+        request = await stream.recv_message()
+        response = await self.get_network_info(request)
+        await stream.send_message(response)
+
+    def __mapping__(self) -> Dict[str, grpclib.const.Handler]:
+        return {
+            "/braiins.bos.v1.NetworkService/GetNetworkConfiguration": grpclib.const.Handler(
+                self.__rpc_get_network_configuration,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                GetNetworkConfigurationRequest,
+                GetNetworkConfigurationResponse,
+            ),
+            "/braiins.bos.v1.NetworkService/SetNetworkConfiguration": grpclib.const.Handler(
+                self.__rpc_set_network_configuration,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                SetNetworkConfigurationRequest,
+                SetNetworkConfigurationResponse,
+            ),
+            "/braiins.bos.v1.NetworkService/GetNetworkInfo": grpclib.const.Handler(
+                self.__rpc_get_network_info,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                GetNetworkInfoRequest,
+                GetNetworkInfoResponse,
+            ),
+        }

pyasic/web/epic.py

@@ -15,9 +15,12 @@
 # ------------------------------------------------------------------------------
 from __future__ import annotations
 
+import hashlib
 import json
+from pathlib import Path
 from typing import Any
 
+import aiofiles
 import httpx
 
 from pyasic import settings
@@ -46,6 +49,14 @@ class ePICWebAPI(BaseWebAPI):
         async with httpx.AsyncClient(transport=settings.transport()) as client:
             for retry_cnt in range(settings.get("get_data_retries", 1)):
                 try:
+                    if parameters.get("form") is not None:
+                        form_data = parameters["form"]
+                        form_data.add_field("password", self.pwd)
+                        response = await client.post(
+                            f"http://{self.ip}:{self.port}/{command}",
+                            timeout=5,
+                            data=form_data,
+                        )
                     if post:
                         response = await client.post(
                             f"http://{self.ip}:{self.port}/{command}",
@@ -135,3 +146,22 @@ class ePICWebAPI(BaseWebAPI):
 
     async def capabilities(self) -> dict:
         return await self.send_command("capabilities")
+
+    async def system_update(self, file: Path | str, keep_settings: bool = True):
+        """Perform a system update by uploading a firmware file and sending a
+        command to initiate the update."""
+
+        # calculate the SHA256 checksum of the firmware file
+        sha256_hash = hashlib.sha256()
+        async with aiofiles.open(str(file), "rb") as f:
+            while chunk := await f.read(8192):
+                sha256_hash.update(chunk)
+        checksum = sha256_hash.hexdigest()
+
+        # prepare the multipart/form-data request
+        form_data = aiohttp.FormData()
+        form_data.add_field("checksum", checksum)
+        form_data.add_field("keepsettings", str(keep_settings).lower())
+        form_data.add_field("update.zip", open(file, "rb"), filename="update.zip")
+
+        await self.send_command("systemupdate", form=form_data)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyasic"
-version = "0.57.6"
+version = "0.59.1"
 description = "A simplified and standardized interface for Bitcoin ASICs."
 authors = ["UpstreamData <brett@upstreamdata.ca>"]
 repository = "https://github.com/UpstreamData/pyasic"
@@ -15,6 +15,7 @@ passlib = "^1.7.4"
 pyaml = "^23.12.0"
 toml = "^0.10.2"
 betterproto = "2.0.0b6"
+aiofiles = "^23.2.1"
 
 [tool.poetry.group.dev]
 optional = true

tests/config_tests/__init__.py

@@ -20,10 +20,10 @@ from pyasic.config import (
     MinerConfig,
     MiningModeConfig,
     PoolConfig,
-    PowerScalingConfig,
+    ScalingConfig,
     TemperatureConfig,
 )
-from pyasic.config.power_scaling import PowerScalingShutdown
+from pyasic.config.mining.scaling import ScalingShutdown
 
 
 class TestConfig(unittest.TestCase):
@@ -40,11 +40,13 @@ class TestConfig(unittest.TestCase):
             ),
             fan_mode=FanModeConfig.manual(speed=90, minimum_fans=2),
             temperature=TemperatureConfig(target=70, danger=120),
-            mining_mode=MiningModeConfig.power_tuning(power=3000),
-            power_scaling=PowerScalingConfig.enabled(
-                power_step=100,
-                minimum_power=2000,
-                shutdown_enabled=PowerScalingShutdown.enabled(duration=3),
+            mining_mode=MiningModeConfig.power_tuning(
+                power=3000,
+                scaling=ScalingConfig(
+                    step=100,
+                    minimum=2000,
+                    shutdown=ScalingShutdown(enabled=True, duration=3),
+                ),
             ),
         )
 
@@ -76,12 +78,11 @@ class TestConfig(unittest.TestCase):
                 "mode": "power_tuning",
                 "power": 3000,
                 "algo": {"mode": "standard"},
-            },
-            "power_scaling": {
-                "mode": "enabled",
-                "power_step": 100,
-                "minimum_power": 2000,
-                "shutdown_enabled": {"mode": "enabled", "duration": 3},
+                "scaling": {
+                    "step": 100,
+                    "minimum": 2000,
+                    "shutdown": {"enabled": True, "duration": 3},
+                },
             },
         }
 

tests/config_tests/fans.py

@@ -71,5 +71,5 @@ class TestFanConfig(unittest.TestCase):
                 fan_mode=fan_mode,
             ):
                 conf = fan_mode()
-                boser_conf = conf.as_boser()
+                boser_conf = conf.as_boser
                 self.assertEqual(conf, FanModeConfig.from_boser(boser_conf))

tests/miners_tests/__init__.py

@@ -55,7 +55,6 @@ class MinersTest(unittest.TestCase):
                 "expected_hashrate",
                 "uptime",
                 "wattage",
-                "voltage",
                 "wattage_limit",
                 "pools",
             ]