version: bump version number

* Docs for Mini Doge

* Mini Doge Recognition Support

* Loading fixes

* Fix for number of fans

* Fixed expected_hashrate

* Fixes for hashboards

* Implemented uptime

* Fixed uptime

* Doc fixes

* Fixes for byte

* Copyright update

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Typo fix

* File renames

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

.gitignore

@@ -7,3 +7,4 @@ pyvenv.cfg
 bin/
 lib/
 .idea/
+.vs/

.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.2
+    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

@@ -23,7 +23,7 @@ Welcome to `pyasic`!  `pyasic` uses an asynchronous method of communicating with
 ## Installation
 
 It is recommended to install `pyasic` in a [virtual environment](https://realpython.com/python-virtual-environments-a-primer/#what-other-popular-options-exist-aside-from-venv) to isolate it from the rest of your system. Options include:
-  - [pypoetry](https://python-poetry.org/): the reccommended way, since pyasic already uses it by default
+  - [pypoetry](https://python-poetry.org/): the reccommended way, since pyasic already uses it by default. Use version 2.0+
 
 ```
     poetry install
@@ -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):
@@ -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/X17.md

@@ -14,19 +14,6 @@
         show_root_heading: false
         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
-
 ## S17 Pro (Stock)
 
 - [ ] Shutdowns
@@ -40,6 +27,19 @@
         show_root_heading: false
         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)
 
 - [ ] Shutdowns
@@ -105,19 +105,6 @@
         show_root_heading: false
         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
-
 ## S17 Pro (BOS+)
 
 - [x] Shutdowns
@@ -131,6 +118,19 @@
         show_root_heading: false
         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+)
 
 - [x] Shutdowns
@@ -183,19 +183,6 @@
         show_root_heading: false
         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
-
 ## S17 Pro (VNish)
 
 - [x] Shutdowns
@@ -209,3 +196,16 @@
         show_root_heading: false
         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/X19.md

@@ -14,14 +14,14 @@
         show_root_heading: false
         heading_level: 0
 
-## S19L (Stock)
+## S19 Hydro (Stock)
 
 - [x] Shutdowns
 - [x] Power Modes
 - [ ] Setpoints
 - [ ] Presets
 
-::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19L
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19Hydro
     handler: python
     options:
         show_root_heading: false
@@ -40,136 +40,6 @@
         show_root_heading: false
         heading_level: 0
 
-## S19j (Stock)
-
-- [x] Shutdowns
-- [x] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19j
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
-## S19i (Stock)
-
-- [x] Shutdowns
-- [x] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19i
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
-## S19+ (Stock)
-
-- [x] Shutdowns
-- [x] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19Plus
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
-## S19j No PIC (Stock)
-
-- [x] Shutdowns
-- [x] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19jNoPIC
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
-## S19 Pro+ (Stock)
-
-- [x] Shutdowns
-- [x] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19ProPlus
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
-## S19j Pro (Stock)
-
-- [x] Shutdowns
-- [x] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19jPro
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
-## S19 XP (Stock)
-
-- [x] Shutdowns
-- [x] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19XP
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
-## S19a (Stock)
-
-- [x] Shutdowns
-- [x] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19a
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
-## S19a Pro (Stock)
-
-- [x] Shutdowns
-- [x] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19aPro
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
-## S19 Hydro (Stock)
-
-- [x] Shutdowns
-- [x] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19Hydro
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
 ## S19 Pro Hydro (Stock)
 
 - [x] Shutdowns
@@ -196,14 +66,105 @@
         show_root_heading: false
         heading_level: 0
 
-## S19K Pro (Stock)
+## S19 XP (Stock)
 
 - [x] Shutdowns
 - [x] Power Modes
 - [ ] Setpoints
 - [ ] Presets
 
-::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19KPro
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19XP
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19+ (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19Plus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19a (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19a
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19a Pro (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19aPro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19i (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19i
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19j (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19j
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19j Pro (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19jPro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19j Pro+ (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19jProPlus
     handler: python
     options:
         show_root_heading: false
@@ -222,6 +183,71 @@
         show_root_heading: false
         heading_level: 0
 
+## S19j+ (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19jPlus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19j No PIC (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19jNoPIC
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19K Pro (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19KPro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19L (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19L
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19 Pro+ (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19ProPlus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## T19 (Stock)
 
 - [x] Shutdowns
@@ -248,19 +274,6 @@
         show_root_heading: false
         heading_level: 0
 
-## S19+ (BOS+)
-
-- [x] Shutdowns
-- [ ] Power Modes
-- [x] Setpoints
-- [ ] Presets
-
-::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19Plus
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
 ## S19 Pro (BOS+)
 
 - [x] Shutdowns
@@ -274,6 +287,58 @@
         show_root_heading: false
         heading_level: 0
 
+## S19 Pro+ Hydro (BOS+)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19ProPlusHydro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19 XP (BOS+)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19XP
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19 XP Hydro (BOS+)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19XPHydro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19+ (BOS+)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19Plus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## S19a (BOS+)
 
 - [x] Shutdowns
@@ -313,19 +378,6 @@
         show_root_heading: false
         heading_level: 0
 
-## S19j No PIC (BOS+)
-
-- [x] Shutdowns
-- [ ] Power Modes
-- [x] Setpoints
-- [ ] Presets
-
-::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19jNoPIC
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
 ## S19j Pro (BOS+)
 
 - [x] Shutdowns
@@ -359,19 +411,6 @@
 - [x] Setpoints
 - [ ] Presets
 
-::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19jProPlus
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
-## S19j Pro+ (BOS+)
-
-- [x] Shutdowns
-- [ ] Power Modes
-- [x] Setpoints
-- [ ] Presets
-
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19jProPlus
     handler: python
     options:
@@ -391,14 +430,14 @@
         show_root_heading: false
         heading_level: 0
 
-## S19k Pro No PIC (BOS+)
+## S19j No PIC (BOS+)
 
 - [x] Shutdowns
 - [ ] Power Modes
 - [x] Setpoints
 - [ ] Presets
 
-::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19kProNoPIC
+::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19jNoPIC
     handler: python
     options:
         show_root_heading: false
@@ -417,32 +456,6 @@
         show_root_heading: false
         heading_level: 0
 
-## S19 XP (BOS+)
-
-- [x] Shutdowns
-- [ ] Power Modes
-- [x] Setpoints
-- [ ] Presets
-
-::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19XP
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
-## S19 Pro+ Hydro (BOS+)
-
-- [x] Shutdowns
-- [ ] Power Modes
-- [x] Setpoints
-- [ ] Presets
-
-::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19ProPlusHydro
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
 ## T19 (BOS+)
 
 - [x] Shutdowns
@@ -469,14 +482,14 @@
         show_root_heading: false
         heading_level: 0
 
-## S19 No PIC (VNish)
+## S19 Hydro (VNish)
 
 - [x] Shutdowns
 - [ ] Power Modes
 - [x] Setpoints
 - [x] Presets
 
-::: pyasic.miners.antminer.vnish.X19.S19.VNishS19NoPIC
+::: pyasic.miners.antminer.vnish.X19.S19.VNishS19Hydro
     handler: python
     options:
         show_root_heading: false
@@ -495,40 +508,53 @@
         show_root_heading: false
         heading_level: 0
 
-## S19j (VNish)
+## S19 Pro A (VNish)
 
 - [x] Shutdowns
 - [ ] Power Modes
 - [x] Setpoints
 - [x] Presets
 
-::: pyasic.miners.antminer.vnish.X19.S19.VNishS19j
+::: pyasic.miners.antminer.vnish.X19.S19.VNishS19ProA
     handler: python
     options:
         show_root_heading: false
         heading_level: 0
 
-## S19j Pro (VNish)
+## S19 Pro Hydro (VNish)
 
 - [x] Shutdowns
 - [ ] Power Modes
 - [x] Setpoints
 - [x] Presets
 
-::: pyasic.miners.antminer.vnish.X19.S19.VNishS19jPro
+::: pyasic.miners.antminer.vnish.X19.S19.VNishS19ProHydro
     handler: python
     options:
         show_root_heading: false
         heading_level: 0
 
-## S19j Pro (VNish)
+## S19 XP (VNish)
 
 - [x] Shutdowns
 - [ ] Power Modes
 - [x] Setpoints
 - [x] Presets
 
-::: pyasic.miners.antminer.vnish.X19.S19.VNishS19jPro
+::: pyasic.miners.antminer.vnish.X19.S19.VNishS19XP
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19 XP Hydro (VNish)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [x] Presets
+
+::: pyasic.miners.antminer.vnish.X19.S19.VNishS19XPHydro
     handler: python
     options:
         show_root_heading: false
@@ -560,14 +586,40 @@
         show_root_heading: false
         heading_level: 0
 
-## S19 Pro Hydro (VNish)
+## S19i (VNish)
 
 - [x] Shutdowns
 - [ ] Power Modes
 - [x] Setpoints
 - [x] Presets
 
-::: pyasic.miners.antminer.vnish.X19.S19.VNishS19ProHydro
+::: pyasic.miners.antminer.vnish.X19.S19.VNishS19i
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19j (VNish)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [x] Presets
+
+::: pyasic.miners.antminer.vnish.X19.S19.VNishS19j
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19j Pro (VNish)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [x] Presets
+
+::: pyasic.miners.antminer.vnish.X19.S19.VNishS19jPro
     handler: python
     options:
         show_root_heading: false
@@ -586,6 +638,19 @@
         show_root_heading: false
         heading_level: 0
 
+## S19 No PIC (VNish)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [x] Presets
+
+::: pyasic.miners.antminer.vnish.X19.S19.VNishS19NoPIC
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## T19 (VNish)
 
 - [x] Shutdowns
@@ -625,6 +690,19 @@
         show_root_heading: false
         heading_level: 0
 
+## S19 XP (ePIC)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.epic.X19.S19.ePICS19XP
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## S19j (ePIC)
 
 - [x] Shutdowns
@@ -651,6 +729,19 @@
         show_root_heading: false
         heading_level: 0
 
+## S19j Pro Dual (ePIC)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.epic.X19.S19.ePICS19jProDual
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## S19j Pro+ (ePIC)
 
 - [x] Shutdowns
@@ -677,40 +768,14 @@
         show_root_heading: false
         heading_level: 0
 
-## S19 XP (ePIC)
+## S19k Pro Dual (ePIC)
 
 - [x] Shutdowns
 - [ ] Power Modes
 - [ ] Setpoints
 - [ ] Presets
 
-::: pyasic.miners.antminer.epic.X19.S19.ePICS19XP
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
-## S19j Pro Dual (ePIC)
-
-- [x] Shutdowns
-- [ ] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-::: pyasic.miners.antminer.epic.X19.S19.ePICS19jProDual
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
-## S19j Pro (Hive)
-
-- [ ] Shutdowns
-- [ ] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-::: pyasic.miners.antminer.hiveon.X19.S19.HiveonS19jPro
+::: pyasic.miners.antminer.epic.X19.S19.ePICS19kProDual
     handler: python
     options:
         show_root_heading: false
@@ -729,11 +794,63 @@
         show_root_heading: false
         heading_level: 0
 
+## S19j Pro (Hive)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.hiveon.X19.S19.HiveonS19jPro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19K Pro (Hive)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.hiveon.X19.S19.HiveonS19kPro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19 No PIC (Hive)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.hiveon.X19.S19.HiveonS19NoPIC
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S19 No PIC (Stock)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.mskminer.X19.S19.MSKMinerS19NoPIC
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## S19 (LuxOS)
 
 - [x] Shutdowns
 - [ ] Power Modes
-- [ ] Setpoints
+- [x] Setpoints
 - [x] Presets
 
 ::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19
@@ -746,7 +863,7 @@
 
 - [x] Shutdowns
 - [ ] Power Modes
-- [ ] Setpoints
+- [x] Setpoints
 - [x] Presets
 
 ::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19Pro
@@ -755,11 +872,24 @@
         show_root_heading: false
         heading_level: 0
 
+## S19 XP (LuxOS)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [x] Presets
+
+::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19XP
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## S19j Pro (LuxOS)
 
 - [x] Shutdowns
 - [ ] Power Modes
-- [ ] Setpoints
+- [x] Setpoints
 - [x] Presets
 
 ::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19jPro
@@ -772,7 +902,7 @@
 
 - [x] Shutdowns
 - [ ] Power Modes
-- [ ] Setpoints
+- [x] Setpoints
 - [x] Presets
 
 ::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19jProPlus
@@ -785,7 +915,7 @@
 
 - [x] Shutdowns
 - [ ] Power Modes
-- [ ] Setpoints
+- [x] Setpoints
 - [x] Presets
 
 ::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19kPro
@@ -794,24 +924,11 @@
         show_root_heading: false
         heading_level: 0
 
-## S19 XP (LuxOS)
-
-- [x] Shutdowns
-- [ ] Power Modes
-- [ ] Setpoints
-- [x] Presets
-
-::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19XP
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
 ## T19 (LuxOS)
 
 - [x] Shutdowns
 - [ ] Power Modes
-- [ ] Setpoints
+- [x] Setpoints
 - [x] Presets
 
 ::: pyasic.miners.antminer.luxos.X19.T19.LUXMinerT19
@@ -846,6 +963,19 @@
         show_root_heading: false
         heading_level: 0
 
+## S19 XP (MaraFW)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.marathon.X19.S19.MaraS19XP
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## S19j (MaraFW)
 
 - [ ] Shutdowns
@@ -859,19 +989,6 @@
         show_root_heading: false
         heading_level: 0
 
-## S19j No PIC (MaraFW)
-
-- [ ] Shutdowns
-- [ ] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-::: pyasic.miners.antminer.marathon.X19.S19.MaraS19jNoPIC
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
 ## S19j Pro (MaraFW)
 
 - [ ] Shutdowns
@@ -885,14 +1002,14 @@
         show_root_heading: false
         heading_level: 0
 
-## S19 XP (MaraFW)
+## S19j No PIC (MaraFW)
 
 - [ ] Shutdowns
 - [ ] Power Modes
 - [ ] Setpoints
 - [ ] Presets
 
-::: pyasic.miners.antminer.marathon.X19.S19.MaraS19XP
+::: pyasic.miners.antminer.marathon.X19.S19.MaraS19jNoPIC
     handler: python
     options:
         show_root_heading: false

docs/miners/antminer/X21.md

@@ -14,6 +14,19 @@
         show_root_heading: false
         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)
 
 - [x] Shutdowns
@@ -27,6 +40,32 @@
         show_root_heading: false
         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
+
+## S21+ Hydro (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X21.S21.BMMinerS21PlusHydro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## T21 (Stock)
 
 - [x] Shutdowns
@@ -53,6 +92,58 @@
         show_root_heading: false
         heading_level: 0
 
+## S21 Hydro (BOS+)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bosminer.X21.S21.BOSMinerS21Hydro
+    handler: python
+    options:
+        show_root_heading: false
+        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
+
+## S21+ (BOS+)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bosminer.X21.S21.BOSMinerS21Plus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S21+ Hydro (BOS+)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bosminer.X21.S21.BOSMinerS21PlusHydro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## T21 (BOS+)
 
 - [x] Shutdowns
@@ -79,6 +170,71 @@
         show_root_heading: false
         heading_level: 0
 
+## S21 Hydro (VNish)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [x] Presets
+
+::: pyasic.miners.antminer.vnish.X21.S21.VNishS21Hydro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S21 Pro (VNish)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [x] Presets
+
+::: pyasic.miners.antminer.vnish.X21.S21.VNishS21Pro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S21+ (VNish)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [x] Presets
+
+::: pyasic.miners.antminer.vnish.X21.S21.VNishS21Plus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
+## S21+ Hydro (VNish)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [x] Presets
+
+::: pyasic.miners.antminer.vnish.X21.S21.VNishS21PlusHydro
+    handler: python
+    options:
+        show_root_heading: false
+        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)
 
 - [x] Shutdowns
@@ -122,7 +278,7 @@
 
 - [x] Shutdowns
 - [ ] Power Modes
-- [ ] Setpoints
+- [x] Setpoints
 - [x] Presets
 
 ::: pyasic.miners.antminer.luxos.X21.S21.LUXMinerS21
@@ -131,6 +287,19 @@
         show_root_heading: false
         heading_level: 0
 
+## T21 (LuxOS)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [x] Presets
+
+::: pyasic.miners.antminer.luxos.X21.T21.LUXMinerT21
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## S21 (MaraFW)
 
 - [ ] Shutdowns

docs/miners/antminer/X3.md

@@ -27,19 +27,6 @@
         show_root_heading: false
         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
-
 ## KA3 (Stock)
 
 - [x] Shutdowns
@@ -66,14 +53,14 @@
         show_root_heading: false
         heading_level: 0
 
-## L3+ (VNish)
+## L3+ (Stock)
 
-- [x] Shutdowns
+- [ ] Shutdowns
 - [ ] Power Modes
-- [x] Setpoints
-- [x] Presets
+- [ ] Setpoints
+- [ ] Presets
 
-::: pyasic.miners.antminer.vnish.X3.L3.VnishL3Plus
+::: pyasic.miners.antminer.bmminer.X3.L3.BMMinerL3Plus
     handler: python
     options:
         show_root_heading: false
@@ -86,7 +73,7 @@
 - [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

docs/miners/antminer/X5.md

@@ -27,3 +27,16 @@
         show_root_heading: false
         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,14 +1,14 @@
 # pyasic
 ## X7 Models
 
-## L7 (Stock)
+## D7 (Stock)
 
-- [ ] Shutdowns
+- [x] Shutdowns
 - [x] Power Modes
 - [ ] Setpoints
 - [ ] Presets
 
-::: pyasic.miners.antminer.bmminer.X7.L7.BMMinerL7
+::: pyasic.miners.antminer.bmminer.X7.D7.BMMinerD7
     handler: python
     options:
         show_root_heading: false
@@ -27,14 +27,14 @@
         show_root_heading: false
         heading_level: 0
 
-## D7 (Stock)
+## L7 (Stock)
 
-- [x] Shutdowns
+- [ ] Shutdowns
 - [x] Power Modes
 - [ ] Setpoints
 - [ ] Presets
 
-::: pyasic.miners.antminer.bmminer.X7.D7.BMMinerD7
+::: pyasic.miners.antminer.bmminer.X7.L7.BMMinerL7
     handler: python
     options:
         show_root_heading: false
@@ -47,7 +47,7 @@
 - [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

docs/miners/antminer/X9.md

@@ -1,6 +1,19 @@
 # pyasic
 ## X9 Models
 
+## D9 (Stock)
+
+- [x] Shutdowns
+- [x] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.antminer.bmminer.X9.D9.BMMinerD9
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## E9Pro (Stock)
 
 - [ ] Shutdowns
@@ -14,14 +27,14 @@
         show_root_heading: false
         heading_level: 0
 
-## D9 (Stock)
+## L9 (Stock)
 
 - [x] Shutdowns
 - [x] Power Modes
 - [ ] Setpoints
 - [ ] Presets
 
-::: pyasic.miners.antminer.bmminer.X9.D9.BMMinerD9
+::: pyasic.miners.antminer.bmminer.X9.L9.BMMinerL9
     handler: python
     options:
         show_root_heading: false
@@ -79,19 +92,6 @@
         show_root_heading: false
         heading_level: 0
 
-## L9 (Stock)
-
-- [x] Shutdowns
-- [x] Power Modes
-- [ ] Setpoints
-- [ ] Presets
-
-::: pyasic.miners.antminer.bmminer.X9.L9.BMMinerL9
-    handler: python
-    options:
-        show_root_heading: false
-        heading_level: 0
-
 ## S9 (BOS+)
 
 - [x] Shutdowns
@@ -105,6 +105,19 @@
         show_root_heading: false
         heading_level: 0
 
+## L9 (VNish)
+
+- [x] Shutdowns
+- [ ] Power Modes
+- [x] Setpoints
+- [x] Presets
+
+::: pyasic.miners.antminer.vnish.X9.L9.VNishL9
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## T9 (Hive)
 
 - [ ] Shutdowns
@@ -122,7 +135,7 @@
 
 - [x] Shutdowns
 - [ ] Power Modes
-- [ ] Setpoints
+- [x] Setpoints
 - [x] Presets
 
 ::: pyasic.miners.antminer.luxos.X9.S9.LUXMinerS9

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/nano.md

@@ -1,6 +1,19 @@
 # pyasic
 ## nano Models
 
+## Avalon Nano 3s (Stock)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.avalonminer.cgminer.nano.nano3.CGMinerAvalonNano3s
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+
 ## Avalon Nano 3 (Stock)
 
 - [ ] Shutdowns

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: 0
-
 ## Ultra (Stock)
 
 - [ ] Shutdowns
@@ -27,14 +14,14 @@
         show_root_heading: false
         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
@@ -53,3 +40,16 @@
         show_root_heading: false
         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

@@ -27,3 +27,16 @@
         show_root_heading: false
         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/elphapex/DGX.md

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

docs/miners/goldshell/Byte.md

@@ -0,0 +1,16 @@
+# pyasic
+## Byte Models
+
+## Byte (Stock)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.goldshell.bfgminer.Byte.Byte.GoldshellByte
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 0
+

docs/miners/goldshell/MiniDoge.md

@@ -0,0 +1,16 @@
+# pyasic
+## Mini Doge Models
+
+## Mini Doge (Stock)
+
+- [ ] Shutdowns
+- [ ] Power Modes
+- [ ] Setpoints
+- [ ] Presets
+
+::: pyasic.miners.goldshell.bfgminer.MiniDoge.MiniDoge.GoldshellMiniDoge
+    handler: python
+    options:
+        show_root_heading: false
+        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,11 +32,13 @@ 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>
             <summary>X7 Series:</summary>
                 <ul>
+                    <li><a href="../antminer/X7#l7-stock">L7 (Stock)</a></li>
                     <li><a href="../antminer/X7#l7-stock">L7 (Stock)</a></li>
                     <li><a href="../antminer/X7#k7-stock">K7 (Stock)</a></li>
                     <li><a href="../antminer/X7#d7-stock">D7 (Stock)</a></li>
@@ -52,6 +54,7 @@ details {
                     <li><a href="../antminer/X9#s9j-stock">S9j (Stock)</a></li>
                     <li><a href="../antminer/X9#t9-stock">T9 (Stock)</a></li>
                     <li><a href="../antminer/X9#l9-stock">L9 (Stock)</a></li>
+                    <li><a href="../antminer/X9#l9-stock">L9 (Stock)</a></li>
                 </ul>
         </details>
         <details>
@@ -85,6 +88,8 @@ details {
                     <li><a href="../antminer/X19#s19j-no-pic-stock">S19j No PIC (Stock)</a></li>
                     <li><a href="../antminer/X19#s19-pro_1-stock">S19 Pro+ (Stock)</a></li>
                     <li><a href="../antminer/X19#s19j-pro-stock">S19j Pro (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19j_1-stock">S19j+ (Stock)</a></li>
+                    <li><a href="../antminer/X19#s19j-pro_1-stock">S19j Pro+ (Stock)</a></li>
                     <li><a href="../antminer/X19#s19-xp-stock">S19 XP (Stock)</a></li>
                     <li><a href="../antminer/X19#s19a-stock">S19a (Stock)</a></li>
                     <li><a href="../antminer/X19#s19a-pro-stock">S19a Pro (Stock)</a></li>
@@ -100,8 +105,14 @@ 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_1-hydro-stock">S21+ Hydro (Stock)</a></li>
+                    <li><a href="../antminer/X21#s21_1-hydro-stock">S21+ Hydro (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>
@@ -548,6 +559,19 @@ details {
             <summary>nano Series:</summary>
                 <ul>
                     <li><a href="../avalonminer/nano#avalon-nano-3-stock">Avalon Nano 3 (Stock)</a></li>
+                    <li><a href="../avalonminer/nano#avalon-nano-3s-stock">Avalon Nano 3s (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>
+        <details>
+            <summary>Q Series:</summary>
+                <ul>
+                    <li><a href="../avalonminer/Q#avalon-q-home-stock">Avalon Q Home (Stock)</a></li>
                 </ul>
         </details>
     </ul>
@@ -579,6 +603,12 @@ details {
 <details>
 <summary>Stock Firmware Goldshells:</summary>
     <ul>
+        <details>
+            <summary>Mini Doge Series:</summary>
+                <ul>
+                    <li><a href="../goldshell/MiniDoge#mini-doge-stock">Mini Doge (Stock)</a></li>
+                </ul>
+        </details>
         <details>
             <summary>X5 Series:</summary>
                 <ul>
@@ -600,6 +630,12 @@ details {
                     <li><a href="../goldshell/XBox#kd-box-pro-stock">KD Box Pro (Stock)</a></li>
                 </ul>
         </details>
+        <details>
+            <summary>Byte Series:</summary>
+                <ul>
+                    <li><a href="../goldshell/Byte#byte-stock">Byte (Stock)</a></li>
+                </ul>
+        </details>
     </ul>
 </details>
 <details>
@@ -643,12 +679,17 @@ details {
                     <li><a href="../antminer/X19#s19-xp-bos_1">S19 XP (BOS+)</a></li>
                     <li><a href="../antminer/X19#s19-pro_1-hydro-bos_1">S19 Pro+ Hydro (BOS+)</a></li>
                     <li><a href="../antminer/X19#t19-bos_1">T19 (BOS+)</a></li>
+                    <li><a href="../antminer/X19#s19-xp-hydro-bos_1">S19 XP Hydro (BOS+)</a></li>
                 </ul>
         </details>
         <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#s21_1-bos_1">S21+ (BOS+)</a></li>
+                    <li><a href="../antminer/X21#s21_1-hydro-bos_1">S21+ Hydro (BOS+)</a></li>
+                    <li><a href="../antminer/X21#s21-hydro-bos_1">S21 Hydro (BOS+)</a></li>
                     <li><a href="../antminer/X21#t21-bos_1">T21 (BOS+)</a></li>
                 </ul>
         </details>
@@ -677,6 +718,12 @@ details {
                     <li><a href="../antminer/X7#l7-vnish">L7 (VNish)</a></li>
                 </ul>
         </details>
+        <details>
+            <summary>X9 Series:</summary>
+                <ul>
+                    <li><a href="../antminer/X9#l9-vnish">L9 (VNish)</a></li>
+                </ul>
+        </details>
         <details>
             <summary>X17 Series:</summary>
                 <ul>
@@ -691,10 +738,17 @@ 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#s19-xp-vnish">S19 XP (VNish)</a></li>
+                    <li><a href="../antminer/X19#s19-xp-hydro-vnish">S19 XP Hydro (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>
+                    <li><a href="../antminer/X19#s19-hydro-vnish">S19 Hydro (VNish)</a></li>
                     <li><a href="../antminer/X19#s19a-pro-vnish">S19a Pro (VNish)</a></li>
+                    <li><a href="../antminer/X19#s19-pro-a-vnish">S19 Pro A (VNish)</a></li>
+                    <li><a href="../antminer/X19#s19-pro-hydro-vnish">S19 Pro Hydro (VNish)</a></li>
                     <li><a href="../antminer/X19#s19-pro-hydro-vnish">S19 Pro Hydro (VNish)</a></li>
                     <li><a href="../antminer/X19#s19k-pro-vnish">S19k Pro (VNish)</a></li>
                     <li><a href="../antminer/X19#t19-vnish">T19 (VNish)</a></li>
@@ -703,7 +757,12 @@ 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>
+                    <li><a href="../antminer/X21#s21_1-vnish">S21+ (VNish)</a></li>
+                    <li><a href="../antminer/X21#s21_1-hydro-vnish">S21+ Hydro (VNish)</a></li>
+                    <li><a href="../antminer/X21#s21-pro-vnish">S21 Pro (VNish)</a></li>
+                    <li><a href="../antminer/X21#s21-hydro-vnish">S21 Hydro (VNish)</a></li>
                 </ul>
         </details>
     </ul>
@@ -722,6 +781,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>
@@ -737,6 +797,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>
@@ -755,6 +816,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>
@@ -784,6 +858,7 @@ details {
             <summary>X21 Series:</summary>
                 <ul>
                     <li><a href="../antminer/X21#s21-luxos">S21 (LuxOS)</a></li>
+                    <li><a href="../antminer/X21#t21-luxos">T21 (LuxOS)</a></li>
                 </ul>
         </details>
     </ul>
@@ -854,6 +929,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>
@@ -870,6 +957,12 @@ details {
                     <li><a href="../iceriver/KSX#ks5m-stock">KS5M (Stock)</a></li>
                 </ul>
         </details>
+        <details>
+            <summary>ALX Series:</summary>
+                <ul>
+                    <li><a href="../iceriver/ALX#al3-stock">AL3 (Stock)</a></li>
+                </ul>
+        </details>
     </ul>
 </details>
 <details>
@@ -894,3 +987,16 @@ details {
         </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>
+                    <li><a href="../elphapex/DGX#dg1-stock">DG1 (Stock)</a></li>
+                    <li><a href="../elphapex/DGX#dg1home-stock">DG1Home (Stock)</a></li>
+                </ul>
+        </details>
+    </ul>
+</details>

docs/miners/whatsminer/M5X.md

@@ -5,7 +5,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus_Plus.BTMinerM50SPlusPlusVK10
@@ -18,7 +18,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus_Plus.BTMinerM50SPlusPlusVK20
@@ -31,7 +31,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus_Plus.BTMinerM50SPlusPlusVK30
@@ -44,7 +44,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus_Plus.BTMinerM50SPlusPlusVK40
@@ -57,7 +57,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus_Plus.BTMinerM50SPlusPlusVK50
@@ -70,7 +70,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus_Plus.BTMinerM50SPlusPlusVK60
@@ -83,7 +83,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus_Plus.BTMinerM50SPlusPlusVL20
@@ -96,7 +96,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus_Plus.BTMinerM50SPlusPlusVL30
@@ -109,7 +109,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus_Plus.BTMinerM50SPlusPlusVL40
@@ -122,7 +122,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus_Plus.BTMinerM50SPlusPlusVL50
@@ -135,7 +135,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus_Plus.BTMinerM50SPlusPlusVL60
@@ -148,7 +148,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVH30
@@ -161,7 +161,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVH40
@@ -174,7 +174,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVJ30
@@ -187,7 +187,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVJ40
@@ -200,7 +200,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVJ60
@@ -213,7 +213,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVK10
@@ -226,7 +226,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVK20
@@ -239,7 +239,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVK30
@@ -252,7 +252,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVL10
@@ -265,7 +265,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVL20
@@ -278,7 +278,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S_Plus.BTMinerM50SPlusVL30
@@ -291,7 +291,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVH10
@@ -304,7 +304,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVH20
@@ -317,7 +317,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVH30
@@ -330,7 +330,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVH40
@@ -343,7 +343,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVH50
@@ -356,7 +356,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVJ10
@@ -369,7 +369,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVJ20
@@ -382,7 +382,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVJ30
@@ -395,7 +395,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVJ40
@@ -408,7 +408,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVJ50
@@ -421,7 +421,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVK10
@@ -434,7 +434,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVK20
@@ -447,7 +447,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVK30
@@ -460,7 +460,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVK50
@@ -473,7 +473,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVK60
@@ -486,7 +486,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVK70
@@ -499,7 +499,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVK80
@@ -512,7 +512,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVL20
@@ -525,7 +525,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50S.BTMinerM50SVL30
@@ -538,7 +538,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VE30
@@ -551,7 +551,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VG30
@@ -564,7 +564,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH10
@@ -577,7 +577,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH20
@@ -590,7 +590,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH30
@@ -603,7 +603,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH40
@@ -616,7 +616,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH50
@@ -629,7 +629,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH60
@@ -642,7 +642,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH70
@@ -655,7 +655,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH80
@@ -668,7 +668,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VH90
@@ -681,7 +681,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VJ10
@@ -694,7 +694,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VJ20
@@ -707,7 +707,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VJ30
@@ -720,7 +720,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VJ40
@@ -733,7 +733,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VJ60
@@ -746,7 +746,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VK40
@@ -759,7 +759,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M50.BTMinerM50VK50
@@ -772,7 +772,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M52S_Plus_Plus.BTMinerM52SPlusPlusVL10
@@ -785,7 +785,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M52S.BTMinerM52SVK30
@@ -798,7 +798,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53H.BTMinerM53HVH10
@@ -811,7 +811,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S_Plus_Plus.BTMinerM53SPlusPlusVK10
@@ -824,7 +824,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S_Plus_Plus.BTMinerM53SPlusPlusVK20
@@ -837,7 +837,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S_Plus_Plus.BTMinerM53SPlusPlusVK30
@@ -850,7 +850,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S_Plus_Plus.BTMinerM53SPlusPlusVK50
@@ -863,7 +863,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S_Plus_Plus.BTMinerM53SPlusPlusVL10
@@ -876,7 +876,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S_Plus_Plus.BTMinerM53SPlusPlusVL30
@@ -889,7 +889,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S_Plus.BTMinerM53SPlusVJ30
@@ -902,7 +902,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S_Plus.BTMinerM53SPlusVJ40
@@ -915,7 +915,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S_Plus.BTMinerM53SPlusVJ50
@@ -928,7 +928,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S_Plus.BTMinerM53SPlusVK30
@@ -941,7 +941,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S.BTMinerM53SVH20
@@ -954,7 +954,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S.BTMinerM53SVH30
@@ -967,7 +967,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S.BTMinerM53SVJ30
@@ -980,7 +980,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S.BTMinerM53SVJ40
@@ -993,7 +993,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S.BTMinerM53SVK30
@@ -1006,7 +1006,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53.BTMinerM53VH30
@@ -1019,7 +1019,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53.BTMinerM53VH40
@@ -1032,7 +1032,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53.BTMinerM53VH50
@@ -1045,7 +1045,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53.BTMinerM53VK30
@@ -1058,7 +1058,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M53.BTMinerM53VK60
@@ -1071,7 +1071,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M54S_Plus_Plus.BTMinerM54SPlusPlusVK30
@@ -1084,7 +1084,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M54S_Plus_Plus.BTMinerM54SPlusPlusVL30
@@ -1097,7 +1097,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M54S_Plus_Plus.BTMinerM54SPlusPlusVL40
@@ -1110,7 +1110,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M56S_Plus_Plus.BTMinerM56SPlusPlusVK10
@@ -1123,7 +1123,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M56S_Plus_Plus.BTMinerM56SPlusPlusVK30
@@ -1136,7 +1136,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M56S_Plus_Plus.BTMinerM56SPlusPlusVK40
@@ -1149,7 +1149,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M56S_Plus_Plus.BTMinerM56SPlusPlusVK50
@@ -1162,7 +1162,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M56S_Plus.BTMinerM56SPlusVJ30
@@ -1175,7 +1175,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M56S_Plus.BTMinerM56SPlusVK30
@@ -1188,7 +1188,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M56S_Plus.BTMinerM56SPlusVK40
@@ -1201,7 +1201,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M56S_Plus.BTMinerM56SPlusVK50
@@ -1214,7 +1214,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M56S.BTMinerM56SVH30
@@ -1227,7 +1227,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M56S.BTMinerM56SVJ30
@@ -1240,7 +1240,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M56S.BTMinerM56SVJ40
@@ -1253,7 +1253,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M56.BTMinerM56VH30
@@ -1266,7 +1266,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M5X.M59.BTMinerM59VH30

docs/miners/whatsminer/M6X.md

@@ -5,7 +5,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S_Plus_Plus.BTMinerM60SPlusPlusVL30
@@ -18,7 +18,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S_Plus_Plus.BTMinerM60SPlusPlusVL40
@@ -31,7 +31,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S_Plus.BTMinerM60SPlusVK30
@@ -44,7 +44,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S_Plus.BTMinerM60SPlusVK40
@@ -57,7 +57,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S_Plus.BTMinerM60SPlusVK50
@@ -70,7 +70,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S_Plus.BTMinerM60SPlusVK60
@@ -83,7 +83,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S_Plus.BTMinerM60SPlusVK70
@@ -96,7 +96,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S_Plus.BTMinerM60SPlusVL10
@@ -109,7 +109,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S_Plus.BTMinerM60SPlusVL30
@@ -122,7 +122,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S_Plus.BTMinerM60SPlusVL40
@@ -135,7 +135,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S_Plus.BTMinerM60SPlusVL50
@@ -148,7 +148,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S_Plus.BTMinerM60SPlusVL60
@@ -161,7 +161,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVK10
@@ -174,7 +174,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVK20
@@ -187,7 +187,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVK30
@@ -200,7 +200,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVK40
@@ -213,7 +213,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVL10
@@ -226,7 +226,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVL20
@@ -239,7 +239,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVL30
@@ -252,7 +252,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVL40
@@ -265,7 +265,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVL50
@@ -278,7 +278,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVL60
@@ -291,7 +291,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVL70
@@ -304,7 +304,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VK10
@@ -317,7 +317,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VK20
@@ -330,7 +330,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VK30
@@ -343,7 +343,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VK40
@@ -356,7 +356,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VK6A
@@ -369,7 +369,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VL10
@@ -382,7 +382,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VL20
@@ -395,7 +395,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VL30
@@ -408,7 +408,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VL40
@@ -421,7 +421,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VL50
@@ -434,7 +434,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M61S_Plus.BTMinerM61SPlusVL30
@@ -447,7 +447,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M61S.BTMinerM61SVL10
@@ -460,7 +460,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M61S.BTMinerM61SVL20
@@ -473,7 +473,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M61S.BTMinerM61SVL30
@@ -486,7 +486,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M61.BTMinerM61VK10
@@ -499,7 +499,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M61.BTMinerM61VK20
@@ -512,7 +512,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M61.BTMinerM61VK30
@@ -525,7 +525,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M61.BTMinerM61VK40
@@ -538,7 +538,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M61.BTMinerM61VL10
@@ -551,7 +551,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M61.BTMinerM61VL30
@@ -564,7 +564,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M61.BTMinerM61VL40
@@ -577,7 +577,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M61.BTMinerM61VL50
@@ -590,7 +590,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M61.BTMinerM61VL60
@@ -603,7 +603,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M62S_Plus.BTMinerM62SPlusVK30
@@ -616,7 +616,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M63S_Plus_Plus.BTMinerM63SPlusPlusVL20
@@ -629,7 +629,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M63S_Plus.BTMinerM63SPlusVK30
@@ -642,7 +642,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M63S_Plus.BTMinerM63SPlusVL10
@@ -655,7 +655,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M63S_Plus.BTMinerM63SPlusVL20
@@ -668,7 +668,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M63S_Plus.BTMinerM63SPlusVL30
@@ -681,7 +681,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M63S_Plus.BTMinerM63SPlusVL50
@@ -694,7 +694,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M63S.BTMinerM63SVK10
@@ -707,7 +707,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M63S.BTMinerM63SVK20
@@ -720,7 +720,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M63S.BTMinerM63SVK30
@@ -733,7 +733,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M63S.BTMinerM63SVK60
@@ -746,7 +746,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M63S.BTMinerM63SVL10
@@ -759,7 +759,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M63S.BTMinerM63SVL50
@@ -772,7 +772,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M63S.BTMinerM63SVL60
@@ -785,7 +785,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M63.BTMinerM63VK10
@@ -798,7 +798,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M63.BTMinerM63VK20
@@ -811,7 +811,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M63.BTMinerM63VK30
@@ -824,7 +824,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M63.BTMinerM63VL10
@@ -837,7 +837,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M63.BTMinerM63VL30
@@ -850,7 +850,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M64S.BTMinerM64SVL30
@@ -863,7 +863,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M64.BTMinerM64VL30
@@ -876,7 +876,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M64.BTMinerM64VL40
@@ -889,7 +889,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M65S_Plus.BTMinerM65SPlusVK30
@@ -902,7 +902,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M65S.BTMinerM65SVK20
@@ -915,7 +915,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M65S.BTMinerM65SVL60
@@ -928,7 +928,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S_Plus_Plus.BTMinerM66SPlusPlusVL20
@@ -941,7 +941,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S_Plus.BTMinerM66SPlusVK30
@@ -954,7 +954,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S_Plus.BTMinerM66SPlusVL10
@@ -967,7 +967,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S_Plus.BTMinerM66SPlusVL20
@@ -980,7 +980,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S_Plus.BTMinerM66SPlusVL30
@@ -993,7 +993,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S_Plus.BTMinerM66SPlusVL40
@@ -1006,7 +1006,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S_Plus.BTMinerM66SPlusVL60
@@ -1019,7 +1019,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S.BTMinerM66SVK20
@@ -1032,7 +1032,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S.BTMinerM66SVK30
@@ -1045,7 +1045,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S.BTMinerM66SVK40
@@ -1058,7 +1058,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S.BTMinerM66SVK50
@@ -1071,7 +1071,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S.BTMinerM66SVK60
@@ -1084,7 +1084,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S.BTMinerM66SVL10
@@ -1097,7 +1097,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S.BTMinerM66SVL20
@@ -1110,7 +1110,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S.BTMinerM66SVL30
@@ -1123,7 +1123,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S.BTMinerM66SVL40
@@ -1136,7 +1136,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66S.BTMinerM66SVL50
@@ -1149,7 +1149,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66.BTMinerM66VK20
@@ -1162,7 +1162,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66.BTMinerM66VK30
@@ -1175,7 +1175,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66.BTMinerM66VL20
@@ -1188,7 +1188,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M66.BTMinerM66VL30
@@ -1201,7 +1201,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M6X.M67S.BTMinerM67SVK30

docs/miners/whatsminer/M7X.md

@@ -5,7 +5,7 @@
 
 - [x] Shutdowns
 - [x] Power Modes
-- [x] Setpoints
+- [ ] Setpoints
 - [ ] Presets
 
 ::: pyasic.miners.whatsminer.btminer.M7X.M70.BTMinerM70VM30

mkdocs.yml

@@ -97,6 +97,8 @@ nav:
         - Innosilicon T3X: "miners/innosilicon/T3X.md"
         - Innosilicon A10X: "miners/innosilicon/A10X.md"
         - Innosilicon A11X: "miners/innosilicon/A11X.md"
+        - Goldshell Byte: "miners/goldshell/Byte.md"
+        - Goldshell Mini Doge: "miners/goldshell/MiniDoge.md"
         - Goldshell X5: "miners/goldshell/X5.md"
         - Goldshell XMax: "miners/goldshell/XMax.md"
         - Goldshell XBox: "miners/goldshell/XBox.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,14 @@ class MinerConfig(BaseModel):
             **self.temperature.as_wm(),
         }
 
-    def as_am_old(self, user_suffix: str = None) -> dict:
+    def as_btminer_v3(self, user_suffix: str | None = None) -> dict:
+        """Generates the configuration in the format suitable for Whatsminers running BTMiner V3."""
+        return {
+            "set.miner.pools": self.pools.as_btminer_v3()
+            ** self.mining_mode.as_btminer_v3()
+        }
+
+    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 +101,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 +110,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 +119,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 +128,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 +136,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 +145,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 +153,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 +162,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 +170,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 +186,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 +226,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."""
@@ -209,6 +254,16 @@ class MinerConfig(BaseModel):
         """Constructs a MinerConfig object from web configuration for Goldshell miners."""
         return cls(pools=PoolConfig.from_am_modern(web_conf))
 
+    @classmethod
+    def from_goldshell_list(cls, web_conf: list) -> "MinerConfig":
+        """Constructs a MinerConfig object from web configuration for Goldshell miners."""
+        return cls(pools=PoolConfig.from_goldshell(web_conf))
+
+    @classmethod
+    def from_goldshell_byte(cls, web_conf: dict) -> "MinerConfig":
+        """Constructs a MinerConfig object from web configuration for Goldshell Byte miners."""
+        return cls(pools=PoolConfig.from_goldshell_byte(web_conf))
+
     @classmethod
     def from_inno(cls, web_pools: list) -> "MinerConfig":
         """Constructs a MinerConfig object from web configuration for Innosilicon miners."""
@@ -245,13 +300,17 @@ class MinerConfig(BaseModel):
         )
 
     @classmethod
-    def from_vnish(cls, web_settings: dict, web_presets: list[dict]) -> "MinerConfig":
+    def from_vnish(
+        cls, web_settings: dict, web_presets: list[dict], web_perf_summary: dict
+    ) -> "MinerConfig":
         """Constructs a MinerConfig object from web settings for VNish miners."""
         return cls(
             pools=PoolConfig.from_vnish(web_settings),
             fan_mode=FanModeConfig.from_vnish(web_settings),
             temperature=TemperatureConfig.from_vnish(web_settings),
-            mining_mode=MiningModeConfig.from_vnish(web_settings, web_presets),
+            mining_mode=MiningModeConfig.from_vnish(
+                web_settings, web_presets, web_perf_summary
+            ),
         )
 
     @classmethod
@@ -272,10 +331,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
@@ -310,5 +369,12 @@ class MinerConfig(BaseModel):
         return cls.from_am_modern(*args, **kwargs)
 
     @classmethod
-    def from_hiveon_modern(cls, web_conf: dict) -> "MinerConfig":
-        return cls.from_am_modern(web_conf)
+    def from_btminer_v3(
+        cls, rpc_pools: dict, rpc_settings: dict, rpc_device_info: dict
+    ) -> "MinerConfig":
+        return cls(
+            pools=PoolConfig.from_btminer_v3(rpc_pools=rpc_pools["msg"]),
+            mining_mode=MiningModeConfig.from_btminer_v3(
+                rpc_device_info=rpc_device_info, rpc_settings=rpc_settings
+            ),
+        )

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,12 +98,18 @@ class MinerConfigValue(BaseModel):
     def as_am_modern(self) -> dict:
         return {}
 
+    def as_hiveon_modern(self) -> dict:
+        return {}
+
     def as_am_old(self) -> dict:
         return {}
 
     def as_wm(self) -> dict:
         return {}
 
+    def as_btminer_v3(self) -> dict:
+        return {}
+
     def as_inno(self) -> dict:
         return {}
 
@@ -125,12 +137,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:
@@ -342,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,9 +52,20 @@ 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}
 
+    def as_btminer_v3(self) -> dict:
+        return {"set.miner.service": "start", "set.miner.power_mode": self.mode}
+
     def as_auradine(self) -> dict:
         return {"mode": {"mode": self.mode}}
 
@@ -74,6 +85,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,9 +101,20 @@ 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}
 
+    def as_btminer_v3(self) -> dict:
+        return {"set.miner.service": "stop"}
+
     def as_auradine(self) -> dict:
         return {"mode": {"sleep": "on"}}
 
@@ -119,9 +144,20 @@ 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}
 
+    def as_btminer_v3(self) -> dict:
+        return {"set.miner.service": "start", "set.miner.power_mode": self.mode}
+
     def as_auradine(self) -> dict:
         return {"mode": {"mode": "eco"}}
 
@@ -141,9 +177,20 @@ 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}
 
+    def as_btminer_v3(self) -> dict:
+        return {"set.miner.service": "start", "set.miner.power_mode": self.mode}
+
     def as_auradine(self) -> dict:
         return {"mode": {"mode": "turbo"}}
 
@@ -174,11 +221,22 @@ 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}}
         return {}
 
+    def as_btminer_v3(self) -> dict:
+        return {"set.miner.service": "start", "set.miner.power_limit": self.power}
+
     def as_bosminer(self) -> dict:
         tuning_cfg = {"enabled": True, "mode": "power_target"}
         if self.power is not None:
@@ -215,18 +273,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 +331,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 +364,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:
@@ -356,32 +427,43 @@ class MiningModePreset(MinerConfigValue):
 
     @classmethod
     def from_vnish(
-        cls, web_overclock_settings: dict, web_presets: list[dict]
+        cls,
+        web_overclock_settings: dict,
+        web_presets: list[dict],
+        web_perf_summary: dict,
     ) -> "MiningModePreset":
-        active_preset = None
-        for preset in web_presets:
-            if preset["name"] == web_overclock_settings["preset"]:
-                active_preset = preset
+        active_preset = web_perf_summary.get("current_preset")
+
+        if active_preset is None:
+            for preset in web_presets:
+                if preset["name"] == web_overclock_settings["preset"]:
+                    active_preset = preset
+
         return cls(
             active_preset=MiningPreset.from_vnish(active_preset),
             available_presets=[MiningPreset.from_vnish(p) for p in web_presets],
         )
 
     @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 +479,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 +511,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 +611,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,9 +721,12 @@ 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]):
+    def from_vnish(
+        cls, web_settings: dict, web_presets: list[dict], web_perf_summary: dict
+    ):
         try:
             mode_settings = web_settings["miner"]["overclock"]
         except KeyError:
@@ -611,7 +735,9 @@ class MiningModeConfig(MinerConfigOption):
         if mode_settings["preset"] == "disabled":
             return MiningModeManual.from_vnish(mode_settings)
         else:
-            return MiningModePreset.from_vnish(mode_settings, web_presets)
+            return MiningModePreset.from_vnish(
+                mode_settings, web_presets, web_perf_summary
+            )
 
     @classmethod
     def from_boser(cls, grpc_miner_conf: dict):
@@ -678,6 +804,26 @@ class MiningModeConfig(MinerConfigOption):
         except LookupError:
             return cls.default()
 
+    @classmethod
+    def from_btminer_v3(cls, rpc_device_info: dict, rpc_settings: dict):
+        try:
+            is_mining = rpc_device_info["msg"]["miner"]["working"] == "true"
+            if not is_mining:
+                return cls.sleep()
+            power_limit = rpc_settings["msg"]["power-limit"]
+            if not power_limit == 0:
+                return cls.power_tuning(power=power_limit)
+            power_mode = rpc_settings["msg"]["power-mode"]
+            if power_mode == "normal":
+                return cls.normal()
+            if power_mode == "high":
+                return cls.high()
+            if power_mode == "low":
+                return cls.low()
+
+        except LookupError:
+            return cls.default()
+
     @classmethod
     def from_mara(cls, web_config: dict):
         try:
@@ -705,7 +851,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,
@@ -50,6 +64,13 @@ class Pool(MinerConfigValue):
             f"passwd_{idx}": self.password,
         }
 
+    def as_btminer_v3(self, user_suffix: str | None = None) -> dict:
+        return {
+            f"pool": self.url,
+            f"worker": f"{self.user}{user_suffix or ''}",
+            f"passwd": self.password,
+        }
+
     def as_am_old(self, idx: int = 1, user_suffix: str | None = None) -> dict:
         return {
             f"_ant_pool{idx}url": self.url,
@@ -102,7 +123,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 ''}",
@@ -134,6 +155,10 @@ class Pool(MinerConfigValue):
     def from_api(cls, api_pool: dict) -> "Pool":
         return cls(url=api_pool["URL"], user=api_pool["User"], password="x")
 
+    @classmethod
+    def from_btminer_v3(cls, api_pool: dict) -> "Pool":
+        return cls(url=api_pool["url"], user=api_pool["account"], password="x")
+
     @classmethod
     def from_epic(cls, api_pool: dict) -> "Pool":
         return cls(
@@ -146,6 +171,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 +201,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 +229,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 +272,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
@@ -248,6 +307,9 @@ class PoolGroup(MinerConfigValue):
             idx += 1
         return pools
 
+    def as_btminer_v3(self, user_suffix: str | None = None) -> list:
+        return [pool.as_btminer_v3(user_suffix) for pool in self.pools[:3]]
+
     def as_am_old(self, user_suffix: str | None = None) -> dict:
         pools = {}
         idx = 0
@@ -306,8 +368,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(
@@ -337,6 +399,13 @@ class PoolGroup(MinerConfigValue):
             pools.append(Pool.from_api(pool))
         return cls(pools=pools)
 
+    @classmethod
+    def from_btminer_v3(cls, api_pool_list: list) -> "PoolGroup":
+        pools = []
+        for pool in api_pool_list:
+            pools.append(Pool.from_btminer_v3(pool))
+        return cls(pools=pools)
+
     @classmethod
     def from_epic(cls, api_pool_list: list) -> "PoolGroup":
         pools = []
@@ -351,6 +420,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])
@@ -395,8 +478,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,11 +519,26 @@ 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)}
         return {"pools": PoolGroup().as_wm()}
 
+    def as_btminer_v3(self, user_suffix: str | None = None) -> dict:
+        if len(self.groups) > 0:
+            return {"pools": self.groups[0].as_btminer_v3(user_suffix=user_suffix)}
+        return {"pools": PoolGroup().as_btminer_v3()}
+
     def as_am_old(self, user_suffix: str | None = None) -> dict:
         if len(self.groups) > 0:
             return self.groups[0].as_am_old(user_suffix=user_suffix)
@@ -507,8 +605,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 {}
@@ -526,6 +624,16 @@ class PoolConfig(MinerConfigValue):
 
         return cls(groups=[PoolGroup.from_api(pool_data)])
 
+    @classmethod
+    def from_btminer_v3(cls, rpc_pools: dict) -> "PoolConfig":
+        try:
+            pool_data = rpc_pools["pools"]
+        except KeyError:
+            return PoolConfig.default()
+        pool_data = sorted(pool_data, key=lambda x: int(x["id"]))
+
+        return cls(groups=[PoolGroup.from_btminer_v3(pool_data)])
+
     @classmethod
     def from_epic(cls, web_conf: dict) -> "PoolConfig":
         pool_data = web_conf["StratumConfigs"]
@@ -533,14 +641,42 @@ 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)])
 
+    @classmethod
+    def from_goldshell_byte(cls, web_pools: list) -> "PoolConfig":
+        return cls(
+            groups=[
+                PoolGroup.from_goldshell(g["pools"])
+                for g in web_pools
+                if len(g["pools"]) > 0
+            ]
+        )
+
     @classmethod
     def from_inno(cls, web_pools: list) -> "PoolConfig":
         return cls(groups=[PoolGroup.from_inno(web_pools)])
@@ -576,8 +712,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
 
 
@@ -71,6 +70,7 @@ class MinerData(BaseModel):
         errors: A list of errors on the miner.
         fault_light: Whether the fault light is on as a boolean.
         efficiency: Efficiency of the miner in J/TH (Watts per TH/s).  Calculated automatically.
+        efficiency_fract: Same as efficiency, but is not rounded to integer.  Calculated automatically.
         is_mining: Whether the miner is mining.
         pools: A list of PoolMetrics instances, each representing metrics for a pool.
     """
@@ -109,25 +109,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 +130,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:
@@ -290,12 +285,24 @@ class MinerData(BaseModel):
     @computed_field  # type: ignore[misc]
     @property
     def efficiency(self) -> int | None:
+        efficiency = self._efficiency(0)
+        if efficiency is None:
+            return None
+        else:
+            return int(efficiency)
+
+    @computed_field  # type: ignore[misc]
+    @property
+    def efficiency_fract(self) -> float | None:
+        return self._efficiency(2)
+
+    def _efficiency(self, ndigits: int) -> float | None:
         if self.hashrate is None or self.wattage is None:
             return None
         try:
-            return round(self.wattage / float(self.hashrate))
+            return round(self.wattage / float(self.hashrate), ndigits)
         except ZeroDivisionError:
-            return 0
+            return 0.0
 
     @computed_field  # type: ignore[misc]
     @property
@@ -309,25 +316,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 +374,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 +385,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
 
@@ -28,6 +28,8 @@ class HashBoard(BaseModel):
     Attributes:
         slot: The slot of the board as an int.
         hashrate: The hashrate of the board in TH/s as a float.
+        inlet_temp: Inlet temperature for hydro asics as an int
+        outlet_temp: Outlet temperature for hydro asics as an int
         temp: The temperature of the PCB as an int.
         chip_temp: The temperature of the chips as an int.
         chips: The chip count of the board as an int.
@@ -41,6 +43,8 @@ class HashBoard(BaseModel):
 
     slot: int = 0
     hashrate: AlgoHashRateType | None = None
+    inlet_temp: float | None = None
+    outlet_temp: float | None = None
     temp: float | None = None
     chip_temp: float | None = None
     chips: int | None = None
@@ -51,6 +55,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 +75,62 @@ 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,50 @@ 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/algorithm/__init__.py

@@ -1,5 +1,6 @@
 from .base import MinerAlgoType
 from .blake256 import Blake256Algo
+from .blockflow import BlockFlowAlgo
 from .eaglesong import EaglesongAlgo
 from .equihash import EquihashAlgo
 from .ethash import EtHashAlgo
@@ -11,6 +12,7 @@ from .kheavyhash import KHeavyHashAlgo
 from .scrypt import ScryptAlgo
 from .sha256 import SHA256Algo
 from .x11 import X11Algo
+from .zksnark import ZkSnarkAlgo
 
 
 class MinerAlgo:
@@ -24,3 +26,5 @@ class MinerAlgo:
     EAGLESONG = EaglesongAlgo
     ETHASH = EtHashAlgo
     EQUIHASH = EquihashAlgo
+    BLOCKFLOW = BlockFlowAlgo
+    ZKSNARK = ZkSnarkAlgo

pyasic/device/algorithm/blockflow.py

@@ -0,0 +1,12 @@
+from __future__ import annotations
+
+from .base import MinerAlgoType
+from .hashrate import BlockFlowHashRate
+from .hashrate.unit import BlockFlowUnit
+
+
+class BlockFlowAlgo(MinerAlgoType):
+    hashrate: type[BlockFlowHashRate] = BlockFlowHashRate
+    unit: type[BlockFlowUnit] = BlockFlowUnit
+
+    name = "BlockFlow"

pyasic/device/algorithm/hashrate/__init__.py

@@ -1,5 +1,6 @@
 from .base import AlgoHashRateType
 from .blake256 import Blake256HashRate
+from .blockflow import BlockFlowHashRate
 from .eaglesong import EaglesongHashRate
 from .equihash import EquihashHashRate
 from .ethash import EtHashHashRate
@@ -9,6 +10,7 @@ from .kheavyhash import KHeavyHashHashRate
 from .scrypt import ScryptHashRate
 from .sha256 import SHA256HashRate
 from .x11 import X11HashRate
+from .zksnark import ZkSnarkHashRate
 
 
 class AlgoHashRate:
@@ -22,3 +24,5 @@ class AlgoHashRate:
     EAGLESONG = EaglesongHashRate
     ETHASH = EtHashHashRate
     EQUIHASH = EquihashHashRate
+    BLOCKFLOW = BlockFlowHashRate
+    ZKSNARK = ZkSnarkHashRate

pyasic/device/algorithm/hashrate/blockflow.py

@@ -0,0 +1,18 @@
+from __future__ import annotations
+
+from typing_extensions import Self
+
+from pyasic.device.algorithm.hashrate.base import AlgoHashRateType
+from pyasic.device.algorithm.hashrate.unit.blockflow import BlockFlowUnit
+
+from .unit import HashUnit
+
+
+class BlockFlowHashRate(AlgoHashRateType):
+    rate: float
+    unit: BlockFlowUnit = HashUnit.BLOCKFLOW.default
+
+    def into(self, other: BlockFlowUnit) -> Self:
+        return self.__class__(
+            rate=self.rate / (other.value / self.unit.value), unit=other
+        )

pyasic/device/algorithm/hashrate/unit/__init__.py

@@ -1,4 +1,5 @@
 from .blake256 import Blake256Unit
+from .blockflow import BlockFlowUnit
 from .eaglesong import EaglesongUnit
 from .equihash import EquihashUnit
 from .ethash import EtHashUnit
@@ -8,6 +9,7 @@ from .kheavyhash import KHeavyHashUnit
 from .scrypt import ScryptUnit
 from .sha256 import SHA256Unit
 from .x11 import X11Unit
+from .zksnark import ZkSnarkUnit
 
 
 class HashUnit:
@@ -21,3 +23,5 @@ class HashUnit:
     EAGLESONG = EaglesongUnit
     ETHASH = EtHashUnit
     EQUIHASH = EquihashUnit
+    BLOCKFLOW = BlockFlowUnit
+    ZKSNARK = ZkSnarkUnit

pyasic/device/algorithm/hashrate/unit/blockflow.py

@@ -0,0 +1,16 @@
+from __future__ import annotations
+
+from .base import AlgoHashRateUnitType
+
+
+class BlockFlowUnit(AlgoHashRateUnitType):
+    H = 1
+    KH = int(H) * 1000
+    MH = int(KH) * 1000
+    GH = int(MH) * 1000
+    TH = int(GH) * 1000
+    PH = int(TH) * 1000
+    EH = int(PH) * 1000
+    ZH = int(EH) * 1000
+
+    default = MH

pyasic/device/algorithm/hashrate/unit/zksnark.py

@@ -0,0 +1,16 @@
+from __future__ import annotations
+
+from .base import AlgoHashRateUnitType
+
+
+class ZkSnarkUnit(AlgoHashRateUnitType):
+    H = 1
+    KH = int(H) * 1000
+    MH = int(KH) * 1000
+    GH = int(MH) * 1000
+    TH = int(GH) * 1000
+    PH = int(TH) * 1000
+    EH = int(PH) * 1000
+    ZH = int(EH) * 1000
+
+    default = GH

pyasic/device/algorithm/hashrate/zksnark.py

@@ -0,0 +1,18 @@
+from __future__ import annotations
+
+from typing_extensions import Self
+
+from pyasic.device.algorithm.hashrate.base import AlgoHashRateType
+from pyasic.device.algorithm.hashrate.unit.zksnark import ZkSnarkUnit
+
+from .unit import HashUnit
+
+
+class ZkSnarkHashRate(AlgoHashRateType):
+    rate: float
+    unit: ZkSnarkUnit = HashUnit.ZKSNARK.default
+
+    def into(self, other: ZkSnarkUnit) -> Self:
+        return self.__class__(
+            rate=self.rate / (other.value / self.unit.value), unit=other
+        )

pyasic/device/algorithm/zksnark.py

@@ -0,0 +1,12 @@
+from __future__ import annotations
+
+from .base import MinerAlgoType
+from .hashrate import ZkSnarkHashRate
+from .hashrate.unit import ZkSnarkUnit
+
+
+class ZkSnarkAlgo(MinerAlgoType):
+    hashrate: type[ZkSnarkHashRate] = ZkSnarkHashRate
+    unit: type[ZkSnarkUnit] = ZkSnarkUnit
+
+    name = "zkSNARK"

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"
@@ -42,6 +43,7 @@ class AntminerModels(MinerModelType):
     S19jNoPIC = "S19j No PIC"
     S19ProPlus = "S19 Pro+"
     S19jPro = "S19j Pro"
+    S19jPlus = "S19j+"
     S19jProNoPIC = "S19j Pro No PIC"
     S19jProPlus = "S19j Pro+"
     S19jProPlusNoPIC = "S19j Pro+ No PIC"
@@ -53,12 +55,17 @@ class AntminerModels(MinerModelType):
     S19ProPlusHydro = "S19 Pro+ Hydro"
     S19KPro = "S19K Pro"
     S19kPro = "S19k Pro"
+    S19ProA = "S19 Pro A"
     S19kProNoPIC = "S19k Pro No PIC"
     S19jXP = "S19j XP"
     T19 = "T19"
     S21 = "S21"
+    S21Plus = "S21+"
+    S21PlusHydro = "S21+ Hydro"
     S21Pro = "S21 Pro"
+    S21Hydro = "S21 Hydro"
     T21 = "T21"
+    S19XPHydro = "S19 XP Hydro"
 
     def __str__(self):
         return self.value
@@ -446,7 +453,10 @@ class AvalonminerModels(MinerModelType):
     Avalon1166Pro = "Avalon 1166 Pro"
     Avalon1126Pro = "Avalon 1126 Pro"
     Avalon1246 = "Avalon 1246"
+    Avalon1566 = "Avalon 1566"
     AvalonNano3 = "Avalon Nano 3"
+    AvalonNano3s = "Avalon Nano 3s"
+    AvalonQHome = "Avalon Q Home"
 
     def __str__(self):
         return self.value
@@ -469,6 +479,8 @@ class GoldshellModels(MinerModelType):
     KDMax = "KD Max"
     KDBoxII = "KD Box II"
     KDBoxPro = "KD Box Pro"
+    Byte = "Byte"
+    MiniDoge = "Mini Doge"
 
     def __str__(self):
         return self.value
@@ -477,7 +489,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
@@ -506,6 +520,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"
@@ -516,6 +538,7 @@ class IceRiverModels(MinerModelType):
     KS5 = "KS5"
     KS5L = "KS5L"
     KS5M = "KS5M"
+    AL3 = "AL3"
 
     def __str__(self):
         return self.value
@@ -540,6 +563,12 @@ class BraiinsModels(MinerModelType):
     BMM101 = "BMM101"
 
 
+class ElphapexModels(MinerModelType):
+    DG1 = "DG1"
+    DG1Plus = "DG1+"
+    DG1Home = "DG1Home"
+
+
 class MinerModel:
     ANTMINER = AntminerModels
     WHATSMINER = WhatsminerModels
@@ -549,7 +578,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/X19/S19.py

@@ -25,7 +25,9 @@ from pyasic.miners.device.models import (
     S19i,
     S19j,
     S19jNoPIC,
+    S19jPlus,
     S19jPro,
+    S19jProPlus,
     S19jXP,
     S19KPro,
     S19Plus,
@@ -80,6 +82,10 @@ class BMMinerS19jPro(AntminerModern, S19jPro):
     pass
 
 
+class BMMinerS19jPlus(AntminerModern, S19jPlus):
+    pass
+
+
 class BMMinerS19L(AntminerModern, S19L):
     pass
 
@@ -102,3 +108,7 @@ class BMMinerS19KPro(AntminerModern, S19KPro):
 
 class BMMinerS19jXP(AntminerModern, S19jXP):
     pass
+
+
+class BMMinerS19jProPlus(AntminerModern, S19jProPlus):
+    pass

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

@@ -22,7 +22,9 @@ from .S19 import (
     BMMinerS19i,
     BMMinerS19j,
     BMMinerS19jNoPIC,
+    BMMinerS19jPlus,
     BMMinerS19jPro,
+    BMMinerS19jProPlus,
     BMMinerS19jXP,
     BMMinerS19KPro,
     BMMinerS19L,

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

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

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

@@ -13,5 +13,11 @@
 #  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,
+    BMMinerS21PlusHydro,
+    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/X19/S19.py

@@ -30,6 +30,7 @@ from pyasic.miners.device.models import (
     S19Plus,
     S19Pro,
     S19ProPlusHydro,
+    S19XPHydro,
 )
 
 
@@ -87,3 +88,7 @@ class BOSMinerS19XP(BOSer, S19XP):
 
 class BOSMinerS19ProPlusHydro(BOSer, S19ProPlusHydro):
     pass
+
+
+class BOSMinerS19XPHydro(BOSer, S19XPHydro):
+    pass

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

@@ -29,5 +29,6 @@ from .S19 import (
     BOSMinerS19Pro,
     BOSMinerS19ProPlusHydro,
     BOSMinerS19XP,
+    BOSMinerS19XPHydro,
 )
 from .T19 import BOSMinerT19

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

@@ -15,8 +15,40 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import BOSer
-from pyasic.miners.device.models import S21
+from pyasic.miners.device.models import S21, S21Hydro, S21Plus, S21PlusHydro, S21Pro
+
+# ------------------------------------------------------------------------------
+#  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.                                              -
+# ------------------------------------------------------------------------------
 
 
 class BOSMinerS21(BOSer, S21):
     pass
+
+
+class BOSMinerS21Plus(BOSer, S21Plus):
+    pass
+
+
+class BOSMinerS21PlusHydro(BOSer, S21PlusHydro):
+    pass
+
+
+class BOSMinerS21Pro(BOSer, S21Pro):
+    pass
+
+
+class BOSMinerS21Hydro(BOSer, S21Hydro):
+    pass

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

@@ -14,5 +14,11 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from .S21 import BOSMinerS21
+from .S21 import (
+    BOSMinerS21,
+    BOSMinerS21Hydro,
+    BOSMinerS21Plus,
+    BOSMinerS21PlusHydro,
+    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/luxos/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 LUXMiner
+from pyasic.miners.device.models import S21, T21
+
+
+class LUXMinerT21(LUXMiner, T21):
+    pass

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

@@ -15,3 +15,4 @@
 # ------------------------------------------------------------------------------
 
 from .S21 import LUXMinerS21
+from .T21 import LUXMinerT21

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,12 +20,16 @@ from pyasic.miners.device.models import (
     S19XP,
     S19a,
     S19aPro,
+    S19Hydro,
+    S19i,
     S19j,
     S19jPro,
     S19kPro,
     S19NoPIC,
     S19Pro,
+    S19ProA,
     S19ProHydro,
+    S19XPHydro,
 )
 
 
@@ -41,10 +45,18 @@ class VNishS19Pro(VNish, S19Pro):
     pass
 
 
+class VNishS19Hydro(VNish, S19Hydro):
+    pass
+
+
 class VNishS19XP(VNish, S19XP):
     pass
 
 
+class VNishS19XPHydro(VNish, S19XPHydro):
+    pass
+
+
 class VNishS19a(VNish, S19a):
     pass
 
@@ -53,6 +65,14 @@ class VNishS19aPro(VNish, S19aPro):
     pass
 
 
+class VNishS19ProA(VNish, S19ProA):
+    pass
+
+
+class VNishS19i(VNish, S19i):
+    pass
+
+
 class VNishS19j(VNish, S19j):
     pass
 
@@ -67,3 +87,7 @@ class VNishS19ProHydro(VNish, S19ProHydro):
 
 class VNishS19kPro(VNish, S19kPro):
     pass
+
+
+class VNishS19ProA(VNish, S19ProA):
+    pass

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

@@ -18,12 +18,16 @@ from .S19 import (
     VNishS19,
     VNishS19a,
     VNishS19aPro,
+    VNishS19Hydro,
+    VNishS19i,
     VNishS19j,
     VNishS19jPro,
     VNishS19kPro,
     VNishS19NoPIC,
     VNishS19Pro,
+    VNishS19ProA,
     VNishS19ProHydro,
     VNishS19XP,
+    VNishS19XPHydro,
 )
 from .T19 import VNishT19

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

@@ -15,8 +15,24 @@
 # ------------------------------------------------------------------------------
 
 from pyasic.miners.backends import VNish
-from pyasic.miners.device.models import S21
+from pyasic.miners.device.models import S21, S21Hydro, S21Plus, S21PlusHydro, S21Pro
 
 
 class VNishS21(VNish, S21):
     pass
+
+
+class VNishS21Plus(VNish, S21Plus):
+    pass
+
+
+class VNishS21PlusHydro(VNish, S21PlusHydro):
+    pass
+
+
+class VNishS21Pro(VNish, S21Pro):
+    pass
+
+
+class VNishS21Hydro(VNish, S21Hydro):
+    pass

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

@@ -14,4 +14,11 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from .S21 import VNishS21
+from .S21 import (
+    VNishS21,
+    VNishS21Hydro,
+    VNishS21Plus,
+    VNishS21PlusHydro,
+    VNishS21Pro,
+)
+from .T21 import VNishT21

pyasic/miners/antminer/vnish/X3/L3.py

@@ -18,5 +18,5 @@ from pyasic.miners.backends import VNish
 from pyasic.miners.device.models import L3Plus
 
 
-class VnishL3Plus(VNish, L3Plus):
+class VNishL3Plus(VNish, L3Plus):
     pass

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

@@ -14,4 +14,4 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from .L3 import VnishL3Plus
+from .L3 import VNishL3Plus

pyasic/miners/antminer/vnish/X7/L7.py

@@ -18,5 +18,5 @@ from pyasic.miners.backends import VNish
 from pyasic.miners.device.models import L7
 
 
-class VnishL7(VNish, L7):
+class VNishL7(VNish, L7):
     pass

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

@@ -14,4 +14,4 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from .L7 import VnishL7
+from .L7 import VNishL7

pyasic/miners/antminer/vnish/X9/L9.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 L9
+
+
+class VNishL9(VNish, L9):
+    pass

pyasic/miners/antminer/vnish/X9/__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 .L9 import VNishL9

pyasic/miners/antminer/vnish/__init__.py

@@ -16,6 +16,7 @@
 
 from .X3 import *
 from .X7 import *
+from .X9 import *
 from .X17 import *
 from .X19 import *
 from .X21 import *

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/Q/Q.py

@@ -0,0 +1,22 @@
+# ------------------------------------------------------------------------------
+#  Copyright 2025 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 AvalonQHome
+
+
+class CGMinerAvalonQHome(AvalonMiner, AvalonQHome):
+    pass

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

@@ -0,0 +1 @@
+from .Q import CGMinerAvalonQHome

pyasic/miners/avalonminer/cgminer/__init__.py

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

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

@@ -14,4 +14,4 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 
-from .nano3 import CGMinerAvalonNano3
+from .nano3 import CGMinerAvalonNano3, CGMinerAvalonNano3s

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

@@ -13,10 +13,217 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
+from typing import List, Optional
 
+from pyasic import APIError
+from pyasic.data.boards import HashBoard
+from pyasic.device.algorithm.hashrate import AlgoHashRate
 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.device.models import AvalonNano3
+from pyasic.miners.data import (
+    DataFunction,
+    DataLocations,
+    DataOptions,
+    RPCAPICommand,
+    WebAPICommand,
+)
+from pyasic.miners.device.models import AvalonNano3, AvalonNano3s
+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_estats", "estats")],
+        ),
+        str(DataOptions.HASHBOARDS): DataFunction(
+            "_get_hashboards",
+            [RPCAPICommand("rpc_estats", "estats")],
+        ),
+        str(DataOptions.ENVIRONMENT_TEMP): DataFunction(
+            "_get_env_temp",
+            [RPCAPICommand("rpc_estats", "estats")],
+        ),
+        str(DataOptions.WATTAGE_LIMIT): DataFunction(
+            "_get_wattage_limit",
+            [RPCAPICommand("rpc_estats", "estats")],
+        ),
+        str(DataOptions.WATTAGE): DataFunction(
+            "_get_wattage",
+            [RPCAPICommand("rpc_estats", "estats")],
+        ),
+        str(DataOptions.FANS): DataFunction(
+            "_get_fans",
+            [RPCAPICommand("rpc_estats", "estats")],
+        ),
+        str(DataOptions.FAULT_LIGHT): DataFunction(
+            "_get_fault_light",
+            [RPCAPICommand("rpc_estats", "estats")],
+        ),
+        str(DataOptions.UPTIME): DataFunction(
+            "_get_uptime",
+            [RPCAPICommand("rpc_stats", "stats")],
+        ),
+        str(DataOptions.POOLS): DataFunction(
+            "_get_pools",
+            [RPCAPICommand("rpc_pools", "pools")],
+        ),
+    }
+)
+
+AVALON_NANO3S_DATA_LOC = DataLocations(
+    **{
+        str(DataOptions.MAC): DataFunction(
+            "_get_mac",
+            [RPCAPICommand("rpc_version", "version")],
+        ),
+        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_estats", "estats")],
+        ),
+        str(DataOptions.EXPECTED_HASHRATE): DataFunction(
+            "_get_expected_hashrate",
+            [RPCAPICommand("rpc_estats", "estats")],
+        ),
+        str(DataOptions.HASHBOARDS): DataFunction(
+            "_get_hashboards",
+            [RPCAPICommand("rpc_estats", "estats")],
+        ),
+        str(DataOptions.ENVIRONMENT_TEMP): DataFunction(
+            "_get_env_temp",
+            [RPCAPICommand("rpc_estats", "estats")],
+        ),
+        str(DataOptions.WATTAGE_LIMIT): DataFunction(
+            "_get_wattage_limit",
+            [RPCAPICommand("rpc_estats", "estats")],
+        ),
+        str(DataOptions.WATTAGE): DataFunction(
+            "_get_wattage",
+            [RPCAPICommand("rpc_estats", "estats")],
+        ),
+        str(DataOptions.FANS): DataFunction(
+            "_get_fans",
+            [RPCAPICommand("rpc_estats", "estats")],
+        ),
+        str(DataOptions.FAULT_LIGHT): DataFunction(
+            "_get_fault_light",
+            [RPCAPICommand("rpc_estats", "estats")],
+        ),
+        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
+
+
+class CGMinerAvalonNano3s(AvalonMiner, AvalonNano3s):
+    data_locations = AVALON_NANO3S_DATA_LOC
+
+    async def _get_wattage(self, rpc_estats: dict = None) -> Optional[int]:
+        if rpc_estats is None:
+            try:
+                rpc_estats = await self.rpc.estats()
+            except APIError:
+                pass
+
+        if rpc_estats is not None:
+            try:
+                unparsed_estats = rpc_estats["STATS"][0]["MM ID0"]
+                parsed_estats = self.parse_estats(unparsed_estats)
+                return int(parsed_estats["PS"][6])
+            except (IndexError, KeyError, ValueError, TypeError):
+                pass
+
+    async def _get_hashrate(self, rpc_estats: dict = None) -> Optional[AlgoHashRate]:
+        if rpc_estats is None:
+            try:
+                rpc_estats = await self.rpc.estats()
+            except APIError:
+                pass
+
+        if rpc_estats is not None:
+            try:
+                unparsed_estats = rpc_estats["STATS"][0]["MM ID0"]
+                parsed_estats = self.parse_estats(unparsed_estats)
+                return self.algo.hashrate(
+                    rate=float(parsed_estats["GHSspd"]), unit=self.algo.unit.GH
+                ).into(self.algo.unit.default)
+            except (IndexError, KeyError, ValueError, TypeError):
+                pass
+
+    async def _get_hashboards(self, rpc_estats: dict = None) -> List[HashBoard]:
+        hashboards = await AvalonMiner._get_hashboards(self, rpc_estats)
+
+        if rpc_estats is None:
+            try:
+                rpc_estats = await self.rpc.estats()
+            except APIError:
+                pass
+
+        if rpc_estats is not None:
+            try:
+                unparsed_estats = rpc_estats["STATS"][0]["MM ID0"]
+                parsed_estats = self.parse_estats(unparsed_estats)
+            except (IndexError, KeyError, ValueError, TypeError):
+                return hashboards
+
+            for board in range(len(hashboards)):
+                try:
+                    board_hr = parsed_estats["GHSspd"][board]
+                    hashboards[board].hashrate = self.algo.hashrate(
+                        rate=float(board_hr), unit=self.algo.unit.GH
+                    ).into(self.algo.unit.default)
+                except LookupError:
+                    pass
+
+        return hashboards

pyasic/miners/backends/__init__.py

@@ -20,16 +20,19 @@ from .bfgminer import BFGMiner
 from .bitaxe import BitAxe
 from .bmminer import BMMiner
 from .braiins_os import BOSer, BOSMiner
-from .btminer import BTMiner
+from .btminer import BTMiner, BTMinerV2, BTMinerV3
 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, 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)
@@ -265,18 +272,47 @@ class AntminerModern(BMMiner):
                         rate=board["rate_real"], unit=self.algo.unit.GH
                     ).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 == 0, board["temp_chip"])
-                    )
-                    hashboards[board["index"]].chip_temp = sum(chip_temp_data) / len(
-                        chip_temp_data
-                    )
+
+                    if "S21+ Hyd" in self.model:
+                        hashboards[board["index"]].inlet_temp = board["temp_pcb"][0]
+                        hashboards[board["index"]].outlet_temp = board["temp_pcb"][2]
+                        hashboards[board["index"]].chip_temp = board["temp_pic"][0]
+                        board_temp_data = list(
+                            filter(
+                                lambda x: not x == 0,
+                                [
+                                    board["temp_pic"][1],
+                                    board["temp_pic"][2],
+                                    board["temp_pic"][3],
+                                    board["temp_pcb"][1],
+                                    board["temp_pcb"][3],
+                                ],
+                            )
+                        )
+                        hashboards[board["index"]].temp = (
+                            sum(board_temp_data) / len(board_temp_data)
+                            if len(board_temp_data) > 0
+                            else 0
+                        )
+
+                    else:
+                        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)
+                            if len(board_temp_data) > 0
+                            else 0
+                        )
+                        chip_temp_data = list(
+                            filter(lambda x: not x == 0, board["temp_chip"])
+                        )
+                        hashboards[board["index"]].chip_temp = (
+                            sum(chip_temp_data) / len(chip_temp_data)
+                            if len(chip_temp_data) > 0
+                            else 0
+                        )
+
                     hashboards[board["index"]].serial_number = board["sn"]
                     hashboards[board["index"]].missing = False
             except LookupError:
@@ -561,6 +597,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 +628,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

@@ -13,8 +13,9 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
-
+import copy
 import re
+import time
 from typing import List, Optional
 
 from pyasic.data import Fan, HashBoard
@@ -22,6 +23,7 @@ from pyasic.device.algorithm import AlgoHashRate
 from pyasic.errors import APIError
 from pyasic.miners.backends.cgminer import CGMiner
 from pyasic.miners.data import DataFunction, DataLocations, DataOptions, RPCAPICommand
+from pyasic.rpc.avalonminer import AvalonMinerRPCAPI
 
 AVALON_DATA_LOC = DataLocations(
     **{
@@ -43,27 +45,31 @@ AVALON_DATA_LOC = DataLocations(
         ),
         str(DataOptions.EXPECTED_HASHRATE): DataFunction(
             "_get_expected_hashrate",
-            [RPCAPICommand("rpc_stats", "stats")],
+            [RPCAPICommand("rpc_estats", "estats")],
         ),
         str(DataOptions.HASHBOARDS): DataFunction(
             "_get_hashboards",
-            [RPCAPICommand("rpc_stats", "stats")],
+            [RPCAPICommand("rpc_estats", "estats")],
         ),
         str(DataOptions.ENVIRONMENT_TEMP): DataFunction(
             "_get_env_temp",
-            [RPCAPICommand("rpc_stats", "stats")],
+            [RPCAPICommand("rpc_estats", "estats")],
         ),
         str(DataOptions.WATTAGE_LIMIT): DataFunction(
             "_get_wattage_limit",
-            [RPCAPICommand("rpc_stats", "stats")],
+            [RPCAPICommand("rpc_estats", "estats")],
+        ),
+        str(DataOptions.WATTAGE): DataFunction(
+            "_get_wattage",
+            [RPCAPICommand("rpc_estats", "estats")],
         ),
         str(DataOptions.FANS): DataFunction(
             "_get_fans",
-            [RPCAPICommand("rpc_stats", "stats")],
+            [RPCAPICommand("rpc_estats", "estats")],
         ),
         str(DataOptions.FAULT_LIGHT): DataFunction(
             "_get_fault_light",
-            [RPCAPICommand("rpc_stats", "stats")],
+            [RPCAPICommand("rpc_estats", "estats")],
         ),
         str(DataOptions.UPTIME): DataFunction(
             "_get_uptime",
@@ -80,6 +86,9 @@ AVALON_DATA_LOC = DataLocations(
 class AvalonMiner(CGMiner):
     """Handler for Avalon Miners"""
 
+    _rpc_cls = AvalonMinerRPCAPI
+    rpc: AvalonMinerRPCAPI
+
     data_locations = AVALON_DATA_LOC
 
     async def fault_light_on(self) -> bool:
@@ -100,6 +109,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()
@@ -113,45 +139,94 @@ class AvalonMiner(CGMiner):
             return False
         return False
 
+    async def stop_mining(self) -> bool:
+        try:
+            # Shut off 5 seconds from now
+            timestamp = int(time.time()) + 5
+            data = await self.rpc.ascset(0, f"softoff", f"1:{timestamp}")
+        except APIError:
+            return False
+        if "success" in data["STATUS"][0]["Msg"]:
+            return True
+        return False
+
+    async def resume_mining(self) -> bool:
+        try:
+            # Shut off 5 seconds from now
+            timestamp = int(time.time()) + 5
+            data = await self.rpc.ascset(0, f"softon", f"1:{timestamp}")
+        except APIError:
+            return False
+        if "success" in data["STATUS"][0]["Msg"]:
+            return True
+        return False
+
     @staticmethod
-    def parse_stats(stats):
-        _stats_items = re.findall(".+?\\[*?]", stats)
-        stats_items = []
-        stats_dict = {}
-        for item in _stats_items:
-            if ": " in item:
-                data = item.replace("]", "").split("[")
-                data_list = [i.split(": ") for i in data[1].strip().split(", ")]
-                data_dict = {}
-                try:
-                    for key, val in [tuple(item) for item in data_list]:
-                        data_dict[key] = val
-                except ValueError:
-                    # --avalon args
-                    for arg_item in data_list:
-                        item_data = arg_item[0].split(" ")
-                        for idx, val in enumerate(item_data):
-                            if idx % 2 == 0 or idx == 0:
-                                data_dict[val] = item_data[idx + 1]
+    def parse_estats(data):
+        # Deep copy to preserve original structure
+        new_data = copy.deepcopy(data)
 
-                raw_data = [data[0].strip(), data_dict]
+        def convert_value(val, key):
+            val = val.strip()
+
+            if key == "SYSTEMSTATU":
+                return val
+
+            if " " in val:
+                parts = val.split()
+                result = []
+                for part in parts:
+                    if part.isdigit():
+                        result.append(int(part))
+                    else:
+                        try:
+                            result.append(float(part))
+                        except ValueError:
+                            result.append(part)
+                return result
             else:
-                raw_data = [
-                    value
-                    for value in item.replace("[", " ")
-                    .replace("]", " ")
-                    .split(" ")[:-1]
-                    if value != ""
-                ]
-                if len(raw_data) == 1:
-                    raw_data.append("")
-            if raw_data[0] == "":
-                raw_data = raw_data[1:]
+                if val.isdigit():
+                    return int(val)
+                try:
+                    return float(val)
+                except ValueError:
+                    return val
 
-            stats_dict[raw_data[0]] = raw_data[1:]
-            stats_items.append(raw_data)
+        def parse_info_block(info_str):
+            pattern = re.compile(r"(\w+)\[([^\]]*)\]")
+            return {
+                key: convert_value(val, key) for key, val in pattern.findall(info_str)
+            }
 
-        return stats_dict
+        for stat in new_data.get("STATS", []):
+            keys_to_replace = {}
+
+            for key, value in stat.items():
+                if "MM" in key:
+                    # Normalize key by removing suffix after colon
+                    norm_key = key.split(":")[0]
+
+                    mm_data = value
+                    if not isinstance(mm_data, str):
+                        continue
+                    if mm_data.startswith("'STATS':"):
+                        mm_data = mm_data[len("'STATS':") :]
+                    keys_to_replace[norm_key] = parse_info_block(mm_data)
+
+                elif key == "HBinfo":
+                    match = re.search(r"'(\w+)':\{(.+)\}", value)
+                    if match:
+                        hb_key = match.group(1)
+                        hb_data = match.group(2)
+                        keys_to_replace[key] = {hb_key: parse_info_block(hb_data)}
+
+            # Remove old keys and insert parsed versions
+            for k in list(stat.keys()):
+                if "MM" in k or k == "HBinfo":
+                    del stat[k]
+            stat.update(keys_to_replace)
+
+        return new_data
 
     ##################################################
     ### DATA GATHERING FUNCTIONS (get_{some_data}) ###
@@ -190,152 +265,210 @@ class AvalonMiner(CGMiner):
             except (KeyError, IndexError, ValueError, TypeError):
                 pass
 
-    async def _get_hashboards(self, rpc_stats: dict = None) -> List[HashBoard]:
+    async def _get_hashboards(self, rpc_estats: 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)
         ]
 
-        if rpc_stats is None:
+        if rpc_estats is None:
             try:
-                rpc_stats = await self.rpc.stats()
+                rpc_estats = await self.rpc.estats()
             except APIError:
                 pass
 
-        if rpc_stats is not None:
+        if rpc_estats is not None:
             try:
-                unparsed_stats = rpc_stats["STATS"][0]["MM ID0"]
-                parsed_stats = self.parse_stats(unparsed_stats)
+                parsed_estats = self.parse_estats(rpc_estats)
             except (IndexError, KeyError, ValueError, TypeError):
                 return hashboards
 
             for board in range(self.expected_hashboards):
                 try:
-                    hashboards[board].chip_temp = int(parsed_stats["MTmax"][board])
+                    board_hr = parsed_estats["STATS"][0]["MM ID0"]["MGHS"]
+                    if isinstance(board_hr, list):
+                        hashboards[board].hashrate = self.algo.hashrate(
+                            rate=float(board_hr[board]), unit=self.algo.unit.GH
+                        ).into(self.algo.unit.default)
+                    else:
+                        hashboards[board].hashrate = self.algo.hashrate(
+                            rate=float(board_hr), unit=self.algo.unit.GH
+                        ).into(self.algo.unit.default)
+
                 except LookupError:
                     pass
 
                 try:
-                    board_hr = parsed_stats["MGHS"][board]
-                    hashboards[board].hashrate = self.algo.hashrate(
-                        rate=float(board_hr), unit=self.algo.unit.GH
-                    ).into(self.algo.unit.default)
+                    hashboards[board].chip_temp = int(
+                        parsed_estats["STATS"][0]["MM ID0"]["MTmax"][board]
+                    )
                 except LookupError:
-                    pass
+                    try:
+                        hashboards[board].chip_temp = int(
+                            parsed_estats["STATS"][0]["MM ID0"]["Tmax"]
+                        )
+                    except LookupError:
+                        pass
 
                 try:
-                    hashboards[board].temp = int(parsed_stats["MTavg"][board])
+                    hashboards[board].temp = int(
+                        parsed_estats["STATS"][0]["MM ID0"]["MTmax"][board]
+                    )
                 except LookupError:
-                    pass
+                    try:
+                        hashboards[board].temp = int(
+                            parsed_estats["STATS"][0]["MM ID0"]["Tavg"]
+                        )
+                    except LookupError:
+                        pass
 
                 try:
-                    chip_data = parsed_stats[f"PVT_T{board}"]
+                    hashboards[board].inlet_temp = int(
+                        parsed_estats["STATS"][0]["MM ID0"]["MTavg"][board]
+                    )
+                except LookupError:
+                    try:
+                        hashboards[board].inlet_temp = int(
+                            parsed_estats["STATS"][0]["MM ID0"]["HBITemp"]
+                        )
+                    except LookupError:
+                        pass
+
+                try:
+                    hashboards[board].outlet_temp = int(
+                        parsed_estats["STATS"][0]["MM ID0"]["MTmax"][board]
+                    )
+                except LookupError:
+                    try:
+                        hashboards[board].outlet_temp = int(
+                            parsed_estats["STATS"][0]["MM ID0"]["HBOTemp"]
+                        )
+                    except LookupError:
+                        pass
+
+                try:
+                    chip_data = parsed_estats["STATS"][0]["MM ID0"][f"PVT_T{board}"]
                     hashboards[board].missing = False
                     if chip_data:
                         hashboards[board].chips = len(
                             [item for item in chip_data if not item == "0"]
                         )
                 except LookupError:
-                    pass
+                    try:
+                        chip_data = parsed_estats["STATS"][0]["HBinfo"][f"HB{board}"][
+                            f"PVT_T{board}"
+                        ]
+                        hashboards[board].missing = False
+                        if chip_data:
+                            hashboards[board].chips = len(
+                                [item for item in chip_data if not item == "0"]
+                            )
+                    except LookupError:
+                        pass
 
         return hashboards
 
     async def _get_expected_hashrate(
-        self, rpc_stats: dict = None
+        self, rpc_estats: dict = None
     ) -> Optional[AlgoHashRate]:
-        if rpc_stats is None:
+        if rpc_estats is None:
             try:
-                rpc_stats = await self.rpc.stats()
+                rpc_estats = await self.rpc.estats()
             except APIError:
                 pass
 
-        if rpc_stats is not None:
+        if rpc_estats is not None:
             try:
-                unparsed_stats = rpc_stats["STATS"][0]["MM ID0"]
-                parsed_stats = self.parse_stats(unparsed_stats)
+                parsed_estats = self.parse_estats(rpc_estats)["STATS"][0]["MM ID0"]
                 return self.algo.hashrate(
-                    rate=float(parsed_stats["GHSmm"][0]), unit=self.algo.unit.GH
+                    rate=float(parsed_estats["GHSmm"]), unit=self.algo.unit.GH
                 ).into(self.algo.unit.default)
             except (IndexError, KeyError, ValueError, TypeError):
                 pass
 
-    async def _get_env_temp(self, rpc_stats: dict = None) -> Optional[float]:
-        if rpc_stats is None:
+    async def _get_env_temp(self, rpc_estats: dict = None) -> Optional[float]:
+        if rpc_estats is None:
             try:
-                rpc_stats = await self.rpc.stats()
+                rpc_estats = await self.rpc.estats()
             except APIError:
                 pass
 
-        if rpc_stats is not None:
+        if rpc_estats is not None:
             try:
-                unparsed_stats = rpc_stats["STATS"][0]["MM ID0"]
-                parsed_stats = self.parse_stats(unparsed_stats)
-                return float(parsed_stats["Temp"][0])
+                parsed_estats = self.parse_estats(rpc_estats)["STATS"][0]["MM ID0"]
+                return float(parsed_estats["Temp"])
             except (IndexError, KeyError, ValueError, TypeError):
                 pass
 
-    async def _get_wattage_limit(self, rpc_stats: dict = None) -> Optional[int]:
-        if rpc_stats is None:
+    async def _get_wattage_limit(self, rpc_estats: dict = None) -> Optional[int]:
+        if rpc_estats is None:
             try:
-                rpc_stats = await self.rpc.stats()
+                rpc_estats = await self.rpc.estats()
             except APIError:
                 pass
 
-        if rpc_stats is not None:
+        if rpc_estats is not None:
             try:
-                unparsed_stats = rpc_stats["STATS"][0]["MM ID0"]
-                parsed_stats = self.parse_stats(unparsed_stats)
-                return int(parsed_stats["MPO"][0])
+                parsed_estats = self.parse_estats(rpc_estats)["STATS"][0]["MM ID0"]
+                return int(parsed_estats["MPO"])
             except (IndexError, KeyError, ValueError, TypeError):
                 pass
 
-    async def _get_fans(self, rpc_stats: dict = None) -> List[Fan]:
-        if rpc_stats is None:
+    async def _get_wattage(self, rpc_estats: dict = None) -> Optional[int]:
+        if rpc_estats is None:
             try:
-                rpc_stats = await self.rpc.stats()
+                rpc_estats = await self.rpc.estats()
+            except APIError:
+                pass
+
+        if rpc_estats is not None:
+            try:
+                parsed_estats = self.parse_estats(rpc_estats)["STATS"][0]["MM ID0"]
+                return int(parsed_estats["WALLPOWER"])
+            except (IndexError, KeyError, ValueError, TypeError):
+                pass
+
+    async def _get_fans(self, rpc_estats: dict = None) -> List[Fan]:
+        if self.expected_fans is None:
+            return []
+
+        if rpc_estats is None:
+            try:
+                rpc_estats = await self.rpc.estats()
             except APIError:
                 pass
 
         fans_data = [Fan() for _ in range(self.expected_fans)]
-        if rpc_stats is not None:
+        if rpc_estats is not None:
             try:
-                unparsed_stats = rpc_stats["STATS"][0]["MM ID0"]
-                parsed_stats = self.parse_stats(unparsed_stats)
+                parsed_estats = self.parse_estats(rpc_estats)["STATS"][0]["MM ID0"]
             except LookupError:
                 return fans_data
 
             for fan in range(self.expected_fans):
                 try:
-                    fans_data[fan].speed = int(parsed_stats[f"Fan{fan + 1}"][0])
+                    fans_data[fan].speed = int(parsed_estats[f"Fan{fan + 1}"])
                 except (IndexError, KeyError, ValueError, TypeError):
                     pass
         return fans_data
 
-    async def _get_fault_light(self, rpc_stats: dict = None) -> Optional[bool]:
+    async def _get_fault_light(self, rpc_estats: dict = None) -> Optional[bool]:
         if self.light:
             return self.light
-        if rpc_stats is None:
+        if rpc_estats is None:
             try:
-                rpc_stats = await self.rpc.stats()
+                rpc_estats = await self.rpc.estats()
             except APIError:
                 pass
 
-        if rpc_stats is not None:
+        if rpc_estats is not None:
             try:
-                unparsed_stats = rpc_stats["STATS"][0]["MM ID0"]
-                parsed_stats = self.parse_stats(unparsed_stats)
-                led = int(parsed_stats["Led"][0])
+                parsed_estats = self.parse_estats(rpc_estats)["STATS"][0]["MM ID0"]
+                led = int(parsed_estats["Led"])
                 return True if led == 1 else False
             except (IndexError, KeyError, ValueError, TypeError):
                 pass
-
-        try:
-            data = await self.rpc.ascset(0, "led", "1-255")
-        except APIError:
-            return False
-        try:
-            if data["STATUS"][0]["Msg"] == "ASC 0 set info: LED[1]":
-                return True
-        except LookupError:
-            pass
         return False

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()
@@ -210,7 +216,7 @@ class BFGMiner(StockFirmware):
                     )
             except LookupError:
                 pass
-        fans = [Fan(speed=d) if d else Fan() for d in fans_data]
+        fans = [Fan(speed=d) for d in fans_data if d is not None]
 
         return fans
 

pyasic/miners/backends/bitaxe.py

@@ -1,235 +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.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")],
-        ),
-    }
-)
+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_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 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()