version: bump version number.

bug: fix parsing of tuner algo modes into json.
2024-04-12 08:48:52 -06:00 · 2024-04-12 08:47:40 -06:00 · 2024-04-11 09:31:00 -06:00 · 2024-04-11 09:30:24 -06:00 · 2024-04-11 09:28:18 -06:00 · 2024-04-11 09:23:55 -06:00
344 changed files with 3911 additions and 2435 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,16 +1,16 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.5.0
    hooks:
    -   id: trailing-whitespace
    -   id: check-yaml
    -   id: check-added-large-files
 -   repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 24.3.0
    hooks:
    -   id: black
 -   repo: https://github.com/pycqa/isort
-    rev: 5.10.1
+    rev: 5.13.2
    hooks:
    -   id: isort
        name: isort (python)
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 [![Commit Activity - master](https://img.shields.io/github/commit-activity/y/UpstreamData/pyasic)](https://github.com/UpstreamData/pyasic/commits/master/)

 [![Code Style - Black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
-[![Read The Docs - Docs](https://img.shields.io/readthedocs/pyasic)](https://pyasic.readthedocs.io/en/latest/)
+[![Read The Docs - Docs](https://img.shields.io/readthedocs/pyasic)](https://docs.pyasic.org)
 [![License - Apache 2.0](https://img.shields.io/github/license/UpstreamData/pyasic)](https://github.com/UpstreamData/pyasic/blob/master/LICENSE.txt)

 ---
@@ -17,7 +17,34 @@

 Welcome to `pyasic`!  `pyasic` uses an asynchronous method of communicating with ASIC miners on your network, which makes it super fast.

-[Click here to view supported miner types](miners/supported_types.md)
+[Click here to view supported miner types](https://docs.pyasic.org/en/latest/miners/supported_types/)
+
+---
+## 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
+    ```
+    poetry install
+    ```
+  - [venv](https://docs.python.org/3/library/venv.html): included in Python standard library but has fewer features than other options
+  - [pyenv-virtualenv](https://github.com/pyenv/pyenv-virtualenv): [pyenv](https://github.com/pyenv/pyenv) plugin for managing virtualenvs
+    ```
+    pyenv install <python version number>
+    pyenv virtualenv <python version number> <env name>
+    pyenv activate <env name>
+    ```
+  - [conda](https://docs.conda.io/en/latest/)
+
+##### Installing `pyasic`
+
+`python -m pip install .` or `poetry install`
+
+##### Additional Developer Setup
+```
+poetry install --with dev
+pre-commit install
+```

 ---
 ## Getting started
--- a/docs/generate_miners.py
+++ b/docs/generate_miners.py
@@ -3,7 +3,7 @@ import importlib
 import os
 import warnings

-from pyasic.miners.miner_factory import MINER_CLASSES, MinerTypes
+from pyasic.miners.factory import MINER_CLASSES, MinerTypes

 warnings.filterwarnings("ignore")

@@ -27,6 +27,8 @@ def backend_str(backend: MinerTypes) -> str:
    match backend:
        case MinerTypes.ANTMINER:
            return "Stock Firmware Antminers"
+        case MinerTypes.AURADINE:
+            return "Stock Firmware Auradine Miners"
        case MinerTypes.AVALONMINER:
            return "Stock Firmware Avalonminers"
        case MinerTypes.VNISH:
@@ -45,6 +47,8 @@ def backend_str(backend: MinerTypes) -> str:
            return "Stock Firmware Goldshells"
        case MinerTypes.LUX_OS:
            return "LuxOS Firmware Miners"
+        case MinerTypes.EPIC:
+            return "ePIC Firmware Miners"


 def create_url_str(mtype: str):
--- a/docs/index.md
+++ b/docs/index.md
@@ -18,6 +18,23 @@ Welcome to `pyasic`!  `pyasic` uses an asynchronous method of communicating with

 [Click here to view supported miner types](miners/supported_types.md)

+---
+## 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:
+  - [venv](https://docs.python.org/3/library/venv.html): included in Python standard library but has fewer features than other options
+  - [pyenv-virtualenv](https://github.com/pyenv/pyenv-virtualenv): [pyenv](https://github.com/pyenv/pyenv) plugin for managing virtualenvs
+    ```
+    pyenv install <python version number>
+    pyenv virtualenv <python version number> <env name>
+    pyenv activate <env name>
+    ```
+  - [conda](https://docs.conda.io/en/latest/)
+
+##### Installing `pyasic`
+
+`python -m pip install .` or `poetry install`
+
 ---
 ## Getting started
 ---
@@ -47,7 +64,7 @@ if __name__ == "__main__":

 ---
 ##### Creating miners based on IP
-If you already know the IP address of your miner or miners, you can use the [`MinerFactory`][pyasic.miners.miner_factory.MinerFactory] to communicate and identify the miners, or an abstraction of its functionality, [`get_miner()`][pyasic.miners.get_miner].
+If you already know the IP address of your miner or miners, you can use the [`MinerFactory`][pyasic.miners.factory.MinerFactory] to communicate and identify the miners, or an abstraction of its functionality, [`get_miner()`][pyasic.miners.get_miner].
 The function [`get_miner()`][pyasic.miners.get_miner] will return any miner it found at the IP address specified, or an `UnknownMiner` if it cannot identify the miner.
 ```python
 import asyncio  # asyncio for handling the async part
@@ -236,6 +253,7 @@ settings.update("default_antminer_password", "my_pwd")
 "factory_get_timeout": 3,
 "get_data_retries": 1,
 "api_function_timeout": 5,
+"antminer_mining_mode_as_str": False,
 "default_whatsminer_password": "admin",
 "default_innosilicon_password": "admin",
 "default_antminer_password": "root",
--- a/docs/miners/antminer/X17.md
+++ b/docs/miners/antminer/X17.md
@@ -50,49 +50,49 @@
        show_root_heading: false
        heading_level: 4

-## S17 (BOS)
+## S17 (BOS+)
 ::: pyasic.miners.antminer.bosminer.X17.S17.BOSMinerS17
    handler: python
    options:
        show_root_heading: false
        heading_level: 4

-## S17+ (BOS)
+## S17+ (BOS+)
 ::: pyasic.miners.antminer.bosminer.X17.S17.BOSMinerS17Plus
    handler: python
    options:
        show_root_heading: false
        heading_level: 4

-## S17 Pro (BOS)
+## S17 Pro (BOS+)
 ::: pyasic.miners.antminer.bosminer.X17.S17.BOSMinerS17Pro
    handler: python
    options:
        show_root_heading: false
        heading_level: 4

-## S17e (BOS)
+## S17e (BOS+)
 ::: pyasic.miners.antminer.bosminer.X17.S17.BOSMinerS17e
    handler: python
    options:
        show_root_heading: false
        heading_level: 4

-## T17 (BOS)
+## T17 (BOS+)
 ::: pyasic.miners.antminer.bosminer.X17.T17.BOSMinerT17
    handler: python
    options:
        show_root_heading: false
        heading_level: 4

-## T17+ (BOS)
+## T17+ (BOS+)
 ::: pyasic.miners.antminer.bosminer.X17.T17.BOSMinerT17Plus
    handler: python
    options:
        show_root_heading: false
        heading_level: 4

-## T17e (BOS)
+## T17e (BOS+)
 ::: pyasic.miners.antminer.bosminer.X17.T17.BOSMinerT17e
    handler: python
    options:
--- a/docs/miners/antminer/X19.md
+++ b/docs/miners/antminer/X19.md
@@ -85,6 +85,34 @@
        show_root_heading: false
        heading_level: 4

+## S19 Hydro
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19Hydro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19 Pro Hydro
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19ProHydro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19 Pro+ Hydro
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19ProPlusHydro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19K Pro
+::: pyasic.miners.antminer.bmminer.X19.S19.BMMinerS19KPro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
 ## T19
 ::: pyasic.miners.antminer.bmminer.X19.T19.BMMinerT19
    handler: python
@@ -92,49 +120,91 @@
        show_root_heading: false
        heading_level: 4

-## S19 (BOS)
+## S19
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19
    handler: python
    options:
        show_root_heading: false
        heading_level: 4

-## S19 Pro (BOS)
+## S19+
+::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19Plus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19 Pro
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19Pro
    handler: python
    options:
        show_root_heading: false
        heading_level: 4

-## S19j (BOS)
+## S19a
+::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19a
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19a Pro
+::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19aPro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19j
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19j
    handler: python
    options:
        show_root_heading: false
        heading_level: 4

-## S19j No PIC (BOS)
+## S19j No PIC
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19jNoPIC
    handler: python
    options:
        show_root_heading: false
        heading_level: 4

-## S19j Pro (BOS)
+## S19j Pro
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19jPro
    handler: python
    options:
        show_root_heading: false
        heading_level: 4

-## S19j Pro (BOS)
+## S19j Pro
 ::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19jPro
    handler: python
    options:
        show_root_heading: false
        heading_level: 4

-## T19 (BOS)
+## S19j Pro+
+::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19jProPlus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19k Pro No PIC
+::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19kProNoPIC
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19 XP
+::: pyasic.miners.antminer.bosminer.X19.S19.BOSMinerS19XP
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## T19
 ::: pyasic.miners.antminer.bosminer.X19.T19.BOSMinerT19
    handler: python
    options:
@@ -225,6 +295,20 @@
        show_root_heading: false
        heading_level: 4

+## S19j Pro+ (ePIC)
+::: pyasic.miners.antminer.epic.X19.S19.ePICS19jProPlus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19k Pro (ePIC)
+::: pyasic.miners.antminer.epic.X19.S19.ePICS19kPro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
 ## S19 XP (ePIC)
 ::: pyasic.miners.antminer.epic.X19.S19.ePICS19XP
    handler: python
@@ -232,3 +316,52 @@
        show_root_heading: false
        heading_level: 4

+## S19 (LuxOS)
+::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19 Pro (LuxOS)
+::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19Pro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19j Pro (LuxOS)
+::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19jPro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19j Pro+ (LuxOS)
+::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19jProPlus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19k Pro (LuxOS)
+::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19kPro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S19 XP (LuxOS)
+::: pyasic.miners.antminer.luxos.X19.S19.LUXMinerS19XP
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## T19 (LuxOS)
+::: pyasic.miners.antminer.luxos.X19.T19.LUXMinerT19
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
--- a/docs/miners/antminer/X21.md
+++ b/docs/miners/antminer/X21.md
@@ -0,0 +1,31 @@
+# pyasic
+## X21 Models
+
+## S21
+::: pyasic.miners.antminer.bmminer.X21.S21.BMMinerS21
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S21
+::: pyasic.miners.antminer.bosminer.X21.S21.BOSMinerS21
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S21 (ePIC)
+::: pyasic.miners.antminer.epic.X21.S21.ePICS21
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## S21 (LuxOS)
+::: pyasic.miners.antminer.luxos.X21.S21.LUXMinerS21
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
--- a/docs/miners/antminer/X3.md
+++ b/docs/miners/antminer/X3.md
@@ -29,3 +29,10 @@
        show_root_heading: false
        heading_level: 4

+## L3+ (VNish)
+::: pyasic.miners.antminer.vnish.X3.L3.VnishL3Plus
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
--- a/docs/miners/antminer/X7.md
+++ b/docs/miners/antminer/X7.md
@@ -8,3 +8,10 @@
        show_root_heading: false
        heading_level: 4

+## L7 (VNish)
+::: pyasic.miners.antminer.vnish.X7.L7.VnishL7
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
--- a/docs/miners/antminer/X9.md
+++ b/docs/miners/antminer/X9.md
@@ -36,14 +36,14 @@
        show_root_heading: false
        heading_level: 4

-## S9 (BOS)
+## S9 (BOS+)
 ::: pyasic.miners.antminer.bosminer.X9.S9.BOSMinerS9
    handler: python
    options:
        show_root_heading: false
        heading_level: 4

-## T9 (Hiveon)
+## T9 (Hive)
 ::: pyasic.miners.antminer.hiveon.X9.T9.HiveonT9
    handler: python
    options:
--- a/docs/miners/auradine/AD.md
+++ b/docs/miners/auradine/AD.md
@@ -0,0 +1,24 @@
+# pyasic
+## AD Models
+
+## AT1500
+::: pyasic.miners.auradine.flux.AD.AT1.AuradineFluxAT1500
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## AT2860
+::: pyasic.miners.auradine.flux.AD.AT2.AuradineFluxAT2860
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## AT2880
+::: pyasic.miners.auradine.flux.AD.AT2.AuradineFluxAT2880
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
--- a/docs/miners/auradine/AI.md
+++ b/docs/miners/auradine/AI.md
@@ -0,0 +1,17 @@
+# pyasic
+## AI Models
+
+## AI2500
+::: pyasic.miners.auradine.flux.AI.AI2.AuradineFluxAI2500
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## AI3680
+::: pyasic.miners.auradine.flux.AI.AI3.AuradineFluxAI3680
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
--- a/docs/miners/auradine/AT.md
+++ b/docs/miners/auradine/AT.md
@@ -0,0 +1,17 @@
+# pyasic
+## AT Models
+
+## AD2500
+::: pyasic.miners.auradine.flux.AT.AD2.AuradineFluxAD2500
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## AD3500
+::: pyasic.miners.auradine.flux.AT.AD3.AuradineFluxAD3500
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
--- a/docs/miners/goldshell/X5.md
+++ b/docs/miners/goldshell/X5.md
@@ -21,3 +21,4 @@
    options:
        show_root_heading: false
        heading_level: 4
+
--- a/docs/miners/goldshell/XBox.md
+++ b/docs/miners/goldshell/XBox.md
@@ -0,0 +1,17 @@
+# pyasic
+## XBox Models
+
+## KD Box II
+::: pyasic.miners.goldshell.bfgminer.XBox.KDBox.GoldshellKDBoxII
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## KD Box Pro
+::: pyasic.miners.goldshell.bfgminer.XBox.KDBox.GoldshellKDBoxPro
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
--- a/docs/miners/goldshell/XMax.md
+++ b/docs/miners/goldshell/XMax.md
@@ -2,8 +2,9 @@
 ## XMax Models

 ## KD Max
-::: pyasic.miners.goldshell.bfgminer.XMax.KDMax.KDMax
+::: pyasic.miners.goldshell.bfgminer.XMax.KDMax.GoldshellKDMax
    handler: python
    options:
        show_root_heading: false
        heading_level: 4
+
--- a/docs/miners/innosilicon/A10X.md
+++ b/docs/miners/innosilicon/A10X.md
@@ -7,3 +7,4 @@
    options:
        show_root_heading: false
        heading_level: 4
+
--- a/docs/miners/innosilicon/T3X.md
+++ b/docs/miners/innosilicon/T3X.md
@@ -7,3 +7,4 @@
    options:
        show_root_heading: false
        heading_level: 4
+
--- a/docs/miners/miner_factory.md
+++ b/docs/miners/miner_factory.md
@@ -1,7 +1,7 @@
 # pyasic
 ## Miner Factory

-[`MinerFactory`][pyasic.miners.miner_factory.MinerFactory] is the way to create miner types in `pyasic`.  The most important method is [`get_miner()`][pyasic.get_miner], which is mapped to [`pyasic.get_miner()`][pyasic.get_miner], and should be used from there.
+[`MinerFactory`][pyasic.MinerFactory] is the way to create miner types in `pyasic`.  The most important method is [`get_miner()`][pyasic.get_miner], which is mapped to [`pyasic.get_miner()`][pyasic.get_miner], and should be used from there.

 The instance used for [`pyasic.get_miner()`][pyasic.get_miner] is `pyasic.miner_factory`.

@@ -9,7 +9,7 @@ The instance used for [`pyasic.get_miner()`][pyasic.get_miner] is `pyasic.miner_

 Finally, there is functionality to get multiple miners without using `asyncio.gather()` explicitly.  Use `pyasic.miner_factory.get_multiple_miners()` with a list of IPs as strings to get a list of miner instances.  You can also get multiple miners with an `AsyncGenerator` by using `pyasic.miner_factory.get_miner_generator()`.

-::: pyasic.miners.miner_factory.MinerFactory
+::: pyasic.miners.factory.MinerFactory
    handler: python
    options:
        show_root_heading: false
@@ -25,12 +25,12 @@ Finally, there is functionality to get multiple miners without using `asyncio.ga
 <br>

 ## AnyMiner
-::: pyasic.miners.miner_factory.AnyMiner
+::: pyasic.miners.base.AnyMiner
    handler: python
    options:
        show_root_heading: false
        heading_level: 4

-[`AnyMiner`][pyasic.miners.miner_factory.AnyMiner] is a placeholder type variable used for typing returns of functions.
-A function returning [`AnyMiner`][pyasic.miners.miner_factory.AnyMiner] will always return a subclass of [`BaseMiner`][pyasic.miners.BaseMiner],
+[`AnyMiner`][pyasic.miners.base.AnyMiner] is a placeholder type variable used for typing returns of functions.
+A function returning [`AnyMiner`][pyasic.miners.base.AnyMiner] will always return a subclass of [`BaseMiner`][pyasic.miners.BaseMiner],
 and is used to specify a function returning some arbitrary type of miner class instance.
--- a/docs/miners/supported_types.md
+++ b/docs/miners/supported_types.md
@@ -78,9 +78,19 @@ details {
                    <li><a href="../antminer/X19#s19-xp">S19 XP</a></li>
                    <li><a href="../antminer/X19#s19a">S19a</a></li>
                    <li><a href="../antminer/X19#s19a-pro">S19a Pro</a></li>
+                    <li><a href="../antminer/X19#s19-hydro">S19 Hydro</a></li>
+                    <li><a href="../antminer/X19#s19-pro-hydro">S19 Pro Hydro</a></li>
+                    <li><a href="../antminer/X19#s19-pro_1-hydro">S19 Pro+ Hydro</a></li>
+                    <li><a href="../antminer/X19#s19k-pro">S19K Pro</a></li>
                    <li><a href="../antminer/X19#t19">T19</a></li>
                </ul>
        </details>
+        <details>
+            <summary>X21 Series:</summary>
+                <ul>
+                    <li><a href="../antminer/X21#s21">S21</a></li>
+                </ul>
+        </details>
    </ul>
 </details>
 <details>
@@ -286,13 +296,39 @@ details {
                    <li><a href="../whatsminer/M5X#m50s_1_1-vk30">M50S++ VK30</a></li>
                    <li><a href="../whatsminer/M5X#m53-vh30">M53 VH30</a></li>
                    <li><a href="../whatsminer/M5X#m53s-vh30">M53S VH30</a></li>
+                    <li><a href="../whatsminer/M5X#m53s-vj40">M53S VJ40</a></li>
                    <li><a href="../whatsminer/M5X#m53s_1-vj30">M53S+ VJ30</a></li>
+                    <li><a href="../whatsminer/M5X#m53s_1_1-vk10">M53S++ VK10</a></li>
                    <li><a href="../whatsminer/M5X#m56-vh30">M56 VH30</a></li>
                    <li><a href="../whatsminer/M5X#m56s-vh30">M56S VH30</a></li>
                    <li><a href="../whatsminer/M5X#m56s_1-vj30">M56S+ VJ30</a></li>
                    <li><a href="../whatsminer/M5X#m59-vh30">M59 VH30</a></li>
                </ul>
        </details>
+        <details>
+            <summary>M6X Series:</summary>
+                <ul>
+                    <li><a href="../whatsminer/M6X#m60-vk10">M60 VK10</a></li>
+                    <li><a href="../whatsminer/M6X#m60-vk20">M60 VK20</a></li>
+                    <li><a href="../whatsminer/M6X#m60-vk30">M60 VK30</a></li>
+                    <li><a href="../whatsminer/M6X#m60-vk40">M60 VK40</a></li>
+                    <li><a href="../whatsminer/M6X#m60s-vk10">M60S VK10</a></li>
+                    <li><a href="../whatsminer/M6X#m60s-vk20">M60S VK20</a></li>
+                    <li><a href="../whatsminer/M6X#m60s-vk30">M60S VK30</a></li>
+                    <li><a href="../whatsminer/M6X#m60s-vk40">M60S VK40</a></li>
+                    <li><a href="../whatsminer/M6X#m63-vk10">M63 VK10</a></li>
+                    <li><a href="../whatsminer/M6X#m63-vk20">M63 VK20</a></li>
+                    <li><a href="../whatsminer/M6X#m63-vk30">M63 VK30</a></li>
+                    <li><a href="../whatsminer/M6X#m63s-vk10">M63S VK10</a></li>
+                    <li><a href="../whatsminer/M6X#m63s-vk20">M63S VK20</a></li>
+                    <li><a href="../whatsminer/M6X#m63s-vk30">M63S VK30</a></li>
+                    <li><a href="../whatsminer/M6X#m66-vk20">M66 VK20</a></li>
+                    <li><a href="../whatsminer/M6X#m66-vk30">M66 VK30</a></li>
+                    <li><a href="../whatsminer/M6X#m66s-vk20">M66S VK20</a></li>
+                    <li><a href="../whatsminer/M6X#m66s-vk30">M66S VK30</a></li>
+                    <li><a href="../whatsminer/M6X#m66s-vk40">M66S VK40</a></li>
+                </ul>
+        </details>
    </ul>
 </details>
 <details>
@@ -376,6 +412,13 @@ details {
                    <li><a href="../goldshell/XMax#kd-max">KD Max</a></li>
                </ul>
        </details>
+        <details>
+            <summary>XBox Series:</summary>
+                <ul>
+                    <li><a href="../goldshell/XBox#kd-box-ii">KD Box II</a></li>
+                    <li><a href="../goldshell/XBox#kd-box-pro">KD Box Pro</a></li>
+                </ul>
+        </details>
    </ul>
 </details>
 <details>
@@ -384,31 +427,43 @@ details {
        <details>
            <summary>X9 Series:</summary>
                <ul>
-                    <li><a href="../antminer/X9#s9-bos">S9 (BOS)</a></li>
+                    <li><a href="../antminer/X9#s9-bos_1">S9 (BOS+)</a></li>
                </ul>
        </details>
        <details>
            <summary>X17 Series:</summary>
                <ul>
-                    <li><a href="../antminer/X17#s17-bos">S17 (BOS)</a></li>
-                    <li><a href="../antminer/X17#s17_1-bos">S17+ (BOS)</a></li>
-                    <li><a href="../antminer/X17#s17-pro-bos">S17 Pro (BOS)</a></li>
-                    <li><a href="../antminer/X17#s17e-bos">S17e (BOS)</a></li>
-                    <li><a href="../antminer/X17#t17-bos">T17 (BOS)</a></li>
-                    <li><a href="../antminer/X17#t17_1-bos">T17+ (BOS)</a></li>
-                    <li><a href="../antminer/X17#t17e-bos">T17e (BOS)</a></li>
+                    <li><a href="../antminer/X17#s17-bos_1">S17 (BOS+)</a></li>
+                    <li><a href="../antminer/X17#s17_1-bos_1">S17+ (BOS+)</a></li>
+                    <li><a href="../antminer/X17#s17-pro-bos_1">S17 Pro (BOS+)</a></li>
+                    <li><a href="../antminer/X17#s17e-bos_1">S17e (BOS+)</a></li>
+                    <li><a href="../antminer/X17#t17-bos_1">T17 (BOS+)</a></li>
+                    <li><a href="../antminer/X17#t17_1-bos_1">T17+ (BOS+)</a></li>
+                    <li><a href="../antminer/X17#t17e-bos_1">T17e (BOS+)</a></li>
                </ul>
        </details>
        <details>
            <summary>X19 Series:</summary>
                <ul>
-                    <li><a href="../antminer/X19#s19-bos">S19 (BOS)</a></li>
-                    <li><a href="../antminer/X19#s19-pro-bos">S19 Pro (BOS)</a></li>
-                    <li><a href="../antminer/X19#s19j-bos">S19j (BOS)</a></li>
-                    <li><a href="../antminer/X19#s19j-no-pic-bos">S19j No PIC (BOS)</a></li>
-                    <li><a href="../antminer/X19#s19j-pro-bos">S19j Pro (BOS)</a></li>
-                    <li><a href="../antminer/X19#s19j-pro-bos">S19j Pro (BOS)</a></li>
-                    <li><a href="../antminer/X19#t19-bos">T19 (BOS)</a></li>
+                    <li><a href="../antminer/X19#s19">S19</a></li>
+                    <li><a href="../antminer/X19#s19_1">S19+</a></li>
+                    <li><a href="../antminer/X19#s19-pro">S19 Pro</a></li>
+                    <li><a href="../antminer/X19#s19a">S19a</a></li>
+                    <li><a href="../antminer/X19#s19a-pro">S19a Pro</a></li>
+                    <li><a href="../antminer/X19#s19j">S19j</a></li>
+                    <li><a href="../antminer/X19#s19j-no-pic">S19j No PIC</a></li>
+                    <li><a href="../antminer/X19#s19j-pro">S19j Pro</a></li>
+                    <li><a href="../antminer/X19#s19j-pro">S19j Pro</a></li>
+                    <li><a href="../antminer/X19#s19j-pro_1">S19j Pro+</a></li>
+                    <li><a href="../antminer/X19#s19k-pro-no-pic">S19k Pro No PIC</a></li>
+                    <li><a href="../antminer/X19#s19-xp">S19 XP</a></li>
+                    <li><a href="../antminer/X19#t19">T19</a></li>
+                </ul>
+        </details>
+        <details>
+            <summary>X21 Series:</summary>
+                <ul>
+                    <li><a href="../antminer/X21#s21">S21</a></li>
                </ul>
        </details>
    </ul>
@@ -420,6 +475,13 @@ details {
            <summary>X3 Series:</summary>
                <ul>
                    <li><a href="../antminer/X3#l3_1-vnish">L3+ (VNish)</a></li>
+                    <li><a href="../antminer/X3#l3_1-vnish">L3+ (VNish)</a></li>
+                </ul>
+        </details>
+        <details>
+            <summary>X7 Series:</summary>
+                <ul>
+                    <li><a href="../antminer/X7#l7-vnish">L7 (VNish)</a></li>
                </ul>
        </details>
        <details>
@@ -454,9 +516,23 @@ details {
                    <li><a href="../antminer/X19#s19-pro-epic">S19 Pro (ePIC)</a></li>
                    <li><a href="../antminer/X19#s19j-epic">S19j (ePIC)</a></li>
                    <li><a href="../antminer/X19#s19j-pro-epic">S19j Pro (ePIC)</a></li>
+                    <li><a href="../antminer/X19#s19j-pro_1-epic">S19j Pro+ (ePIC)</a></li>
+                    <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>
                </ul>
        </details>
+        <details>
+            <summary>X21 Series:</summary>
+                <ul>
+                    <li><a href="../antminer/X21#s21-epic">S21 (ePIC)</a></li>
+                </ul>
+        </details>
+        <details>
+            <summary>blockminer Series:</summary>
+                <ul>
+                    <li><a href="../blockminer/blockminer#blockminer-520i-epic">BlockMiner 520i (ePIC)</a></li>
+                </ul>
+        </details>
    </ul>
 </details>
 <details>
@@ -465,7 +541,7 @@ details {
        <details>
            <summary>X9 Series:</summary>
                <ul>
-                    <li><a href="../antminer/X9#t9-hiveon">T9 (Hiveon)</a></li>
+                    <li><a href="../antminer/X9#t9-hive">T9 (Hive)</a></li>
                </ul>
        </details>
    </ul>
@@ -479,5 +555,50 @@ details {
                    <li><a href="../antminer/X9#s9-luxos">S9 (LuxOS)</a></li>
                </ul>
        </details>
+        <details>
+            <summary>X19 Series:</summary>
+                <ul>
+                    <li><a href="../antminer/X19#s19-luxos">S19 (LuxOS)</a></li>
+                    <li><a href="../antminer/X19#s19-pro-luxos">S19 Pro (LuxOS)</a></li>
+                    <li><a href="../antminer/X19#s19j-pro-luxos">S19j Pro (LuxOS)</a></li>
+                    <li><a href="../antminer/X19#s19j-pro_1-luxos">S19j Pro+ (LuxOS)</a></li>
+                    <li><a href="../antminer/X19#s19k-pro-luxos">S19k Pro (LuxOS)</a></li>
+                    <li><a href="../antminer/X19#s19-xp-luxos">S19 XP (LuxOS)</a></li>
+                    <li><a href="../antminer/X19#t19-luxos">T19 (LuxOS)</a></li>
+                </ul>
+        </details>
+        <details>
+            <summary>X21 Series:</summary>
+                <ul>
+                    <li><a href="../antminer/X21#s21-luxos">S21 (LuxOS)</a></li>
+                </ul>
+        </details>
+    </ul>
+</details>
+<details>
+<summary>Stock Firmware Auradine Miners:</summary>
+    <ul>
+        <details>
+            <summary>AD Series:</summary>
+                <ul>
+                    <li><a href="../auradine/AD#at1500">AT1500</a></li>
+                    <li><a href="../auradine/AD#at2860">AT2860</a></li>
+                    <li><a href="../auradine/AD#at2880">AT2880</a></li>
+                </ul>
+        </details>
+        <details>
+            <summary>AI Series:</summary>
+                <ul>
+                    <li><a href="../auradine/AI#ai2500">AI2500</a></li>
+                    <li><a href="../auradine/AI#ai3680">AI3680</a></li>
+                </ul>
+        </details>
+        <details>
+            <summary>AT Series:</summary>
+                <ul>
+                    <li><a href="../auradine/AT#ad2500">AD2500</a></li>
+                    <li><a href="../auradine/AT#ad3500">AD3500</a></li>
+                </ul>
+        </details>
    </ul>
 </details>
--- a/docs/miners/whatsminer/M5X.md
+++ b/docs/miners/whatsminer/M5X.md
@@ -211,6 +211,13 @@
        show_root_heading: false
        heading_level: 4

+## M53S VJ40
+::: pyasic.miners.whatsminer.btminer.M5X.M53S.BTMinerM53SVJ40
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
 ## M53S+ VJ30
 ::: pyasic.miners.whatsminer.btminer.M5X.M53S_Plus.BTMinerM53SPlusVJ30
    handler: python
@@ -218,6 +225,13 @@
        show_root_heading: false
        heading_level: 4

+## M53S++ VK10
+::: pyasic.miners.whatsminer.btminer.M5X.M53S_Plus_Plus.BTMinerM53SPlusPlusVK10
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
 ## M56 VH30
 ::: pyasic.miners.whatsminer.btminer.M5X.M56.BTMinerM56VH30
    handler: python
--- a/docs/miners/whatsminer/M6X.md
+++ b/docs/miners/whatsminer/M6X.md
@@ -0,0 +1,136 @@
+# pyasic
+## M6X Models
+
+## M60 VK10
+::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VK10
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M60 VK20
+::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VK20
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M60 VK30
+::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VK30
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M60 VK40
+::: pyasic.miners.whatsminer.btminer.M6X.M60.BTMinerM60VK40
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M60S VK10
+::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVK10
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M60S VK20
+::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVK20
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M60S VK30
+::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVK30
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M60S VK40
+::: pyasic.miners.whatsminer.btminer.M6X.M60S.BTMinerM60SVK40
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M63 VK10
+::: pyasic.miners.whatsminer.btminer.M6X.M63.BTMinerM63VK10
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M63 VK20
+::: pyasic.miners.whatsminer.btminer.M6X.M63.BTMinerM63VK20
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M63 VK30
+::: pyasic.miners.whatsminer.btminer.M6X.M63.BTMinerM63VK30
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M63S VK10
+::: pyasic.miners.whatsminer.btminer.M6X.M63S.BTMinerM63SVK10
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M63S VK20
+::: pyasic.miners.whatsminer.btminer.M6X.M63S.BTMinerM63SVK20
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M63S VK30
+::: pyasic.miners.whatsminer.btminer.M6X.M63S.BTMinerM63SVK30
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M66 VK20
+::: pyasic.miners.whatsminer.btminer.M6X.M66.BTMinerM66VK20
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M66 VK30
+::: pyasic.miners.whatsminer.btminer.M6X.M66.BTMinerM66VK30
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M66S VK20
+::: pyasic.miners.whatsminer.btminer.M6X.M66S.BTMinerM66SVK20
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M66S VK30
+::: pyasic.miners.whatsminer.btminer.M6X.M66S.BTMinerM66SVK30
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
+## M66S VK40
+::: pyasic.miners.whatsminer.btminer.M6X.M66S.BTMinerM66SVK40
+    handler: python
+    options:
+        show_root_heading: false
+        heading_level: 4
+
--- a/docs/rpc/api.md
+++ b/docs/rpc/api.md
@@ -4,10 +4,10 @@ Each miner has a unique API that is used to communicate with it.
 Each of these API types has commands that differ between them, and some commands have data that others do not.
 Each miner that is a subclass of [`BaseMiner`][pyasic.miners.BaseMiner] should have an API linked to it as `Miner.api`.

-All API implementations inherit from [`BaseMinerRPCAPI`][pyasic.rpc.BaseMinerRPCAPI], which implements the basic communications protocols.
+All API implementations inherit from [`BaseMinerRPCAPI`][pyasic.rpc.base.BaseMinerRPCAPI], which implements the basic communications protocols.

-[`BaseMinerRPCAPI`][pyasic.rpc.BaseMinerRPCAPI] should never be used unless inheriting to create a new miner API class for a new type of miner (which should be exceedingly rare).
-[`BaseMinerRPCAPI`][pyasic.rpc.BaseMinerRPCAPI] cannot be instantiated directly, it will raise a `TypeError`.
+[`BaseMinerRPCAPI`][pyasic.rpc.base.BaseMinerRPCAPI] should never be used unless inheriting to create a new miner API class for a new type of miner (which should be exceedingly rare).
+[`BaseMinerRPCAPI`][pyasic.rpc.base.BaseMinerRPCAPI] cannot be instantiated directly, it will raise a `TypeError`.
 Use these instead -

 #### [BFGMiner API][pyasic.rpc.bfgminer.BFGMinerRPCAPI]
@@ -21,7 +21,7 @@ Use these instead -
 <br>

 ## BaseMinerRPCAPI
-::: pyasic.rpc.BaseMinerRPCAPI
+::: pyasic.rpc.base.BaseMinerRPCAPI
    handler: python
    options:
        heading_level: 4
--- a/docs/settings/settings.md
+++ b/docs/settings/settings.md
@@ -12,6 +12,7 @@ Settings options:
 - `factory_get_timeout`
 - `get_data_retries`
 - `api_function_timeout`
+- `antminer_mining_mode_as_str`
 - `default_whatsminer_password`
 - `default_innosilicon_password`
 - `default_antminer_password`
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -40,6 +40,7 @@ nav:
        - Antminer X15: "miners/antminer/X15.md"
        - Antminer X17: "miners/antminer/X17.md"
        - Antminer X19: "miners/antminer/X19.md"
+        - Antminer X21: "miners/antminer/X21.md"
        - Avalon 7X: "miners/avalonminer/A7X.md"
        - Avalon 8X: "miners/avalonminer/A8X.md"
        - Avalon 9X: "miners/avalonminer/A9X.md"
--- a/pyasic/init.py
+++ b/pyasic/init.py
@@ -15,45 +15,10 @@
 # ------------------------------------------------------------------------------
 from pyasic import settings
 from pyasic.config import MinerConfig
-from pyasic.data import (
-    BraiinsOSError,
-    InnosiliconError,
-    MinerData,
-    WhatsminerError,
-    X19Error,
-)
+from pyasic.data import MinerData
 from pyasic.errors import APIError, APIWarning
-from pyasic.miners import get_miner
-from pyasic.miners.base import AnyMiner, DataOptions
-from pyasic.miners.miner_factory import MinerFactory, miner_factory
-from pyasic.miners.miner_listener import MinerListener
+from pyasic.miners import *
 from pyasic.network import MinerNetwork
-from pyasic.rpc.bmminer import BMMinerRPCAPI
-from pyasic.rpc.bosminer import BOSMinerRPCAPI
-from pyasic.rpc.btminer import BTMinerRPCAPI
-from pyasic.rpc.cgminer import CGMinerRPCAPI
-from pyasic.rpc.unknown import UnknownRPCAPI
-
-__all__ = [
-    "BMMinerRPCAPI",
-    "BOSMinerRPCAPI",
-    "BTMinerRPCAPI",
-    "CGMinerRPCAPI",
-    "UnknownRPCAPI",
-    "MinerConfig",
-    "MinerData",
-    "BraiinsOSError",
-    "InnosiliconError",
-    "WhatsminerError",
-    "X19Error",
-    "APIError",
-    "APIWarning",
-    "get_miner",
-    "AnyMiner",
-    "DataOptions",
-    "MinerFactory",
-    "miner_factory",
-    "MinerListener",
-    "MinerNetwork",
-    "settings",
-]
+from pyasic.rpc import *
+from pyasic.ssh import *
+from pyasic.web import *
--- a/pyasic/config/init.py
+++ b/pyasic/config/init.py
@@ -13,7 +13,6 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
-from copy import deepcopy
 from dataclasses import asdict, dataclass, field

 from pyasic.config.fans import FanModeConfig
@@ -21,6 +20,7 @@ from pyasic.config.mining import MiningModeConfig
 from pyasic.config.pools import PoolConfig
 from pyasic.config.power_scaling import PowerScalingConfig
 from pyasic.config.temperature import TemperatureConfig
+from pyasic.misc import merge_dicts


@dataclass
@@ -93,7 +93,7 @@ class MinerConfig:

    def as_bosminer(self, user_suffix: str = None) -> dict:
        return {
-            **merge(self.fan_mode.as_bosminer(), self.temperature.as_bosminer()),
+            **merge_dicts(self.fan_mode.as_bosminer(), self.temperature.as_bosminer()),
            **self.mining_mode.as_bosminer(),
            **self.pools.as_bosminer(user_suffix=user_suffix),
            **self.power_scaling.as_bosminer(),
@@ -110,18 +110,19 @@ class MinerConfig:

    def as_epic(self, user_suffix: str = None) -> dict:
        return {
-            **self.fan_mode.as_epic(),
-            **self.temperature.as_epic(),
+            **merge_dicts(self.fan_mode.as_epic(), self.temperature.as_epic()),
            **self.mining_mode.as_epic(),
-            **self.pools.as_epic(),
+            **self.pools.as_epic(user_suffix=user_suffix),
            **self.power_scaling.as_epic(),
        }

    def as_auradine(self, user_suffix: str = None) -> dict:
        return {
            **self.fan_mode.as_auradine(),
+            **self.temperature.as_auradine(),
            **self.mining_mode.as_auradine(),
            **self.pools.as_auradine(user_suffix=user_suffix),
+            **self.power_scaling.as_auradine(),
        }

    @classmethod
@@ -203,14 +204,3 @@ class MinerConfig:
            fan_mode=FanModeConfig.from_auradine(web_conf["fan"]),
            mining_mode=MiningModeConfig.from_auradine(web_conf["mode"]),
        )
-
-
-def merge(a: dict, b: dict) -> dict:
-    result = deepcopy(a)
-    for b_key, b_val in b.items():
-        a_val = result.get(b_key)
-        if isinstance(a_val, dict) and isinstance(b_val, dict):
-            result[b_key] = merge(a_val, b_val)
-        else:
-            result[b_key] = deepcopy(b_val)
-    return result
--- a/pyasic/config/base.py
+++ b/pyasic/config/base.py
@@ -13,14 +13,15 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
+from __future__ import annotations
+
 from dataclasses import asdict, dataclass
 from enum import Enum
-from typing import Union


 class MinerConfigOption(Enum):
    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]):
+    def from_dict(cls, dict_conf: dict | None):
        return cls.default()

    def as_am_modern(self) -> dict:
@@ -67,10 +68,10 @@ class MinerConfigOption(Enum):
@dataclass
 class MinerConfigValue:
    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]):
+    def from_dict(cls, dict_conf: dict | None):
        return cls()

-    def as_dict(self):
+    def as_dict(self) -> dict:
        return asdict(self)

    def as_am_modern(self) -> dict:
--- a/pyasic/config/fans.py
+++ b/pyasic/config/fans.py
@@ -13,8 +13,9 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
+from __future__ import annotations
+
 from dataclasses import dataclass, field
-from typing import Union

 from pyasic.config.base import MinerConfigOption, MinerConfigValue

@@ -26,7 +27,7 @@ class FanModeNormal(MinerConfigValue):
    minimum_speed: int = 0

    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]) -> "FanModeNormal":
+    def from_dict(cls, dict_conf: dict | None) -> "FanModeNormal":
        cls_conf = {}
        if dict_conf.get("minimum_fans") is not None:
            cls_conf["minimum_fans"] = dict_conf["minimum_fans"]
@@ -35,7 +36,7 @@ class FanModeNormal(MinerConfigValue):
        return cls(**cls_conf)

    @classmethod
-    def from_vnish(cls, web_cooling_settings: dict):
+    def from_vnish(cls, web_cooling_settings: dict) -> "FanModeNormal":
        cls_conf = {}
        if web_cooling_settings.get("fan_min_count") is not None:
            cls_conf["minimum_fans"] = web_cooling_settings["fan_min_count"]
@@ -49,6 +50,17 @@ class FanModeNormal(MinerConfigValue):
    def as_bosminer(self) -> dict:
        return {"temp_control": {"mode": "auto"}}

+    def as_epic(self) -> dict:
+        return {
+            "fans": {
+                "Auto": {
+                    "Idle Speed": (
+                        self.minimum_speed if not self.minimum_speed == 0 else 100
+                    )
+                }
+            }
+        }
+

@dataclass
 class FanModeManual(MinerConfigValue):
@@ -57,7 +69,7 @@ class FanModeManual(MinerConfigValue):
    minimum_fans: int = 1

    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]) -> "FanModeManual":
+    def from_dict(cls, dict_conf: dict | None) -> "FanModeManual":
        cls_conf = {}
        if dict_conf.get("speed") is not None:
            cls_conf["speed"] = dict_conf["speed"]
@@ -84,7 +96,7 @@ class FanModeManual(MinerConfigValue):
        return cls(**cls_conf)

    def as_am_modern(self) -> dict:
-        return {"bitmain-fan-ctrl": True, "bitmain-fan-pwn": str(self.speed)}
+        return {"bitmain-fan-ctrl": True, "bitmain-fan-pwm": str(self.speed)}

    def as_bosminer(self) -> dict:
        return {
@@ -95,17 +107,20 @@ class FanModeManual(MinerConfigValue):
    def as_auradine(self) -> dict:
        return {"fan": {"percentage": self.speed}}

+    def as_epic(self) -> dict:
+        return {"fans": {"Manual": {"speed": self.speed}}}
+

@dataclass
 class FanModeImmersion(MinerConfigValue):
    mode: str = field(init=False, default="immersion")

    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]) -> "FanModeImmersion":
+    def from_dict(cls, dict_conf: dict | None) -> "FanModeImmersion":
        return cls()

    def as_am_modern(self) -> dict:
-        return {"bitmain-fan-ctrl": True, "bitmain-fan-pwn": "0"}
+        return {"bitmain-fan-ctrl": True, "bitmain-fan-pwm": "0"}

    def as_bosminer(self) -> dict:
        return {"temp_control": {"mode": "disabled"}}
@@ -124,7 +139,7 @@ class FanModeConfig(MinerConfigOption):
        return cls.normal()

    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]):
+    def from_dict(cls, dict_conf: dict | None):
        if dict_conf is None:
            return cls.default()

@@ -132,16 +147,19 @@ class FanModeConfig(MinerConfigOption):
        if mode is None:
            return cls.default()

-        clsattr = getattr(cls, mode)
-        if clsattr is not None:
-            return clsattr().from_dict(dict_conf)
+        cls_attr = getattr(cls, mode)
+        if cls_attr is not None:
+            return cls_attr().from_dict(dict_conf)

    @classmethod
    def from_am_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:
-                return cls.manual(speed=web_conf["bitmain-fan-pwm"])
+                speed = int(web_conf["bitmain-fan-pwm"])
+                if speed == 0:
+                    return cls.immersion()
+                return cls.manual(speed=speed)
            else:
                return cls.normal()
        else:
--- a/pyasic/config/mining.py
+++ b/pyasic/config/mining.py
@@ -13,9 +13,11 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
-from dataclasses import dataclass, field
-from typing import Dict, Union
+from __future__ import annotations

+from dataclasses import dataclass, field
+
+from pyasic import settings
 from pyasic.config.base import MinerConfigOption, MinerConfigValue
 from pyasic.web.braiins_os.proto.braiins.bos.v1 import (
    HashrateTargetMode,
@@ -34,11 +36,13 @@ class MiningModeNormal(MinerConfigValue):
    mode: str = field(init=False, default="normal")

    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]) -> "MiningModeNormal":
+    def from_dict(cls, dict_conf: dict | None) -> "MiningModeNormal":
        return cls()

    def as_am_modern(self) -> dict:
-        return {"miner-mode": "0"}
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "0"}
+        return {"miner-mode": 0}

    def as_wm(self) -> dict:
        return {"mode": self.mode}
@@ -46,17 +50,25 @@ class MiningModeNormal(MinerConfigValue):
    def as_auradine(self) -> dict:
        return {"mode": {"mode": self.mode}}

+    def as_epic(self) -> dict:
+        return {"ptune": {"enabled": False}}
+
+    def as_goldshell(self) -> dict:
+        return {"settings": {"level": 0}}
+

@dataclass
 class MiningModeSleep(MinerConfigValue):
    mode: str = field(init=False, default="sleep")

    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]) -> "MiningModeSleep":
+    def from_dict(cls, dict_conf: dict | None) -> "MiningModeSleep":
        return cls()

    def as_am_modern(self) -> dict:
-        return {"miner-mode": "1"}
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "1"}
+        return {"miner-mode": 1}

    def as_wm(self) -> dict:
        return {"mode": self.mode}
@@ -64,17 +76,25 @@ class MiningModeSleep(MinerConfigValue):
    def as_auradine(self) -> dict:
        return {"mode": {"sleep": "on"}}

+    def as_epic(self) -> dict:
+        return {"ptune": {"algo": "Sleep", "target": 0}}
+
+    def as_goldshell(self) -> dict:
+        return {"settings": {"level": 3}}
+

@dataclass
 class MiningModeLPM(MinerConfigValue):
    mode: str = field(init=False, default="low")

    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]) -> "MiningModeLPM":
+    def from_dict(cls, dict_conf: dict | None) -> "MiningModeLPM":
        return cls()

    def as_am_modern(self) -> dict:
-        return {"miner-mode": "3"}
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "3"}
+        return {"miner-mode": 3}

    def as_wm(self) -> dict:
        return {"mode": self.mode}
@@ -82,17 +102,22 @@ class MiningModeLPM(MinerConfigValue):
    def as_auradine(self) -> dict:
        return {"mode": {"mode": "eco"}}

+    def as_goldshell(self) -> dict:
+        return {"settings": {"level": 1}}
+

@dataclass
 class MiningModeHPM(MinerConfigValue):
    mode: str = field(init=False, default="high")

    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]) -> "MiningModeHPM":
+    def from_dict(cls, dict_conf: dict | None) -> "MiningModeHPM":
        return cls()

-    def as_am_modern(self):
-        return {"miner-mode": "0"}
+    def as_am_modern(self) -> dict:
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "0"}
+        return {"miner-mode": 0}

    def as_wm(self) -> dict:
        return {"mode": self.mode}
@@ -101,17 +126,70 @@ class MiningModeHPM(MinerConfigValue):
        return {"mode": {"mode": "turbo"}}


+@dataclass
+class StandardTuneAlgo(MinerConfigValue):
+    mode: str = field(init=False, default="standard")
+
+    def as_epic(self) -> str:
+        return VOptAlgo().as_epic()
+
+
+@dataclass
+class VOptAlgo(MinerConfigValue):
+    mode: str = field(init=False, default="voltage_optimizer")
+
+    def as_epic(self) -> str:
+        return "VoltageOptimizer"
+
+
+class ChipTuneAlgo(MinerConfigValue):
+    mode: str = field(init=False, default="chip_tune")
+
+    def as_epic(self) -> str:
+        return "ChipTune"
+
+
+@dataclass
+class TunerAlgo(MinerConfigOption):
+    standard = StandardTuneAlgo
+    voltage_optimizer = VOptAlgo
+    chip_tune = ChipTuneAlgo
+
+    @classmethod
+    def default(cls):
+        return cls.standard()
+
+    @classmethod
+    def from_dict(cls, dict_conf: dict | None):
+        mode = dict_conf.get("mode")
+        if mode is None:
+            return cls.default()
+
+        cls_attr = getattr(cls, mode)
+        if cls_attr is not None:
+            return cls_attr().from_dict(dict_conf)
+
+
@dataclass
 class MiningModePowerTune(MinerConfigValue):
    mode: str = field(init=False, default="power_tuning")
    power: int = None
+    algo: TunerAlgo = field(default_factory=TunerAlgo.default)

    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]) -> "MiningModePowerTune":
-        return cls(dict_conf.get("power"))
+    def from_dict(cls, dict_conf: dict | None) -> "MiningModePowerTune":
+        cls_conf = {}
+        if dict_conf.get("power"):
+            cls_conf["power"] = dict_conf["power"]
+        if dict_conf.get("algo"):
+            cls_conf["algo"] = TunerAlgo.from_dict(dict_conf["algo"])
+
+        return cls(**cls_conf)

    def as_am_modern(self) -> dict:
-        return {"miner-mode": "0"}
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "0"}
+        return {"miner-mode": 0}

    def as_wm(self) -> dict:
        if self.power is not None:
@@ -119,7 +197,10 @@ class MiningModePowerTune(MinerConfigValue):
        return {}

    def as_bosminer(self) -> dict:
-        return {"autotuning": {"enabled": True, "psu_power_limit": self.power}}
+        conf = {"enabled": True, "mode": "power_target"}
+        if self.power is not None:
+            conf["power_target"] = self.power
+        return {"autotuning": conf}

    def as_boser(self) -> dict:
        return {
@@ -143,13 +224,28 @@ class MiningModePowerTune(MinerConfigValue):
 class MiningModeHashrateTune(MinerConfigValue):
    mode: str = field(init=False, default="hashrate_tuning")
    hashrate: int = None
+    algo: TunerAlgo = field(default_factory=TunerAlgo.default)

    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]) -> "MiningModeHashrateTune":
-        return cls(dict_conf.get("hashrate"))
+    def from_dict(cls, dict_conf: dict | None) -> "MiningModeHashrateTune":
+        cls_conf = {}
+        if dict_conf.get("hashrate"):
+            cls_conf["hashrate"] = dict_conf["hashrate"]
+        if dict_conf.get("algo"):
+            cls_conf["algo"] = TunerAlgo.from_dict(dict_conf["algo"])
+
+        return cls(**cls_conf)

    def as_am_modern(self) -> dict:
-        return {"miner-mode": "0"}
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "0"}
+        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}

    def as_boser(self) -> dict:
        return {
@@ -170,6 +266,9 @@ class MiningModeHashrateTune(MinerConfigValue):
    def as_auradine(self) -> dict:
        return {"mode": {"mode": "custom", "tune": "ths", "ths": self.hashrate}}

+    def as_epic(self) -> dict:
+        return {"ptune": {"algo": self.algo.as_epic(), "target": self.hashrate}}
+

@dataclass
 class ManualBoardSettings(MinerConfigValue):
@@ -177,11 +276,13 @@ class ManualBoardSettings(MinerConfigValue):
    volt: float

    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]) -> "ManualBoardSettings":
+    def from_dict(cls, dict_conf: dict | None) -> "ManualBoardSettings":
        return cls(freq=dict_conf["freq"], volt=dict_conf["volt"])

    def as_am_modern(self) -> dict:
-        return {"miner-mode": "0"}
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "0"}
+        return {"miner-mode": 0}


@dataclass
@@ -190,10 +291,10 @@ class MiningModeManual(MinerConfigValue):

    global_freq: float
    global_volt: float
-    boards: Dict[int, ManualBoardSettings] = field(default_factory=dict)
+    boards: dict[int, ManualBoardSettings] = field(default_factory=dict)

    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]) -> "MiningModeManual":
+    def from_dict(cls, dict_conf: dict | None) -> "MiningModeManual":
        return cls(
            global_freq=dict_conf["global_freq"],
            global_volt=dict_conf["global_volt"],
@@ -201,7 +302,9 @@ class MiningModeManual(MinerConfigValue):
        )

    def as_am_modern(self) -> dict:
-        return {"miner-mode": "0"}
+        if settings.get("antminer_mining_mode_as_str", False):
+            return {"miner-mode": "0"}
+        return {"miner-mode": 0}

    @classmethod
    def from_vnish(cls, web_overclock_settings: dict) -> "MiningModeManual":
@@ -232,7 +335,7 @@ class MiningModeConfig(MinerConfigOption):
        return cls.normal()

    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]):
+    def from_dict(cls, dict_conf: dict | None):
        if dict_conf is None:
            return cls.default()

@@ -240,9 +343,9 @@ class MiningModeConfig(MinerConfigOption):
        if mode is None:
            return cls.default()

-        clsattr = getattr(cls, mode)
-        if clsattr is not None:
-            return clsattr().from_dict(dict_conf)
+        cls_attr = getattr(cls, mode)
+        if cls_attr is not None:
+            return cls_attr().from_dict(dict_conf)

    @classmethod
    def from_am_modern(cls, web_conf: dict):
@@ -261,20 +364,18 @@ class MiningModeConfig(MinerConfigOption):
    @classmethod
    def from_epic(cls, web_conf: dict):
        try:
-            work_mode = web_conf["PerpetualTune"]["Running"]
-            if work_mode:
-                if (
-                    web_conf["PerpetualTune"]["Algorithm"].get("VoltageOptimizer")
-                    is not None
-                ):
+            tuner_running = web_conf["PerpetualTune"]["Running"]
+            if tuner_running:
+                algo_info = web_conf["PerpetualTune"]["Algorithm"]
+                if algo_info.get("VoltageOptimizer") is not None:
                    return cls.hashrate_tuning(
-                        web_conf["PerpetualTune"]["Algorithm"]["VoltageOptimizer"][
-                            "Target"
-                        ]
+                        hashrate=algo_info["VoltageOptimizer"]["Target"],
+                        algo=TunerAlgo.voltage_optimizer,
                    )
                else:
                    return cls.hashrate_tuning(
-                        web_conf["PerpetualTune"]["Algorithm"]["ChipTune"]["Target"]
+                        hashrate=algo_info["ChipTune"]["Target"],
+                        algo=TunerAlgo.chip_tune,
                    )
            else:
                return cls.normal()
--- a/pyasic/config/pools.py
+++ b/pyasic/config/pools.py
@@ -13,10 +13,12 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
+from __future__ import annotations
+
 import random
 import string
 from dataclasses import dataclass, field
-from typing import Dict, List, Union
+from typing import List

 from pyasic.config.base import MinerConfigValue

@@ -107,8 +109,17 @@ class Pool(MinerConfigValue):
            }
        return {"url": self.url, "user": self.user, "pass": self.password}

+    def as_epic(self, user_suffix: str = None):
+        if user_suffix is not None:
+            return {
+                "pool": self.url,
+                "login": f"{self.user}{user_suffix}",
+                "password": self.password,
+            }
+        return {"pool": self.url, "login": self.user, "password": self.password}
+
    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]) -> "Pool":
+    def from_dict(cls, dict_conf: dict | None) -> "Pool":
        return cls(
            url=dict_conf["url"], user=dict_conf["user"], password=dict_conf["password"]
        )
@@ -169,7 +180,7 @@ class Pool(MinerConfigValue):

@dataclass
 class PoolGroup(MinerConfigValue):
-    pools: List[Pool] = field(default_factory=list)
+    pools: list[Pool] = field(default_factory=list)
    quota: int = 1
    name: str = None

@@ -219,7 +230,7 @@ class PoolGroup(MinerConfigValue):
    def as_goldshell(self, user_suffix: str = None) -> list:
        return [pool.as_goldshell(user_suffix) for pool in self.pools]

-    def as_avalon(self, user_suffix: str = None) -> dict:
+    def as_avalon(self, user_suffix: str = None) -> str:
        if len(self.pools) > 0:
            return self.pools[0].as_avalon(user_suffix=user_suffix)
        return Pool("", "", "").as_avalon()
@@ -253,8 +264,11 @@ class PoolGroup(MinerConfigValue):
    def as_auradine(self, user_suffix: str = None) -> list:
        return [p.as_auradine(user_suffix=user_suffix) for p in self.pools]

+    def as_epic(self, user_suffix: str = None) -> dict:
+        return [p.as_epic(user_suffix=user_suffix) for p in self.pools]
+
    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]) -> "PoolGroup":
+    def from_dict(cls, dict_conf: dict | None) -> "PoolGroup":
        cls_conf = {}

        if dict_conf.get("quota") is not None:
@@ -313,9 +327,11 @@ class PoolGroup(MinerConfigValue):
            return cls(
                pools=[Pool.from_boser(p) for p in grpc_pool_group["pools"]],
                name=grpc_pool_group["name"],
-                quota=grpc_pool_group["quota"]["value"]
-                if grpc_pool_group.get("quota") is not None
-                else 1,
+                quota=(
+                    grpc_pool_group["quota"]["value"]
+                    if grpc_pool_group.get("quota") is not None
+                    else 1
+                ),
            )
        except LookupError:
            return cls()
@@ -330,14 +346,14 @@ class PoolConfig(MinerConfigValue):
        return cls()

    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]) -> "PoolConfig":
+    def from_dict(cls, dict_conf: dict | None) -> "PoolConfig":
        if dict_conf is None:
            return cls.default()

        return cls(groups=[PoolGroup.from_dict(g) for g in dict_conf["groups"]])

    @classmethod
-    def simple(cls, pools: List[Union[Pool, Dict[str, str]]]) -> "PoolConfig":
+    def simple(cls, pools: list[Pool | dict[str, str]]) -> "PoolConfig":
        group_pools = []
        for pool in pools:
            if isinstance(pool, dict):
@@ -394,6 +410,23 @@ class PoolConfig(MinerConfigValue):
            }
        return {"updatepools": {"pools": PoolGroup().as_auradine()}}

+    def as_epic(self, user_suffix: str = None) -> dict:
+        if len(self.groups) > 0:
+            return {
+                "pools": {
+                    "coin": "Btc",
+                    "stratum_configs": self.groups[0].as_epic(user_suffix=user_suffix),
+                    "unique_id": False,
+                }
+            }
+        return {
+            "pools": {
+                "coin": "Btc",
+                "stratum_configs": [PoolGroup().as_epic()],
+                "unique_id": False,
+            }
+        }
+
    @classmethod
    def from_api(cls, api_pools: dict) -> "PoolConfig":
        try:
--- a/pyasic/config/power_scaling.py
+++ b/pyasic/config/power_scaling.py
@@ -13,8 +13,9 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
+from __future__ import annotations
+
 from dataclasses import dataclass, field
-from typing import Union

 from pyasic.config.base import MinerConfigOption, MinerConfigValue
 from pyasic.web.braiins_os.proto.braiins.bos.v1 import (
@@ -31,7 +32,7 @@ class PowerScalingShutdownEnabled(MinerConfigValue):
    duration: int = None

    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]) -> "PowerScalingShutdownEnabled":
+    def from_dict(cls, dict_conf: dict | None) -> "PowerScalingShutdownEnabled":
        return cls(duration=dict_conf.get("duration"))

    def as_bosminer(self) -> dict:
@@ -51,7 +52,7 @@ class PowerScalingShutdownDisabled(MinerConfigValue):
    mode: str = field(init=False, default="disabled")

    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]) -> "PowerScalingShutdownDisabled":
+    def from_dict(cls, dict_conf: dict | None) -> "PowerScalingShutdownDisabled":
        return cls()

    def as_bosminer(self) -> dict:
@@ -66,7 +67,7 @@ class PowerScalingShutdown(MinerConfigOption):
    disabled = PowerScalingShutdownDisabled

    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]):
+    def from_dict(cls, dict_conf: dict | None):
        if dict_conf is None:
            return cls.default()

@@ -107,14 +108,14 @@ class PowerScalingEnabled(MinerConfigValue):
    mode: str = field(init=False, default="enabled")
    power_step: int = None
    minimum_power: int = None
-    shutdown_enabled: Union[
-        PowerScalingShutdownEnabled, PowerScalingShutdownDisabled
-    ] = None
+    shutdown_enabled: PowerScalingShutdownEnabled | PowerScalingShutdownDisabled = None

    @classmethod
    def from_bosminer(cls, power_scaling_conf: dict) -> "PowerScalingEnabled":
        power_step = power_scaling_conf.get("power_step")
        min_power = power_scaling_conf.get("min_psu_power_limit")
+        if min_power is None:
+            min_power = power_scaling_conf.get("min_power_target")
        sd_mode = PowerScalingShutdown.from_bosminer(power_scaling_conf)

        return cls(
@@ -122,7 +123,7 @@ class PowerScalingEnabled(MinerConfigValue):
        )

    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]) -> "PowerScalingEnabled":
+    def from_dict(cls, dict_conf: dict | None) -> "PowerScalingEnabled":
        cls_conf = {
            "power_step": dict_conf.get("power_step"),
            "minimum_power": dict_conf.get("minimum_power"),
@@ -139,12 +140,12 @@ class PowerScalingEnabled(MinerConfigValue):
        if self.power_step is not None:
            cfg["power_step"] = self.power_step
        if self.minimum_power is not None:
-            cfg["min_psu_power_limit"] = self.minimum_power
+            cfg["min_power_target"] = self.minimum_power

        if self.shutdown_enabled is not None:
            cfg = {**cfg, **self.shutdown_enabled.as_bosminer()}

-        return {"power_scaling": cfg}
+        return {"performance_scaling": cfg}

    def as_boser(self) -> dict:
        return {
@@ -175,7 +176,7 @@ class PowerScalingConfig(MinerConfigOption):
        return cls.disabled()

    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]):
+    def from_dict(cls, dict_conf: dict | None):
        if dict_conf is None:
            return cls.default()

@@ -190,6 +191,8 @@ class PowerScalingConfig(MinerConfigOption):
    @classmethod
    def from_bosminer(cls, toml_conf: dict):
        power_scaling = toml_conf.get("power_scaling")
+        if power_scaling is None:
+            power_scaling = toml_conf.get("performance_scaling")
        if power_scaling is not None:
            enabled = power_scaling.get("enabled")
            if enabled is not None:
--- a/pyasic/config/temperature.py
+++ b/pyasic/config/temperature.py
@@ -13,8 +13,9 @@
 #  See the License for the specific language governing permissions and         -
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
+from __future__ import annotations
+
 from dataclasses import dataclass
-from typing import Union

 from pyasic.config.base import MinerConfigValue

@@ -39,8 +40,18 @@ class TemperatureConfig(MinerConfigValue):
            temp_cfg["dangerous_temp"] = self.danger
        return {"temp_control": temp_cfg}

+    def as_epic(self) -> dict:
+        temps_config = {"temps": {}, "fans": {"Auto": {}}}
+        if self.target is not None:
+            temps_config["fans"]["Auto"]["Target Temperature"] = self.target
+        else:
+            temps_config["fans"]["Auto"]["Target Temperature"] = 60
+        if self.danger is not None:
+            temps_config["temps"]["shutdown"] = self.danger
+        return temps_config
+
    @classmethod
-    def from_dict(cls, dict_conf: Union[dict, None]) -> "TemperatureConfig":
+    def from_dict(cls, dict_conf: dict | None) -> "TemperatureConfig":
        return cls(
            target=dict_conf.get("target"),
            hot=dict_conf.get("hot"),
@@ -72,7 +83,7 @@ class TemperatureConfig(MinerConfigValue):
        return cls(target=target_temp, danger=dangerous_temp)

    @classmethod
-    def from_vnish(cls, web_settings: dict):
+    def from_vnish(cls, web_settings: dict) -> "TemperatureConfig":
        try:
            if web_settings["miner"]["cooling"]["mode"]["name"] == "auto":
                return cls(target=web_settings["miner"]["cooling"]["mode"]["param"])
@@ -81,7 +92,7 @@ class TemperatureConfig(MinerConfigValue):
        return cls()

    @classmethod
-    def from_boser(cls, grpc_miner_conf: dict):
+    def from_boser(cls, grpc_miner_conf: dict) -> "TemperatureConfig":
        try:
            temperature_conf = grpc_miner_conf["temperature"]
        except KeyError:
--- a/pyasic/data/init.py
+++ b/pyasic/data/init.py
@@ -24,73 +24,9 @@ from typing import Any, List, Union
 from pyasic.config import MinerConfig
 from pyasic.config.mining import MiningModePowerTune

+from .boards import HashBoard
 from .error_codes import BraiinsOSError, InnosiliconError, WhatsminerError, X19Error
-
-
-@dataclass
-class HashBoard:
-    """A Dataclass to standardize hashboard data.
-
-    Attributes:
-        slot: The slot of the board as an int.
-        hashrate: The hashrate of the board in TH/s as a float.
-        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.
-        expected_chips: The expected chip count of the board as an int.
-        serial_number: The serial number of the board.
-        missing: Whether the board is returned from the miners data as a bool.
-    """
-
-    slot: int = 0
-    hashrate: float = None
-    temp: int = None
-    chip_temp: int = None
-    chips: int = None
-    expected_chips: int = None
-    serial_number: str = None
-    missing: bool = True
-
-    def get(self, __key: str, default: Any = None):
-        try:
-            val = self.__getitem__(__key)
-            if val is None:
-                return default
-            return val
-        except KeyError:
-            return default
-
-    def __getitem__(self, item: str):
-        try:
-            return getattr(self, item)
-        except AttributeError:
-            raise KeyError(f"{item}")
-
-
-@dataclass
-class Fan:
-    """A Dataclass to standardize fan data.
-
-    Attributes:
-        speed: The speed of the fan.
-    """
-
-    speed: int = None
-
-    def get(self, __key: str, default: Any = None):
-        try:
-            val = self.__getitem__(__key)
-            if val is None:
-                return default
-            return val
-        except KeyError:
-            return default
-
-    def __getitem__(self, item: str):
-        try:
-            return getattr(self, item)
-        except AttributeError:
-            raise KeyError(f"{item}")
+from .fans import Fan


@dataclass
@@ -159,7 +95,12 @@ class MinerData:
    nominal: bool = field(init=False)
    config: MinerConfig = None
    errors: List[
-        Union[WhatsminerError, BraiinsOSError, X19Error, InnosiliconError]
+        Union[
+            WhatsminerError,
+            BraiinsOSError,
+            X19Error,
+            InnosiliconError,
+        ]
    ] = field(default_factory=list)
    fault_light: Union[bool, None] = None
    efficiency: int = field(init=False)
--- a/pyasic/data/boards.py
+++ b/pyasic/data/boards.py
@@ -0,0 +1,58 @@
+# ------------------------------------------------------------------------------
+#  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 dataclasses import dataclass
+from typing import Any
+
+
+@dataclass
+class HashBoard:
+    """A Dataclass to standardize hashboard data.
+
+    Attributes:
+        slot: The slot of the board as an int.
+        hashrate: The hashrate of the board in TH/s as a float.
+        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.
+        expected_chips: The expected chip count of the board as an int.
+        serial_number: The serial number of the board.
+        missing: Whether the board is returned from the miners data as a bool.
+    """
+
+    slot: int = 0
+    hashrate: float = None
+    temp: int = None
+    chip_temp: int = None
+    chips: int = None
+    expected_chips: int = None
+    serial_number: str = None
+    missing: bool = True
+
+    def get(self, __key: str, default: Any = None):
+        try:
+            val = self.__getitem__(__key)
+            if val is None:
+                return default
+            return val
+        except KeyError:
+            return default
+
+    def __getitem__(self, item: str):
+        try:
+            return getattr(self, item)
+        except AttributeError:
+            raise KeyError(f"{item}")
--- a/pyasic/data/fans.py
+++ b/pyasic/data/fans.py
@@ -0,0 +1,44 @@
+# ------------------------------------------------------------------------------
+#  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 dataclasses import dataclass
+from typing import Any
+
+
+@dataclass
+class Fan:
+    """A Dataclass to standardize fan data.
+
+    Attributes:
+        speed: The speed of the fan.
+    """
+
+    speed: int = None
+
+    def get(self, __key: str, default: Any = None):
+        try:
+            val = self.__getitem__(__key)
+            if val is None:
+                return default
+            return val
+        except KeyError:
+            return default
+
+    def __getitem__(self, item: str):
+        try:
+            return getattr(self, item)
+        except AttributeError:
+            raise KeyError(f"{item}")
--- a/pyasic/load/init.py
+++ b/pyasic/load/init.py
@@ -20,7 +20,7 @@ from typing import List, Union
 from pyasic.errors import APIError
 from pyasic.miners import AnyMiner
 from pyasic.miners.backends import AntminerModern, BOSMiner, BTMiner
-from pyasic.miners.types import S9, S17, T17, S17e, S17Plus, S17Pro, T17e, T17Plus
+from pyasic.miners.models import S9, S17, T17, S17e, S17Plus, S17Pro, T17e, T17Plus

 FAN_USAGE = 50  # 50 W per fan

--- a/pyasic/miners/init.py
+++ b/pyasic/miners/init.py
@@ -14,13 +14,7 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------

-import ipaddress
-from typing import Union
-
-from pyasic.miners.base import AnyMiner, BaseMiner
-from pyasic.miners.miner_factory import miner_factory
-
-
-# abstracted version of get miner that is easier to access
-async def get_miner(ip: Union[ipaddress.ip_address, str]) -> AnyMiner:
-    return await miner_factory.get_miner(ip)
+from .base import AnyMiner
+from .data import DataOptions
+from .factory import get_miner, miner_factory
+from .listener import MinerListener
--- a/pyasic/miners/antminer/bmminer/X17/S17.py
+++ b/pyasic/miners/antminer/bmminer/X17/S17.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import AntminerOld
-from pyasic.miners.types import S17, S17e, S17Plus, S17Pro
+from pyasic.miners.models import S17, S17e, S17Plus, S17Pro


 class BMMinerS17(AntminerOld, S17):
--- a/pyasic/miners/antminer/bmminer/X17/T17.py
+++ b/pyasic/miners/antminer/bmminer/X17/T17.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import AntminerOld
-from pyasic.miners.types import T17, T17e, T17Plus
+from pyasic.miners.models import T17, T17e, T17Plus


 class BMMinerT17(AntminerOld, T17):
--- a/pyasic/miners/antminer/bmminer/X19/S19.py
+++ b/pyasic/miners/antminer/bmminer/X19/S19.py
@@ -15,12 +15,13 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.types import (
+from pyasic.miners.models import (
    S19,
    S19L,
    S19XP,
    S19a,
    S19aPro,
+    S19Hydro,
    S19i,
    S19j,
    S19jNoPIC,
@@ -29,6 +30,8 @@ from pyasic.miners.types import (
    S19Pro,
    S19ProHydro,
    S19ProPlus,
+    S19ProPlusHydro,
+    S19KPro,
 )


@@ -82,3 +85,15 @@ class BMMinerS19L(AntminerModern, S19L):

 class BMMinerS19ProHydro(AntminerModern, S19ProHydro):
    pass
+
+
+class BMMinerS19Hydro(AntminerModern, S19Hydro):
+    pass
+
+
+class BMMinerS19ProPlusHydro(AntminerModern, S19ProPlusHydro):
+    pass
+
+
+class BMMinerS19KPro(AntminerModern, S19KPro):
+    pass
--- a/pyasic/miners/antminer/bmminer/X19/T19.py
+++ b/pyasic/miners/antminer/bmminer/X19/T19.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.types import T19
+from pyasic.miners.models import T19


 class BMMinerT19(AntminerModern, T19):
--- a/pyasic/miners/antminer/bmminer/X19/init.py
+++ b/pyasic/miners/antminer/bmminer/X19/init.py
@@ -18,6 +18,7 @@ from .S19 import (
    BMMinerS19,
    BMMinerS19a,
    BMMinerS19aPro,
+    BMMinerS19Hydro,
    BMMinerS19i,
    BMMinerS19j,
    BMMinerS19jNoPIC,
@@ -27,6 +28,8 @@ from .S19 import (
    BMMinerS19Pro,
    BMMinerS19ProHydro,
    BMMinerS19ProPlus,
+    BMMinerS19ProPlusHydro,
    BMMinerS19XP,
+    BMMinerS19KPro,
 )
 from .T19 import BMMinerT19
--- a/pyasic/miners/antminer/bmminer/X21/S21.py
+++ b/pyasic/miners/antminer/bmminer/X21/S21.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 AntminerModern
+from pyasic.miners.models import S21
+
+
+class BMMinerS21(AntminerModern, S21):
+    pass
--- a/pyasic/miners/antminer/bmminer/X21/T21.py
+++ b/pyasic/miners/antminer/bmminer/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 AntminerModern
+from pyasic.miners.models import T21
+
+
+class BMMinerT21(AntminerModern, T21):
+    pass
--- a/pyasic/miners/antminer/bmminer/X21/init.py
+++ b/pyasic/miners/antminer/bmminer/X21/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 .S21 import BMMinerS21
+from .T21 import BMMinerT21
--- a/pyasic/miners/antminer/bmminer/X3/HS3.py
+++ b/pyasic/miners/antminer/bmminer/X3/HS3.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.types import HS3
+from pyasic.miners.models import HS3


 class BMMinerHS3(AntminerModern, HS3):
--- a/pyasic/miners/antminer/bmminer/X3/L3.py
+++ b/pyasic/miners/antminer/bmminer/X3/L3.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import AntminerOld
-from pyasic.miners.types import L3Plus
+from pyasic.miners.models import L3Plus


 class BMMinerL3Plus(AntminerOld, L3Plus):
--- a/pyasic/miners/antminer/bmminer/X7/L7.py
+++ b/pyasic/miners/antminer/bmminer/X7/L7.py
@@ -14,7 +14,7 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.types import L7
+from pyasic.miners.models import L7


 class BMMinerL7(AntminerModern, L7):
--- a/pyasic/miners/antminer/bmminer/X9/E9.py
+++ b/pyasic/miners/antminer/bmminer/X9/E9.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import AntminerModern
-from pyasic.miners.types import E9Pro
+from pyasic.miners.models import E9Pro


 class BMMinerE9Pro(AntminerModern, E9Pro):
--- a/pyasic/miners/antminer/bmminer/X9/S9.py
+++ b/pyasic/miners/antminer/bmminer/X9/S9.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import BMMiner
-from pyasic.miners.types import S9, S9i, S9j
+from pyasic.miners.models import S9, S9i, S9j


 class BMMinerS9(BMMiner, S9):
--- a/pyasic/miners/antminer/bmminer/X9/T9.py
+++ b/pyasic/miners/antminer/bmminer/X9/T9.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import BMMiner
-from pyasic.miners.types import T9
+from pyasic.miners.models import T9


 class BMMinerT9(BMMiner, T9):
--- a/pyasic/miners/antminer/bmminer/init.py
+++ b/pyasic/miners/antminer/bmminer/init.py
@@ -18,3 +18,4 @@ from .X7 import *
 from .X9 import *
 from .X17 import *
 from .X19 import *
+from .X21 import *
--- a/pyasic/miners/antminer/bosminer/X17/S17.py
+++ b/pyasic/miners/antminer/bosminer/X17/S17.py
@@ -14,21 +14,21 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------

-from pyasic.miners.backends import BOSer
-from pyasic.miners.types import S17, S17e, S17Plus, S17Pro
+from pyasic.miners.backends import BOSMiner
+from pyasic.miners.models import S17, S17e, S17Plus, S17Pro


-class BOSMinerS17(BOSer, S17):
+class BOSMinerS17(BOSMiner, S17):
    pass


-class BOSMinerS17Plus(BOSer, S17Plus):
+class BOSMinerS17Plus(BOSMiner, S17Plus):
    pass


-class BOSMinerS17Pro(BOSer, S17Pro):
+class BOSMinerS17Pro(BOSMiner, S17Pro):
    pass


-class BOSMinerS17e(BOSer, S17e):
+class BOSMinerS17e(BOSMiner, S17e):
    pass
--- a/pyasic/miners/antminer/bosminer/X17/T17.py
+++ b/pyasic/miners/antminer/bosminer/X17/T17.py
@@ -14,17 +14,17 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------

-from pyasic.miners.backends import BOSer
-from pyasic.miners.types import T17, T17e, T17Plus
+from pyasic.miners.backends import BOSMiner
+from pyasic.miners.models import T17, T17e, T17Plus


-class BOSMinerT17(BOSer, T17):
+class BOSMinerT17(BOSMiner, T17):
    pass


-class BOSMinerT17Plus(BOSer, T17Plus):
+class BOSMinerT17Plus(BOSMiner, T17Plus):
    pass


-class BOSMinerT17e(BOSer, T17e):
+class BOSMinerT17e(BOSMiner, T17e):
    pass
--- a/pyasic/miners/antminer/bosminer/X19/S19.py
+++ b/pyasic/miners/antminer/bosminer/X19/S19.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import BOSer
-from pyasic.miners.types import (
+from pyasic.miners.models import (
    S19,
    S19XP,
    S19a,
--- a/pyasic/miners/antminer/bosminer/X19/T19.py
+++ b/pyasic/miners/antminer/bosminer/X19/T19.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import BOSer
-from pyasic.miners.types import T19
+from pyasic.miners.models import T19


 class BOSMinerT19(BOSer, T19):
--- a/pyasic/miners/antminer/bosminer/X21/S21.py
+++ b/pyasic/miners/antminer/bosminer/X21/S21.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 BOSer
+from pyasic.miners.models import S21
+
+
+class BOSMinerS21(BOSer, S21):
+    pass
--- a/pyasic/miners/antminer/bosminer/X21/init.py
+++ b/pyasic/miners/antminer/bosminer/X21/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 .S21 import BOSMinerS21
--- a/pyasic/miners/antminer/bosminer/X9/S9.py
+++ b/pyasic/miners/antminer/bosminer/X9/S9.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import BOSMiner
-from pyasic.miners.types import S9
+from pyasic.miners.models import S9


 class BOSMinerS9(BOSMiner, S9):
--- a/pyasic/miners/antminer/bosminer/init.py
+++ b/pyasic/miners/antminer/bosminer/init.py
@@ -17,3 +17,4 @@
 from .X9 import *
 from .X17 import *
 from .X19 import *
+from .X21 import *
--- a/pyasic/miners/antminer/cgminer/X15/Z15.py
+++ b/pyasic/miners/antminer/cgminer/X15/Z15.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import AntminerOld
-from pyasic.miners.types import Z15
+from pyasic.miners.models import Z15


 class CGMinerZ15(AntminerOld, Z15):
--- a/pyasic/miners/antminer/cgminer/X3/D3.py
+++ b/pyasic/miners/antminer/cgminer/X3/D3.py
@@ -14,7 +14,7 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 from pyasic.miners.backends import AntminerOld
-from pyasic.miners.types import D3
+from pyasic.miners.models import D3


 class CGMinerD3(AntminerOld, D3):
--- a/pyasic/miners/antminer/cgminer/X5/DR5.py
+++ b/pyasic/miners/antminer/cgminer/X5/DR5.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import AntminerOld
-from pyasic.miners.types import DR5
+from pyasic.miners.models import DR5


 class CGMinerDR5(AntminerOld, DR5):
--- a/pyasic/miners/antminer/epic/X19/S19.py
+++ b/pyasic/miners/antminer/epic/X19/S19.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import ePIC
-from pyasic.miners.types import S19, S19XP, S19j, S19jPro, S19jProPlus, S19kPro, S19Pro
+from pyasic.miners.models import S19, S19XP, S19j, S19jPro, S19jProPlus, S19kPro, S19Pro


 class ePICS19(ePIC, S19):
--- a/pyasic/miners/antminer/epic/X21/S21.py
+++ b/pyasic/miners/antminer/epic/X21/S21.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 ePIC
+from pyasic.miners.models import S21
+
+
+class ePICS21(ePIC, S21):
+    pass
--- a/pyasic/miners/antminer/epic/X21/T21.py
+++ b/pyasic/miners/antminer/epic/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 ePIC
+from pyasic.miners.models import T21
+
+
+class ePICT21(ePIC, T21):
+    pass
--- a/pyasic/miners/antminer/epic/X21/init.py
+++ b/pyasic/miners/antminer/epic/X21/init.py
@@ -0,0 +1,23 @@
+# ------------------------------------------------------------------------------
+#  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 .S21 import (
+    ePICS21,
+)
+
+from .T21 import (
+    ePICT21,
+)
--- a/pyasic/miners/antminer/epic/init.py
+++ b/pyasic/miners/antminer/epic/init.py
@@ -15,3 +15,4 @@
 # ------------------------------------------------------------------------------

 from .X19 import *
+from .X21 import *
--- a/pyasic/miners/antminer/hiveon/X9/T9.py
+++ b/pyasic/miners/antminer/hiveon/X9/T9.py
@@ -21,46 +21,46 @@ import asyncssh
 from pyasic.data import HashBoard
 from pyasic.errors import APIError
 from pyasic.miners.backends import Hiveon
-from pyasic.miners.base import DataFunction, DataLocations, DataOptions, RPCAPICommand
-from pyasic.miners.types import T9
+from pyasic.miners.data import DataFunction, DataLocations, DataOptions, RPCAPICommand
+from pyasic.miners.models import T9

 HIVEON_T9_DATA_LOC = DataLocations(
    **{
        str(DataOptions.API_VERSION): DataFunction(
            "_get_api_ver",
-            [RPCAPICommand("api_version", "version")],
+            [RPCAPICommand("rpc_version", "version")],
        ),
        str(DataOptions.FW_VERSION): DataFunction(
            "_get_fw_ver",
-            [RPCAPICommand("api_version", "version")],
+            [RPCAPICommand("rpc_version", "version")],
        ),
        str(DataOptions.HASHRATE): DataFunction(
            "_get_hashrate",
-            [RPCAPICommand("api_summary", "summary")],
+            [RPCAPICommand("rpc_summary", "summary")],
        ),
        str(DataOptions.EXPECTED_HASHRATE): DataFunction(
            "_get_expected_hashrate",
-            [RPCAPICommand("api_stats", "stats")],
+            [RPCAPICommand("rpc_stats", "stats")],
        ),
        str(DataOptions.HASHBOARDS): DataFunction(
            "_get_hashboards",
-            [RPCAPICommand("api_stats", "stats")],
+            [RPCAPICommand("rpc_stats", "stats")],
        ),
        str(DataOptions.ENVIRONMENT_TEMP): DataFunction(
            "_get_env_temp",
-            [RPCAPICommand("api_stats", "stats")],
+            [RPCAPICommand("rpc_stats", "stats")],
        ),
        str(DataOptions.WATTAGE): DataFunction(
            "_get_wattage",
-            [RPCAPICommand("api_stats", "stats")],
+            [RPCAPICommand("rpc_stats", "stats")],
        ),
        str(DataOptions.FANS): DataFunction(
            "_get_fans",
-            [RPCAPICommand("api_stats", "stats")],
+            [RPCAPICommand("rpc_stats", "stats")],
        ),
        str(DataOptions.UPTIME): DataFunction(
            "_get_uptime",
-            [RPCAPICommand("api_stats", "stats")],
+            [RPCAPICommand("rpc_stats", "stats")],
        ),
    }
 )
@@ -84,15 +84,15 @@ class HiveonT9(Hiveon, T9):
        except (TypeError, ValueError, asyncssh.Error, OSError, AttributeError):
            pass

-    async def _get_hashboards(self, api_stats: dict = None) -> List[HashBoard]:
+    async def _get_hashboards(self, rpc_stats: dict = None) -> List[HashBoard]:
        hashboards = [
            HashBoard(slot=board, expected_chips=self.expected_chips)
            for board in range(self.expected_hashboards)
        ]

-        if api_stats is None:
+        if rpc_stats is None:
            try:
-                api_stats = self.api.stats()
+                rpc_stats = self.rpc.stats()
            except APIError:
                return []

@@ -108,8 +108,8 @@ class HiveonT9(Hiveon, T9):
            for chipset in board_map[board]:
                if hashboards[board].chip_temp is None:
                    try:
-                        hashboards[board].temp = api_stats["STATS"][1][f"temp{chipset}"]
-                        hashboards[board].chip_temp = api_stats["STATS"][1][
+                        hashboards[board].temp = rpc_stats["STATS"][1][f"temp{chipset}"]
+                        hashboards[board].chip_temp = rpc_stats["STATS"][1][
                            f"temp2_{chipset}"
                        ]
                    except (KeyError, IndexError):
@@ -117,8 +117,8 @@ class HiveonT9(Hiveon, T9):
                    else:
                        hashboards[board].missing = False
                try:
-                    hashrate += api_stats["STATS"][1][f"chain_rate{chipset}"]
-                    chips += api_stats["STATS"][1][f"chain_acn{chipset}"]
+                    hashrate += rpc_stats["STATS"][1][f"chain_rate{chipset}"]
+                    chips += rpc_stats["STATS"][1][f"chain_acn{chipset}"]
                except (KeyError, IndexError):
                    pass
            hashboards[board].hashrate = round(hashrate / 1000, 2)
@@ -126,15 +126,15 @@ class HiveonT9(Hiveon, T9):

        return hashboards

-    async def _get_wattage(self, api_stats: dict = None) -> Optional[int]:
-        if not api_stats:
+    async def _get_wattage(self, rpc_stats: dict = None) -> Optional[int]:
+        if not rpc_stats:
            try:
-                api_stats = await self.api.stats()
+                rpc_stats = await self.rpc.stats()
            except APIError:
                pass

-        if api_stats:
-            boards = api_stats.get("STATS")
+        if rpc_stats:
+            boards = rpc_stats.get("STATS")
            try:
                wattage_raw = boards[1]["chain_power"]
            except (KeyError, IndexError):
@@ -143,23 +143,23 @@ class HiveonT9(Hiveon, T9):
                # parse wattage position out of raw data
                return round(float(wattage_raw.split(" ")[0]))

-    async def _get_env_temp(self, api_stats: dict = None) -> Optional[float]:
+    async def _get_env_temp(self, rpc_stats: dict = None) -> Optional[float]:
        env_temp_list = []
        board_map = {
            0: [2, 9, 10],
            1: [3, 11, 12],
            2: [4, 13, 14],
        }
-        if not api_stats:
+        if not rpc_stats:
            try:
-                api_stats = await self.api.stats()
+                rpc_stats = await self.rpc.stats()
            except APIError:
                pass
-        if api_stats:
+        if rpc_stats:
            for board in board_map.values():
                for chipset in board:
                    try:
-                        env_temp = api_stats["STATS"][1][f"temp3_{chipset}"]
+                        env_temp = rpc_stats["STATS"][1][f"temp3_{chipset}"]
                        if not env_temp == 0:
                            env_temp_list.append(int(env_temp))
                    except (KeyError, IndexError):
--- a/pyasic/miners/antminer/luxos/X19/S19.py
+++ b/pyasic/miners/antminer/luxos/X19/S19.py
@@ -0,0 +1,42 @@
+# ------------------------------------------------------------------------------
+#  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.models import S19, S19XP, S19jPro, S19jProPlus, S19kPro, S19Pro
+
+
+class LUXMinerS19(LUXMiner, S19):
+    pass
+
+
+class LUXMinerS19Pro(LUXMiner, S19Pro):
+    pass
+
+
+class LUXMinerS19jPro(LUXMiner, S19jPro):
+    pass
+
+
+class LUXMinerS19jProPlus(LUXMiner, S19jProPlus):
+    pass
+
+
+class LUXMinerS19kPro(LUXMiner, S19kPro):
+    pass
+
+
+class LUXMinerS19XP(LUXMiner, S19XP):
+    pass
--- a/pyasic/miners/antminer/luxos/X19/T19.py
+++ b/pyasic/miners/antminer/luxos/X19/T19.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.models import T19
+
+
+class LUXMinerT19(LUXMiner, T19):
+    pass
--- a/pyasic/miners/antminer/luxos/X19/init.py
+++ b/pyasic/miners/antminer/luxos/X19/init.py
@@ -0,0 +1,25 @@
+# ------------------------------------------------------------------------------
+#  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 (
+    LUXMinerS19,
+    LUXMinerS19jPro,
+    LUXMinerS19jProPlus,
+    LUXMinerS19kPro,
+    LUXMinerS19Pro,
+    LUXMinerS19XP,
+)
+from .T19 import LUXMinerT19
--- a/pyasic/miners/antminer/luxos/X21/S21.py
+++ b/pyasic/miners/antminer/luxos/X21/S21.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.models import S21
+
+
+class LUXMinerS21(LUXMiner, S21):
+    pass
--- a/pyasic/miners/antminer/luxos/X21/init.py
+++ b/pyasic/miners/antminer/luxos/X21/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 .S21 import LUXMinerS21
--- a/pyasic/miners/antminer/luxos/X9/S9.py
+++ b/pyasic/miners/antminer/luxos/X9/S9.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import LUXMiner
-from pyasic.miners.types import S9
+from pyasic.miners.models import S9


 class LUXMinerS9(LUXMiner, S9):
--- a/pyasic/miners/antminer/luxos/init.py
+++ b/pyasic/miners/antminer/luxos/init.py
@@ -15,3 +15,5 @@
 # ------------------------------------------------------------------------------

 from .X9 import *
+from .X19 import *
+from .X21 import *
--- a/pyasic/miners/antminer/vnish/X17/S17.py
+++ b/pyasic/miners/antminer/vnish/X17/S17.py
@@ -14,7 +14,7 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------
 from pyasic.miners.backends import VNish
-from pyasic.miners.types import S17Plus, S17Pro
+from pyasic.miners.models import S17Plus, S17Pro


 class VNishS17Plus(VNish, S17Plus):
--- a/pyasic/miners/antminer/vnish/X19/S19.py
+++ b/pyasic/miners/antminer/vnish/X19/S19.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import VNish
-from pyasic.miners.types import (
+from pyasic.miners.models import (
    S19,
    S19XP,
    S19a,
--- a/pyasic/miners/antminer/vnish/X19/T19.py
+++ b/pyasic/miners/antminer/vnish/X19/T19.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import VNish
-from pyasic.miners.types import T19
+from pyasic.miners.models import T19


 class VNishT19(VNish, T19):
--- a/pyasic/miners/antminer/vnish/X3/L3.py
+++ b/pyasic/miners/antminer/vnish/X3/L3.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import VNish
-from pyasic.miners.types import L3Plus
+from pyasic.miners.models import L3Plus


 class VnishL3Plus(VNish, L3Plus):
--- a/pyasic/miners/antminer/vnish/X7/L7.py
+++ b/pyasic/miners/antminer/vnish/X7/L7.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.models import L7
+
+
+class VnishL7(VNish, L7):
+    pass
--- a/pyasic/miners/antminer/vnish/X7/init.py
+++ b/pyasic/miners/antminer/vnish/X7/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 .L7 import VnishL7
--- a/pyasic/miners/antminer/vnish/init.py
+++ b/pyasic/miners/antminer/vnish/init.py
@@ -15,5 +15,6 @@
 # ------------------------------------------------------------------------------

 from .X3 import *
+from .X7 import *
 from .X17 import *
 from .X19 import *
--- a/pyasic/miners/auradine/flux/AD/AT1.py
+++ b/pyasic/miners/auradine/flux/AD/AT1.py
@@ -1,5 +1,5 @@
 from pyasic.miners.backends import Auradine
-from pyasic.miners.types import AuradineAT1500
+from pyasic.miners.models import AuradineAT1500


 class AuradineFluxAT1500(AuradineAT1500, Auradine):
--- a/pyasic/miners/auradine/flux/AD/AT2.py
+++ b/pyasic/miners/auradine/flux/AD/AT2.py
@@ -1,5 +1,5 @@
 from pyasic.miners.backends import Auradine
-from pyasic.miners.types import AuradineAT2860, AuradineAT2880
+from pyasic.miners.models import AuradineAT2860, AuradineAT2880


 class AuradineFluxAT2860(AuradineAT2860, Auradine):
--- a/pyasic/miners/auradine/flux/AI/AI2.py
+++ b/pyasic/miners/auradine/flux/AI/AI2.py
@@ -1,5 +1,5 @@
 from pyasic.miners.backends import Auradine
-from pyasic.miners.types import AuradineAI2500
+from pyasic.miners.models import AuradineAI2500


 class AuradineFluxAI2500(AuradineAI2500, Auradine):
--- a/pyasic/miners/auradine/flux/AI/AI3.py
+++ b/pyasic/miners/auradine/flux/AI/AI3.py
@@ -1,5 +1,5 @@
 from pyasic.miners.backends import Auradine
-from pyasic.miners.types import AuradineAI3680
+from pyasic.miners.models import AuradineAI3680


 class AuradineFluxAI3680(AuradineAI3680, Auradine):
--- a/pyasic/miners/auradine/flux/AT/AD2.py
+++ b/pyasic/miners/auradine/flux/AT/AD2.py
@@ -1,5 +1,5 @@
 from pyasic.miners.backends import Auradine
-from pyasic.miners.types import AuradineAD2500
+from pyasic.miners.models import AuradineAD2500


 class AuradineFluxAD2500(AuradineAD2500, Auradine):
--- a/pyasic/miners/auradine/flux/AT/AD3.py
+++ b/pyasic/miners/auradine/flux/AT/AD3.py
@@ -1,5 +1,5 @@
 from pyasic.miners.backends import Auradine
-from pyasic.miners.types import AuradineAD3500
+from pyasic.miners.models import AuradineAD3500


 class AuradineFluxAD3500(AuradineAD3500, Auradine):
--- a/pyasic/miners/avalonminer/cgminer/A10X/A1026.py
+++ b/pyasic/miners/avalonminer/cgminer/A10X/A1026.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon1026
+from pyasic.miners.models import Avalon1026


 class CGMinerAvalon1026(AvalonMiner, Avalon1026):
--- a/pyasic/miners/avalonminer/cgminer/A10X/A1047.py
+++ b/pyasic/miners/avalonminer/cgminer/A10X/A1047.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon1047
+from pyasic.miners.models import Avalon1047


 class CGMinerAvalon1047(AvalonMiner, Avalon1047):
--- a/pyasic/miners/avalonminer/cgminer/A10X/A1066.py
+++ b/pyasic/miners/avalonminer/cgminer/A10X/A1066.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon1066
+from pyasic.miners.models import Avalon1066


 class CGMinerAvalon1066(AvalonMiner, Avalon1066):
--- a/pyasic/miners/avalonminer/cgminer/A11X/A1166.py
+++ b/pyasic/miners/avalonminer/cgminer/A11X/A1166.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon1166Pro
+from pyasic.miners.models import Avalon1166Pro


 class CGMinerAvalon1166Pro(AvalonMiner, Avalon1166Pro):
--- a/pyasic/miners/avalonminer/cgminer/A12X/A1246.py
+++ b/pyasic/miners/avalonminer/cgminer/A12X/A1246.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon1246
+from pyasic.miners.models import Avalon1246


 class CGMinerAvalon1246(AvalonMiner, Avalon1246):
--- a/pyasic/miners/avalonminer/cgminer/A7X/A721.py
+++ b/pyasic/miners/avalonminer/cgminer/A7X/A721.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon721
+from pyasic.miners.models import Avalon721


 class CGMinerAvalon721(AvalonMiner, Avalon721):
--- a/pyasic/miners/avalonminer/cgminer/A7X/A741.py
+++ b/pyasic/miners/avalonminer/cgminer/A7X/A741.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon741
+from pyasic.miners.models import Avalon741


 class CGMinerAvalon741(AvalonMiner, Avalon741):
--- a/pyasic/miners/avalonminer/cgminer/A7X/A761.py
+++ b/pyasic/miners/avalonminer/cgminer/A7X/A761.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon761
+from pyasic.miners.models import Avalon761


 class CGMinerAvalon761(AvalonMiner, Avalon761):
--- a/pyasic/miners/avalonminer/cgminer/A8X/A821.py
+++ b/pyasic/miners/avalonminer/cgminer/A8X/A821.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon821
+from pyasic.miners.models import Avalon821


 class CGMinerAvalon821(AvalonMiner, Avalon821):
--- a/pyasic/miners/avalonminer/cgminer/A8X/A841.py
+++ b/pyasic/miners/avalonminer/cgminer/A8X/A841.py
@@ -15,7 +15,7 @@
 # ------------------------------------------------------------------------------

 from pyasic.miners.backends import AvalonMiner
-from pyasic.miners.types import Avalon841
+from pyasic.miners.models import Avalon841


 class CGMinerAvalon841(AvalonMiner, Avalon841):
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Upstream Data	ba6a1606b6	version: bump version number.	2024-04-12 08:48:52 -06:00
Upstream Data	51b0c0456f	bug: fix parsing of tuner algo modes into json.	2024-04-12 08:47:40 -06:00
Upstream Data	04bd03b496	version: bump version number.	2024-04-11 09:31:00 -06:00
Upstream Data	bc5764c8ff	feature: add stock support for T21.	2024-04-11 09:30:24 -06:00
Brett Rowan	1f2e066f4c	Merge pull request #122 from jpcomps/fix_is_mining feature: add is_mining for ePIC, add T21, add BlockMiner 720i	2024-04-11 09:28:18 -06:00
Upstream Data	74c457a694	version: bump version number.	2024-04-11 09:23:55 -06:00
Upstream Data	4a1c53dfd7	bug: fix some issues with config on bosminer.	2024-04-11 09:23:33 -06:00
John-Paul Compagnone	81b77f8768	cleaner code	2024-04-11 11:06:45 -04:00
John-Paul Compagnone	3b127b6862	fix is_mining for ePIC	2024-04-11 09:34:40 -04:00
Upstream Data	2815d2ba11	version: bump version number.	2024-04-08 12:15:38 -06:00
Upstream Data	1ff20fc6f0	feature: add bosminer S21 support.	2024-04-08 12:15:18 -06:00
Brett Rowan	797c847055	version: bump version number.	2024-04-07 17:17:17 -06:00
Brett Rowan	65c7f2f66f	bug: fix vnish shutting-down handling.	2024-04-07 17:16:37 -06:00
Brett Rowan	445d621590	version: bump version number.	2024-04-07 17:04:10 -06:00
Brett Rowan	d39ecfd6b4	feature: add is_mining for vnish.	2024-04-07 17:03:28 -06:00
Brett Rowan	36663471fb	version: bump version number.	2024-04-06 12:34:43 -06:00
Brett Rowan	80293ac52f	bug: fix incorrect model for XP.	2024-04-06 12:34:14 -06:00
UpstreamData	70b45f40f5	docs: update dev setup.	2024-03-29 11:19:17 -06:00
UpstreamData	a511fabd9c	Update README.md with dev docs.	2024-03-29 11:17:39 -06:00
Jim Burtoft	8bc8f6f178	Comment on some code I didn't understand initially (#118 )	2024-03-28 21:31:37 -06:00
Brett Rowan	b790ad58a7	version: bump version number.	2024-03-23 20:27:42 -06:00
Brett Rowan	354ab793a2	bug: fix vnish MAC not working on some versions.	2024-03-23 20:25:26 -06:00
Upstream Data	59346d641f	version: bump version number.	2024-03-22 15:12:35 -06:00
Upstream Data	11d770771b	feature: fix vnish not having the shutdown flag.	2024-03-22 15:12:20 -06:00
Upstream Data	1b6db7ed45	feature: add antminer new API.	2024-03-22 13:42:10 -06:00
Upstream Data	55c4e10fae	tests: Update tests, and fix some bugs.	2024-03-22 13:19:44 -06:00
Upstream Data	77c06dad61	version: bump version number.	2024-03-19 14:24:54 -06:00
Upstream Data	68d250d2f2	bug: fix K pro naming.	2024-03-19 14:24:31 -06:00
Upstream Data	094a17ac68	version: bump version number.	2024-03-19 14:17:21 -06:00
Upstream Data	dbcdeaa3de	feature: add support for S19K Pro.	2024-03-19 14:16:57 -06:00
Upstream Data	872cac811a	version: bump version number.	2024-03-19 12:41:57 -06:00
Upstream Data	d324c2fee9	feature: add stock S21 support.	2024-03-19 12:41:37 -06:00
JP Compagnone	577e8df612	Merge branch 'UpstreamData:master' into master	2024-03-14 16:58:12 -04:00
Upstream Data	4b54cf67ba	version: bump version number.	2024-03-12 16:16:40 -06:00
Upstream Data	0e00fe3114	feature: add antminer mode as str setting.	2024-03-12 16:16:15 -06:00
wilfredallyn	15d1dc5bb6	feature: add install docs (#117 )	2024-03-10 09:09:06 -06:00
Brett Rowan	2af0003843	version: bump version number.	2024-03-06 21:56:10 -07:00
Brett Rowan	3c227be170	bug: update httpx to use compatible versioning.	2024-03-06 21:53:14 -07:00
Brett Rowan	e889780bad	version: bump version number.	2024-03-03 11:16:16 -07:00
Brett Rowan	cc3d4fa805	feature: add S19 Hydro and S19 Pro+ Hydro.	2024-03-03 11:15:44 -07:00
John-Paul Compagnone	743823f66e	add Blockminer 720i and Antminer T21 support	2024-02-25 17:44:20 -05:00
Brett Rowan	227e1e2d2d	version: bump version number.	2024-02-25 13:10:11 -07:00
Brett Rowan	d6c8ff0910	feature: add support for more S21 LUXOS.	2024-02-25 13:08:25 -07:00
Brett Rowan	bd20e051b0	feature: add support for more LuxOS models.	2024-02-25 13:02:52 -07:00
UpstreamData	2eb6697e9a	version: bump version number	2024-02-21 13:23:38 -07:00
UpstreamData	c5817fcc36	docs: Update docs.	2024-02-21 13:22:40 -07:00
Brett Rowan	f2391bcb2d	Merge pull request #110 from jpcomps/add_blockminer_support ePIC: Add Blockminer support	2024-02-21 13:21:45 -07:00
Brett Rowan	bc3bd9e5da	Fix issue with possible type hint incompatability.	2024-02-21 13:20:41 -07:00
UpstreamData	3f0959d75e	docs: Update docs.	2024-02-21 12:43:46 -07:00
UpstreamData	31f7b56724	docs: Update docs.	2024-02-21 12:39:40 -07:00
UpstreamData	072954d755	docs: Update docs.	2024-02-21 12:39:08 -07:00
UpstreamData	d271e0f9c8	version: bump version number.	2024-02-21 12:33:21 -07:00
UpstreamData	8f1408ce17	bug: fix sending privileged commands on BTMiner using timeout as the port, and capture positional arguments in `_send_bytes` to prevent this.	2024-02-21 12:32:56 -07:00
John-Paul Compagnone	825d1f4cfb	fix checks	2024-02-20 20:39:22 -05:00
John-Paul Compagnone	c6bcd7e05a	fix capitalization	2024-02-20 20:33:30 -05:00
John-Paul Compagnone	5d80051f3b	more missing i	2024-02-20 18:15:40 -05:00
John-Paul Compagnone	b71c448199	add missing i	2024-02-20 18:12:19 -05:00
JP Compagnone	c82148412c	Merge branch 'UpstreamData:master' into add_blockminer_support	2024-02-20 18:01:16 -05:00
UpstreamData	a582ee63a0	bug: use force apply to fix DPS bug with setting wattage.	2024-02-20 10:11:57 -07:00
UpstreamData	db7c19c486	feature: add some miner support.	2024-02-20 09:47:28 -07:00
JP Compagnone	599f71da19	Merge branch 'UpstreamData:master' into add_blockminer_support	2024-02-19 19:04:32 -05:00
UpstreamData	0995744d90	version: bump version number.	2024-02-14 13:48:07 -07:00
UpstreamData	4073a27aba	bug: update miner handling with unknown models, but known makes.	2024-02-14 13:47:34 -07:00
UpstreamData	bec9c31c97	docs: Update supported miners location.	2024-02-12 10:38:22 -07:00
UpstreamData	acdd615c53	docs: update docs location.	2024-02-12 10:37:33 -07:00
UpstreamData	8091617ee2	feature: add supports_power_modes flag.	2024-02-12 09:26:09 -07:00
John-Paul Compagnone	c25ff6fcef	add ePIC Blockminer 520i support	2024-02-11 10:55:49 -05:00
John-Paul Compagnone	ab0dcd607b	make ePIC api calls more reliable	2024-02-10 21:59:08 -05:00
Brett Rowan	ce288e472f	version: bump version number.	2024-02-10 17:51:12 -07:00
Brett Rowan	02d8f25daf	Merge pull request #108 from jpcomps/master add ePIC UMC S21 support, fix HB generation by using capabilities	2024-02-10 17:50:37 -07:00
John-Paul Compagnone	a76d1c6149	add ePIC UMC S21 support, fix HB generation by using capabilities	2024-02-10 19:36:07 -05:00
Brett Rowan	17f5eade19	version: bump version number.	2024-02-10 16:45:49 -07:00
Brett Rowan	b6a2a5054b	bug: fix goldshell sleep mode again.	2024-02-10 16:45:29 -07:00
Brett Rowan	5984338c64	version: bump version number.	2024-02-10 15:47:25 -07:00
Brett Rowan	07d1c48e33	bug: fix goldshell config/power modes.	2024-02-10 15:46:55 -07:00
Brett Rowan	d2abae947c	version: bump version number.	2024-02-10 15:39:34 -07:00
Brett Rowan	e4a0f2451a	Attempt to fix goldshell mode issues.	2024-02-10 15:39:00 -07:00
b-rowan	880c598b1a	version: bump version number.	2024-02-10 14:26:09 -07:00
b-rowan	3632c2c4d8	feature: add support for goldshell shutdown.	2024-02-10 14:25:42 -07:00
b-rowan	09bc9686ae	feature: add support for goldshell mode settings.	2024-02-10 14:23:17 -07:00
b-rowan	34584ab098	feature: add support for KDBoxPro and KDBoxII.	2024-02-10 13:56:00 -07:00
UpstreamData	554d99ca08	bug: update API unlocker format.	2024-02-09 14:25:14 -07:00
UpstreamData	5c5d688ffa	Update api opener.	2024-02-09 13:39:48 -07:00
b-rowan	c50d55e87c	version: bump version number.	2024-02-07 20:16:26 -07:00
b-rowan	5e5516bfb3	bug: fix serial numbers for antminer.	2024-02-07 20:15:38 -07:00
UpstreamData	4b068c57c5	version: bump version number.	2024-02-07 11:17:29 -07:00
UpstreamData	203f199aec	feature: add wmt.pyasic.org.	2024-02-07 11:09:27 -07:00
b-rowan	895f17aaf9	version: bump version number.	2024-02-03 00:36:44 -07:00
b-rowan	8a64ff3559	bug: swap to asyncio.read() in base RPC to try to handle possible missed messages.	2024-02-03 00:36:03 -07:00
UpstreamData	4c45d356c4	version: bump version number.	2024-02-02 10:07:08 -07:00
UpstreamData	4dec329f11	bug: Try to return something when checking vnish fw version.	2024-02-02 10:06:33 -07:00
UpstreamData	b563ed118e	bug: fix vnish firmware version bug.	2024-02-02 10:05:34 -07:00
UpstreamData	75b2ec40b1	bug: fix ePIC config parsing to use hashrate tuning instead of power tuning.	2024-01-31 09:21:32 -07:00
b-rowan	d9adaf6667	version: bump version number.	2024-01-30 21:41:49 -07:00
b-rowan	9343308f41	feature: Add support for new whatsminers, and try to handle whatsminer errors when receiving data.	2024-01-30 21:41:10 -07:00
UpstreamData	88769e40ae	version: bump version number.	2024-01-30 13:34:24 -07:00
UpstreamData	be45eb7400	bug: fix issues with bosminer multicommand, and update X17 to use BOSMiner instead of BOSer.	2024-01-30 13:34:00 -07:00
b-rowan	2f719a03a4	version: bump version number.	2024-01-29 20:57:01 -07:00
b-rowan	64196f9754	bug: update whatsminer set_target_freq to match docs.	2024-01-29 20:56:36 -07:00
UpstreamData	49a77f1b79	version: bump version number.	2024-01-29 12:47:54 -07:00
UpstreamData	3838c4f2f9	bug: fix missing validation import for BTMiner.	2024-01-29 12:47:30 -07:00
UpstreamData	80d89c95b5	version: bump version number.	2024-01-29 12:33:07 -07:00
UpstreamData	30cd8b5cfe	bug: fix some issues with rpc renaming.	2024-01-29 12:32:54 -07:00
b-rowan	c443170f78	refactor: improve epic web send_command implementation.	2024-01-27 09:42:35 -07:00
b-rowan	a2c2aa2377	version: bump version number.	2024-01-27 09:26:13 -07:00
b-rowan	4f0eb49a02	bug: fix some issues with epic send config.	2024-01-27 09:25:20 -07:00
b-rowan	a821357b4f	Merge pull request #102 from jpcomps/master fix send_config for ePIC	2024-01-27 09:05:23 -07:00
John-Paul Compagnone	3c7679a22d	fix send_config for ePIC	2024-01-27 10:50:37 -05:00
UpstreamData	a52737e236	refactor: add some type hints for epic config.	2024-01-26 13:58:08 -07:00
UpstreamData	7c96bbe153	version: bump version number.	2024-01-26 13:56:15 -07:00
UpstreamData	e8bbf22aa7	bug: fix a bug with epic mining mode configs.	2024-01-26 13:55:54 -07:00
UpstreamData	5ac8b27cb6	version: bump version number.	2024-01-26 12:49:45 -07:00
UpstreamData	6c14902484	Add ePIC send_config and config.as_epic (#101 ) * feature: Add epic send_config. * feature: remove UID from epic config. * feature: add default for temp configs in epic.	2024-01-26 12:47:19 -07:00
UpstreamData	96aa346f00	refactor: rename miner.api to miner.rpc. Add miner.api property linked to miner.rpc.	2024-01-26 10:15:20 -07:00
UpstreamData	c2b6cc7468	refactor: improve validate_command_output, and move it out of the miner rpc api.	2024-01-26 09:51:09 -07:00
UpstreamData	ac7f41be44	refactor: move bind addr to init in MinerListener.	2024-01-25 16:34:46 -07:00
UpstreamData	718b87fd12	refactor: rename overwritten method.	2024-01-25 16:32:33 -07:00
UpstreamData	5ad23c6cd0	refactor: remove unused imports.	2024-01-25 16:31:19 -07:00
UpstreamData	66be443dc3	refactor: re-arrange some imports.	2024-01-25 16:25:25 -07:00
UpstreamData	a9135e21d4	docs: update docs.	2024-01-25 14:35:31 -07:00
UpstreamData	dd4c087749	refactor: move base classes to base.py in their directories, move data locations to miners.data, and rename `types` to `models`.	2024-01-25 14:26:53 -07:00
UpstreamData	aa1d7c1b6f	refactor: make web handlers much more consistent across types, remove graphql, and make luci and grpc the dedicated web apis for BOSer and BOSMiner respectively.	2024-01-25 13:50:04 -07:00
UpstreamData	b328a27f04	refactor: Update config to use future annotations and move merge_dicts to misc.	2024-01-25 11:32:03 -07:00
UpstreamData	c5eed797ec	refactor: update type annotations in config.	2024-01-25 10:07:19 -07:00