version: bump version number

* bug: update set_dps configuration to handle optional power and hashrate parameters

.pre-commit-config.yaml

@@ -1,7 +1,15 @@
 ci:
   skip:
+    - poetry-lock
     - unittest
+    - generate-docs
 repos:
+-   repo: https://github.com/python-poetry/poetry
+    rev: 2.1.1
+    hooks:
+      - id: poetry-check
+      - id: poetry-lock
+      - id: poetry-install
 -   repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
@@ -15,11 +23,11 @@ repos:
         exclude: ^mkdocs\.yml$
     -   id: check-added-large-files
 -   repo: https://github.com/psf/black
-    rev: 24.10.0
+    rev: 25.1.0
     hooks:
     -   id: black
 -   repo: https://github.com/pycqa/isort
-    rev: 5.13.2
+    rev: 6.0.1
     hooks:
     -   id: isort
         name: isort (python)
@@ -30,6 +38,12 @@ repos:
         name: unittest
         entry: python -m unittest discover
         language: system
-        'types': [python]
+        types: [ python ]
         args: ["-p '*test.py'"] # Probably this option is absolutely not needed.
         pass_filenames: false
+    -   id: generate-docs
+        name: generate-docs
+        entry: python docs/generate_miners.py
+        language: system
+        types: [ python ]
+        pass_filenames: false

README.md

@@ -50,6 +50,13 @@ poetry install --with dev
 pre-commit install
 ```
 
+##### Building Documentation Locally
+```
+poetry install --with docs
+python docs/generate_miners.py
+poetry run mkdocs serve
+```
+
 ---
 ## Getting started
 

docs/generate_miners.py

@@ -2,6 +2,7 @@ import asyncio
 import importlib
 import os
 import warnings
+from pathlib import Path
 
 from pyasic.miners.factory import MINER_CLASSES, MinerTypes
 
@@ -51,12 +52,19 @@ def backend_str(backend: MinerTypes) -> str:
             return "Mara Firmware Miners"
         case MinerTypes.BITAXE:
             return "Stock Firmware BitAxe Miners"
+        case MinerTypes.LUCKYMINER:
+            return "Stock Firmware Lucky Miners"
         case MinerTypes.ICERIVER:
             return "Stock Firmware IceRiver Miners"
         case MinerTypes.HAMMER:
             return "Stock Firmware Hammer Miners"
         case MinerTypes.VOLCMINER:
             return "Stock Firmware Volcminers"
+        case MinerTypes.ELPHAPEX:
+            return "Stock Firmware Elphapex Miners"
+        case MinerTypes.MSKMINER:
+            return "MSKMiner Firmware Miners"
+    raise TypeError("Unknown miner backend, cannot generate docs")
 
 
 def create_url_str(mtype: str):
@@ -77,11 +85,11 @@ DATA_FORMAT = """
 - [{}] Setpoints
 - [{}] Presets
 
-    ::: {}
+::: {}
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 """
 SUPPORTED_TYPES_HEADER = """# pyasic
@@ -121,27 +129,28 @@ BACKEND_TYPE_CLOSER = """
 </details>"""
 
 m_data = {}
-
+done = []
 
 for m in MINER_CLASSES:
-    for t in MINER_CLASSES[m]:
-        if t is not None:
+    for t in sorted(MINER_CLASSES[m], key=lambda x: x or ""):
+        if t is not None and MINER_CLASSES[m][t] not in done:
             miner = MINER_CLASSES[m][t]
             if make(miner) not in m_data:
                 m_data[make(miner)] = {}
             if model_type(miner) not in m_data[make(miner)]:
                 m_data[make(miner)][model_type(miner)] = []
             m_data[make(miner)][model_type(miner)].append(miner)
+            done.append(miner)
 
 
-async def create_directory_structure(directory, data):
+def create_directory_structure(directory, data):
     if not os.path.exists(directory):
         os.makedirs(directory)
 
     for key, value in data.items():
         subdirectory = os.path.join(directory, key)
         if isinstance(value, dict):
-            await create_directory_structure(subdirectory, value)
+            create_directory_structure(subdirectory, value)
         elif isinstance(value, list):
             file_path = os.path.join(subdirectory + ".md")
 
@@ -162,7 +171,7 @@ async def create_directory_structure(directory, data):
                     )
 
 
-async def create_supported_types(directory):
+def create_supported_types(directory):
     with open(os.path.join(directory, "supported_types.md"), "w") as file:
         file.write(SUPPORTED_TYPES_HEADER)
         for mback in MINER_CLASSES:
@@ -179,7 +188,7 @@ async def create_supported_types(directory):
             for mtype in backend_types:
                 file.write(MINER_TYPE_HEADER.format(mtype))
                 for minstance in backend_types[mtype]:
-                    model = await minstance("1.1.1.1").get_model()
+                    model = minstance("1.1.1.1").model
                     file.write(
                         MINER_DETAILS.format(
                             make(minstance), mtype, create_url_str(model), model
@@ -189,6 +198,7 @@ async def create_supported_types(directory):
             file.write(BACKEND_TYPE_CLOSER)
 
 
-root_directory = os.path.join(os.getcwd(), "miners")
-asyncio.run(create_directory_structure(root_directory, m_data))
-asyncio.run(create_supported_types(root_directory))
+if __name__ == "__main__":
+    root_directory = Path(__file__).parent.joinpath("miners")
+    create_directory_structure(root_directory, m_data)
+    create_supported_types(root_directory)

docs/miners/antminer/X15.md

@@ -8,11 +8,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.cgminer.X15.Z15.CGMinerZ15
+::: pyasic.miners.antminer.cgminer.X15.Z15.CGMinerZ15
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## Z15 Pro (Stock)
 
@@ -21,9 +21,9 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bmminer.X15.Z15.BMMinerZ15Pro
+::: pyasic.miners.antminer.bmminer.X15.Z15.BMMinerZ15Pro
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/antminer/X17.md

@@ -8,24 +8,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bmminer.X17.S17.BMMinerS17
+::: pyasic.miners.antminer.bmminer.X17.S17.BMMinerS17
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
-
-## S17+ (Stock)
-
-- [ ] Shutdowns
-- [ ] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-    ::: pyasic.miners.antminer.bmminer.X17.S17.BMMinerS17Plus
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## S17 Pro (Stock)
 
@@ -34,11 +21,24 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bmminer.X17.S17.BMMinerS17Pro
+::: pyasic.miners.antminer.bmminer.X17.S17.BMMinerS17Pro
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
+
+## S17+ (Stock)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X17.S17.BMMinerS17Plus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
 
 ## S17e (Stock)
 
@@ -47,11 +47,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bmminer.X17.S17.BMMinerS17e
+::: pyasic.miners.antminer.bmminer.X17.S17.BMMinerS17e
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## T17 (Stock)
 
@@ -60,11 +60,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bmminer.X17.T17.BMMinerT17
+::: pyasic.miners.antminer.bmminer.X17.T17.BMMinerT17
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## T17+ (Stock)
 
@@ -73,11 +73,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bmminer.X17.T17.BMMinerT17Plus
+::: pyasic.miners.antminer.bmminer.X17.T17.BMMinerT17Plus
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## T17e (Stock)
 
@@ -86,11 +86,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bmminer.X17.T17.BMMinerT17e
+::: pyasic.miners.antminer.bmminer.X17.T17.BMMinerT17e
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## S17 (BOS+)
 
@@ -99,24 +99,11 @@
 - [x] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bosminer.X17.S17.BOSMinerS17
+::: pyasic.miners.antminer.bosminer.X17.S17.BOSMinerS17
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
-
-## S17+ (BOS+)
-
-- [x] Shutdowns
-- [ ] Power Modes
-- [x] Setpoints
-- [ ] Presets
-
-    ::: pyasic.miners.antminer.bosminer.X17.S17.BOSMinerS17Plus
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## S17 Pro (BOS+)
 
@@ -125,11 +112,24 @@
 - [x] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bosminer.X17.S17.BOSMinerS17Pro
+::: pyasic.miners.antminer.bosminer.X17.S17.BOSMinerS17Pro
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
+
+## S17+ (BOS+)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bosminer.X17.S17.BOSMinerS17Plus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
 
 ## S17e (BOS+)
 
@@ -138,11 +138,11 @@
 - [x] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bosminer.X17.S17.BOSMinerS17e
+::: pyasic.miners.antminer.bosminer.X17.S17.BOSMinerS17e
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## T17 (BOS+)
 
@@ -151,11 +151,11 @@
 - [x] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bosminer.X17.T17.BOSMinerT17
+::: pyasic.miners.antminer.bosminer.X17.T17.BOSMinerT17
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## T17+ (BOS+)
 
@@ -164,11 +164,11 @@
 - [x] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bosminer.X17.T17.BOSMinerT17Plus
+::: pyasic.miners.antminer.bosminer.X17.T17.BOSMinerT17Plus
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## T17e (BOS+)
 
@@ -177,24 +177,11 @@
 - [x] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bosminer.X17.T17.BOSMinerT17e
+::: pyasic.miners.antminer.bosminer.X17.T17.BOSMinerT17e
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
-
-## S17+ (VNish)
-
-- [x] Shutdowns
-- [ ] Power Modes
-- [x] Setpoints
-- [x] Presets
-
-    ::: pyasic.miners.antminer.vnish.X17.S17.VNishS17Plus
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## S17 Pro (VNish)
 
@@ -203,9 +190,22 @@
 - [x] Setpoints
 - [x] Presets
 
-    ::: pyasic.miners.antminer.vnish.X17.S17.VNishS17Pro
+::: pyasic.miners.antminer.vnish.X17.S17.VNishS17Pro
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
+
+## S17+ (VNish)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [x] Presets
+
+::: pyasic.miners.antminer.vnish.X17.S17.VNishS17Plus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
 

docs/miners/antminer/X21.md

@@ -8,11 +8,24 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bmminer.X21.S21.BMMinerS21
+::: pyasic.miners.antminer.bmminer.X21.S21.BMMinerS21
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
+
+## S21 Hydro (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X21.S21.BMMinerS21Hydro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
 
 ## S21 Pro (Stock)
 
@@ -21,11 +34,24 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bmminer.X21.S21.BMMinerS21Pro
+::: pyasic.miners.antminer.bmminer.X21.S21.BMMinerS21Pro
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
+
+## S21+ (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X21.S21.BMMinerS21Plus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
 
 ## T21 (Stock)
 
@@ -34,11 +60,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bmminer.X21.T21.BMMinerT21
+::: pyasic.miners.antminer.bmminer.X21.T21.BMMinerT21
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## S21 (BOS+)
 
@@ -47,11 +73,24 @@
 - [x] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bosminer.X21.S21.BOSMinerS21
+::: pyasic.miners.antminer.bosminer.X21.S21.BOSMinerS21
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
+
+## S21 Pro (BOS+)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bosminer.X21.S21.BOSMinerS21Pro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
 
 ## T21 (BOS+)
 
@@ -60,11 +99,11 @@
 - [x] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bosminer.X21.T21.BOSMinerT21
+::: pyasic.miners.antminer.bosminer.X21.T21.BOSMinerT21
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## S21 (VNish)
 
@@ -73,11 +112,24 @@
 - [x] Setpoints
 - [x] Presets
 
-    ::: pyasic.miners.antminer.vnish.X21.S21.VNishS21
+::: pyasic.miners.antminer.vnish.X21.S21.VNishS21
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
+
+## T21 (VNish)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [x] Presets
+
+::: pyasic.miners.antminer.vnish.X21.T21.VNishT21
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
 
 ## S21 (ePIC)
 
@@ -86,11 +138,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.epic.X21.S21.ePICS21
+::: pyasic.miners.antminer.epic.X21.S21.ePICS21
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## S21 Pro (ePIC)
 
@@ -99,11 +151,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.epic.X21.S21.ePICS21Pro
+::: pyasic.miners.antminer.epic.X21.S21.ePICS21Pro
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## T21 (ePIC)
 
@@ -112,11 +164,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.epic.X21.T21.ePICT21
+::: pyasic.miners.antminer.epic.X21.T21.ePICT21
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## S21 (LuxOS)
 
@@ -125,11 +177,11 @@
 - [ ] Setpoints
 - [x] Presets
 
-    ::: pyasic.miners.antminer.luxos.X21.S21.LUXMinerS21
+::: pyasic.miners.antminer.luxos.X21.S21.LUXMinerS21
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## S21 (MaraFW)
 
@@ -138,11 +190,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.marathon.X21.S21.MaraS21
+::: pyasic.miners.antminer.marathon.X21.S21.MaraS21
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## T21 (MaraFW)
 
@@ -151,9 +203,9 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.marathon.X21.T21.MaraT21
+::: pyasic.miners.antminer.marathon.X21.T21.MaraT21
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/antminer/X3.md

@@ -8,11 +8,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.cgminer.X3.D3.CGMinerD3
+::: pyasic.miners.antminer.cgminer.X3.D3.CGMinerD3
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## HS3 (Stock)
 
@@ -21,24 +21,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bmminer.X3.HS3.BMMinerHS3
+::: pyasic.miners.antminer.bmminer.X3.HS3.BMMinerHS3
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
-
-## L3+ (Stock)
-
-- [ ] Shutdowns
-- [ ] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-    ::: pyasic.miners.antminer.bmminer.X3.L3.BMMinerL3Plus
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## KA3 (Stock)
 
@@ -47,11 +34,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bmminer.X3.KA3.BMMinerKA3
+::: pyasic.miners.antminer.bmminer.X3.KA3.BMMinerKA3
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## KS3 (Stock)
 
@@ -60,11 +47,24 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bmminer.X3.KS3.BMMinerKS3
+::: pyasic.miners.antminer.bmminer.X3.KS3.BMMinerKS3
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
+
+## L3+ (Stock)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X3.L3.BMMinerL3Plus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
 
 ## L3+ (VNish)
 
@@ -73,22 +73,9 @@
 - [x] Setpoints
 - [x] Presets
 
-    ::: pyasic.miners.antminer.vnish.X3.L3.VnishL3Plus
+::: pyasic.miners.antminer.vnish.X3.L3.VnishL3Plus
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
-
-## L3+ (VNish)
-
-- [x] Shutdowns
-- [ ] Power Modes
-- [x] Setpoints
-- [x] Presets
-
-    ::: pyasic.miners.antminer.vnish.X3.L3.VnishL3Plus
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/antminer/X5.md

@@ -8,11 +8,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.cgminer.X5.DR5.CGMinerDR5
+::: pyasic.miners.antminer.cgminer.X5.DR5.CGMinerDR5
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## KS5 (Stock)
 
@@ -21,9 +21,22 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bmminer.X5.KS5.BMMinerKS5
+::: pyasic.miners.antminer.bmminer.X5.KS5.BMMinerKS5
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
+
+## KS5 (Stock)
+
+- [ ] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X5.KS5.BMMinerKS5Pro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
 

docs/miners/antminer/X7.md

@@ -1,32 +1,6 @@
 # pyasic
 ## X7 Models
 
-## L7 (Stock)
-
-- [ ] Shutdowns
-- [x] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-    ::: pyasic.miners.antminer.bmminer.X7.L7.BMMinerL7
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 4
-
-## K7 (Stock)
-
-- [x] Shutdowns
-- [x] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-    ::: pyasic.miners.antminer.bmminer.X7.K7.BMMinerK7
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 4
-
 ## D7 (Stock)
 
 - [x] Shutdowns
@@ -34,11 +8,37 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bmminer.X7.D7.BMMinerD7
+::: pyasic.miners.antminer.bmminer.X7.D7.BMMinerD7
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
+
+## K7 (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X7.K7.BMMinerK7
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## L7 (Stock)
+
+- [ ] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X7.L7.BMMinerL7
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
 
 ## L7 (VNish)
 
@@ -47,9 +47,9 @@
 - [x] Setpoints
 - [x] Presets
 
-    ::: pyasic.miners.antminer.vnish.X7.L7.VnishL7
+::: pyasic.miners.antminer.vnish.X7.L7.VnishL7
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/antminer/X9.md

@@ -1,19 +1,6 @@
 # pyasic
 ## X9 Models
 
-## E9Pro (Stock)
-
-- [ ] Shutdowns
-- [x] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-    ::: pyasic.miners.antminer.bmminer.X9.E9.BMMinerE9Pro
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 4
-
 ## D9 (Stock)
 
 - [x] Shutdowns
@@ -21,63 +8,24 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bmminer.X9.D9.BMMinerD9
+::: pyasic.miners.antminer.bmminer.X9.D9.BMMinerD9
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
-## S9 (Stock)
+## E9Pro (Stock)
 
 - [ ] Shutdowns
-- [ ] Power Modes
+- [x] Power Modes
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bmminer.X9.S9.BMMinerS9
+::: pyasic.miners.antminer.bmminer.X9.E9.BMMinerE9Pro
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
-
-## S9i (Stock)
-
-- [ ] Shutdowns
-- [ ] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-    ::: pyasic.miners.antminer.bmminer.X9.S9.BMMinerS9i
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 4
-
-## S9j (Stock)
-
-- [ ] Shutdowns
-- [ ] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-    ::: pyasic.miners.antminer.bmminer.X9.S9.BMMinerS9j
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 4
-
-## T9 (Stock)
-
-- [ ] Shutdowns
-- [ ] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-    ::: pyasic.miners.antminer.bmminer.X9.T9.BMMinerT9
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## L9 (Stock)
 
@@ -86,11 +34,63 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bmminer.X9.L9.BMMinerL9
+::: pyasic.miners.antminer.bmminer.X9.L9.BMMinerL9
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
+
+## S9 (Stock)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X9.S9.BMMinerS9
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S9i (Stock)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X9.S9.BMMinerS9i
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S9j (Stock)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X9.S9.BMMinerS9j
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## T9 (Stock)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X9.T9.BMMinerT9
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
 
 ## S9 (BOS+)
 
@@ -99,11 +99,11 @@
 - [x] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.bosminer.X9.S9.BOSMinerS9
+::: pyasic.miners.antminer.bosminer.X9.S9.BOSMinerS9
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## T9 (Hive)
 
@@ -112,11 +112,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.antminer.hiveon.X9.T9.HiveonT9
+::: pyasic.miners.antminer.hiveon.X9.T9.HiveonT9
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## S9 (LuxOS)
 
@@ -125,9 +125,9 @@
 - [ ] Setpoints
 - [x] Presets
 
-    ::: pyasic.miners.antminer.luxos.X9.S9.LUXMinerS9
+::: pyasic.miners.antminer.luxos.X9.S9.LUXMinerS9
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/auradine/AD.md

@@ -8,11 +8,11 @@
 - [x] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.auradine.flux.AD.AT1.AuradineFluxAT1500
+::: pyasic.miners.auradine.flux.AD.AT1.AuradineFluxAT1500
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## AT2860 (Stock)
 
@@ -21,11 +21,11 @@
 - [x] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.auradine.flux.AD.AT2.AuradineFluxAT2860
+::: pyasic.miners.auradine.flux.AD.AT2.AuradineFluxAT2860
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## AT2880 (Stock)
 
@@ -34,9 +34,9 @@
 - [x] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.auradine.flux.AD.AT2.AuradineFluxAT2880
+::: pyasic.miners.auradine.flux.AD.AT2.AuradineFluxAT2880
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/auradine/AI.md

@@ -8,11 +8,11 @@
 - [x] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.auradine.flux.AI.AI2.AuradineFluxAI2500
+::: pyasic.miners.auradine.flux.AI.AI2.AuradineFluxAI2500
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## AI3680 (Stock)
 
@@ -21,9 +21,9 @@
 - [x] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.auradine.flux.AI.AI3.AuradineFluxAI3680
+::: pyasic.miners.auradine.flux.AI.AI3.AuradineFluxAI3680
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/auradine/AT.md

@@ -8,11 +8,11 @@
 - [x] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.auradine.flux.AT.AD2.AuradineFluxAD2500
+::: pyasic.miners.auradine.flux.AT.AD2.AuradineFluxAD2500
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## AD3500 (Stock)
 
@@ -21,9 +21,9 @@
 - [x] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.auradine.flux.AT.AD3.AuradineFluxAD3500
+::: pyasic.miners.auradine.flux.AT.AD3.AuradineFluxAD3500
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/avalonminer/A10X.md

@@ -8,11 +8,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.avalonminer.cgminer.A10X.A1026.CGMinerAvalon1026
+::: pyasic.miners.avalonminer.cgminer.A10X.A1026.CGMinerAvalon1026
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## Avalon 1047 (Stock)
 
@@ -21,11 +21,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.avalonminer.cgminer.A10X.A1047.CGMinerAvalon1047
+::: pyasic.miners.avalonminer.cgminer.A10X.A1047.CGMinerAvalon1047
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## Avalon 1066 (Stock)
 
@@ -34,9 +34,9 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.avalonminer.cgminer.A10X.A1066.CGMinerAvalon1066
+::: pyasic.miners.avalonminer.cgminer.A10X.A1066.CGMinerAvalon1066
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/avalonminer/A11X.md

@@ -8,11 +8,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.avalonminer.cgminer.A11X.A1126.CGMinerAvalon1126Pro
+::: pyasic.miners.avalonminer.cgminer.A11X.A1126.CGMinerAvalon1126Pro
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## Avalon 1166 Pro (Stock)
 
@@ -21,9 +21,9 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.avalonminer.cgminer.A11X.A1166.CGMinerAvalon1166Pro
+::: pyasic.miners.avalonminer.cgminer.A11X.A1166.CGMinerAvalon1166Pro
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/avalonminer/A12X.md

@@ -8,9 +8,9 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.avalonminer.cgminer.A12X.A1246.CGMinerAvalon1246
+::: pyasic.miners.avalonminer.cgminer.A12X.A1246.CGMinerAvalon1246
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/avalonminer/A15X.md

@@ -0,0 +1,16 @@
+# pyasic
+## A15X Models
+
+## Avalon 1566 (Stock)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.avalonminer.cgminer.A15X.A1566.CGMinerAvalon1566
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+

docs/miners/avalonminer/A7X.md

@@ -8,11 +8,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.avalonminer.cgminer.A7X.A721.CGMinerAvalon721
+::: pyasic.miners.avalonminer.cgminer.A7X.A721.CGMinerAvalon721
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## Avalon 741 (Stock)
 
@@ -21,11 +21,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.avalonminer.cgminer.A7X.A741.CGMinerAvalon741
+::: pyasic.miners.avalonminer.cgminer.A7X.A741.CGMinerAvalon741
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## Avalon 761 (Stock)
 
@@ -34,9 +34,9 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.avalonminer.cgminer.A7X.A761.CGMinerAvalon761
+::: pyasic.miners.avalonminer.cgminer.A7X.A761.CGMinerAvalon761
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/avalonminer/A8X.md

@@ -8,11 +8,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.avalonminer.cgminer.A8X.A821.CGMinerAvalon821
+::: pyasic.miners.avalonminer.cgminer.A8X.A821.CGMinerAvalon821
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## Avalon 841 (Stock)
 
@@ -21,11 +21,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.avalonminer.cgminer.A8X.A841.CGMinerAvalon841
+::: pyasic.miners.avalonminer.cgminer.A8X.A841.CGMinerAvalon841
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## Avalon 851 (Stock)
 
@@ -34,9 +34,9 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.avalonminer.cgminer.A8X.A851.CGMinerAvalon851
+::: pyasic.miners.avalonminer.cgminer.A8X.A851.CGMinerAvalon851
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/avalonminer/A9X.md

@@ -8,9 +8,9 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.avalonminer.cgminer.A9X.A921.CGMinerAvalon921
+::: pyasic.miners.avalonminer.cgminer.A9X.A921.CGMinerAvalon921
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/avalonminer/nano.md

@@ -8,9 +8,9 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.avalonminer.cgminer.nano.nano3.CGMinerAvalonNano3
+::: pyasic.miners.avalonminer.cgminer.nano.nano3.CGMinerAvalonNano3
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/bitaxe/BM.md

@@ -1,19 +1,6 @@
 # pyasic
 ## BM Models
 
-## Supra (Stock)
-
-- [ ] Shutdowns
-- [ ] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-    ::: pyasic.miners.bitaxe.espminer.BM.BM1368.BitAxeSupra
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 4
-
 ## Ultra (Stock)
 
 - [ ] Shutdowns
@@ -21,24 +8,24 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.bitaxe.espminer.BM.BM1366.BitAxeUltra
+::: pyasic.miners.bitaxe.espminer.BM.BM1366.BitAxeUltra
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
-## Max (Stock)
+## Supra (Stock)
 
 - [ ] Shutdowns
 - [ ] Power Modes
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.bitaxe.espminer.BM.BM1397.BitAxeMax
+::: pyasic.miners.bitaxe.espminer.BM.BM1368.BitAxeSupra
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## Gamma (Stock)
 
@@ -47,9 +34,22 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.bitaxe.espminer.BM.BM1370.BitAxeGamma
+::: pyasic.miners.bitaxe.espminer.BM.BM1370.BitAxeGamma
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
+
+## Max (Stock)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.bitaxe.espminer.BM.BM1397.BitAxeMax
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
 

docs/miners/blockminer/blockminer.md

@@ -8,11 +8,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.blockminer.epic.blockminer.blockminer.ePICBlockMiner520i
+::: pyasic.miners.blockminer.epic.blockminer.blockminer.ePICBlockMiner520i
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## BlockMiner 720i (ePIC)
 
@@ -21,9 +21,22 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.blockminer.epic.blockminer.blockminer.ePICBlockMiner720i
+::: pyasic.miners.blockminer.epic.blockminer.blockminer.ePICBlockMiner720i
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
+
+## BlockMiner eLITE 1.0 (ePIC)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.blockminer.epic.blockminer.blockminer.ePICBlockMinerELITE1
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
 

docs/miners/braiins/BMM.md

@@ -8,11 +8,11 @@
 - [x] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.braiins.braiins.BMM.BMM.BraiinsBMM100
+::: pyasic.miners.braiins.braiins.BMM.BMM.BraiinsBMM100
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## BMM101 (BOS+)
 
@@ -21,9 +21,9 @@
 - [x] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.braiins.braiins.BMM.BMM.BraiinsBMM101
+::: pyasic.miners.braiins.braiins.BMM.BMM.BraiinsBMM101
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/elphapex/DGX.md

@@ -0,0 +1,16 @@
+# pyasic
+## DGX Models
+
+## DG1+ (Stock)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.elphapex.daoge.DGX.DG1.ElphapexDG1Plus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+

docs/miners/goldshell/X5.md

@@ -8,11 +8,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.goldshell.bfgminer.X5.CK5.GoldshellCK5
+::: pyasic.miners.goldshell.bfgminer.X5.CK5.GoldshellCK5
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## HS5 (Stock)
 
@@ -21,11 +21,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.goldshell.bfgminer.X5.HS5.GoldshellHS5
+::: pyasic.miners.goldshell.bfgminer.X5.HS5.GoldshellHS5
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## KD5 (Stock)
 
@@ -34,9 +34,9 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.goldshell.bfgminer.X5.KD5.GoldshellKD5
+::: pyasic.miners.goldshell.bfgminer.X5.KD5.GoldshellKD5
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/goldshell/XBox.md

@@ -8,11 +8,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.goldshell.bfgminer.XBox.KDBox.GoldshellKDBoxII
+::: pyasic.miners.goldshell.bfgminer.XBox.KDBox.GoldshellKDBoxII
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## KD Box Pro (Stock)
 
@@ -21,9 +21,9 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.goldshell.bfgminer.XBox.KDBox.GoldshellKDBoxPro
+::: pyasic.miners.goldshell.bfgminer.XBox.KDBox.GoldshellKDBoxPro
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/goldshell/XMax.md

@@ -8,9 +8,9 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.goldshell.bfgminer.XMax.KDMax.GoldshellKDMax
+::: pyasic.miners.goldshell.bfgminer.XMax.KDMax.GoldshellKDMax
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/hammer/DX.md

@@ -8,9 +8,9 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.hammer.blackminer.DX.D10.HammerD10
+::: pyasic.miners.hammer.blackminer.DX.D10.HammerD10
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/iceriver/KSX.md

@@ -8,11 +8,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.iceriver.iceminer.KSX.KS0.IceRiverKS0
+::: pyasic.miners.iceriver.iceminer.KSX.KS0.IceRiverKS0
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## KS1 (Stock)
 
@@ -21,11 +21,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.iceriver.iceminer.KSX.KS1.IceRiverKS1
+::: pyasic.miners.iceriver.iceminer.KSX.KS1.IceRiverKS1
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## KS2 (Stock)
 
@@ -34,11 +34,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.iceriver.iceminer.KSX.KS2.IceRiverKS2
+::: pyasic.miners.iceriver.iceminer.KSX.KS2.IceRiverKS2
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## KS3 (Stock)
 
@@ -47,11 +47,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.iceriver.iceminer.KSX.KS3.IceRiverKS3
+::: pyasic.miners.iceriver.iceminer.KSX.KS3.IceRiverKS3
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## KS3L (Stock)
 
@@ -60,11 +60,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.iceriver.iceminer.KSX.KS3.IceRiverKS3L
+::: pyasic.miners.iceriver.iceminer.KSX.KS3.IceRiverKS3L
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## KS3M (Stock)
 
@@ -73,11 +73,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.iceriver.iceminer.KSX.KS3.IceRiverKS3M
+::: pyasic.miners.iceriver.iceminer.KSX.KS3.IceRiverKS3M
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## KS5 (Stock)
 
@@ -86,11 +86,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.iceriver.iceminer.KSX.KS5.IceRiverKS5
+::: pyasic.miners.iceriver.iceminer.KSX.KS5.IceRiverKS5
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## KS5L (Stock)
 
@@ -99,11 +99,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.iceriver.iceminer.KSX.KS5.IceRiverKS5L
+::: pyasic.miners.iceriver.iceminer.KSX.KS5.IceRiverKS5L
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## KS5M (Stock)
 
@@ -112,9 +112,9 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.iceriver.iceminer.KSX.KS5.IceRiverKS5M
+::: pyasic.miners.iceriver.iceminer.KSX.KS5.IceRiverKS5M
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/innosilicon/A10X.md

@@ -8,9 +8,9 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.innosilicon.cgminer.A10X.A10X.InnosiliconA10X
+::: pyasic.miners.innosilicon.cgminer.A10X.A10X.InnosiliconA10X
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/innosilicon/A11X.md

@@ -8,11 +8,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.innosilicon.cgminer.A11X.A11.InnosiliconA11
+::: pyasic.miners.innosilicon.cgminer.A11X.A11.InnosiliconA11
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## A11MX (Stock)
 
@@ -21,9 +21,9 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.innosilicon.cgminer.A11X.A11M.InnosiliconA11MX
+::: pyasic.miners.innosilicon.cgminer.A11X.A11M.InnosiliconA11MX
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/innosilicon/T3X.md

@@ -8,9 +8,9 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.innosilicon.cgminer.T3X.T3H.InnosiliconT3HPlus
+::: pyasic.miners.innosilicon.cgminer.T3X.T3H.InnosiliconT3HPlus
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/luckyminer/LV.md

@@ -0,0 +1,29 @@
+# pyasic
+## LV Models
+
+## LV07 (Stock)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.luckyminer.espminer.LV.LV07.LuckyMinerLV07
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## LV08 (Stock)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.luckyminer.espminer.LV.LV08.LuckyMinerLV08
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+

docs/miners/supported_types.md

@@ -32,6 +32,7 @@ details {
                 <ul>
                     <li><a href="../antminer/X5#dr5-stock">DR5 (Stock)</a></li>
                     <li><a href="../antminer/X5#ks5-stock">KS5 (Stock)</a></li>
+                    <li><a href="../antminer/X5#ks5-stock">KS5 (Stock)</a></li>
                 </ul>
         </details>
         <details>
@@ -100,8 +101,12 @@ details {
             <summary>X21 Series:</summary>
                 <ul>
                     <li><a href="../antminer/X21#s21-stock">S21 (Stock)</a></li>
+                    <li><a href="../antminer/X21#s21-stock">S21 (Stock)</a></li>
+                    <li><a href="../antminer/X21#s21-stock">S21 (Stock)</a></li>
+                    <li><a href="../antminer/X21#s21_1-stock">S21+ (Stock)</a></li>
                     <li><a href="../antminer/X21#s21-pro-stock">S21 Pro (Stock)</a></li>
                     <li><a href="../antminer/X21#t21-stock">T21 (Stock)</a></li>
+                    <li><a href="../antminer/X21#s21-hydro-stock">S21 Hydro (Stock)</a></li>
                 </ul>
         </details>
     </ul>
@@ -112,28 +117,89 @@ details {
         <details>
             <summary>M2X Series:</summary>
                 <ul>
-                    <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#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#m20-v10-stock">M20 V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M2X#m21s_1-v20-stock">M21S+ V20 (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#m21-v10-stock">M21 V10 (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-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_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-vh100-stock">M30S++ VH100 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vh110-stock">M30S++ VH110 (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-vi30-stock">M30S++ VI30 (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#m30s_1_1-vj50-stock">M30S++ VJ50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vj60-stock">M30S++ VJ60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vj70-stock">M30S++ VJ70 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vk30-stock">M30S++ VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1_1-vk40-stock">M30S++ VK40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-v10-stock">M30S+ V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-v100-stock">M30S+ V100 (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-ve100-stock">M30S+ VE100 (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-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-vh70-stock">M30S+ VH70 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-vi30-stock">M30S+ VI30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-vj30-stock">M30S+ VJ30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m30s_1-vj40-stock">M30S+ VJ40 (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>
@@ -163,63 +229,35 @@ details {
                     <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#m30s-vj30-stock">M30S VJ30 (Stock)</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#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#m31l-v10-stock">M31L V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-v10-stock">M31S+ V10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m31s_1-v100-stock">M31S+ V100 (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-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#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-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>
@@ -232,45 +270,25 @@ details {
                     <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#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#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#m33s_1_1-vg40-stock">M33S++ VG40 (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-vg20-stock">M33S+ VG20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m33s_1-vg30-stock">M33S+ VG30 (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-vg30-stock">M33S VG30 (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#m36s_1-vg30-stock">M36S+ VG30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M3X#m36s-ve10-stock">M36S VE10 (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>
@@ -279,6 +297,47 @@ details {
         <details>
             <summary>M5X Series:</summary>
                 <ul>
+                    <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#m50s_1_1-vk40-stock">M50S++ VK40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1_1-vk50-stock">M50S++ VK50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1_1-vk60-stock">M50S++ VK60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1_1-vl20-stock">M50S++ VL20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1_1-vl30-stock">M50S++ VL30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1_1-vl40-stock">M50S++ VL40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1_1-vl50-stock">M50S++ VL50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1_1-vl60-stock">M50S++ VL60 (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-vj40-stock">M50S+ VJ40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1-vj60-stock">M50S+ VJ60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1-vk10-stock">M50S+ VK10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1-vk20-stock">M50S+ VK20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1-vk30-stock">M50S+ VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1-vl10-stock">M50S+ VL10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1-vl20-stock">M50S+ VL20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s_1-vl30-stock">M50S+ VL30 (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-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-vj40-stock">M50S VJ40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s-vj50-stock">M50S VJ50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s-vk10-stock">M50S VK10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s-vk20-stock">M50S VK20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s-vk30-stock">M50S VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s-vk50-stock">M50S VK50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s-vk60-stock">M50S VK60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s-vk70-stock">M50S VK70 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s-vk80-stock">M50S VK80 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s-vl20-stock">M50S VL20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50s-vl30-stock">M50S VL30 (Stock)</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>
@@ -293,55 +352,153 @@ details {
                     <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#m50s_1_1-vl30-stock">M50S++ VL30 (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#m50-vj40-stock">M50 VJ40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50-vj60-stock">M50 VJ60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50-vk40-stock">M50 VK40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m50-vk50-stock">M50 VK50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m52s_1_1-vl10-stock">M52S++ VL10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m52s-vk30-stock">M52S VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53h-vh10-stock">M53H VH10 (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#m53s_1_1-vk20-stock">M53S++ VK20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53s_1_1-vk30-stock">M53S++ VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53s_1_1-vk50-stock">M53S++ VK50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53s_1_1-vl10-stock">M53S++ VL10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53s_1_1-vl30-stock">M53S++ VL30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53s_1-vj30-stock">M53S+ VJ30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53s_1-vj40-stock">M53S+ VJ40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53s_1-vj50-stock">M53S+ VJ50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53s_1-vk30-stock">M53S+ VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53s-vh20-stock">M53S VH20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53s-vh30-stock">M53S VH30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53s-vj30-stock">M53S VJ30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53s-vj40-stock">M53S VJ40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53s-vk30-stock">M53S VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53-vh30-stock">M53 VH30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53-vh40-stock">M53 VH40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53-vh50-stock">M53 VH50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53-vk30-stock">M53 VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m53-vk60-stock">M53 VK60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m54s_1_1-vk30-stock">M54S++ VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m54s_1_1-vl30-stock">M54S++ VL30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m54s_1_1-vl40-stock">M54S++ VL40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m56s_1_1-vk10-stock">M56S++ VK10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m56s_1_1-vk30-stock">M56S++ VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m56s_1_1-vk40-stock">M56S++ VK40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m56s_1_1-vk50-stock">M56S++ VK50 (Stock)</a></li>
                     <li><a href="../whatsminer/M5X#m56s_1-vj30-stock">M56S+ VJ30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m56s_1-vk30-stock">M56S+ VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m56s_1-vk40-stock">M56S+ VK40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m56s_1-vk50-stock">M56S+ VK50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m56s-vh30-stock">M56S VH30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m56s-vj30-stock">M56S VJ30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m56s-vj40-stock">M56S VJ40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M5X#m56-vh30-stock">M56 VH30 (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-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_1_1-vl30-stock">M60S++ VL30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s_1_1-vl40-stock">M60S++ VL40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s_1-vk30-stock">M60S+ VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s_1-vk40-stock">M60S+ VK40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s_1-vk50-stock">M60S+ VK50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s_1-vk60-stock">M60S+ VK60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s_1-vk70-stock">M60S+ VK70 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s_1-vl10-stock">M60S+ VL10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s_1-vl30-stock">M60S+ VL30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s_1-vl40-stock">M60S+ VL40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s_1-vl50-stock">M60S+ VL50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s_1-vl60-stock">M60S+ VL60 (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#m60s-vl10-stock">M60S VL10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s-vl20-stock">M60S VL20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s-vl30-stock">M60S VL30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s-vl40-stock">M60S VL40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s-vl50-stock">M60S VL50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s-vl60-stock">M60S VL60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60s-vl70-stock">M60S VL70 (Stock)</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#m60-vk6a-stock">M60 VK6A (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60-vl10-stock">M60 VL10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60-vl20-stock">M60 VL20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60-vl30-stock">M60 VL30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60-vl40-stock">M60 VL40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m60-vl50-stock">M60 VL50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m61s_1-vl30-stock">M61S+ VL30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m61s-vl10-stock">M61S VL10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m61s-vl20-stock">M61S VL20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m61s-vl30-stock">M61S VL30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m61-vk10-stock">M61 VK10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m61-vk20-stock">M61 VK20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m61-vk30-stock">M61 VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m61-vk40-stock">M61 VK40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m61-vl10-stock">M61 VL10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m61-vl30-stock">M61 VL30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m61-vl40-stock">M61 VL40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m61-vl50-stock">M61 VL50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m61-vl60-stock">M61 VL60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m62s_1-vk30-stock">M62S+ VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m63s_1_1-vl20-stock">M63S++ VL20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m63s_1-vk30-stock">M63S+ VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m63s_1-vl10-stock">M63S+ VL10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m63s_1-vl20-stock">M63S+ VL20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m63s_1-vl30-stock">M63S+ VL30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m63s_1-vl50-stock">M63S+ VL50 (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#m63s-vk60-stock">M63S VK60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m63s-vl10-stock">M63S VL10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m63s-vl50-stock">M63S VL50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m63s-vl60-stock">M63S VL60 (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#m63-vl10-stock">M63 VL10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m63-vl30-stock">M63 VL30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m64s-vl30-stock">M64S VL30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m64-vl30-stock">M64 VL30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m64-vl40-stock">M64 VL40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m65s_1-vk30-stock">M65S+ VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m65s-vk20-stock">M65S VK20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m65s-vl60-stock">M65S VL60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m66s_1_1-vl20-stock">M66S++ VL20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m66s_1-vk30-stock">M66S+ VK30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m66s_1-vl10-stock">M66S+ VL10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m66s_1-vl20-stock">M66S+ VL20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m66s_1-vl30-stock">M66S+ VL30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m66s_1-vl40-stock">M66S+ VL40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m66s_1-vl60-stock">M66S+ VL60 (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>
+                    <li><a href="../whatsminer/M6X#m66s-vk50-stock">M66S VK50 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m66s-vk60-stock">M66S VK60 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m66s-vl10-stock">M66S VL10 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m66s-vl20-stock">M66S VL20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m66s-vl30-stock">M66S VL30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m66s-vl40-stock">M66S VL40 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m66s-vl50-stock">M66S VL50 (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#m66-vl20-stock">M66 VL20 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m66-vl30-stock">M66 VL30 (Stock)</a></li>
+                    <li><a href="../whatsminer/M6X#m67s-vk30-stock">M67S VK30 (Stock)</a></li>
+                </ul>
+        </details>
+        <details>
+            <summary>M7X Series:</summary>
+                <ul>
+                    <li><a href="../whatsminer/M7X#m70-vm30-stock">M70 VM30 (Stock)</a></li>
                 </ul>
         </details>
     </ul>
@@ -398,6 +555,12 @@ details {
                     <li><a href="../avalonminer/nano#avalon-nano-3-stock">Avalon Nano 3 (Stock)</a></li>
                 </ul>
         </details>
+        <details>
+            <summary>A15X Series:</summary>
+                <ul>
+                    <li><a href="../avalonminer/A15X#avalon-1566-stock">Avalon 1566 (Stock)</a></li>
+                </ul>
+        </details>
     </ul>
 </details>
 <details>
@@ -497,6 +660,7 @@ details {
             <summary>X21 Series:</summary>
                 <ul>
                     <li><a href="../antminer/X21#s21-bos_1">S21 (BOS+)</a></li>
+                    <li><a href="../antminer/X21#s21-pro-bos_1">S21 Pro (BOS+)</a></li>
                     <li><a href="../antminer/X21#t21-bos_1">T21 (BOS+)</a></li>
                 </ul>
         </details>
@@ -539,6 +703,8 @@ details {
                     <li><a href="../antminer/X19#s19-no-pic-vnish">S19 No PIC (VNish)</a></li>
                     <li><a href="../antminer/X19#s19-pro-vnish">S19 Pro (VNish)</a></li>
                     <li><a href="../antminer/X19#s19j-vnish">S19j (VNish)</a></li>
+                    <li><a href="../antminer/X19#s19i-vnish">S19i (VNish)</a></li>
+                    <li><a href="../antminer/X19#s19j-pro-vnish">S19j Pro (VNish)</a></li>
                     <li><a href="../antminer/X19#s19j-pro-vnish">S19j Pro (VNish)</a></li>
                     <li><a href="../antminer/X19#s19j-pro-vnish">S19j Pro (VNish)</a></li>
                     <li><a href="../antminer/X19#s19a-vnish">S19a (VNish)</a></li>
@@ -551,6 +717,7 @@ details {
         <details>
             <summary>X21 Series:</summary>
                 <ul>
+                    <li><a href="../antminer/X21#t21-vnish">T21 (VNish)</a></li>
                     <li><a href="../antminer/X21#s21-vnish">S21 (VNish)</a></li>
                 </ul>
         </details>
@@ -570,6 +737,7 @@ details {
                     <li><a href="../antminer/X19#s19k-pro-epic">S19k Pro (ePIC)</a></li>
                     <li><a href="../antminer/X19#s19-xp-epic">S19 XP (ePIC)</a></li>
                     <li><a href="../antminer/X19#s19j-pro-dual-epic">S19j Pro Dual (ePIC)</a></li>
+                    <li><a href="../antminer/X19#s19k-pro-dual-epic">S19k Pro Dual (ePIC)</a></li>
                 </ul>
         </details>
         <details>
@@ -585,6 +753,7 @@ details {
                 <ul>
                     <li><a href="../blockminer/blockminer#blockminer-520i-epic">BlockMiner 520i (ePIC)</a></li>
                     <li><a href="../blockminer/blockminer#blockminer-720i-epic">BlockMiner 720i (ePIC)</a></li>
+                    <li><a href="../blockminer/blockminer#blockminer-elite-1.0-epic">BlockMiner eLITE 1.0 (ePIC)</a></li>
                 </ul>
         </details>
     </ul>
@@ -603,6 +772,19 @@ details {
                 <ul>
                     <li><a href="../antminer/X19#s19j-pro-hive">S19j Pro (Hive)</a></li>
                     <li><a href="../antminer/X19#s19-hive">S19 (Hive)</a></li>
+                    <li><a href="../antminer/X19#s19k-pro-hive">S19K Pro (Hive)</a></li>
+                    <li><a href="../antminer/X19#s19-no-pic-hive">S19 No PIC (Hive)</a></li>
+                </ul>
+        </details>
+    </ul>
+</details>
+<details>
+<summary>MSKMiner Firmware Miners:</summary>
+    <ul>
+        <details>
+            <summary>X19 Series:</summary>
+                <ul>
+                    <li><a href="../antminer/X19#s19-no-pic-stock">S19 No PIC (Stock)</a></li>
                 </ul>
         </details>
     </ul>
@@ -702,6 +884,18 @@ details {
     </ul>
 </details>
 <details>
+<summary>Stock Firmware Lucky Miners:</summary>
+    <ul>
+        <details>
+            <summary>LV Series:</summary>
+                <ul>
+                    <li><a href="../luckyminer/LV#lv08-stock">LV08 (Stock)</a></li>
+                    <li><a href="../luckyminer/LV#lv07-stock">LV07 (Stock)</a></li>
+                </ul>
+        </details>
+    </ul>
+</details>
+<details>
 <summary>Stock Firmware IceRiver Miners:</summary>
     <ul>
         <details>
@@ -741,4 +935,15 @@ details {
                 </ul>
         </details>
     </ul>
+</details>
+<details>
+<summary>Stock Firmware Elphapex Miners:</summary>
+    <ul>
+        <details>
+            <summary>DGX Series:</summary>
+                <ul>
+                    <li><a href="../elphapex/DGX#dg1_1-stock">DG1+ (Stock)</a></li>
+                </ul>
+        </details>
+    </ul>
 </details>

docs/miners/volcminer/DX.md

@@ -0,0 +1,16 @@
+# pyasic
+## DX Models
+
+## D1 (Stock)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.volcminer.blackminer.DX.D1.VolcMinerD1
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+

docs/miners/whatsminer/M2X.md

@@ -1,58 +1,6 @@
 # pyasic
 ## M2X Models
 
-## M20 V10 (Stock)
-
-- [x] Shutdowns
-- [x] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-    ::: pyasic.miners.whatsminer.btminer.M2X.M20.BTMinerM20V10
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 4
-
-## M20S V10 (Stock)
-
-- [x] Shutdowns
-- [x] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-    ::: pyasic.miners.whatsminer.btminer.M2X.M20S.BTMinerM20SV10
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 4
-
-## M20S V20 (Stock)
-
-- [x] Shutdowns
-- [x] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-    ::: pyasic.miners.whatsminer.btminer.M2X.M20S.BTMinerM20SV20
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 4
-
-## M20S V30 (Stock)
-
-- [x] Shutdowns
-- [x] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-    ::: pyasic.miners.whatsminer.btminer.M2X.M20S.BTMinerM20SV30
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 4
-
 ## M20P V10 (Stock)
 
 - [x] Shutdowns
@@ -60,11 +8,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.whatsminer.btminer.M2X.M20P.BTMinerM20PV10
+::: pyasic.miners.whatsminer.btminer.M2X.M20P.BTMinerM20PV10
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## M20P V30 (Stock)
 
@@ -73,11 +21,11 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.whatsminer.btminer.M2X.M20P.BTMinerM20PV30
+::: pyasic.miners.whatsminer.btminer.M2X.M20P.BTMinerM20PV30
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## M20S+ V30 (Stock)
 
@@ -86,63 +34,63 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.whatsminer.btminer.M2X.M20S_Plus.BTMinerM20SPlusV30
+::: pyasic.miners.whatsminer.btminer.M2X.M20S_Plus.BTMinerM20SPlusV30
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
-## M21 V10 (Stock)
+## M20S V10 (Stock)
 
 - [x] Shutdowns
 - [x] Power Modes
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.whatsminer.btminer.M2X.M21.BTMinerM21V10
+::: pyasic.miners.whatsminer.btminer.M2X.M20S.BTMinerM20SV10
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
-## M21S V20 (Stock)
+## M20S V20 (Stock)
 
 - [x] Shutdowns
 - [x] Power Modes
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.whatsminer.btminer.M2X.M21S.BTMinerM21SV20
+::: pyasic.miners.whatsminer.btminer.M2X.M20S.BTMinerM20SV20
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
-## M21S V60 (Stock)
+## M20S V30 (Stock)
 
 - [x] Shutdowns
 - [x] Power Modes
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.whatsminer.btminer.M2X.M21S.BTMinerM21SV60
+::: pyasic.miners.whatsminer.btminer.M2X.M20S.BTMinerM20SV30
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
-## M21S V70 (Stock)
+## M20 V10 (Stock)
 
 - [x] Shutdowns
 - [x] Power Modes
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.whatsminer.btminer.M2X.M21S.BTMinerM21SV70
+::: pyasic.miners.whatsminer.btminer.M2X.M20.BTMinerM20V10
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 
 ## M21S+ V20 (Stock)
 
@@ -151,11 +99,63 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.whatsminer.btminer.M2X.M21S_Plus.BTMinerM21SPlusV20
+::: pyasic.miners.whatsminer.btminer.M2X.M21S_Plus.BTMinerM21SPlusV20
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
+
+## M21S V20 (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.whatsminer.btminer.M2X.M21S.BTMinerM21SV20
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## M21S V60 (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.whatsminer.btminer.M2X.M21S.BTMinerM21SV60
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## M21S V70 (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.whatsminer.btminer.M2X.M21S.BTMinerM21SV70
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## M21 V10 (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.whatsminer.btminer.M2X.M21.BTMinerM21V10
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
 
 ## M29 V10 (Stock)
 
@@ -164,9 +164,9 @@
 - [ ] Setpoints
 - [ ] Presets
 
-    ::: pyasic.miners.whatsminer.btminer.M2X.M29.BTMinerM29V10
+::: pyasic.miners.whatsminer.btminer.M2X.M29.BTMinerM29V10
     handler: python
     options:
         show_root_heading: false
-        heading_level: 4
+        heading_level: 0
 

docs/miners/whatsminer/M7X.md

@@ -0,0 +1,16 @@
+# pyasic
+## M7X Models
+
+## M70 VM30 (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [x] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.whatsminer.btminer.M7X.M70.BTMinerM70VM30
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+

mkdocs.yml

@@ -93,6 +93,7 @@ nav:
         - Whatsminer M3X: "miners/whatsminer/M3X.md"
         - Whatsminer M5X: "miners/whatsminer/M5X.md"
         - Whatsminer M6X: "miners/whatsminer/M6X.md"
+        - Whatsminer M7X: "miners/whatsminer/M7X.md"
         - Innosilicon T3X: "miners/innosilicon/T3X.md"
         - Innosilicon A10X: "miners/innosilicon/A10X.md"
         - Innosilicon A11X: "miners/innosilicon/A11X.md"

pyasic/__init__.py

@@ -13,6 +13,8 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
+import importlib.metadata
+
 from pyasic import settings
 from pyasic.config import MinerConfig
 from pyasic.data import MinerData
@@ -22,3 +24,5 @@ from pyasic.network import MinerNetwork
 from pyasic.rpc import *
 from pyasic.ssh import *
 from pyasic.web import *
+
+__version__ = importlib.metadata.version("pyasic")

pyasic/config/__init__.py

@@ -46,7 +46,7 @@ class MinerConfig(BaseModel):
         """Converts the MinerConfig object to a dictionary."""
         return self.model_dump()
 
-    def as_am_modern(self, user_suffix: str = None) -> dict:
+    def as_am_modern(self, user_suffix: str | None = None) -> dict:
         """Generates the configuration in the format suitable for modern Antminers."""
         return {
             **self.fan_mode.as_am_modern(),
@@ -56,7 +56,27 @@ class MinerConfig(BaseModel):
             **self.temperature.as_am_modern(),
         }
 
-    def as_wm(self, user_suffix: str = None) -> dict:
+    def as_hiveon_modern(self, user_suffix: str | None = None) -> dict:
+        """Generates the configuration in the format suitable for modern Hiveon."""
+        return {
+            **self.fan_mode.as_hiveon_modern(),
+            "freq-level": "100",
+            **self.mining_mode.as_hiveon_modern(),
+            **self.pools.as_hiveon_modern(user_suffix=user_suffix),
+            **self.temperature.as_hiveon_modern(),
+        }
+
+    def as_elphapex(self, user_suffix: str | None = None) -> dict:
+        """Generates the configuration in the format suitable for modern Elphapex."""
+        return {
+            **self.fan_mode.as_elphapex(),
+            "fc-freq-level": "100",
+            **self.mining_mode.as_elphapex(),
+            **self.pools.as_elphapex(user_suffix=user_suffix),
+            **self.temperature.as_elphapex(),
+        }
+
+    def as_wm(self, user_suffix: str | None = None) -> dict:
         """Generates the configuration in the format suitable for Whatsminers."""
         return {
             **self.fan_mode.as_wm(),
@@ -65,7 +85,7 @@ class MinerConfig(BaseModel):
             **self.temperature.as_wm(),
         }
 
-    def as_am_old(self, user_suffix: str = None) -> dict:
+    def as_am_old(self, user_suffix: str | None = None) -> dict:
         """Generates the configuration in the format suitable for old versions of Antminers."""
         return {
             **self.fan_mode.as_am_old(),
@@ -74,7 +94,7 @@ class MinerConfig(BaseModel):
             **self.temperature.as_am_old(),
         }
 
-    def as_goldshell(self, user_suffix: str = None) -> dict:
+    def as_goldshell(self, user_suffix: str | None = None) -> dict:
         """Generates the configuration in the format suitable for Goldshell miners."""
         return {
             **self.fan_mode.as_goldshell(),
@@ -83,7 +103,7 @@ class MinerConfig(BaseModel):
             **self.temperature.as_goldshell(),
         }
 
-    def as_avalon(self, user_suffix: str = None) -> dict:
+    def as_avalon(self, user_suffix: str | None = None) -> dict:
         """Generates the configuration in the format suitable for Avalonminers."""
         return {
             **self.fan_mode.as_avalon(),
@@ -92,7 +112,7 @@ class MinerConfig(BaseModel):
             **self.temperature.as_avalon(),
         }
 
-    def as_inno(self, user_suffix: str = None) -> dict:
+    def as_inno(self, user_suffix: str | None = None) -> dict:
         """Generates the configuration in the format suitable for Innosilicon miners."""
         return {
             **self.fan_mode.as_inno(),
@@ -101,7 +121,7 @@ class MinerConfig(BaseModel):
             **self.temperature.as_inno(),
         }
 
-    def as_bosminer(self, user_suffix: str = None) -> dict:
+    def as_bosminer(self, user_suffix: str | None = None) -> dict:
         """Generates the configuration in the bosminer.toml format."""
         return {
             **merge_dicts(self.fan_mode.as_bosminer(), self.temperature.as_bosminer()),
@@ -109,7 +129,7 @@ class MinerConfig(BaseModel):
             **self.pools.as_bosminer(user_suffix=user_suffix),
         }
 
-    def as_boser(self, user_suffix: str = None) -> dict:
+    def as_boser(self, user_suffix: str | None = None) -> dict:
         """Generates the configuration in the format suitable for BOSer."""
         return {
             **self.fan_mode.as_boser(),
@@ -118,7 +138,7 @@ class MinerConfig(BaseModel):
             **self.pools.as_boser(user_suffix=user_suffix),
         }
 
-    def as_epic(self, user_suffix: str = None) -> dict:
+    def as_epic(self, user_suffix: str | None = None) -> dict:
         """Generates the configuration in the format suitable for ePIC miners."""
         return {
             **merge_dicts(self.fan_mode.as_epic(), self.temperature.as_epic()),
@@ -126,7 +146,7 @@ class MinerConfig(BaseModel):
             **self.pools.as_epic(user_suffix=user_suffix),
         }
 
-    def as_auradine(self, user_suffix: str = None) -> dict:
+    def as_auradine(self, user_suffix: str | None = None) -> dict:
         """Generates the configuration in the format suitable for Auradine miners."""
         return {
             **self.fan_mode.as_auradine(),
@@ -135,7 +155,7 @@ class MinerConfig(BaseModel):
             **self.pools.as_auradine(user_suffix=user_suffix),
         }
 
-    def as_mara(self, user_suffix: str = None) -> dict:
+    def as_mara(self, user_suffix: str | None = None) -> dict:
         return {
             **self.fan_mode.as_mara(),
             **self.temperature.as_mara(),
@@ -143,15 +163,15 @@ class MinerConfig(BaseModel):
             **self.pools.as_mara(user_suffix=user_suffix),
         }
 
-    def as_bitaxe(self, user_suffix: str = None) -> dict:
+    def as_espminer(self, user_suffix: str | None = 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),
+            **self.fan_mode.as_espminer(),
+            **self.temperature.as_espminer(),
+            **self.mining_mode.as_espminer(),
+            **self.pools.as_espminer(user_suffix=user_suffix),
         }
 
-    def as_luxos(self, user_suffix: str = None) -> dict:
+    def as_luxos(self, user_suffix: str | None = None) -> dict:
         return {
             **self.fan_mode.as_luxos(),
             **self.temperature.as_luxos(),
@@ -159,7 +179,7 @@ class MinerConfig(BaseModel):
             **self.pools.as_luxos(user_suffix=user_suffix),
         }
 
-    def as_vnish(self, user_suffix: str = None) -> dict:
+    def as_vnish(self, user_suffix: str | None = None) -> dict:
         main_cfg = {
             "miner": {
                 **self.fan_mode.as_vnish(),
@@ -199,6 +219,24 @@ class MinerConfig(BaseModel):
             fan_mode=FanModeConfig.from_am_modern(web_conf),
         )
 
+    @classmethod
+    def from_hiveon_modern(cls, web_conf: dict) -> "MinerConfig":
+        """Constructs a MinerConfig object from web configuration for Hiveon."""
+        return cls(
+            pools=PoolConfig.from_hiveon_modern(web_conf),
+            mining_mode=MiningModeConfig.from_hiveon_modern(web_conf),
+            fan_mode=FanModeConfig.from_hiveon_modern(web_conf),
+        )
+
+    @classmethod
+    def from_elphapex(cls, web_conf: dict) -> "MinerConfig":
+        """Constructs a MinerConfig object from web configuration for modern Antminers."""
+        return cls(
+            pools=PoolConfig.from_elphapex(web_conf),
+            mining_mode=MiningModeConfig.from_elphapex(web_conf),
+            fan_mode=FanModeConfig.from_elphapex(web_conf),
+        )
+
     @classmethod
     def from_am_old(cls, web_conf: dict) -> "MinerConfig":
         """Constructs a MinerConfig object from web configuration for old versions of Antminers."""
@@ -272,10 +310,10 @@ class MinerConfig(BaseModel):
         )
 
     @classmethod
-    def from_bitaxe(cls, web_system_info: dict) -> "MinerConfig":
+    def from_espminer(cls, web_system_info: dict) -> "MinerConfig":
         return cls(
-            pools=PoolConfig.from_bitaxe(web_system_info),
-            fan_mode=FanModeConfig.from_bitaxe(web_system_info),
+            pools=PoolConfig.from_espminer(web_system_info),
+            fan_mode=FanModeConfig.from_espminer(web_system_info),
         )
 
     @classmethod
@@ -308,7 +346,3 @@ class MinerConfig(BaseModel):
     @classmethod
     def from_hammer(cls, *args, **kwargs) -> "MinerConfig":
         return cls.from_am_modern(*args, **kwargs)
-
-    @classmethod
-    def from_hiveon_modern(cls, web_conf: dict) -> "MinerConfig":
-        return cls.from_am_modern(web_conf)

pyasic/config/base.py

@@ -28,6 +28,9 @@ class MinerConfigOption(Enum):
     def as_am_modern(self) -> dict:
         return self.value.as_am_modern()
 
+    def as_hiveon_modern(self) -> dict:
+        return self.value.as_hiveon_modern()
+
     def as_am_old(self) -> dict:
         return self.value.as_am_old()
 
@@ -61,12 +64,15 @@ class MinerConfigOption(Enum):
     def as_mara(self) -> dict:
         return self.value.as_mara()
 
-    def as_bitaxe(self) -> dict:
-        return self.value.as_bitaxe()
+    def as_espminer(self) -> dict:
+        return self.value.as_espminer()
 
     def as_luxos(self) -> dict:
         return self.value.as_luxos()
 
+    def as_elphapex(self) -> dict:
+        return self.value.as_elphapex()
+
     def __call__(self, *args, **kwargs):
         return self.value(*args, **kwargs)
 
@@ -92,6 +98,9 @@ class MinerConfigValue(BaseModel):
     def as_am_modern(self) -> dict:
         return {}
 
+    def as_hiveon_modern(self) -> dict:
+        return {}
+
     def as_am_old(self) -> dict:
         return {}
 
@@ -125,12 +134,15 @@ class MinerConfigValue(BaseModel):
     def as_mara(self) -> dict:
         return {}
 
-    def as_bitaxe(self) -> dict:
+    def as_espminer(self) -> dict:
         return {}
 
     def as_luxos(self) -> dict:
         return {}
 
+    def as_elphapex(self) -> dict:
+        return {}
+
     def __getitem__(self, item):
         try:
             return getattr(self, item)

pyasic/config/fans.py

@@ -55,6 +55,12 @@ class FanModeNormal(MinerConfigValue):
     def as_am_modern(self) -> dict:
         return {"bitmain-fan-ctrl": False, "bitmain-fan-pwn": "100"}
 
+    def as_hiveon_modern(self) -> dict:
+        return {"bitmain-fan-ctrl": False, "bitmain-fan-pwn": "100"}
+
+    def as_elphapex(self) -> dict:
+        return {"fc-fan-ctrl": False, "fc-fan-pwn": "100"}
+
     def as_bosminer(self) -> dict:
         return {
             "temp_control": {"mode": "auto"},
@@ -81,7 +87,7 @@ class FanModeNormal(MinerConfigValue):
             },
         }
 
-    def as_bitaxe(self) -> dict:
+    def as_espminer(self) -> dict:
         return {"autoFanspeed": 1}
 
     def as_luxos(self) -> dict:
@@ -135,6 +141,12 @@ class FanModeManual(MinerConfigValue):
     def as_am_modern(self) -> dict:
         return {"bitmain-fan-ctrl": True, "bitmain-fan-pwm": str(self.speed)}
 
+    def as_hiveon_modern(self) -> dict:
+        return {"bitmain-fan-ctrl": True, "bitmain-fan-pwm": str(self.speed)}
+
+    def as_elphapex(self) -> dict:
+        return {"fc-fan-ctrl": True, "fc-fan-pwm": str(self.speed)}
+
     def as_bosminer(self) -> dict:
         return {
             "temp_control": {"mode": "manual"},
@@ -156,7 +168,7 @@ class FanModeManual(MinerConfigValue):
             },
         }
 
-    def as_bitaxe(self) -> dict:
+    def as_espminer(self) -> dict:
         return {"autoFanspeed": 0, "fanspeed": self.speed}
 
     def as_luxos(self) -> dict:
@@ -185,6 +197,12 @@ class FanModeImmersion(MinerConfigValue):
     def as_am_modern(self) -> dict:
         return {"bitmain-fan-ctrl": True, "bitmain-fan-pwm": "0"}
 
+    def as_hiveon_modern(self) -> dict:
+        return {"bitmain-fan-ctrl": True, "bitmain-fan-pwm": "0"}
+
+    def as_elphapex(self) -> dict:
+        return {"fc-fan-ctrl": True, "fc-fan-pwm": "0"}
+
     def as_bosminer(self) -> dict:
         return {
             "fan_control": {"min_fans": 0},
@@ -239,6 +257,34 @@ class FanModeConfig(MinerConfigOption):
         else:
             return cls.default()
 
+    @classmethod
+    def from_hiveon_modern(cls, web_conf: dict):
+        if web_conf.get("bitmain-fan-ctrl") is not None:
+            fan_manual = web_conf["bitmain-fan-ctrl"]
+            if fan_manual:
+                speed = int(web_conf["bitmain-fan-pwm"])
+                if speed == 0:
+                    return cls.immersion()
+                return cls.manual(speed=speed)
+            else:
+                return cls.normal()
+        else:
+            return cls.default()
+
+    @classmethod
+    def from_elphapex(cls, web_conf: dict):
+        if web_conf.get("fc-fan-ctrl") is not None:
+            fan_manual = web_conf["fc-fan-ctrl"]
+            if fan_manual:
+                speed = int(web_conf["fc-fan-pwm"])
+                if speed == 0:
+                    return cls.immersion()
+                return cls.manual(speed=speed)
+            else:
+                return cls.normal()
+        else:
+            return cls.default()
+
     @classmethod
     def from_epic(cls, web_conf: dict):
         try:
@@ -308,6 +354,12 @@ class FanModeConfig(MinerConfigOption):
             if "minimumRequiredFans" in keys:
                 conf["minimum_fans"] = int(temperature_conf["minimumRequiredFans"])
             return cls.manual(**conf)
+        if "disabled" in keys:
+            conf = {}
+            if "fanSpeedRatio" in temperature_conf["disabled"].keys():
+                conf["speed"] = int(temperature_conf["disabled"]["fanSpeedRatio"])
+            return cls.manual(**conf)
+        return cls.default()
 
     @classmethod
     def from_auradine(cls, web_fan: dict):
@@ -336,7 +388,7 @@ class FanModeConfig(MinerConfigOption):
         return cls.default()
 
     @classmethod
-    def from_bitaxe(cls, web_system_info: dict):
+    def from_espminer(cls, web_system_info: dict):
         if web_system_info["autofanspeed"] == 1:
             return cls.normal()
         else:

pyasic/config/mining/__init__.py

@@ -52,6 +52,14 @@ class MiningModeNormal(MinerConfigValue):
             return {"miner-mode": "0"}
         return {"miner-mode": 0}
 
+    def as_hiveon_modern(self) -> dict:
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "0"}
+        return {"miner-mode": 0}
+
+    def as_elphapex(self) -> dict:
+        return {"miner-mode": 0}
+
     def as_wm(self) -> dict:
         return {"mode": self.mode}
 
@@ -74,6 +82,9 @@ class MiningModeNormal(MinerConfigValue):
     def as_luxos(self) -> dict:
         return {"autotunerset": {"enabled": False}}
 
+    def as_bosminer(self) -> dict:
+        return {"autotuning": {"enabled": True}}
+
 
 class MiningModeSleep(MinerConfigValue):
     mode: str = field(init=False, default="sleep")
@@ -87,6 +98,14 @@ class MiningModeSleep(MinerConfigValue):
             return {"miner-mode": "1"}
         return {"miner-mode": 1}
 
+    def as_hiveon_modern(self) -> dict:
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "1"}
+        return {"miner-mode": 1}
+
+    def as_elphapex(self) -> dict:
+        return {"miner-mode": 1}
+
     def as_wm(self) -> dict:
         return {"mode": self.mode}
 
@@ -119,6 +138,14 @@ class MiningModeLPM(MinerConfigValue):
             return {"miner-mode": "3"}
         return {"miner-mode": 3}
 
+    def as_hiveon_modern(self) -> dict:
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "3"}
+        return {"miner-mode": 3}
+
+    def as_elphapex(self) -> dict:
+        return {"miner-mode": 3}
+
     def as_wm(self) -> dict:
         return {"mode": self.mode}
 
@@ -141,6 +168,14 @@ class MiningModeHPM(MinerConfigValue):
             return {"miner-mode": "0"}
         return {"miner-mode": 0}
 
+    def as_hiveon_modern(self) -> dict:
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "0"}
+        return {"miner-mode": 0}
+
+    def as_elphapex(self) -> dict:
+        return {"miner-mode": 0}
+
     def as_wm(self) -> dict:
         return {"mode": self.mode}
 
@@ -174,6 +209,14 @@ class MiningModePowerTune(MinerConfigValue):
             return {"miner-mode": "0"}
         return {"miner-mode": 0}
 
+    def as_hiveon_modern(self) -> dict:
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "0"}
+        return {"miner-mode": 0}
+
+    def as_elphapex(self) -> dict:
+        return {"miner-mode": 0}
+
     def as_wm(self) -> dict:
         if self.power is not None:
             return {"mode": self.mode, self.mode: {"wattage": self.power}}
@@ -215,18 +258,18 @@ class MiningModePowerTune(MinerConfigValue):
             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),
-                        )
-                    ),
-                ),
+            power_target_kwargs = {}
+            if self.scaling.step is not None:
+                power_target_kwargs["power_step"] = Power(self.scaling.step)
+            if self.scaling.minimum is not None:
+                power_target_kwargs["min_power_target"] = Power(self.scaling.minimum)
+            cfg["set_dps"] = SetDpsRequest(
+                save_action=SaveAction.SAVE_AND_APPLY,
+                enable=True,
+                **sd_cfg,
+                target=DpsTarget(power_target=DpsPowerTarget(**power_target_kwargs)),
             )
+
         return cfg
 
     def as_auradine(self) -> dict:
@@ -273,13 +316,20 @@ class MiningModeHashrateTune(MinerConfigValue):
             return {"miner-mode": "0"}
         return {"miner-mode": 0}
 
+    def as_hiveon_modern(self) -> dict:
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "0"}
+        return {"miner-mode": 0}
+
+    def as_elphapex(self) -> dict:
+        return {"miner-mode": 0}
+
     def as_bosminer(self) -> dict:
         conf = {"enabled": True, "mode": "hashrate_target"}
         if self.hashrate is not None:
             conf["hashrate_target"] = self.hashrate
         return {"autotuning": conf}
 
-    @property
     def as_boser(self) -> dict:
         cfg = {
             "set_performance_mode": SetPerformanceModeRequest(
@@ -299,18 +349,24 @@ class MiningModeHashrateTune(MinerConfigValue):
             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),
-                        )
-                    ),
+            hashrate_target_kwargs = {}
+            if self.scaling.step is not None:
+                hashrate_target_kwargs["hashrate_step"] = TeraHashrate(
+                    self.scaling.step
+                )
+            if self.scaling.minimum is not None:
+                hashrate_target_kwargs["min_hashrate_target"] = TeraHashrate(
+                    self.scaling.minimum
+                )
+            cfg["set_dps"] = SetDpsRequest(
+                save_action=SaveAction.SAVE_AND_APPLY,
+                enable=True,
+                **sd_cfg,
+                target=DpsTarget(
+                    hashrate_target=DpsHashrateTarget(**hashrate_target_kwargs)
                 ),
             )
+
         return cfg
 
     def as_auradine(self) -> dict:
@@ -368,20 +424,25 @@ class MiningModePreset(MinerConfigValue):
         )
 
     @classmethod
-    def from_luxos(
-        cls, rpc_config: dict, rpc_profiles: list[dict]
-    ) -> "MiningModePreset":
+    def from_luxos(cls, rpc_config: dict, rpc_profiles: dict) -> "MiningModePreset":
+        active_preset = cls.get_active_preset_from_luxos(rpc_config, rpc_profiles)
+        return cls(
+            active_preset=active_preset,
+            available_presets=[
+                MiningPreset.from_luxos(p) for p in rpc_profiles["PROFILES"]
+            ],
+        )
+
+    @classmethod
+    def get_active_preset_from_luxos(
+        cls, rpc_config: dict, rpc_profiles: dict
+    ) -> MiningPreset:
         active_preset = None
         active_profile = rpc_config["CONFIG"][0]["Profile"]
         for profile in rpc_profiles["PROFILES"]:
             if profile["Profile Name"] == active_profile:
                 active_preset = profile
-        return cls(
-            active_preset=MiningPreset.from_luxos(active_preset),
-            available_presets=[
-                MiningPreset.from_luxos(p) for p in rpc_profiles["PROFILES"]
-            ],
-        )
+        return MiningPreset.from_luxos(active_preset)
 
 
 class ManualBoardSettings(MinerConfigValue):
@@ -397,6 +458,14 @@ class ManualBoardSettings(MinerConfigValue):
             return {"miner-mode": "0"}
         return {"miner-mode": 0}
 
+    def as_hiveon_modern(self) -> dict:
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "0"}
+        return {"miner-mode": 0}
+
+    def as_elphapex(self) -> dict:
+        return {"miner-mode": 0}
+
     def as_vnish(self) -> dict:
         return {"freq": self.freq}
 
@@ -421,6 +490,9 @@ class MiningModeManual(MinerConfigValue):
             return {"miner-mode": "0"}
         return {"miner-mode": 0}
 
+    def as_elphapex(self) -> dict:
+        return {"miner-mode": 0}
+
     def as_vnish(self) -> dict:
         chains = [b.as_vnish() for b in self.boards.values() if b.freq != 0]
         return {
@@ -518,6 +590,34 @@ class MiningModeConfig(MinerConfigOption):
                 return cls.low()
         return cls.default()
 
+    @classmethod
+    def from_hiveon_modern(cls, web_conf: dict):
+        if web_conf.get("bitmain-work-mode") is not None:
+            work_mode = web_conf["bitmain-work-mode"]
+            if work_mode == "":
+                return cls.default()
+            if int(work_mode) == 0:
+                return cls.normal()
+            elif int(work_mode) == 1:
+                return cls.sleep()
+            elif int(work_mode) == 3:
+                return cls.low()
+        return cls.default()
+
+    @classmethod
+    def from_elphapex(cls, web_conf: dict):
+        if web_conf.get("fc-work-mode") is not None:
+            work_mode = web_conf["fc-work-mode"]
+            if work_mode == "":
+                return cls.default()
+            if int(work_mode) == 0:
+                return cls.normal()
+            elif int(work_mode) == 1:
+                return cls.sleep()
+            elif int(work_mode) == 3:
+                return cls.low()
+        return cls.default()
+
     @classmethod
     def from_epic(cls, web_conf: dict):
         try:
@@ -600,6 +700,7 @@ class MiningModeConfig(MinerConfigOption):
                 return cls.hashrate_tuning(
                     scaling=ScalingConfig.from_bosminer(toml_conf, mode="hashrate"),
                 )
+        return cls.default()
 
     @classmethod
     def from_vnish(cls, web_settings: dict, web_presets: list[dict]):
@@ -705,7 +806,11 @@ class MiningModeConfig(MinerConfigOption):
 
     @classmethod
     def from_luxos(cls, rpc_config: dict, rpc_profiles: dict):
-        return MiningModePreset.from_luxos(rpc_config, rpc_profiles)
+        preset_info = MiningModePreset.from_luxos(rpc_config, rpc_profiles)
+        return cls.preset(
+            active_preset=preset_info.active_preset,
+            available_presets=preset_info.available_presets,
+        )
 
 
 MiningMode = TypeVar(

pyasic/config/mining/algo.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, field
+from dataclasses import field
 from typing import TypeVar, Union
 
 from pyasic.config.base import MinerConfigOption, MinerConfigValue

pyasic/config/mining/presets.py

@@ -24,7 +24,14 @@ class MiningPreset(MinerConfigValue):
             hashrate = None
         else:
             power = hr_power_split[0].replace("watt", "").strip()
-            hashrate = hr_power_split[1].replace("TH", "").replace(" LC", "").strip()
+            hashrate = (
+                hr_power_split[1]
+                .replace("TH", "")
+                .replace("GH", "")
+                .replace("MH", "")
+                .replace(" LC", "")
+                .strip()
+            )
         tuned = web_preset["status"] == "tuned"
         modded_psu = web_preset["modded_psu_required"]
         return cls(

pyasic/config/mining/scaling.py

@@ -15,14 +15,12 @@
 # ------------------------------------------------------------------------------
 from __future__ import annotations
 
-from dataclasses import dataclass
-
 from pyasic.config.base import MinerConfigValue
 
 
 class ScalingShutdown(MinerConfigValue):
     enabled: bool = False
-    duration: int = None
+    duration: int | None = None
 
     @classmethod
     def from_dict(cls, dict_conf: dict | None) -> "ScalingShutdown":
@@ -65,9 +63,9 @@ class ScalingShutdown(MinerConfigValue):
 
 
 class ScalingConfig(MinerConfigValue):
-    step: int = None
-    minimum: int = None
-    shutdown: ScalingShutdown = None
+    step: int | None = None
+    minimum: int | None = None
+    shutdown: ScalingShutdown | None = None
 
     @classmethod
     def from_dict(cls, dict_conf: dict | None) -> "ScalingConfig":
@@ -81,7 +79,7 @@ class ScalingConfig(MinerConfigValue):
         return cls(**cls_conf)
 
     @classmethod
-    def from_bosminer(cls, toml_conf: dict, mode: str = None):
+    def from_bosminer(cls, toml_conf: dict, mode: str | None = None):
         if mode == "power":
             return cls._from_bosminer_power(toml_conf)
         if mode == "hashrate":
@@ -106,7 +104,7 @@ class ScalingConfig(MinerConfigValue):
             return cls(step=power_step, minimum=min_power, shutdown=sd_mode)
 
     @classmethod
-    def from_boser(cls, grpc_miner_conf: dict, mode: str = None):
+    def from_boser(cls, grpc_miner_conf: dict, mode: str | None = None):
         if mode == "power":
             return cls._from_boser_power(grpc_miner_conf)
         if mode == "hashrate":

pyasic/config/pools.py

@@ -43,6 +43,20 @@ class Pool(MinerConfigValue):
             "pass": self.password,
         }
 
+    def as_hiveon_modern(self, user_suffix: str | None = None) -> dict:
+        return {
+            "url": self.url,
+            "user": f"{self.user}{user_suffix or ''}",
+            "pass": self.password,
+        }
+
+    def as_elphapex(self, user_suffix: str | None = None) -> dict:
+        return {
+            "url": self.url,
+            "user": f"{self.user}{user_suffix or ''}",
+            "pass": self.password,
+        }
+
     def as_wm(self, idx: int = 1, user_suffix: str | None = None) -> dict:
         return {
             f"pool_{idx}": self.url,
@@ -102,7 +116,7 @@ class Pool(MinerConfigValue):
             "pass": self.password,
         }
 
-    def as_bitaxe(self, user_suffix: str | None = None) -> dict:
+    def as_espminer(self, user_suffix: str | None = None) -> dict:
         return {
             "stratumURL": self.url,
             "stratumUser": f"{self.user}{user_suffix or ''}",
@@ -146,6 +160,18 @@ class Pool(MinerConfigValue):
             url=web_pool["url"], user=web_pool["user"], password=web_pool["pass"]
         )
 
+    @classmethod
+    def from_hiveon_modern(cls, web_pool: dict) -> "Pool":
+        return cls(
+            url=web_pool["url"], user=web_pool["user"], password=web_pool["pass"]
+        )
+
+    @classmethod
+    def from_elphapex(cls, web_pool: dict) -> "Pool":
+        return cls(
+            url=web_pool["url"], user=web_pool["user"], password=web_pool["pass"]
+        )
+
     # TODO: check if this is accurate, user/username, pass/password
     @classmethod
     def from_goldshell(cls, web_pool: dict) -> "Pool":
@@ -164,7 +190,7 @@ class Pool(MinerConfigValue):
         return cls(
             url=toml_pool_conf["url"],
             user=toml_pool_conf["user"],
-            password=toml_pool_conf["password"],
+            password=toml_pool_conf.get("password", ""),
         )
 
     @classmethod
@@ -192,7 +218,7 @@ class Pool(MinerConfigValue):
         )
 
     @classmethod
-    def from_bitaxe(cls, web_system_info: dict) -> "Pool":
+    def from_espminer(cls, web_system_info: dict) -> "Pool":
         url = f"stratum+tcp://{web_system_info['stratumURL']}:{web_system_info['stratumPort']}"
         return cls(
             url=url,
@@ -235,6 +261,28 @@ class PoolGroup(MinerConfigValue):
             idx += 1
         return pools
 
+    def as_hiveon_modern(self, user_suffix: str | None = None) -> list:
+        pools = []
+        idx = 0
+        while idx < 3:
+            if len(self.pools) > idx:
+                pools.append(self.pools[idx].as_hiveon_modern(user_suffix=user_suffix))
+            else:
+                pools.append(Pool(url="", user="", password="").as_hiveon_modern())
+            idx += 1
+        return pools
+
+    def as_elphapex(self, user_suffix: str | None = None) -> list:
+        pools = []
+        idx = 0
+        while idx < 3:
+            if len(self.pools) > idx:
+                pools.append(self.pools[idx].as_elphapex(user_suffix=user_suffix))
+            else:
+                pools.append(Pool(url="", user="", password="").as_elphapex())
+            idx += 1
+        return pools
+
     def as_wm(self, user_suffix: str | None = None) -> dict:
         pools = {}
         idx = 0
@@ -306,8 +354,8 @@ class PoolGroup(MinerConfigValue):
     def as_mara(self, user_suffix: str | None = None) -> list:
         return [p.as_mara(user_suffix=user_suffix) for p in self.pools]
 
-    def as_bitaxe(self, user_suffix: str | None = None) -> dict:
-        return self.pools[0].as_bitaxe(user_suffix=user_suffix)
+    def as_espminer(self, user_suffix: str | None = None) -> dict:
+        return self.pools[0].as_espminer(user_suffix=user_suffix)
 
     def as_boser(self, user_suffix: str | None = None) -> PoolGroupConfiguration:
         return PoolGroupConfiguration(
@@ -351,6 +399,20 @@ class PoolGroup(MinerConfigValue):
             pools.append(Pool.from_am_modern(pool))
         return cls(pools=pools)
 
+    @classmethod
+    def from_hiveon_modern(cls, web_pool_list: list) -> "PoolGroup":
+        pools = []
+        for pool in web_pool_list:
+            pools.append(Pool.from_hiveon_modern(pool))
+        return cls(pools=pools)
+
+    @classmethod
+    def from_elphapex(cls, web_pool_list: list) -> "PoolGroup":
+        pools = []
+        for pool in web_pool_list:
+            pools.append(Pool.from_elphapex(pool))
+        return cls(pools=pools)
+
     @classmethod
     def from_goldshell(cls, web_pools: list) -> "PoolGroup":
         return cls(pools=[Pool.from_goldshell(p) for p in web_pools])
@@ -364,7 +426,7 @@ class PoolGroup(MinerConfigValue):
         if toml_group_conf.get("pool") is not None:
             return cls(
                 name=toml_group_conf["name"],
-                quota=toml_group_conf.get("quota"),
+                quota=toml_group_conf.get("quota", 1),
                 pools=[Pool.from_bosminer(p) for p in toml_group_conf["pool"]],
             )
         return cls()
@@ -395,8 +457,8 @@ class PoolGroup(MinerConfigValue):
         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)])
+    def from_espminer(cls, web_system_info: dict) -> "PoolGroup":
+        return cls(pools=[Pool.from_espminer(web_system_info)])
 
     @classmethod
     def from_iceriver(cls, web_userpanel: dict) -> "PoolGroup":
@@ -436,6 +498,16 @@ class PoolConfig(MinerConfigValue):
             return {"pools": self.groups[0].as_am_modern(user_suffix=user_suffix)}
         return {"pools": PoolGroup().as_am_modern()}
 
+    def as_hiveon_modern(self, user_suffix: str | None = None) -> dict:
+        if len(self.groups) > 0:
+            return {"pools": self.groups[0].as_hiveon_modern(user_suffix=user_suffix)}
+        return {"pools": PoolGroup().as_hiveon_modern()}
+
+    def as_elphapex(self, user_suffix: str | None = None) -> dict:
+        if len(self.groups) > 0:
+            return {"pools": self.groups[0].as_elphapex(user_suffix=user_suffix)}
+        return {"pools": PoolGroup().as_elphapex()}
+
     def as_wm(self, user_suffix: str | None = None) -> dict:
         if len(self.groups) > 0:
             return {"pools": self.groups[0].as_wm(user_suffix=user_suffix)}
@@ -507,8 +579,8 @@ class PoolConfig(MinerConfigValue):
             return {"pools": self.groups[0].as_mara(user_suffix=user_suffix)}
         return {"pools": []}
 
-    def as_bitaxe(self, user_suffix: str | None = None) -> dict:
-        return self.groups[0].as_bitaxe(user_suffix=user_suffix)
+    def as_espminer(self, user_suffix: str | None = None) -> dict:
+        return self.groups[0].as_espminer(user_suffix=user_suffix)
 
     def as_luxos(self, user_suffix: str | None = None) -> dict:
         return {}
@@ -533,10 +605,28 @@ class PoolConfig(MinerConfigValue):
 
     @classmethod
     def from_am_modern(cls, web_conf: dict) -> "PoolConfig":
-        pool_data = web_conf["pools"]
+        try:
+            pool_data = web_conf["pools"]
+        except KeyError:
+            return cls(groups=[])
 
         return cls(groups=[PoolGroup.from_am_modern(pool_data)])
 
+    @classmethod
+    def from_hiveon_modern(cls, web_conf: dict) -> "PoolConfig":
+        try:
+            pool_data = web_conf["pools"]
+        except KeyError:
+            return cls(groups=[])
+
+        return cls(groups=[PoolGroup.from_hiveon_modern(pool_data)])
+
+    @classmethod
+    def from_elphapex(cls, web_conf: dict) -> "PoolConfig":
+        pool_data = web_conf["pools"]
+
+        return cls(groups=[PoolGroup.from_elphapex(pool_data)])
+
     @classmethod
     def from_goldshell(cls, web_pools: list) -> "PoolConfig":
         return cls(groups=[PoolGroup.from_goldshell(web_pools)])
@@ -576,8 +666,8 @@ class PoolConfig(MinerConfigValue):
         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)])
+    def from_espminer(cls, web_system_info: dict) -> "PoolConfig":
+        return cls(groups=[PoolGroup.from_espminer(web_system_info)])
 
     @classmethod
     def from_iceriver(cls, web_userpanel: dict) -> "PoolConfig":

pyasic/config/temperature.py

@@ -15,8 +15,6 @@
 # ------------------------------------------------------------------------------
 from __future__ import annotations
 
-from dataclasses import dataclass
-
 from pyasic.config.base import MinerConfigValue
 
 

pyasic/data/__init__.py

@@ -16,7 +16,7 @@
 import copy
 import time
 from datetime import datetime, timezone
-from typing import Any, List, Union
+from typing import Any
 
 from pydantic import BaseModel, Field, computed_field
 
@@ -24,12 +24,11 @@ from pyasic.config import MinerConfig
 from pyasic.config.mining import MiningModePowerTune
 from pyasic.data.pools import PoolMetrics, Scheme
 from pyasic.device.algorithm.hashrate import AlgoHashRateType
-from pyasic.device.algorithm.hashrate.base import GenericHashrate
 
-from ..device.algorithm.hashrate.unit.base import GenericUnit
 from .boards import HashBoard
 from .device import DeviceInfo
 from .error_codes import BraiinsOSError, InnosiliconError, WhatsminerError, X19Error
+from .error_codes.base import BaseMinerError
 from .fans import Fan
 
 
@@ -109,25 +108,18 @@ class MinerData(BaseModel):
     raw_wattage_limit: int | None = Field(exclude=True, default=None, repr=False)
 
     # fans
-    fans: List[Fan] = Field(default_factory=list)
+    fans: list[Fan] = Field(default_factory=list)
     fan_psu: int | None = None
 
     # boards
-    hashboards: List[HashBoard] = Field(default_factory=list)
+    hashboards: list[HashBoard] = Field(default_factory=list)
 
     # config
     config: MinerConfig | None = None
     fault_light: bool | None = None
 
     # errors
-    errors: List[
-        Union[
-            WhatsminerError,
-            BraiinsOSError,
-            X19Error,
-            InnosiliconError,
-        ]
-    ] = Field(default_factory=list)
+    errors: list[BaseMinerError] = Field(default_factory=list)
 
     # mining state
     is_mining: bool = True
@@ -137,8 +129,10 @@ class MinerData(BaseModel):
     pools: list[PoolMetrics] = Field(default_factory=list)
 
     @classmethod
-    def fields(cls):
-        return list(cls.model_fields.keys())
+    def fields(cls) -> set:
+        all_fields = set(cls.model_fields.keys())
+        all_fields.update(set(cls.model_computed_fields.keys()))
+        return all_fields
 
     def get(self, __key: str, default: Any = None):
         try:
@@ -309,25 +303,25 @@ class MinerData(BaseModel):
 
     @computed_field  # type: ignore[misc]
     @property
-    def make(self) -> str:
+    def make(self) -> str | None:
         if self.device_info.make is not None:
             return str(self.device_info.make)
 
     @computed_field  # type: ignore[misc]
     @property
-    def model(self) -> str:
+    def model(self) -> str | None:
         if self.device_info.model is not None:
             return str(self.device_info.model)
 
     @computed_field  # type: ignore[misc]
     @property
-    def firmware(self) -> str:
+    def firmware(self) -> str | None:
         if self.device_info.firmware is not None:
             return str(self.device_info.firmware)
 
     @computed_field  # type: ignore[misc]
     @property
-    def algo(self) -> str:
+    def algo(self) -> str | None:
         if self.device_info.algo is not None:
             return str(self.device_info.algo)
 
@@ -367,7 +361,9 @@ class MinerData(BaseModel):
         data_list = [str(data[item]) for item in data]
         return ",".join(data_list)
 
-    def as_influxdb(self, measurement_name: str = "miner_data") -> str:
+    def as_influxdb(
+        self, measurement_name: str = "miner_data", level_delimiter: str = "."
+    ) -> str:
         """Get this dataclass as [influxdb line protocol](https://docs.influxdata.com/influxdb/v2.4/reference/syntax/line-protocol/).
 
         Parameters:
@@ -376,54 +372,127 @@ class MinerData(BaseModel):
         Returns:
             A influxdb line protocol version of this class.
         """
-        tag_data = [measurement_name]
+
+        def serialize_int(key: str, value: int) -> str:
+            return f"{key}={value}"
+
+        def serialize_float(key: str, value: float) -> str:
+            return f"{key}={value}"
+
+        def serialize_str(key: str, value: str) -> str:
+            return f'{key}="{value}"'
+
+        def serialize_algo_hash_rate(key: str, value: AlgoHashRateType) -> str:
+            return f"{key}={round(float(value), 2)}"
+
+        def serialize_list(key: str, value: list[Any]) -> str | None:
+            if len(value) == 0:
+                return None
+
+            list_field_data = []
+            for idx, list_field_val in enumerate(value):
+                item_serialization_func = serialization_map.get(
+                    type(list_field_val), lambda _k, _v: None
+                )
+                item_serialized = item_serialization_func(
+                    f"{key}{level_delimiter}{idx}", list_field_val
+                )
+                if item_serialized is not None:
+                    list_field_data.append(item_serialized)
+                    continue
+                for dt in serialization_map_instance:
+                    if item_serialized is None:
+                        if isinstance(list_field_val, dt):
+                            item_serialized = serialization_map_instance[dt](
+                                f"{key}{level_delimiter}{idx}", list_field_val
+                            )
+                if item_serialized is not None:
+                    list_field_data.append(item_serialized)
+            return ",".join(list_field_data)
+
+        def serialize_miner_error(key: str, value: BaseMinerError):
+            return value.as_influxdb(key, level_delimiter=level_delimiter)
+
+        def serialize_fan(key: str, value: Fan) -> str:
+            return f"{key}{level_delimiter}speed={value.speed}"
+
+        def serialize_hashboard(key: str, value: HashBoard) -> str:
+            return value.as_influxdb(key, level_delimiter=level_delimiter)
+
+        def serialize_bool(key: str, value: bool):
+            return f"{key}={str(value).lower()}"
+
+        def serialize_pool_metrics(key: str, value: PoolMetrics):
+            return value.as_influxdb(key, level_delimiter=level_delimiter)
+
+        include = [
+            "uptime",
+            "expected_hashrate",
+            "hashrate",
+            "hashboards",
+            "temperature_avg",
+            "env_temp",
+            "wattage",
+            "wattage_limit",
+            "voltage",
+            "fans",
+            "expected_fans",
+            "fan_psu",
+            "total_chips",
+            "expected_chips",
+            "efficiency",
+            "fault_light",
+            "is_mining",
+            "errors",
+            "pools",
+        ]
+
+        serialization_map_instance = {
+            AlgoHashRateType: serialize_algo_hash_rate,
+            BaseMinerError: serialize_miner_error,
+        }
+        serialization_map = {
+            int: serialize_int,
+            float: serialize_float,
+            str: serialize_str,
+            bool: serialize_bool,
+            list: serialize_list,
+            Fan: serialize_fan,
+            HashBoard: serialize_hashboard,
+            PoolMetrics: serialize_pool_metrics,
+        }
+
+        tag_data = [
+            measurement_name,
+            f"ip={str(self.ip)}",
+            f"mac={str(self.mac)}",
+            f"make={str(self.make)}",
+            f"model={str(self.model)}",
+            f"firmware={str(self.firmware)}",
+            f"algo={str(self.algo)}",
+        ]
         field_data = []
 
-        tags = ["ip", "mac", "model", "hostname"]
-        for attribute in self.fields():
-            if attribute in tags:
-                escaped_data = self.get(attribute, "Unknown").replace(" ", "\\ ")
-                tag_data.append(f"{attribute}={escaped_data}")
+        for field in include:
+            field_val = getattr(self, field)
+            serialization_func = serialization_map.get(
+                type(field_val), lambda _k, _v: None
+            )
+            serialized = serialization_func(field, field_val)
+            if serialized is not None:
+                field_data.append(serialized)
                 continue
-            elif str(attribute).startswith("_"):
-                continue
-            elif isinstance(self[attribute], str):
-                field_data.append(f'{attribute}="{self[attribute]}"')
-                continue
-            elif isinstance(self[attribute], bool):
-                field_data.append(f"{attribute}={str(self[attribute]).lower()}")
-                continue
-            elif isinstance(self[attribute], int):
-                field_data.append(f"{attribute}={self[attribute]}")
-                continue
-            elif isinstance(self[attribute], float):
-                field_data.append(f"{attribute}={self[attribute]}")
-                continue
-            elif attribute == "errors":
-                for idx, item in enumerate(self[attribute]):
-                    field_data.append(f'error_{idx+1}="{item.error_message}"')
-            elif attribute == "hashboards":
-                for idx, item in enumerate(self[attribute]):
-                    field_data.append(
-                        f"hashboard_{idx+1}_hashrate={item.get('hashrate', 0.0)}"
-                    )
-                    field_data.append(
-                        f"hashboard_{idx+1}_temperature={item.get('temp', 0)}"
-                    )
-                    field_data.append(
-                        f"hashboard_{idx+1}_chip_temperature={item.get('chip_temp', 0)}"
-                    )
-                    field_data.append(f"hashboard_{idx+1}_chips={item.get('chips', 0)}")
-                    field_data.append(
-                        f"hashboard_{idx+1}_expected_chips={item.get('expected_chips', 0)}"
-                    )
-            elif attribute == "fans":
-                for idx, item in enumerate(self[attribute]):
-                    if item.speed is not None:
-                        field_data.append(f"fan_{idx+1}={item.speed}")
+            for datatype in serialization_map_instance:
+                if serialized is None:
+                    if isinstance(field_val, datatype):
+                        serialized = serialization_map_instance[datatype](
+                            field, field_val
+                        )
+            if serialized is not None:
+                field_data.append(serialized)
 
-        tags_str = ",".join(tag_data)
-        field_str = ",".join(field_data)
-        timestamp = str(self.timestamp * 1e9)
+        tags_str = ",".join(tag_data).replace(" ", "\\ ")
+        field_str = ",".join(field_data).replace(" ", "\\ ")
+        timestamp = str(self.timestamp * 10**9)
 
         return " ".join([tags_str, field_str, timestamp])

pyasic/data/boards.py

@@ -17,7 +17,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from pydantic import BaseModel, field_serializer
+from pydantic import BaseModel
 
 from pyasic.device.algorithm.hashrate import AlgoHashRateType
 
@@ -51,6 +51,12 @@ class HashBoard(BaseModel):
     active: bool | None = None
     voltage: float | None = None
 
+    @classmethod
+    def fields(cls) -> set:
+        all_fields = set(cls.model_fields.keys())
+        all_fields.update(set(cls.model_computed_fields.keys()))
+        return all_fields
+
     def get(self, __key: str, default: Any = None):
         try:
             val = self.__getitem__(__key)
@@ -65,3 +71,63 @@ class HashBoard(BaseModel):
             return getattr(self, item)
         except AttributeError:
             raise KeyError(f"{item}")
+
+    def as_influxdb(self, key_root: str, level_delimiter: str = ".") -> str:
+
+        def serialize_int(key: str, value: int) -> str:
+            return f"{key}={value}"
+
+        def serialize_float(key: str, value: float) -> str:
+            return f"{key}={value}"
+
+        def serialize_str(key: str, value: str) -> str:
+            return f'{key}="{value}"'
+
+        def serialize_algo_hash_rate(key: str, value: AlgoHashRateType) -> str:
+            return f"{key}={round(float(value), 2)}"
+
+        def serialize_bool(key: str, value: bool):
+            return f"{key}={str(value).lower()}"
+
+        serialization_map_instance = {
+            AlgoHashRateType: serialize_algo_hash_rate,
+        }
+        serialization_map = {
+            int: serialize_int,
+            float: serialize_float,
+            str: serialize_str,
+            bool: serialize_bool,
+        }
+
+        include = [
+            "hashrate",
+            "temp",
+            "chip_temp",
+            "chips",
+            "expected_chips",
+            "tuned",
+            "active",
+            "voltage",
+        ]
+
+        field_data = []
+        for field in include:
+            field_val = getattr(self, field)
+            serialization_func = serialization_map.get(
+                type(field_val), lambda _k, _v: None
+            )
+            serialized = serialization_func(
+                f"{key_root}{level_delimiter}{field}", field_val
+            )
+            if serialized is not None:
+                field_data.append(serialized)
+                continue
+            for datatype in serialization_map_instance:
+                if serialized is None:
+                    if isinstance(field_val, datatype):
+                        serialized = serialization_map_instance[datatype](
+                            f"{key_root}{level_delimiter}{field}", field_val
+                        )
+            if serialized is not None:
+                field_data.append(serialized)
+        return ",".join(field_data)

pyasic/data/error_codes/__init__.py

@@ -18,9 +18,15 @@ from typing import TypeVar
 
 from .bos import BraiinsOSError
 from .innosilicon import InnosiliconError
+from .vnish import VnishError
 from .whatsminer import WhatsminerError
 from .X19 import X19Error
 
 MinerErrorData = TypeVar(
-    "MinerErrorData", WhatsminerError, BraiinsOSError, X19Error, InnosiliconError
+    "MinerErrorData",
+    WhatsminerError,
+    BraiinsOSError,
+    X19Error,
+    InnosiliconError,
+    VnishError,
 )

pyasic/data/error_codes/base.py

@@ -16,3 +16,17 @@ class BaseMinerError(BaseModel):
             A dictionary version of this class.
         """
         return self.asdict()
+
+    def as_influxdb(self, root_key: str, level_delimiter: str = ".") -> str:
+        field_data = []
+
+        if self.error_code is not None:
+            field_data.append(
+                f"{root_key}{level_delimiter}error_code={self.error_code}"
+            )
+        if self.error_message is not None:
+            field_data.append(
+                f'{root_key}{level_delimiter}error_message="{self.error_message}"'
+            )
+
+        return ",".join(field_data)

pyasic/data/error_codes/vnish.py

@@ -0,0 +1,28 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2022 Upstream Data Inc                                            -
+#                                                                              -
+#  Licensed under the Apache License, Version 2.0 (the "License");             -
+#  you may not use this file except in compliance with the License.            -
+#  You may obtain a copy of the License at                                     -
+#                                                                              -
+#      http://www.apache.org/licenses/LICENSE-2.0                              -
+#                                                                              -
+#  Unless required by applicable law or agreed to in writing, software         -
+#  distributed under the License is distributed on an "AS IS" BASIS,           -
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.    -
+#  See the License for the specific language governing permissions and         -
+#  limitations under the License.                                              -
+# ------------------------------------------------------------------------------
+from pyasic.data.error_codes.base import BaseMinerError
+
+
+class VnishError(BaseMinerError):
+    """A Dataclass to handle error codes of Vnish miners.
+
+    Attributes:
+        error_message: The error message as a string.
+        error_code: The error code as an int.  0 if the message is not assigned a code.
+    """
+
+    error_message: str
+    error_code: int = 0

pyasic/data/pools.py

@@ -92,3 +92,51 @@ class PoolMetrics(BaseModel):
         if total == 0:
             return 0
         return (value / total) * 100
+
+    def as_influxdb(self, key_root: str, level_delimiter: str = ".") -> str:
+
+        def serialize_int(key: str, value: int) -> str:
+            return f"{key}={value}"
+
+        def serialize_float(key: str, value: float) -> str:
+            return f"{key}={value}"
+
+        def serialize_str(key: str, value: str) -> str:
+            return f'{key}="{value}"'
+
+        def serialize_pool_url(key: str, value: str) -> str:
+            return f'{key}="{str(value)}"'
+
+        def serialize_bool(key: str, value: bool):
+            return f"{key}={str(value).lower()}"
+
+        serialization_map = {
+            int: serialize_int,
+            float: serialize_float,
+            str: serialize_str,
+            bool: serialize_bool,
+            PoolUrl: serialize_pool_url,
+        }
+
+        include = [
+            "url",
+            "accepted",
+            "rejected",
+            "active",
+            "alive",
+            "user",
+        ]
+
+        field_data = []
+        for field in include:
+            field_val = getattr(self, field)
+            serialization_func = serialization_map.get(
+                type(field_val), lambda _k, _v: None
+            )
+            serialized = serialization_func(
+                f"{key_root}{level_delimiter}{field}", field_val
+            )
+            if serialized is not None:
+                field_data.append(serialized)
+
+        return ",".join(field_data)

pyasic/device/makes.py

@@ -26,9 +26,11 @@ class MinerMake(str, Enum):
     AURADINE = "Auradine"
     EPIC = "ePIC"
     BITAXE = "BitAxe"
+    LUCKYMINER = "LuckyMiner"
     ICERIVER = "IceRiver"
     HAMMER = "Hammer"
     VOLCMINER = "VolcMiner"
+    ELPHAPEX = "Elphapex"
     BRAIINS = "Braiins"
 
     def __str__(self):

pyasic/device/models.py

@@ -13,6 +13,7 @@ class AntminerModels(MinerModelType):
     KS3 = "KS3"
     DR5 = "DR5"
     KS5 = "KS5"
+    KS5Pro = "KS5Pro"
     L7 = "L7"
     K7 = "K7"
     D7 = "D7"
@@ -57,7 +58,9 @@ class AntminerModels(MinerModelType):
     S19jXP = "S19j XP"
     T19 = "T19"
     S21 = "S21"
+    S21Plus = "S21+"
     S21Pro = "S21 Pro"
+    S21Hydro = "S21 Hydro"
     T21 = "T21"
 
     def __str__(self):
@@ -65,23 +68,84 @@ class AntminerModels(MinerModelType):
 
 
 class WhatsminerModels(MinerModelType):
-    M20V10 = "M20 V10"
-    M20SV10 = "M20S V10"
-    M20SV20 = "M20S V20"
-    M20SV30 = "M20S V30"
     M20PV10 = "M20P V10"
     M20PV30 = "M20P V30"
     M20SPlusV30 = "M20S+ V30"
-    M21V10 = "M21 V10"
+    M20SV10 = "M20S V10"
+    M20SV20 = "M20S V20"
+    M20SV30 = "M20S V30"
+    M20V10 = "M20 V10"
+    M21SPlusV20 = "M21S+ V20"
     M21SV20 = "M21S V20"
     M21SV60 = "M21S V60"
     M21SV70 = "M21S V70"
-    M21SPlusV20 = "M21S+ V20"
+    M21V10 = "M21 V10"
     M29V10 = "M29 V10"
-    M30V10 = "M30 V10"
-    M30V20 = "M30 V20"
     M30KV10 = "M30K V10"
     M30LV10 = "M30L V10"
+    M30SPlusPlusV10 = "M30S++ V10"
+    M30SPlusPlusV20 = "M30S++ V20"
+    M30SPlusPlusVE30 = "M30S++ VE30"
+    M30SPlusPlusVE40 = "M30S++ VE40"
+    M30SPlusPlusVE50 = "M30S++ VE50"
+    M30SPlusPlusVF40 = "M30S++ VF40"
+    M30SPlusPlusVG30 = "M30S++ VG30"
+    M30SPlusPlusVG40 = "M30S++ VG40"
+    M30SPlusPlusVG50 = "M30S++ VG50"
+    M30SPlusPlusVH10 = "M30S++ VH10"
+    M30SPlusPlusVH100 = "M30S++ VH100"
+    M30SPlusPlusVH110 = "M30S++ VH110"
+    M30SPlusPlusVH20 = "M30S++ VH20"
+    M30SPlusPlusVH30 = "M30S++ VH30"
+    M30SPlusPlusVH40 = "M30S++ VH40"
+    M30SPlusPlusVH50 = "M30S++ VH50"
+    M30SPlusPlusVH60 = "M30S++ VH60"
+    M30SPlusPlusVH70 = "M30S++ VH70"
+    M30SPlusPlusVH80 = "M30S++ VH80"
+    M30SPlusPlusVH90 = "M30S++ VH90"
+    M30SPlusPlusVI30 = "M30S++ VI30"
+    M30SPlusPlusVJ20 = "M30S++ VJ20"
+    M30SPlusPlusVJ30 = "M30S++ VJ30"
+    M30SPlusPlusVJ50 = "M30S++ VJ50"
+    M30SPlusPlusVJ60 = "M30S++ VJ60"
+    M30SPlusPlusVJ70 = "M30S++ VJ70"
+    M30SPlusPlusVK30 = "M30S++ VK30"
+    M30SPlusPlusVK40 = "M30S++ VK40"
+    M30SPlusV10 = "M30S+ V10"
+    M30SPlusV100 = "M30S+ V100"
+    M30SPlusV20 = "M30S+ V20"
+    M30SPlusV30 = "M30S+ V30"
+    M30SPlusV40 = "M30S+ V40"
+    M30SPlusV50 = "M30S+ V50"
+    M30SPlusV60 = "M30S+ V60"
+    M30SPlusV70 = "M30S+ V70"
+    M30SPlusV80 = "M30S+ V80"
+    M30SPlusV90 = "M30S+ V90"
+    M30SPlusVE100 = "M30S+ VE100"
+    M30SPlusVE30 = "M30S+ VE30"
+    M30SPlusVE40 = "M30S+ VE40"
+    M30SPlusVE50 = "M30S+ VE50"
+    M30SPlusVE60 = "M30S+ VE60"
+    M30SPlusVE70 = "M30S+ VE70"
+    M30SPlusVE80 = "M30S+ VE80"
+    M30SPlusVE90 = "M30S+ VE90"
+    M30SPlusVF20 = "M30S+ VF20"
+    M30SPlusVF30 = "M30S+ VF30"
+    M30SPlusVG20 = "M30S+ VG20"
+    M30SPlusVG30 = "M30S+ VG30"
+    M30SPlusVG40 = "M30S+ VG40"
+    M30SPlusVG50 = "M30S+ VG50"
+    M30SPlusVG60 = "M30S+ VG60"
+    M30SPlusVH10 = "M30S+ VH10"
+    M30SPlusVH20 = "M30S+ VH20"
+    M30SPlusVH30 = "M30S+ VH30"
+    M30SPlusVH40 = "M30S+ VH40"
+    M30SPlusVH50 = "M30S+ VH50"
+    M30SPlusVH60 = "M30S+ VH60"
+    M30SPlusVH70 = "M30S+ VH70"
+    M30SPlusVI30 = "M30S+ VI30"
+    M30SPlusVJ30 = "M30S+ VJ30"
+    M30SPlusVJ40 = "M30S+ VJ40"
     M30SV10 = "M30S V10"
     M30SV20 = "M30S V20"
     M30SV30 = "M30S V30"
@@ -111,63 +175,35 @@ class WhatsminerModels(MinerModelType):
     M30SVH50 = "M30S VH50"
     M30SVH60 = "M30S VH60"
     M30SVI20 = "M30S VI20"
-    M30SPlusV10 = "M30S+ V10"
-    M30SPlusV20 = "M30S+ V20"
-    M30SPlusV30 = "M30S+ V30"
-    M30SPlusV40 = "M30S+ V40"
-    M30SPlusV50 = "M30S+ V50"
-    M30SPlusV60 = "M30S+ V60"
-    M30SPlusV70 = "M30S+ V70"
-    M30SPlusV80 = "M30S+ V80"
-    M30SPlusV90 = "M30S+ V90"
-    M30SPlusV100 = "M30S+ V100"
-    M30SPlusVE30 = "M30S+ VE30"
-    M30SPlusVE40 = "M30S+ VE40"
-    M30SPlusVE50 = "M30S+ VE50"
-    M30SPlusVE60 = "M30S+ VE60"
-    M30SPlusVE70 = "M30S+ VE70"
-    M30SPlusVE80 = "M30S+ VE80"
-    M30SPlusVE90 = "M30S+ VE90"
-    M30SPlusVE100 = "M30S+ VE100"
-    M30SPlusVF20 = "M30S+ VF20"
-    M30SPlusVF30 = "M30S+ VF30"
-    M30SPlusVG20 = "M30S+ VG20"
-    M30SPlusVG30 = "M30S+ VG30"
-    M30SPlusVG40 = "M30S+ VG40"
-    M30SPlusVG50 = "M30S+ VG50"
-    M30SPlusVG60 = "M30S+ VG60"
-    M30SPlusVH10 = "M30S+ VH10"
-    M30SPlusVH20 = "M30S+ VH20"
-    M30SPlusVH30 = "M30S+ VH30"
-    M30SPlusVH40 = "M30S+ VH40"
-    M30SPlusVH50 = "M30S+ VH50"
-    M30SPlusVH60 = "M30S+ VH60"
-    M30SPlusPlusV10 = "M30S++ V10"
-    M30SPlusPlusV20 = "M30S++ V20"
-    M30SPlusPlusVE30 = "M30S++ VE30"
-    M30SPlusPlusVE40 = "M30S++ VE40"
-    M30SPlusPlusVE50 = "M30S++ VE50"
-    M30SPlusPlusVF40 = "M30S++ VF40"
-    M30SPlusPlusVG30 = "M30S++ VG30"
-    M30SPlusPlusVG40 = "M30S++ VG40"
-    M30SPlusPlusVG50 = "M30S++ VG50"
-    M30SPlusPlusVH10 = "M30S++ VH10"
-    M30SPlusPlusVH20 = "M30S++ VH20"
-    M30SPlusPlusVH30 = "M30S++ VH30"
-    M30SPlusPlusVH40 = "M30S++ VH40"
-    M30SPlusPlusVH50 = "M30S++ VH50"
-    M30SPlusPlusVH60 = "M30S++ VH60"
-    M30SPlusPlusVH70 = "M30S++ VH70"
-    M30SPlusPlusVH80 = "M30S++ VH80"
-    M30SPlusPlusVH90 = "M30S++ VH90"
-    M30SPlusPlusVH100 = "M30S++ VH100"
-    M30SPlusPlusVJ20 = "M30S++ VJ20"
-    M30SPlusPlusVJ30 = "M30S++ VJ30"
-    M31V10 = "M31 V10"
-    M31V20 = "M31 V20"
+    M30SVJ30 = "M30S VJ30"
+    M30V10 = "M30 V10"
+    M30V20 = "M30 V20"
     M31HV10 = "M31H V10"
     M31HV40 = "M31H V40"
-    M31LV10 = "M30L V10"
+    M31LV10 = "M31L V10"
+    M31SPlusV10 = "M31S+ V10"
+    M31SPlusV100 = "M31S+ V100"
+    M31SPlusV20 = "M31S+ V20"
+    M31SPlusV30 = "M31S+ V30"
+    M31SPlusV40 = "M31S+ V40"
+    M31SPlusV50 = "M31S+ V50"
+    M31SPlusV60 = "M31S+ V60"
+    M31SPlusV80 = "M31S+ V80"
+    M31SPlusV90 = "M31S+ V90"
+    M31SPlusVE10 = "M31S+ VE10"
+    M31SPlusVE20 = "M31S+ VE20"
+    M31SPlusVE30 = "M31S+ VE30"
+    M31SPlusVE40 = "M31S+ VE40"
+    M31SPlusVE50 = "M31S+ VE50"
+    M31SPlusVE60 = "M31S+ VE60"
+    M31SPlusVE80 = "M31S+ VE80"
+    M31SPlusVF20 = "M31S+ VF20"
+    M31SPlusVF30 = "M31S+ VF30"
+    M31SPlusVG20 = "M31S+ VG20"
+    M31SPlusVG30 = "M31S+ VG30"
+    M31SEV10 = "M31SE V10"
+    M31SEV20 = "M31SE V20"
+    M31SEV30 = "M31SE V30"
     M31SV10 = "M31S V10"
     M31SV20 = "M31S V20"
     M31SV30 = "M31S V30"
@@ -180,49 +216,69 @@ class WhatsminerModels(MinerModelType):
     M31SVE10 = "M31S VE10"
     M31SVE20 = "M31S VE20"
     M31SVE30 = "M31S VE30"
-    M31SEV10 = "M31SE V10"
-    M31SEV20 = "M31SE V20"
-    M31SEV30 = "M31SE V30"
-    M31SPlusV10 = "M31S+ V10"
-    M31SPlusV20 = "M31S+ V20"
-    M31SPlusV30 = "M31S+ V30"
-    M31SPlusV40 = "M31S+ V40"
-    M31SPlusV50 = "M31S+ V50"
-    M31SPlusV60 = "M31S+ V60"
-    M31SPlusV80 = "M31S+ V80"
-    M31SPlusV90 = "M31S+ V90"
-    M31SPlusV100 = "M31S+ V100"
-    M31SPlusVE10 = "M31S+ VE10"
-    M31SPlusVE20 = "M31S+ VE20"
-    M31SPlusVE30 = "M31S+ VE30"
-    M31SPlusVE40 = "M31S+ VE40"
-    M31SPlusVE50 = "M31S+ VE50"
-    M31SPlusVE60 = "M31S+ VE60"
-    M31SPlusVE80 = "M31S+ VE80"
-    M31SPlusVF20 = "M31S+ VF20"
-    M31SPlusVF30 = "M31S+ VF30"
-    M31SPlusVG20 = "M31S+ VG20"
-    M31SPlusVG30 = "M31S+ VG30"
+    M31V10 = "M31 V10"
+    M31V20 = "M31 V20"
     M32V10 = "M32 V10"
     M32V20 = "M32 V20"
-    M32S = "M32S"
+    M33SPlusPlusVG40 = "M33S++ VG40"
+    M33SPlusPlusVH20 = "M33S++ VH20"
+    M33SPlusPlusVH30 = "M33S++ VH30"
+    M33SPlusVG20 = "M33S+ VG20"
+    M33SPlusVG30 = "M33S+ VG30"
+    M33SPlusVH20 = "M33S+ VH20"
+    M33SPlusVH30 = "M33S+ VH30"
+    M33SVG30 = "M33S VG30"
     M33V10 = "M33 V10"
     M33V20 = "M33 V20"
     M33V30 = "M33 V30"
-    M33SVG30 = "M33S VG30"
-    M33SPlusVG20 = "M33S+ VG20"
-    M33SPlusVH20 = "M33S+ VH20"
-    M33SPlusVH30 = "M33S+ VH30"
-    M33SPlusPlusVH20 = "M33S++ VH20"
-    M33SPlusPlusVH30 = "M33S++ VH30"
-    M33SPlusPlusVG40 = "M33S++ VG40"
     M34SPlusVE10 = "M34S+ VE10"
-    M36SVE10 = "M36S VE10"
-    M36SPlusVG30 = "M36S+ VG30"
     M36SPlusPlusVH30 = "M36S++ VH30"
+    M36SPlusVG30 = "M36S+ VG30"
+    M36SVE10 = "M36S VE10"
     M39V10 = "M39 V10"
     M39V20 = "M39 V20"
     M39V30 = "M39 V30"
+    M50SPlusPlusVK10 = "M50S++ VK10"
+    M50SPlusPlusVK20 = "M50S++ VK20"
+    M50SPlusPlusVK30 = "M50S++ VK30"
+    M50SPlusPlusVK40 = "M50S++ VK40"
+    M50SPlusPlusVK50 = "M50S++ VK50"
+    M50SPlusPlusVK60 = "M50S++ VK60"
+    M50SPlusPlusVL20 = "M50S++ VL20"
+    M50SPlusPlusVL30 = "M50S++ VL30"
+    M50SPlusPlusVL40 = "M50S++ VL40"
+    M50SPlusPlusVL50 = "M50S++ VL50"
+    M50SPlusPlusVL60 = "M50S++ VL60"
+    M50SPlusVH30 = "M50S+ VH30"
+    M50SPlusVH40 = "M50S+ VH40"
+    M50SPlusVJ30 = "M50S+ VJ30"
+    M50SPlusVJ40 = "M50S+ VJ40"
+    M50SPlusVJ60 = "M50S+ VJ60"
+    M50SPlusVK10 = "M50S+ VK10"
+    M50SPlusVK20 = "M50S+ VK20"
+    M50SPlusVK30 = "M50S+ VK30"
+    M50SPlusVL10 = "M50S+ VL10"
+    M50SPlusVL20 = "M50S+ VL20"
+    M50SPlusVL30 = "M50S+ VL30"
+    M50SVH10 = "M50S VH10"
+    M50SVH20 = "M50S VH20"
+    M50SVH30 = "M50S VH30"
+    M50SVH40 = "M50S VH40"
+    M50SVH50 = "M50S VH50"
+    M50SVJ10 = "M50S VJ10"
+    M50SVJ20 = "M50S VJ20"
+    M50SVJ30 = "M50S VJ30"
+    M50SVJ40 = "M50S VJ40"
+    M50SVJ50 = "M50S VJ50"
+    M50SVK10 = "M50S VK10"
+    M50SVK20 = "M50S VK20"
+    M50SVK30 = "M50S VK30"
+    M50SVK50 = "M50S VK50"
+    M50SVK60 = "M50S VK60"
+    M50SVK70 = "M50S VK70"
+    M50SVK80 = "M50S VK80"
+    M50SVL20 = "M50S VL20"
+    M50SVL30 = "M50S VL30"
     M50VE30 = "M50 VE30"
     M50VG30 = "M50 VG30"
     M50VH10 = "M50 VH10"
@@ -237,50 +293,143 @@ class WhatsminerModels(MinerModelType):
     M50VJ10 = "M50 VJ10"
     M50VJ20 = "M50 VJ20"
     M50VJ30 = "M50 VJ30"
-    M50SVJ10 = "M50S VJ10"
-    M50SVJ20 = "M50S VJ20"
-    M50SVJ30 = "M50S VJ30"
-    M50SVH10 = "M50S VH10"
-    M50SVH20 = "M50S VH20"
-    M50SVH30 = "M50S VH30"
-    M50SVH40 = "M50S VH40"
-    M50SVH50 = "M50S VH50"
-    M50SPlusVH30 = "M50S+ VH30"
-    M50SPlusVH40 = "M50S+ VH40"
-    M50SPlusVJ30 = "M50S+ VJ30"
-    M50SPlusVK20 = "M50S+ VK20"
-    M50SPlusPlusVK10 = "M50S++ VK10"
-    M50SPlusPlusVK20 = "M50S++ VK20"
-    M50SPlusPlusVK30 = "M50S++ VK30"
-    M50SPlusPlusVL30 = "M50S++ VL30"
-    M53VH30 = "M53 VH30"
-    M53SVH30 = "M53S VH30"
-    M53SVJ40 = "M53S VJ40"
-    M53SPlusVJ30 = "M53S+ VJ30"
+    M50VJ40 = "M50 VJ40"
+    M50VJ60 = "M50 VJ60"
+    M50VK40 = "M50 VK40"
+    M50VK50 = "M50 VK50"
+    M52SPlusPlusVL10 = "M52S++ VL10"
+    M52SVK30 = "M52S VK30"
+    M53HVH10 = "M53H VH10"
     M53SPlusPlusVK10 = "M53S++ VK10"
-    M56VH30 = "M56 VH30"
-    M56SVH30 = "M56S VH30"
+    M53SPlusPlusVK20 = "M53S++ VK20"
+    M53SPlusPlusVK30 = "M53S++ VK30"
+    M53SPlusPlusVK50 = "M53S++ VK50"
+    M53SPlusPlusVL10 = "M53S++ VL10"
+    M53SPlusPlusVL30 = "M53S++ VL30"
+    M53SPlusVJ30 = "M53S+ VJ30"
+    M53SPlusVJ40 = "M53S+ VJ40"
+    M53SPlusVJ50 = "M53S+ VJ50"
+    M53SPlusVK30 = "M53S+ VK30"
+    M53SVH20 = "M53S VH20"
+    M53SVH30 = "M53S VH30"
+    M53SVJ30 = "M53S VJ30"
+    M53SVJ40 = "M53S VJ40"
+    M53SVK30 = "M53S VK30"
+    M53VH30 = "M53 VH30"
+    M53VH40 = "M53 VH40"
+    M53VH50 = "M53 VH50"
+    M53VK30 = "M53 VK30"
+    M53VK60 = "M53 VK60"
+    M54SPlusPlusVK30 = "M54S++ VK30"
+    M54SPlusPlusVL30 = "M54S++ VL30"
+    M54SPlusPlusVL40 = "M54S++ VL40"
+    M56SPlusPlusVK10 = "M56S++ VK10"
+    M56SPlusPlusVK30 = "M56S++ VK30"
+    M56SPlusPlusVK40 = "M56S++ VK40"
+    M56SPlusPlusVK50 = "M56S++ VK50"
     M56SPlusVJ30 = "M56S+ VJ30"
+    M56SPlusVK30 = "M56S+ VK30"
+    M56SPlusVK40 = "M56S+ VK40"
+    M56SPlusVK50 = "M56S+ VK50"
+    M56SVH30 = "M56S VH30"
+    M56SVJ30 = "M56S VJ30"
+    M56SVJ40 = "M56S VJ40"
+    M56VH30 = "M56 VH30"
     M59VH30 = "M59 VH30"
-    M60VK10 = "M60 VK10"
-    M60VK20 = "M60 VK20"
-    M60VK30 = "M60 VK30"
-    M60VK40 = "M60 VK40"
+    M60SPlusPlusVL30 = "M60S++ VL30"
+    M60SPlusPlusVL40 = "M60S++ VL40"
+    M60SPlusVK30 = "M60S+ VK30"
+    M60SPlusVK40 = "M60S+ VK40"
+    M60SPlusVK50 = "M60S+ VK50"
+    M60SPlusVK60 = "M60S+ VK60"
+    M60SPlusVK70 = "M60S+ VK70"
+    M60SPlusVL10 = "M60S+ VL10"
+    M60SPlusVL30 = "M60S+ VL30"
+    M60SPlusVL40 = "M60S+ VL40"
+    M60SPlusVL50 = "M60S+ VL50"
+    M60SPlusVL60 = "M60S+ VL60"
     M60SVK10 = "M60S VK10"
     M60SVK20 = "M60S VK20"
     M60SVK30 = "M60S VK30"
     M60SVK40 = "M60S VK40"
-    M63VK10 = "M63 VK10"
-    M63VK20 = "M63 VK20"
-    M63VK30 = "M63 VK30"
+    M60SVL10 = "M60S VL10"
+    M60SVL20 = "M60S VL20"
+    M60SVL30 = "M60S VL30"
+    M60SVL40 = "M60S VL40"
+    M60SVL50 = "M60S VL50"
+    M60SVL60 = "M60S VL60"
+    M60SVL70 = "M60S VL70"
+    M60VK10 = "M60 VK10"
+    M60VK20 = "M60 VK20"
+    M60VK30 = "M60 VK30"
+    M60VK40 = "M60 VK40"
+    M60VK6A = "M60 VK6A"
+    M60VL10 = "M60 VL10"
+    M60VL20 = "M60 VL20"
+    M60VL30 = "M60 VL30"
+    M60VL40 = "M60 VL40"
+    M60VL50 = "M60 VL50"
+    M61SPlusVL30 = "M61S+ VL30"
+    M61SVL10 = "M61S VL10"
+    M61SVL20 = "M61S VL20"
+    M61SVL30 = "M61S VL30"
+    M61VK10 = "M61 VK10"
+    M61VK20 = "M61 VK20"
+    M61VK30 = "M61 VK30"
+    M61VK40 = "M61 VK40"
+    M61VL10 = "M61 VL10"
+    M61VL30 = "M61 VL30"
+    M61VL40 = "M61 VL40"
+    M61VL50 = "M61 VL50"
+    M61VL60 = "M61 VL60"
+    M62SPlusVK30 = "M62S+ VK30"
+    M63SPlusPlusVL20 = "M63S++ VL20"
+    M63SPlusVK30 = "M63S+ VK30"
+    M63SPlusVL10 = "M63S+ VL10"
+    M63SPlusVL20 = "M63S+ VL20"
+    M63SPlusVL30 = "M63S+ VL30"
+    M63SPlusVL50 = "M63S+ VL50"
     M63SVK10 = "M63S VK10"
     M63SVK20 = "M63S VK20"
     M63SVK30 = "M63S VK30"
-    M66VK20 = "M66 VK20"
-    M66VK30 = "M66 VK30"
+    M63SVK60 = "M63S VK60"
+    M63SVL10 = "M63S VL10"
+    M63SVL50 = "M63S VL50"
+    M63SVL60 = "M63S VL60"
+    M63VK10 = "M63 VK10"
+    M63VK20 = "M63 VK20"
+    M63VK30 = "M63 VK30"
+    M63VL10 = "M63 VL10"
+    M63VL30 = "M63 VL30"
+    M64SVL30 = "M64S VL30"
+    M64VL30 = "M64 VL30"
+    M64VL40 = "M64 VL40"
+    M65SPlusVK30 = "M65S+ VK30"
+    M65SVK20 = "M65S VK20"
+    M65SVL60 = "M65S VL60"
+    M66SPlusPlusVL20 = "M66S++ VL20"
+    M66SPlusVK30 = "M66S+ VK30"
+    M66SPlusVL10 = "M66S+ VL10"
+    M66SPlusVL20 = "M66S+ VL20"
+    M66SPlusVL30 = "M66S+ VL30"
+    M66SPlusVL40 = "M66S+ VL40"
+    M66SPlusVL60 = "M66S+ VL60"
     M66SVK20 = "M66S VK20"
     M66SVK30 = "M66S VK30"
     M66SVK40 = "M66S VK40"
+    M66SVK50 = "M66S VK50"
+    M66SVK60 = "M66S VK60"
+    M66SVL10 = "M66S VL10"
+    M66SVL20 = "M66S VL20"
+    M66SVL30 = "M66S VL30"
+    M66SVL40 = "M66S VL40"
+    M66SVL50 = "M66S VL50"
+    M66VK20 = "M66 VK20"
+    M66VK30 = "M66 VK30"
+    M66VL20 = "M66 VL20"
+    M66VL30 = "M66 VL30"
+    M67SVK30 = "M67S VK30"
+    M70VM30 = "M70 VM30"
 
     def __str__(self):
         return self.value
@@ -300,6 +449,7 @@ class AvalonminerModels(MinerModelType):
     Avalon1166Pro = "Avalon 1166 Pro"
     Avalon1126Pro = "Avalon 1126 Pro"
     Avalon1246 = "Avalon 1246"
+    Avalon1566 = "Avalon 1566"
     AvalonNano3 = "Avalon Nano 3"
 
     def __str__(self):
@@ -331,7 +481,9 @@ class GoldshellModels(MinerModelType):
 class ePICModels(MinerModelType):
     BM520i = "BlockMiner 520i"
     BM720i = "BlockMiner 720i"
+    eLITE1 = "BlockMiner eLITE 1.0"
     S19jProDual = "S19j Pro Dual"
+    S19kProDual = "S19k Pro Dual"
 
     def __str__(self):
         return self.value
@@ -360,6 +512,14 @@ class BitAxeModels(MinerModelType):
         return self.value
 
 
+class LuckyMinerModels(MinerModelType):
+    LV07 = "LV07"
+    LV08 = "LV08"
+
+    def __str__(self):
+        return self.value
+
+
 class IceRiverModels(MinerModelType):
     KS0 = "KS0"
     KS1 = "KS1"
@@ -394,6 +554,10 @@ class BraiinsModels(MinerModelType):
     BMM101 = "BMM101"
 
 
+class ElphapexModels(MinerModelType):
+    DG1Plus = "DG1+"
+
+
 class MinerModel:
     ANTMINER = AntminerModels
     WHATSMINER = WhatsminerModels
@@ -403,7 +567,9 @@ class MinerModel:
     AURADINE = AuradineModels
     EPIC = ePICModels
     BITAXE = BitAxeModels
+    LUCKYMINER = LuckyMinerModels
     ICERIVER = IceRiverModels
     HAMMER = HammerModels
     VOLCMINER = VolcMinerModels
+    ELPHAPEX = ElphapexModels
     BRAIINS = BraiinsModels

pyasic/miners/antminer/__init__.py

@@ -21,4 +21,5 @@ from .epic import *
 from .hiveon import *
 from .luxos import *
 from .marathon import *
+from .mskminer import *
 from .vnish import *

pyasic/miners/antminer/bmminer/X21/S21.py

@@ -15,12 +15,20 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.device.models import S21, S21Pro
+from pyasic.miners.device.models import S21, S21Hydro, S21Plus, S21Pro
 
 
 class BMMinerS21(AntminerModern, S21):
     pass
 
 
+class BMMinerS21Plus(AntminerModern, S21Plus):
+    pass
+
+
 class BMMinerS21Pro(AntminerModern, S21Pro):
     pass
+
+
+class BMMinerS21Hydro(AntminerModern, S21Hydro):
+    pass

pyasic/miners/antminer/bmminer/X21/__init__.py

@@ -13,5 +13,5 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
-from .S21 import BMMinerS21, BMMinerS21Pro
+from .S21 import BMMinerS21, BMMinerS21Hydro, BMMinerS21Plus, BMMinerS21Pro
 from .T21 import BMMinerT21

pyasic/miners/antminer/bmminer/X5/KS5.py

@@ -14,8 +14,12 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.device.models import KS5
+from pyasic.miners.device.models.antminer import KS5, KS5Pro
 
 
 class BMMinerKS5(AntminerModern, KS5):
     supports_shutdown = False
+
+
+class BMMinerKS5Pro(AntminerModern, KS5Pro):
+    supports_shutdown = False

pyasic/miners/antminer/bmminer/X5/__init__.py

@@ -13,4 +13,4 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
-from .KS5 import BMMinerKS5
+from .KS5 import BMMinerKS5, BMMinerKS5Pro

pyasic/miners/antminer/bosminer/X21/S21.py

@@ -15,8 +15,12 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import BOSer
-from pyasic.miners.device.models import S21
+from pyasic.miners.device.models import S21, S21Pro
 
 
 class BOSMinerS21(BOSer, S21):
     pass
+
+
+class BOSMinerS21Pro(BOSer, S21Pro):
+    pass

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

@@ -14,5 +14,5 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from .S21 import BOSMinerS21
+from .S21 import BOSMinerS21, BOSMinerS21Pro
 from .T21 import BOSMinerT21

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

@@ -59,3 +59,9 @@ class ePICS19jProDual(ePIC, S19jPro):
     raw_model = MinerModel.EPIC.S19jProDual
     expected_fans = S19jPro.expected_fans * 2
     expected_hashboards = S19jPro.expected_hashboards * 2
+
+
+class ePICS19kProDual(ePIC, S19kPro):
+    raw_model = MinerModel.EPIC.S19kProDual
+    expected_fans = S19kPro.expected_fans * 2
+    expected_hashboards = S19kPro.expected_hashboards * 2

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

@@ -21,6 +21,7 @@ from .S19 import (
     ePICS19jProDual,
     ePICS19jProPlus,
     ePICS19kPro,
+    ePICS19kProDual,
     ePICS19Pro,
     ePICS19XP,
 )

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

@@ -27,6 +27,7 @@ from pyasic.miners.device.models import (
     S19jNoPIC,
     S19jPro,
     S19KPro,
+    S19NoPIC,
     S19Plus,
     S19Pro,
     S19ProHydro,
@@ -39,6 +40,10 @@ class HiveonS19(HiveonModern, S19):
     pass
 
 
+class HiveonS19NoPIC(HiveonModern, S19NoPIC):
+    pass
+
+
 class HiveonS19Plus(HiveonModern, S19Plus):
     pass
 
@@ -95,5 +100,5 @@ class HiveonS19ProPlusHydro(HiveonModern, S19ProPlusHydro):
     pass
 
 
-class HiveonS19KPro(HiveonModern, S19KPro):
+class HiveonS19kPro(HiveonModern, S19KPro):
     pass

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

@@ -23,8 +23,9 @@ from .S19 import (
     HiveonS19j,
     HiveonS19jNoPIC,
     HiveonS19jPro,
-    HiveonS19KPro,
+    HiveonS19kPro,
     HiveonS19L,
+    HiveonS19NoPIC,
     HiveonS19Plus,
     HiveonS19Pro,
     HiveonS19ProHydro,

pyasic/miners/antminer/hiveon/X9/T9.py

@@ -16,8 +16,6 @@
 
 from typing import List, Optional
 
-import asyncssh
-
 from pyasic.data import HashBoard
 from pyasic.device.algorithm import AlgoHashRate, HashUnit
 from pyasic.errors import APIError

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

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

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

@@ -0,0 +1,17 @@
+# ------------------------------------------------------------------------------
+#  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 .S19 import MSKMinerS19NoPIC

pyasic/miners/antminer/mskminer/__init__.py

@@ -0,0 +1,17 @@
+# ------------------------------------------------------------------------------
+#  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 .X19 import *

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

@@ -20,6 +20,7 @@ from pyasic.miners.device.models import (
     S19XP,
     S19a,
     S19aPro,
+    S19i,
     S19j,
     S19jPro,
     S19kPro,
@@ -53,6 +54,10 @@ class VNishS19aPro(VNish, S19aPro):
     pass
 
 
+class VNishS19i(VNish, S19i):
+    pass
+
+
 class VNishS19j(VNish, S19j):
     pass
 

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

@@ -18,6 +18,7 @@ from .S19 import (
     VNishS19,
     VNishS19a,
     VNishS19aPro,
+    VNishS19i,
     VNishS19j,
     VNishS19jPro,
     VNishS19kPro,

pyasic/miners/antminer/vnish/X21/T21.py

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

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

@@ -15,3 +15,4 @@
 # ------------------------------------------------------------------------------
 
 from .S21 import VNishS21
+from .T21 import VNishT21

pyasic/miners/avalonminer/cgminer/A15X/A1566.py

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

pyasic/miners/avalonminer/cgminer/A15X/__init__.py

@@ -0,0 +1,17 @@
+# ------------------------------------------------------------------------------
+#  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 .A1566 import CGMinerAvalon1566

pyasic/miners/avalonminer/cgminer/__init__.py

@@ -20,4 +20,5 @@ from .A9X import *
 from .A10X import *
 from .A11X import *
 from .A12X import *
+from .A15X import *
 from .nano import *

pyasic/miners/avalonminer/cgminer/nano/nano3.py

@@ -13,10 +13,95 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
+from typing import Optional
 
+from pyasic import APIError
 from pyasic.miners.backends import AvalonMiner
+from pyasic.miners.data import (
+    DataFunction,
+    DataLocations,
+    DataOptions,
+    RPCAPICommand,
+    WebAPICommand,
+)
 from pyasic.miners.device.models import AvalonNano3
+from pyasic.web.avalonminer import AvalonMinerWebAPI
+
+AVALON_NANO_DATA_LOC = DataLocations(
+    **{
+        str(DataOptions.MAC): DataFunction(
+            "_get_mac",
+            [WebAPICommand("web_minerinfo", "get_minerinfo")],
+        ),
+        str(DataOptions.API_VERSION): DataFunction(
+            "_get_api_ver",
+            [RPCAPICommand("rpc_version", "version")],
+        ),
+        str(DataOptions.FW_VERSION): DataFunction(
+            "_get_fw_ver",
+            [RPCAPICommand("rpc_version", "version")],
+        ),
+        str(DataOptions.HASHRATE): DataFunction(
+            "_get_hashrate",
+            [RPCAPICommand("rpc_devs", "devs")],
+        ),
+        str(DataOptions.EXPECTED_HASHRATE): DataFunction(
+            "_get_expected_hashrate",
+            [RPCAPICommand("rpc_stats", "stats")],
+        ),
+        str(DataOptions.HASHBOARDS): DataFunction(
+            "_get_hashboards",
+            [RPCAPICommand("rpc_stats", "stats")],
+        ),
+        str(DataOptions.ENVIRONMENT_TEMP): DataFunction(
+            "_get_env_temp",
+            [RPCAPICommand("rpc_stats", "stats")],
+        ),
+        str(DataOptions.WATTAGE_LIMIT): DataFunction(
+            "_get_wattage_limit",
+            [RPCAPICommand("rpc_stats", "stats")],
+        ),
+        str(DataOptions.WATTAGE): DataFunction(
+            "_get_wattage",
+            [RPCAPICommand("rpc_stats", "stats")],
+        ),
+        str(DataOptions.FANS): DataFunction(
+            "_get_fans",
+            [RPCAPICommand("rpc_stats", "stats")],
+        ),
+        str(DataOptions.FAULT_LIGHT): DataFunction(
+            "_get_fault_light",
+            [RPCAPICommand("rpc_stats", "stats")],
+        ),
+        str(DataOptions.UPTIME): DataFunction(
+            "_get_uptime",
+            [RPCAPICommand("rpc_stats", "stats")],
+        ),
+        str(DataOptions.POOLS): DataFunction(
+            "_get_pools",
+            [RPCAPICommand("rpc_pools", "pools")],
+        ),
+    }
+)
 
 
 class CGMinerAvalonNano3(AvalonMiner, AvalonNano3):
-    pass
+    _web_cls = AvalonMinerWebAPI
+    web: AvalonMinerWebAPI
+
+    data_locations = AVALON_NANO_DATA_LOC
+
+    async def _get_mac(self, web_minerinfo: dict) -> Optional[dict]:
+        if web_minerinfo is None:
+            try:
+                web_minerinfo = await self.web.minerinfo()
+            except APIError:
+                pass
+
+        if web_minerinfo is not None:
+            try:
+                mac = web_minerinfo.get("mac")
+                if mac is not None:
+                    return mac.upper()
+            except (KeyError, ValueError):
+                pass

pyasic/miners/backends/__init__.py

@@ -22,14 +22,17 @@ from .bmminer import BMMiner
 from .braiins_os import BOSer, BOSMiner
 from .btminer import BTMiner
 from .cgminer import CGMiner
+from .elphapex import ElphapexMiner
 from .epic import ePIC
 from .goldshell import GoldshellMiner
 from .hammer import BlackMiner
 from .hiveon import HiveonModern, HiveonOld
 from .iceriver import IceRiver
 from .innosilicon import Innosilicon
+from .luckyminer import LuckyMiner
 from .luxminer import LUXMiner
 from .marathon import MaraMiner
+from .mskminer import MSKMiner
 from .unknown import UnknownMiner
 from .vnish import VNish
-from .whatsminer import M2X, M3X, M5X, M6X
+from .whatsminer import M2X, M3X, M5X, M6X, M7X

pyasic/miners/backends/antminer.py

@@ -75,6 +75,10 @@ ANTMINER_MODERN_DATA_LOC = DataLocations(
             "_get_fault_light",
             [WebAPICommand("web_get_blink_status", "get_blink_status")],
         ),
+        str(DataOptions.HASHBOARDS): DataFunction(
+            "_get_hashboards",
+            [],
+        ),
         str(DataOptions.IS_MINING): DataFunction(
             "_is_mining",
             [WebAPICommand("web_get_conf", "get_miner_conf")],
@@ -248,6 +252,9 @@ class AntminerModern(BMMiner):
         return errors
 
     async def _get_hashboards(self) -> List[HashBoard]:
+        if self.expected_hashboards is None:
+            return []
+
         hashboards = [
             HashBoard(slot=idx, expected_chips=self.expected_chips)
             for idx in range(self.expected_hashboards)
@@ -561,6 +568,9 @@ class AntminerOld(CGMiner):
                 pass
 
     async def _get_fans(self, rpc_stats: dict = None) -> List[Fan]:
+        if self.expected_fans is None:
+            return []
+
         if rpc_stats is None:
             try:
                 rpc_stats = await self.rpc.stats()
@@ -589,6 +599,8 @@ class AntminerOld(CGMiner):
         return fans_data
 
     async def _get_hashboards(self, rpc_stats: dict = None) -> List[HashBoard]:
+        if self.expected_hashboards is None:
+            return []
         hashboards = []
 
         if rpc_stats is None:

pyasic/miners/backends/auradine.py

@@ -303,6 +303,9 @@ class Auradine(StockFirmware):
     async def _get_hashboards(
         self, rpc_devs: dict = None, web_ipreport: dict = None
     ) -> List[HashBoard]:
+        if self.expected_hashboards is None:
+            return []
+
         hashboards = [
             HashBoard(slot=i, expected_chips=self.expected_chips)
             for i in range(self.expected_hashboards)
@@ -382,6 +385,9 @@ class Auradine(StockFirmware):
                 pass
 
     async def _get_fans(self, web_fan: dict = None) -> List[Fan]:
+        if self.expected_fans is None:
+            return []
+
         if web_fan is None:
             try:
                 web_fan = await self.web.get_fan()

pyasic/miners/backends/avalonminer.py

@@ -57,6 +57,10 @@ AVALON_DATA_LOC = DataLocations(
             "_get_wattage_limit",
             [RPCAPICommand("rpc_stats", "stats")],
         ),
+        str(DataOptions.WATTAGE): DataFunction(
+            "_get_wattage",
+            [RPCAPICommand("rpc_stats", "stats")],
+        ),
         str(DataOptions.FANS): DataFunction(
             "_get_fans",
             [RPCAPICommand("rpc_stats", "stats")],
@@ -100,6 +104,23 @@ class AvalonMiner(CGMiner):
             return True
         return False
 
+    async def set_power_limit(self, wattage: int) -> bool:
+        try:
+            if wattage < 3:
+                limit = wattage
+            elif wattage > 100:
+                limit = 2
+            elif wattage > 80:
+                limit = 1
+            else:
+                limit = 0
+            data = await self.rpc.ascset(0, "worklevel,set", 1)
+        except APIError:
+            return False
+        if data["STATUS"][0]["Msg"] == "ASC 0 set OK":
+            return True
+        return False
+
     async def reboot(self) -> bool:
         try:
             data = await self.rpc.restart()
@@ -191,6 +212,9 @@ class AvalonMiner(CGMiner):
                 pass
 
     async def _get_hashboards(self, rpc_stats: dict = None) -> List[HashBoard]:
+        if self.expected_hashboards is None:
+            return []
+
         hashboards = [
             HashBoard(slot=i, expected_chips=self.expected_chips)
             for i in range(self.expected_hashboards)
@@ -289,7 +313,25 @@ class AvalonMiner(CGMiner):
             except (IndexError, KeyError, ValueError, TypeError):
                 pass
 
+    async def _get_wattage(self, rpc_stats: dict = None) -> Optional[int]:
+        if rpc_stats is None:
+            try:
+                rpc_stats = await self.rpc.stats()
+            except APIError:
+                pass
+
+        if rpc_stats is not None:
+            try:
+                unparsed_stats = rpc_stats["STATS"][0]["MM ID0"]
+                parsed_stats = self.parse_stats(unparsed_stats)
+                return int(parsed_stats["WALLPOWER"][0])
+            except (IndexError, KeyError, ValueError, TypeError):
+                pass
+
     async def _get_fans(self, rpc_stats: dict = None) -> List[Fan]:
+        if self.expected_fans is None:
+            return []
+
         if rpc_stats is None:
             try:
                 rpc_stats = await self.rpc.stats()

pyasic/miners/backends/bfgminer.py

@@ -129,6 +129,9 @@ class BFGMiner(StockFirmware):
                 pass
 
     async def _get_hashboards(self, rpc_stats: dict = None) -> List[HashBoard]:
+        if self.expected_hashboards is None:
+            return []
+
         hashboards = []
 
         if rpc_stats is None:
@@ -185,6 +188,9 @@ class BFGMiner(StockFirmware):
         return hashboards
 
     async def _get_fans(self, rpc_stats: dict = None) -> List[Fan]:
+        if self.expected_fans is None:
+            return []
+
         if rpc_stats is None:
             try:
                 rpc_stats = await self.rpc.stats()

pyasic/miners/backends/bitaxe.py

@@ -1,208 +1,7 @@
-from typing import List, Optional
-
-from pyasic import APIError, MinerConfig
-from pyasic.data import Fan, HashBoard
-from pyasic.device.algorithm import AlgoHashRate
-from pyasic.device.firmware 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")],
-        ),
-        str(DataOptions.MAC): DataFunction(
-            "_get_mac",
-            [WebAPICommand("web_system_info", "system/info")],
-        ),
-    }
-)
+from pyasic.miners.backends.espminer import ESPMiner
 
 
-class BitAxe(BaseMiner):
+class BitAxe(ESPMiner):
     """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 self.algo.hashrate(
-                    rate=float(web_system_info["hashRate"]), unit=self.algo.unit.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=self.algo.hashrate(
-                            rate=float(web_system_info["hashRate"]),
-                            unit=self.algo.unit.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
-
-    async def _get_mac(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["macAddr"].upper()
-            except KeyError:
-                pass
+    pass

pyasic/miners/backends/bmminer.py

@@ -133,6 +133,9 @@ class BMMiner(StockFirmware):
                 pass
 
     async def _get_hashboards(self, rpc_stats: dict = None) -> List[HashBoard]:
+        if self.expected_hashboards is None:
+            return []
+
         hashboards = []
 
         if rpc_stats is None:
@@ -202,6 +205,9 @@ class BMMiner(StockFirmware):
         return hashboards
 
     async def _get_fans(self, rpc_stats: dict = None) -> List[Fan]:
+        if self.expected_fans is None:
+            return []
+
         if rpc_stats is None:
             try:
                 rpc_stats = await self.rpc.stats()

pyasic/miners/backends/braiins_os.py

@@ -376,6 +376,9 @@ class BOSMiner(BraiinsOSFirmware):
         rpc_devdetails: dict = None,
         rpc_devs: dict = None,
     ) -> List[HashBoard]:
+        if self.expected_hashboards is None:
+            return []
+
         hashboards = [
             HashBoard(slot=i, expected_chips=self.expected_chips)
             for i in range(self.expected_hashboards)
@@ -473,6 +476,9 @@ class BOSMiner(BraiinsOSFirmware):
                 pass
 
     async def _get_fans(self, rpc_fans: dict = None) -> List[Fan]:
+        if self.expected_fans is None:
+            return []
+
         if rpc_fans is None:
             try:
                 rpc_fans = await self.rpc.fans()
@@ -926,6 +932,9 @@ class BOSer(BraiinsOSFirmware):
                 pass
 
     async def _get_hashboards(self, grpc_hashboards: dict = None) -> List[HashBoard]:
+        if self.expected_hashboards is None:
+            return []
+
         hashboards = [
             HashBoard(slot=i, expected_chips=self.expected_chips)
             for i in range(self.expected_hashboards)
@@ -997,6 +1006,9 @@ class BOSer(BraiinsOSFirmware):
                 pass
 
     async def _get_fans(self, grpc_cooling_state: dict = None) -> List[Fan]:
+        if self.expected_fans is None:
+            return []
+
         if grpc_cooling_state is None:
             try:
                 grpc_cooling_state = await self.web.get_cooling_state()

pyasic/miners/backends/btminer.py

@@ -412,6 +412,9 @@ class BTMiner(StockFirmware):
                 pass
 
     async def _get_hashboards(self, rpc_devs: dict = None) -> List[HashBoard]:
+        if self.expected_hashboards is None:
+            return []
+
         hashboards = [
             HashBoard(slot=i, expected_chips=self.expected_chips)
             for i in range(self.expected_hashboards)
@@ -426,21 +429,22 @@ class BTMiner(StockFirmware):
         if rpc_devs is not None:
             try:
                 for board in rpc_devs["DEVS"]:
-                    if len(hashboards) < board["ASC"] + 1:
+                    asc = board.get("ASC")
+                    if asc is None:
+                        asc = board["Slot"]
+                    if len(hashboards) < asc + 1:
                         hashboards.append(
-                            HashBoard(
-                                slot=board["ASC"], expected_chips=self.expected_chips
-                            )
+                            HashBoard(slot=asc, expected_chips=self.expected_chips)
                         )
                         self.expected_hashboards += 1
-                    hashboards[board["ASC"]].chip_temp = round(board["Chip Temp Avg"])
-                    hashboards[board["ASC"]].temp = round(board["Temperature"])
-                    hashboards[board["ASC"]].hashrate = self.algo.hashrate(
+                    hashboards[asc].chip_temp = round(board["Chip Temp Avg"])
+                    hashboards[asc].temp = round(board["Temperature"])
+                    hashboards[asc].hashrate = self.algo.hashrate(
                         rate=float(board["MHS 1m"]), unit=self.algo.unit.MH
                     ).into(self.algo.unit.default)
-                    hashboards[board["ASC"]].chips = board["Effective Chips"]
-                    hashboards[board["ASC"]].serial_number = board["PCB SN"]
-                    hashboards[board["ASC"]].missing = False
+                    hashboards[asc].chips = board["Effective Chips"]
+                    hashboards[asc].serial_number = board["PCB SN"]
+                    hashboards[asc].missing = False
             except LookupError:
                 pass
 
@@ -489,6 +493,9 @@ class BTMiner(StockFirmware):
     async def _get_fans(
         self, rpc_summary: dict = None, rpc_get_psu: dict = None
     ) -> List[Fan]:
+        if self.expected_fans is None:
+            return []
+
         if rpc_summary is None:
             try:
                 rpc_summary = await self.rpc.summary()

pyasic/miners/backends/elphapex.py

@@ -0,0 +1,380 @@
+# ------------------------------------------------------------------------------
+#  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 typing import List, Optional
+
+from pyasic import APIError, MinerConfig
+from pyasic.data import Fan, HashBoard, X19Error
+from pyasic.data.error_codes import MinerErrorData
+from pyasic.data.pools import PoolMetrics, PoolUrl
+from pyasic.device.algorithm import AlgoHashRate
+from pyasic.miners.data import (
+    DataFunction,
+    DataLocations,
+    DataOptions,
+    WebAPICommand,
+)
+from pyasic.miners.device.firmware import StockFirmware
+from pyasic.web.elphapex import ElphapexWebAPI
+
+ELPHAPEX_DATA_LOC = DataLocations(
+    **{
+        str(DataOptions.MAC): DataFunction(
+            "_get_mac",
+            [WebAPICommand("web_get_system_info", "get_system_info")],
+        ),
+        str(DataOptions.API_VERSION): DataFunction(
+            "_get_api_ver",
+            [WebAPICommand("web_summary", "summary")],
+        ),
+        str(DataOptions.FW_VERSION): DataFunction(
+            "_get_fw_ver",
+            [WebAPICommand("web_get_system_info", "get_system_info")],
+        ),
+        str(DataOptions.HOSTNAME): DataFunction(
+            "_get_hostname",
+            [WebAPICommand("web_get_system_info", "get_system_info")],
+        ),
+        str(DataOptions.HASHBOARDS): DataFunction(
+            "_get_hashboards",
+            [WebAPICommand("web_stats", "stats")],
+        ),
+        str(DataOptions.EXPECTED_HASHRATE): DataFunction(
+            "_get_expected_hashrate",
+            [WebAPICommand("web_stats", "stats")],
+        ),
+        str(DataOptions.FANS): DataFunction(
+            "_get_fans",
+            [WebAPICommand("web_stats", "stats")],
+        ),
+        str(DataOptions.ERRORS): DataFunction(
+            "_get_errors",
+            [WebAPICommand("web_summary", "summary")],
+        ),
+        str(DataOptions.FAULT_LIGHT): DataFunction(
+            "_get_fault_light",
+            [WebAPICommand("web_get_blink_status", "get_blink_status")],
+        ),
+        str(DataOptions.IS_MINING): DataFunction(
+            "_is_mining",
+            [WebAPICommand("web_get_miner_conf", "get_miner_conf")],
+        ),
+        str(DataOptions.UPTIME): DataFunction(
+            "_get_uptime",
+            [WebAPICommand("web_summary", "summary")],
+        ),
+        str(DataOptions.POOLS): DataFunction(
+            "_get_pools",
+            [WebAPICommand("web_pools", "pools")],
+        ),
+    }
+)
+
+
+class ElphapexMiner(StockFirmware):
+    """Handler for Elphapex miners."""
+
+    _web_cls = ElphapexWebAPI
+    web: ElphapexWebAPI
+
+    data_locations = ELPHAPEX_DATA_LOC
+
+    async def get_config(self) -> MinerConfig:
+        data = await self.web.get_miner_conf()
+        if data:
+            self.config = MinerConfig.from_elphapex(data)
+        return self.config
+
+    async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
+        self.config = config
+        await self.web.set_miner_conf(config.as_elphapex(user_suffix=user_suffix))
+
+    async def fault_light_on(self) -> bool:
+        data = await self.web.blink(blink=True)
+        if data:
+            if data.get("code") == "B000":
+                self.light = True
+        return self.light
+
+    async def fault_light_off(self) -> bool:
+        data = await self.web.blink(blink=False)
+        if data:
+            if data.get("code") == "B100":
+                self.light = False
+        return self.light
+
+    async def reboot(self) -> bool:
+        data = await self.web.reboot()
+        if data:
+            return True
+        return False
+
+    async def _get_api_ver(self, web_summary: dict = None) -> Optional[str]:
+        if web_summary is None:
+            try:
+                web_summary = await self.web.summary()
+            except APIError:
+                pass
+
+        if web_summary is not None:
+            try:
+                self.api_ver = web_summary["STATUS"]["api_version"]
+            except LookupError:
+                pass
+
+        return self.api_ver
+
+    async def _get_fw_ver(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()
+            except APIError:
+                pass
+
+        if web_get_system_info is not None:
+            try:
+                self.fw_ver = (
+                    web_get_system_info["system_filesystem_version"]
+                    .upper()
+                    .split("V")[-1]
+                )
+            except LookupError:
+                pass
+
+        return self.fw_ver
+
+    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()
+            except APIError:
+                pass
+
+        if web_get_system_info is not None:
+            try:
+                return web_get_system_info["hostname"]
+            except KeyError:
+                pass
+
+    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()
+            except APIError:
+                pass
+
+        if web_get_system_info is not None:
+            try:
+                return web_get_system_info["macaddr"]
+            except KeyError:
+                pass
+
+        try:
+            data = await self.web.get_network_info()
+            if data:
+                return data["macaddr"]
+        except KeyError:
+            pass
+
+    async def _get_errors(self, web_summary: dict = None) -> List[MinerErrorData]:
+        if web_summary is None:
+            try:
+                web_summary = await self.web.summary()
+            except APIError:
+                pass
+
+        errors = []
+        if web_summary is not None:
+            try:
+                for item in web_summary["SUMMARY"][0]["status"]:
+                    try:
+                        if not item["status"] == "s":
+                            errors.append(X19Error(error_message=item["msg"]))
+                    except KeyError:
+                        continue
+            except LookupError:
+                pass
+        return errors
+
+    async def _get_hashboards(self, web_stats: dict | None = None) -> List[HashBoard]:
+        if self.expected_hashboards is None:
+            return []
+
+        hashboards = [
+            HashBoard(slot=idx, expected_chips=self.expected_chips)
+            for idx in range(self.expected_hashboards)
+        ]
+
+        if web_stats is None:
+            try:
+                web_stats = await self.web.stats()
+            except APIError:
+                return hashboards
+
+        if web_stats is not None:
+            try:
+                for board in web_stats["STATS"][0]["chain"]:
+                    hashboards[board["index"]].hashrate = self.algo.hashrate(
+                        rate=board["rate_real"], unit=self.algo.unit.MH
+                    ).into(self.algo.unit.default)
+                    hashboards[board["index"]].chips = board["asic_num"]
+                    board_temp_data = list(
+                        filter(lambda x: not x == 0, board["temp_pcb"])
+                    )
+                    hashboards[board["index"]].temp = sum(board_temp_data) / len(
+                        board_temp_data
+                    )
+                    chip_temp_data = list(
+                        filter(lambda x: not x == "", board["temp_chip"])
+                    )
+                    hashboards[board["index"]].chip_temp = sum(
+                        [int(i) / 1000 for i in chip_temp_data]
+                    ) / len(chip_temp_data)
+                    hashboards[board["index"]].serial_number = board["sn"]
+                    hashboards[board["index"]].missing = False
+            except LookupError:
+                pass
+        return hashboards
+
+    async def _get_fault_light(
+        self, web_get_blink_status: dict = None
+    ) -> Optional[bool]:
+        if self.light:
+            return self.light
+
+        if web_get_blink_status is None:
+            try:
+                web_get_blink_status = await self.web.get_blink_status()
+            except APIError:
+                pass
+
+        if web_get_blink_status is not None:
+            try:
+                self.light = web_get_blink_status["blink"]
+            except KeyError:
+                pass
+        return self.light
+
+    async def _get_expected_hashrate(
+        self, web_stats: dict = None
+    ) -> Optional[AlgoHashRate]:
+        if web_stats is None:
+            try:
+                web_stats = await self.web.stats()
+            except APIError:
+                pass
+
+        if web_stats is not None:
+            try:
+                expected_rate = web_stats["STATS"][1]["total_rateideal"]
+                try:
+                    rate_unit = web_stats["STATS"][1]["rate_unit"]
+                except KeyError:
+                    rate_unit = "MH"
+                return self.algo.hashrate(
+                    rate=float(expected_rate), unit=self.algo.unit.from_str(rate_unit)
+                ).into(self.algo.unit.default)
+            except LookupError:
+                pass
+
+    async def _is_mining(self, web_get_miner_conf: dict = None) -> Optional[bool]:
+        if web_get_miner_conf is None:
+            try:
+                web_get_miner_conf = await self.web.get_miner_conf()
+            except APIError:
+                pass
+
+        if web_get_miner_conf is not None:
+            try:
+                if str(web_get_miner_conf["fc-work-mode"]).isdigit():
+                    return (
+                        False if int(web_get_miner_conf["fc-work-mode"]) == 1 else True
+                    )
+                return False
+            except LookupError:
+                pass
+
+    async def _get_uptime(self, web_summary: dict = None) -> Optional[int]:
+        if web_summary is None:
+            try:
+                web_summary = await self.web.summary()
+            except APIError:
+                pass
+
+        if web_summary is not None:
+            try:
+                return int(web_summary["SUMMARY"][1]["elapsed"])
+            except LookupError:
+                pass
+
+    async def _get_fans(self, web_stats: dict = None) -> List[Fan]:
+        if self.expected_fans is None:
+            return []
+
+        if web_stats is None:
+            try:
+                web_stats = await self.web.stats()
+            except APIError:
+                pass
+
+        fans = [Fan() for _ in range(self.expected_fans)]
+        if web_stats is not None:
+            for fan_n in range(self.expected_fans):
+                try:
+                    fans[fan_n].speed = int(web_stats["STATS"][0]["fan"][fan_n])
+                except LookupError:
+                    pass
+
+        return fans
+
+    async def _get_pools(self, web_pools: list = None) -> List[PoolMetrics]:
+        if web_pools is None:
+            try:
+                web_pools = await self.web.pools()
+            except APIError:
+                return []
+
+        active_pool_index = None
+        highest_priority = float("inf")
+
+        for pool_info in web_pools["POOLS"]:
+            if (
+                pool_info.get("status") == "Alive"
+                and pool_info.get("priority", float("inf")) < highest_priority
+            ):
+                highest_priority = pool_info["priority"]
+                active_pool_index = pool_info["index"]
+
+        pools_data = []
+        if web_pools is not None:
+            try:
+                for pool_info in web_pools["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("stale"),
+                        remote_failures=pool_info.get("discarded"),
+                        active=pool_info.get("index") == active_pool_index,
+                        alive=pool_info.get("status") == "Alive",
+                        url=pool_url,
+                        user=pool_info.get("user"),
+                        index=pool_info.get("index"),
+                    )
+                    pools_data.append(pool_data)
+            except LookupError:
+                pass
+        return pools_data

pyasic/miners/backends/epic.py

@@ -21,7 +21,7 @@ from pyasic.config import MinerConfig
 from pyasic.data import Fan, HashBoard
 from pyasic.data.error_codes import MinerErrorData, X19Error
 from pyasic.data.pools import PoolMetrics, PoolUrl
-from pyasic.device.algorithm import AlgoHashRate
+from pyasic.device.algorithm import AlgoHashRate, ScryptAlgo
 from pyasic.errors import APIError
 from pyasic.logger import logger
 from pyasic.miners.data import DataFunction, DataLocations, DataOptions, WebAPICommand
@@ -138,6 +138,8 @@ class ePIC(ePICFirmware):
                 await self.web.set_ptune_algo(conf["ptune"])
 
             ## Pools
+            if self.algo == ScryptAlgo:
+                conf["pools"]["coin"] = "Ltc"
             await self.web.set_pools(conf["pools"])
         except APIError:
             pass
@@ -283,6 +285,9 @@ class ePIC(ePICFirmware):
                 pass
 
     async def _get_fans(self, web_summary: dict = None) -> List[Fan]:
+        if self.expected_fans is None:
+            return []
+
         if web_summary is None:
             try:
                 web_summary = await self.web.summary()
@@ -302,6 +307,9 @@ class ePIC(ePICFirmware):
     async def _get_hashboards(
         self, web_summary: dict = None, web_capabilities: dict = None
     ) -> List[HashBoard]:
+        if self.expected_hashboards is None:
+            return []
+
         if web_summary is None:
             try:
                 web_summary = await self.web.summary()

pyasic/miners/backends/espminer.py

@@ -0,0 +1,241 @@
+from typing import List, Optional
+
+from pyasic import APIError, MinerConfig
+from pyasic.data import Fan, HashBoard
+from pyasic.device.algorithm import AlgoHashRate
+from pyasic.device.firmware import MinerFirmware
+from pyasic.miners.base import BaseMiner
+from pyasic.miners.data import DataFunction, DataLocations, DataOptions, WebAPICommand
+from pyasic.web.espminer import ESPMinerWebAPI
+
+ESPMINER_DATA_LOC = DataLocations(
+    **{
+        str(DataOptions.HASHRATE): DataFunction(
+            "_get_hashrate",
+            [WebAPICommand("web_system_info", "system/info")],
+        ),
+        str(DataOptions.EXPECTED_HASHRATE): DataFunction(
+            "_get_expected_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")],
+        ),
+        str(DataOptions.MAC): DataFunction(
+            "_get_mac",
+            [WebAPICommand("web_system_info", "system/info")],
+        ),
+    }
+)
+
+
+class ESPMiner(BaseMiner):
+    """Handler for ESPMiner"""
+
+    web: ESPMinerWebAPI
+    _web_cls = ESPMinerWebAPI
+
+    firmware = MinerFirmware.STOCK
+
+    data_locations = ESPMINER_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_espminer(web_system_info)
+
+    async def send_config(self, config: MinerConfig, user_suffix: str = None) -> None:
+        await self.web.update_settings(**config.as_espminer())
+
+    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 self.algo.hashrate(
+                    rate=float(web_system_info["hashRate"]), unit=self.algo.unit.GH
+                ).into(self.algo.unit.default)
+            except KeyError:
+                pass
+
+    async def _get_expected_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:
+                expected_hashrate = (
+                    web_system_info.get("smallCoreCount")
+                    * web_system_info.get("asicCount")
+                    * web_system_info.get("frequency")
+                )
+
+                return self.algo.hashrate(
+                    rate=float(expected_hashrate), unit=self.algo.unit.MH
+                ).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 self.expected_hashboards is None:
+            return []
+
+        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=self.algo.hashrate(
+                            rate=float(web_system_info["hashRate"]),
+                            unit=self.algo.unit.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 self.expected_fans is None:
+            return []
+
+        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
+
+    async def _get_mac(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["macAddr"].upper()
+            except KeyError:
+                pass

pyasic/miners/backends/goldshell.py

@@ -145,6 +145,9 @@ class GoldshellMiner(BFGMiner):
     async def _get_hashboards(
         self, rpc_devs: dict = None, rpc_devdetails: dict = None
     ) -> List[HashBoard]:
+        if self.expected_hashboards is None:
+            return []
+
         if rpc_devs is None:
             try:
                 rpc_devs = await self.rpc.devs()

pyasic/miners/backends/hammer.py

@@ -180,6 +180,9 @@ class BlackMiner(StockFirmware):
                 pass
 
     async def _get_hashboards(self, rpc_stats: dict = None) -> List[HashBoard]:
+        if self.expected_hashboards is None:
+            return []
+
         hashboards = []
 
         if rpc_stats is None:
@@ -245,6 +248,9 @@ class BlackMiner(StockFirmware):
         return hashboards
 
     async def _get_fans(self, rpc_stats: dict = None) -> List[Fan]:
+        if self.expected_fans is None:
+            return []
+
         if rpc_stats is None:
             try:
                 rpc_stats = await self.rpc.stats()
@@ -358,7 +364,7 @@ class BlackMiner(StockFirmware):
             try:
                 expected_rate = rpc_stats["STATS"][1].get("total_rateideal")
                 if expected_rate is None:
-                    return self.sticker_hashrate
+                    return self.sticker_hashrate.into(self.algo.unit.default)
                 try:
                     rate_unit = rpc_stats["STATS"][1]["rate_unit"]
                 except KeyError:

pyasic/miners/backends/iceriver.py

@@ -79,6 +79,9 @@ class IceRiver(StockFirmware):
         return MinerConfig.from_iceriver(web_userpanel)
 
     async def _get_fans(self, web_userpanel: dict = None) -> List[Fan]:
+        if self.expected_fans is None:
+            return []
+
         if web_userpanel is None:
             try:
                 web_userpanel = await self.web.userpanel()
@@ -170,6 +173,9 @@ class IceRiver(StockFirmware):
                 pass
 
     async def _get_hashboards(self, web_userpanel: dict = None) -> List[HashBoard]:
+        if self.expected_hashboards is None:
+            return []
+
         if web_userpanel is None:
             try:
                 web_userpanel = await self.web.userpanel()