version: bump version number.

feature: add bosminer S21 support.
2024-04-08 12:15:38 -06:00 · 2024-04-08 12:15:18 -06:00 · 2024-04-07 17:17:17 -06:00 · 2024-04-07 17:16:37 -06:00 · 2024-04-07 17:04:10 -06:00 · 2024-04-07 17:03:28 -06:00
81 changed files with 1362 additions and 153 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
@@ -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
 ---
@@ -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/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/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/config/fans.py
+++ b/pyasic/config/fans.py
@@ -54,9 +54,9 @@ class FanModeNormal(MinerConfigValue):
        return {
            "fans": {
                "Auto": {
-                    "Idle Speed": self.minimum_speed
-                    if not self.minimum_speed == 0
-                    else 100
+                    "Idle Speed": (
+                        self.minimum_speed if not self.minimum_speed == 0 else 100
+                    )
                }
            }
        }
@@ -96,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 {
@@ -120,7 +120,7 @@ class FanModeImmersion(MinerConfigValue):
        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"}}
@@ -156,7 +156,10 @@ class FanModeConfig(MinerConfigOption):
        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
@@ -17,6 +17,7 @@ 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,
@@ -39,7 +40,9 @@ class MiningModeNormal(MinerConfigValue):
        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}
@@ -51,7 +54,7 @@ class MiningModeNormal(MinerConfigValue):
        return {"ptune": {"enabled": False}}

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


@dataclass
@@ -63,7 +66,9 @@ class MiningModeSleep(MinerConfigValue):
        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}
@@ -75,7 +80,7 @@ class MiningModeSleep(MinerConfigValue):
        return {"ptune": {"algo": "Sleep", "target": 0}}

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


@dataclass
@@ -87,7 +92,9 @@ class MiningModeLPM(MinerConfigValue):
        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}
@@ -96,7 +103,7 @@ class MiningModeLPM(MinerConfigValue):
        return {"mode": {"mode": "eco"}}

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


@dataclass
@@ -108,7 +115,9 @@ class MiningModeHPM(MinerConfigValue):
        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}
@@ -165,7 +174,9 @@ class MiningModePowerTune(MinerConfigValue):
        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:
@@ -204,7 +215,9 @@ class MiningModeHashrateTune(MinerConfigValue):
        return cls(dict_conf.get("hashrate"))

    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_boser(self) -> dict:
        return {
@@ -239,7 +252,9 @@ class ManualBoardSettings(MinerConfigValue):
        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
@@ -259,7 +274,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":
--- a/pyasic/config/pools.py
+++ b/pyasic/config/pools.py
@@ -327,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()
--- a/pyasic/data/init.py
+++ b/pyasic/data/init.py
@@ -94,9 +94,7 @@ class MinerData:
    percent_expected_wattage: float = field(init=False)
    nominal: bool = field(init=False)
    config: MinerConfig = None
-    errors: List[
-        Union[WhatsminerError, BraiinsOSError, X19Error, InnosiliconError]
-    ] = field(default_factory=list)
+    errors: List[Union[WhatsminerError, BraiinsOSError, X19Error, InnosiliconError]] = field(default_factory=list)
    fault_light: Union[bool, None] = None
    efficiency: int = field(init=False)
    is_mining: bool = True
--- a/pyasic/miners/antminer/bmminer/X19/S19.py
+++ b/pyasic/miners/antminer/bmminer/X19/S19.py
@@ -21,6 +21,7 @@ from pyasic.miners.models import (
    S19XP,
    S19a,
    S19aPro,
+    S19Hydro,
    S19i,
    S19j,
    S19jNoPIC,
@@ -29,6 +30,8 @@ from pyasic.miners.models 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/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/init.py
+++ b/pyasic/miners/antminer/bmminer/X21/init.py
@@ -0,0 +1,16 @@
+# ------------------------------------------------------------------------------
+#  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
--- 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/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/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/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/init.py
+++ b/pyasic/miners/antminer/epic/X21/init.py
@@ -0,0 +1,19 @@
+# ------------------------------------------------------------------------------
+#  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,
+)
--- 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/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/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/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/backends/antminer.py
+++ b/pyasic/miners/backends/antminer.py
@@ -22,6 +22,7 @@ from pyasic.data.error_codes import MinerErrorData, X19Error
 from pyasic.errors import APIError
 from pyasic.miners.backends.bmminer import BMMiner
 from pyasic.miners.backends.cgminer import CGMiner
+from pyasic.miners.base import BaseMiner
 from pyasic.miners.data import (
    DataFunction,
    DataLocations,
@@ -29,6 +30,7 @@ from pyasic.miners.data import (
    RPCAPICommand,
    WebAPICommand,
 )
+from pyasic.rpc.antminer import AntminerRPCAPI
 from pyasic.ssh.antminer import AntminerModernSSH
 from pyasic.web.antminer import AntminerModernWebAPI, AntminerOldWebAPI

@@ -88,12 +90,16 @@ class AntminerModern(BMMiner):
    _web_cls = AntminerModernWebAPI
    web: AntminerModernWebAPI

+    _rpc_cls = AntminerRPCAPI
+    web: AntminerRPCAPI
+
    _ssh_cls = AntminerModernSSH
    ssh: AntminerModernSSH

    data_locations = ANTMINER_MODERN_DATA_LOC

    supports_shutdown = True
+    supports_power_modes = True

    async def get_config(self) -> MinerConfig:
        data = await self.web.get_miner_conf()
@@ -206,7 +212,7 @@ class AntminerModern(BMMiner):
        ]

        try:
-            rpc_stats = await self.rpc.send_command("stats", new_api=True)
+            rpc_stats = await self.rpc.stats(new_api=True)
        except APIError:
            return hashboards

--- a/pyasic/miners/backends/auradine.py
+++ b/pyasic/miners/backends/auradine.py
@@ -124,6 +124,7 @@ class Auradine(BaseMiner):
    data_locations = AURADINE_DATA_LOC

    supports_shutdown = True
+    supports_power_modes = True
    supports_autotuning = True

    async def fault_light_on(self) -> bool:
--- a/pyasic/miners/backends/braiins_os.py
+++ b/pyasic/miners/backends/braiins_os.py
@@ -35,6 +35,7 @@ from pyasic.miners.data import (
 from pyasic.rpc.bosminer import BOSMinerRPCAPI
 from pyasic.ssh.braiins_os import BOSMinerSSH
 from pyasic.web.braiins_os import BOSerWebAPI, BOSMinerWebAPI
+from pyasic.web.braiins_os.proto.braiins.bos.v1 import SaveAction

 BOSMINER_DATA_LOC = DataLocations(
    **{
@@ -691,7 +692,9 @@ class BOSer(BaseMiner):

    async def set_power_limit(self, wattage: int) -> bool:
        try:
-            result = await self.web.set_power_target(wattage)
+            result = await self.web.set_power_target(
+                wattage, save_action=SaveAction.SAVE_ACTION_SAVE_AND_FORCE_APPLY
+            )
        except APIError:
            return False

--- a/pyasic/miners/backends/btminer.py
+++ b/pyasic/miners/backends/btminer.py
@@ -119,6 +119,7 @@ class BTMiner(BaseMiner):
    data_locations = BTMINER_DATA_LOC

    supports_shutdown = True
+    supports_power_modes = True

    async def _reset_rpc_pwd_to_admin(self, pwd: str):
        try:
--- a/pyasic/miners/backends/epic.py
+++ b/pyasic/miners/backends/epic.py
@@ -51,7 +51,7 @@ EPIC_DATA_LOC = DataLocations(
            "_get_hashboards",
            [
                WebAPICommand("web_summary", "summary"),
-                WebAPICommand("web_hashrate", "hashrate"),
+                WebAPICommand("web_capabilities", "capabilities"),
            ],
        ),
        str(DataOptions.WATTAGE): DataFunction(
@@ -284,7 +284,7 @@ class ePIC(BaseMiner):
        return fans

    async def _get_hashboards(
-        self, web_summary: dict = None, web_hashrate: dict = None
+        self, web_summary: dict = None, web_capabilities: dict = None
    ) -> List[HashBoard]:
        if web_summary is None:
            try:
@@ -292,28 +292,25 @@ class ePIC(BaseMiner):
            except APIError:
                pass

-        if web_hashrate is not None:
+        if web_capabilities is not None:
            try:
-                web_hashrate = await self.web.hashrate()
+                web_capabilities = await self.web.capabilities()
            except APIError:
                pass
+
        hb_list = [
            HashBoard(slot=i, expected_chips=self.expected_chips)
            for i in range(self.expected_hashboards)
        ]
-
        if web_summary.get("HBs") is not None:
            for hb in web_summary["HBs"]:
-                for hr in web_hashrate:
-                    if hr["Index"] == hb["Index"]:
-                        num_of_chips = len(hr["Data"])
-                        hashrate = hb["Hashrate"][0]
-                        # Update the Hashboard object
-                        hb_list[hr["Index"]].expected_chips = num_of_chips
-                        hb_list[hr["Index"]].missing = False
-                        hb_list[hr["Index"]].hashrate = round(hashrate / 1000000, 2)
-                        hb_list[hr["Index"]].chips = num_of_chips
-                        hb_list[hr["Index"]].temp = hb["Temperature"]
+                num_of_chips = web_capabilities["Performance Estimator"]["Chip Count"]
+                hashrate = hb["Hashrate"][0]
+                # Update the Hashboard object
+                hb_list[hb["Index"]].missing = False
+                hb_list[hb["Index"]].hashrate = round(hashrate / 1000000, 2)
+                hb_list[hb["Index"]].chips = num_of_chips
+                hb_list[hb["Index"]].temp = hb["Temperature"]
        return hb_list

    async def _is_mining(self, *args, **kwargs) -> Optional[bool]:
--- a/pyasic/miners/backends/goldshell.py
+++ b/pyasic/miners/backends/goldshell.py
@@ -75,6 +75,7 @@ class GoldshellMiner(BFGMiner):
    data_locations = GOLDSHELL_DATA_LOC

    supports_shutdown = True
+    supports_power_modes = True

    async def get_config(self) -> MinerConfig:
        # get pool data
@@ -106,8 +107,9 @@ class GoldshellMiner(BFGMiner):
            )

        settings = await self.web.setting()
-        for new_setting in cfg["settings"]:
-            settings[new_setting] = cfg["settings"][new_setting]
+        for idx, plan in enumerate(settings["powerplans"]):
+            if plan["level"] == cfg["settings"]["level"]:
+                settings["select"] = idx
        await self.web.set_setting(settings)

    async def _get_mac(self, web_setting: dict = None) -> str:
@@ -190,8 +192,10 @@ class GoldshellMiner(BFGMiner):
        settings = await self.web.setting()
        mode = MiningModeConfig.sleep()
        cfg = mode.as_goldshell()
-        for new_setting in cfg["settings"]:
-            settings[new_setting] = cfg["settings"][new_setting]
+        level = cfg["settings"]["level"]
+        for idx, plan in enumerate(settings["powerplans"]):
+            if plan["level"] == level:
+                settings["select"] = idx
        await self.web.set_setting(settings)
        return True

@@ -199,7 +203,9 @@ class GoldshellMiner(BFGMiner):
        settings = await self.web.setting()
        mode = MiningModeConfig.normal()
        cfg = mode.as_goldshell()
-        for new_setting in cfg["settings"]:
-            settings[new_setting] = cfg["settings"][new_setting]
+        level = cfg["settings"]["level"]
+        for idx, plan in enumerate(settings["powerplans"]):
+            if plan["level"] == level:
+                settings["select"] = idx
        await self.web.set_setting(settings)
        return True
--- a/pyasic/miners/backends/vnish.py
+++ b/pyasic/miners/backends/vnish.py
@@ -74,6 +74,10 @@ VNISH_DATA_LOC = DataLocations(
            "_get_uptime",
            [RPCAPICommand("rpc_stats", "stats")],
        ),
+        str(DataOptions.IS_MINING): DataFunction(
+            "_is_mining",
+            [WebAPICommand("web_summary", "summary")],
+        ),
    }
 )

@@ -84,6 +88,8 @@ class VNish(BMMiner):
    _web_cls = VNishWebAPI
    web: VNishWebAPI

+    supports_shutdown = True
+
    firmware = "VNish"

    data_locations = VNISH_DATA_LOC
@@ -125,16 +131,6 @@ class VNish(BMMiner):
        return False

    async def _get_mac(self, web_summary: dict = None) -> str:
-        if web_summary is None:
-            web_info = await self.web.info()
-
-            if web_info is not None:
-                try:
-                    mac = web_info["system"]["network_status"]["mac"]
-                    return mac
-                except KeyError:
-                    pass
-
        if web_summary is not None:
            try:
                mac = web_summary["system"]["network_status"]["mac"]
@@ -142,6 +138,15 @@ class VNish(BMMiner):
            except KeyError:
                pass

+        web_info = await self.web.info()
+
+        if web_info is not None:
+            try:
+                mac = web_info["system"]["network_status"]["mac"]
+                return mac
+            except KeyError:
+                pass
+
    async def _get_hostname(self, web_summary: dict = None) -> str:
        if web_summary is None:
            web_info = await self.web.info()
@@ -214,6 +219,20 @@ class VNish(BMMiner):
            except LookupError:
                return fw_ver

+    async def _is_mining(self, web_summary: dict = None) -> Optional[bool]:
+        if web_summary is None:
+            web_summary = await self.web.summary()
+
+        if web_summary is not None:
+            try:
+                is_mining = not web_summary["miner"]["miner_status"]["miner_state"] in [
+                    "stopped",
+                    "shutting-down",
+                ]
+                return is_mining
+            except LookupError:
+                pass
+
    async def get_config(self) -> MinerConfig:
        try:
            web_settings = await self.web.settings()
--- a/pyasic/miners/base.py
+++ b/pyasic/miners/base.py
@@ -47,6 +47,7 @@ class MinerProtocol(Protocol):
    data_locations: DataLocations = None

    supports_shutdown: bool = False
+    supports_power_modes: bool = False
    supports_autotuning: bool = False

    api_ver: str = None
@@ -68,7 +69,12 @@ class MinerProtocol(Protocol):

    @property
    def model(self) -> str:
-        model_data = [self.raw_model if self.raw_model is not None else "Unknown"]
+        if self.raw_model is not None:
+            model_data = [self.raw_model]
+        elif self.make is not None:
+            model_data = [self.make]
+        else:
+            model_data = ["Unknown"]
        if self.firmware is not None:
            model_data.append(f"({self.firmware})")
        return " ".join(model_data)
@@ -461,9 +467,11 @@ class MinerProtocol(Protocol):
            ip=str(self.ip),
            make=self.make,
            model=self.model,
-            expected_chips=self.expected_chips * self.expected_hashboards
-            if self.expected_chips is not None
-            else 0,
+            expected_chips=(
+                self.expected_chips * self.expected_hashboards
+                if self.expected_chips is not None
+                else 0
+            ),
            expected_hashboards=self.expected_hashboards,
            hashboards=[
                HashBoard(slot=i, expected_chips=self.expected_chips)
--- a/pyasic/miners/blockminer/init.py
+++ b/pyasic/miners/blockminer/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 .epic import *
--- a/pyasic/miners/blockminer/epic/init.py
+++ b/pyasic/miners/blockminer/epic/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 .blockminer import *
--- a/pyasic/miners/blockminer/epic/blockminer/init.py
+++ b/pyasic/miners/blockminer/epic/blockminer/init.py
@@ -0,0 +1,19 @@
+# ------------------------------------------------------------------------------
+#  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 .blockminer import (
+    ePICBlockMiner520i,
+)
--- a/pyasic/miners/blockminer/epic/blockminer/blockminer.py
+++ b/pyasic/miners/blockminer/epic/blockminer/blockminer.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 BlockMiner520i
+
+
+class ePICBlockMiner520i(ePIC, BlockMiner520i):
+    pass
--- a/pyasic/miners/factory.py
+++ b/pyasic/miners/factory.py
@@ -45,8 +45,10 @@ from pyasic.miners.backends import (
 )
 from pyasic.miners.backends.unknown import UnknownMiner
 from pyasic.miners.base import AnyMiner
+from pyasic.miners.blockminer import *
 from pyasic.miners.goldshell import *
 from pyasic.miners.innosilicon import *
+from pyasic.miners.makes import *
 from pyasic.miners.whatsminer import *


@@ -66,7 +68,7 @@ class MinerTypes(enum.Enum):

 MINER_CLASSES = {
    MinerTypes.ANTMINER: {
-        None: BMMiner,
+        None: type("AntminerUnknown", (BMMiner, AntMinerMake), {}),
        "ANTMINER D3": CGMinerD3,
        "ANTMINER HS3": BMMinerHS3,
        "ANTMINER L3+": BMMinerL3Plus,
@@ -97,11 +99,15 @@ MINER_CLASSES = {
        "ANTMINER S19 XP": BMMinerS19XP,
        "ANTMINER S19A": BMMinerS19a,
        "ANTMINER S19A PRO": BMMinerS19aPro,
+        "ANTMINER S19 HYDRO": BMMinerS19Hydro,
        "ANTMINER S19 PRO HYD.": BMMinerS19ProHydro,
+        "ANTMINER S19 PRO+ HYD.": BMMinerS19ProPlusHydro,
+        "ANTMINER S19K PRO": BMMinerS19KPro,
        "ANTMINER T19": BMMinerT19,
+        "ANTMINER S21": BMMinerS21,
    },
    MinerTypes.WHATSMINER: {
-        None: BTMiner,
+        None: type("WhatsminerUnknown", (BTMiner, WhatsMinerMake), {}),
        "M20V10": BTMinerM20V10,
        "M20SV10": BTMinerM20SV10,
        "M20SV20": BTMinerM20SV20,
@@ -317,7 +323,7 @@ MINER_CLASSES = {
        "M66SVK40": BTMinerM66SVK40,
    },
    MinerTypes.AVALONMINER: {
-        None: AvalonMiner,
+        None: type("AvalonUnknown", (AvalonMiner, AvalonMinerMake), {}),
        "AVALONMINER 721": CGMinerAvalon721,
        "AVALONMINER 741": CGMinerAvalon741,
        "AVALONMINER 761": CGMinerAvalon761,
@@ -332,12 +338,12 @@ MINER_CLASSES = {
        "AVALONMINER 1246": CGMinerAvalon1246,
    },
    MinerTypes.INNOSILICON: {
-        None: Innosilicon,
+        None: type("InnosiliconUnknown", (Innosilicon, InnosiliconMake), {}),
        "T3H+": InnosiliconT3HPlus,
        "A10X": InnosiliconA10X,
    },
    MinerTypes.GOLDSHELL: {
-        None: GoldshellMiner,
+        None: type("GoldshellUnknown", (GoldshellMiner, GoldshellMake), {}),
        "GOLDSHELL CK5": GoldshellCK5,
        "GOLDSHELL HS5": GoldshellHS5,
        "GOLDSHELL KD5": GoldshellKD5,
@@ -366,12 +372,15 @@ MINER_CLASSES = {
        "ANTMINER S19J PRO NOPIC": BOSMinerS19jPro,
        "ANTMINER S19J PRO+": BOSMinerS19jProPlus,
        "ANTMINER S19K PRO NOPIC": BOSMinerS19kProNoPIC,
-        "ANTMINER S19XP": BOSMinerS19XP,
+        "ANTMINER S19 XP": BOSMinerS19XP,
        "ANTMINER T19": BOSMinerT19,
+        "ANTMINER S21": BOSMinerS21,
    },
    MinerTypes.VNISH: {
        None: VNish,
+        "L3+": VnishL3Plus,
        "ANTMINER L3+": VnishL3Plus,
+        "ANTMINER L7": VnishL7,
        "ANTMINER S17+": VNishS17Plus,
        "ANTMINER S17 PRO": VNishS17Pro,
        "ANTMINER S19": VNishS19,
@@ -392,6 +401,8 @@ MINER_CLASSES = {
        "ANTMINER S19J PRO+": ePICS19jProPlus,
        "ANTMINER S19K PRO": ePICS19kPro,
        "ANTMINER S19 XP": ePICS19XP,
+        "ANTMINER S21": ePICS21,
+        "BLOCKMINER 520I": ePICBlockMiner520i,
    },
    MinerTypes.HIVEON: {
        None: Hiveon,
@@ -400,9 +411,17 @@ MINER_CLASSES = {
    MinerTypes.LUX_OS: {
        None: LUXMiner,
        "ANTMINER S9": LUXMinerS9,
+        "ANTMINER S19": LUXMinerS19,
+        "ANTMINER S19 PRO": LUXMinerS19Pro,
+        "ANTMINER S19J PRO": LUXMinerS19jPro,
+        "ANTMINER S19J PRO+": LUXMinerS19jProPlus,
+        "ANTMINER S19K PRO": LUXMinerS19kPro,
+        "ANTMINER S19 XP": LUXMinerS19XP,
+        "ANTMINER T19": LUXMinerT19,
+        "ANTMINER S21": LUXMinerS21,
    },
    MinerTypes.AURADINE: {
-        None: Auradine,
+        None: type("GoldshellUnknown", (Auradine, AuradineMake), {}),
        "AT1500": AuradineFluxAT1500,
        "AT2860": AuradineFluxAT2860,
        "AT2880": AuradineFluxAT2880,
@@ -498,7 +517,6 @@ class MinerFactory:
                    )
                except asyncio.TimeoutError:
                    pass
-
            miner = self._select_miner_from_classes(
                ip,
                miner_type=miner_type,
@@ -898,10 +916,11 @@ class MinerFactory:
    async def get_miner_model_braiins_os(self, ip: str) -> str | None:
        sock_json_data = await self.send_api_command(ip, "devdetails")
        try:
-            miner_model = sock_json_data["DEVDETAILS"][0]["Model"].replace(
-                "Bitmain ", ""
+            miner_model = (
+                sock_json_data["DEVDETAILS"][0]["Model"]
+                .replace("Bitmain ", "")
+                .replace("S19XP", "S19 XP")
            )
-
            return miner_model
        except (TypeError, LookupError):
            pass
@@ -914,7 +933,9 @@ class MinerFactory:
                )
            if d.status_code == 200:
                json_data = d.json()
-                miner_model = json_data["data"]["bosminer"]["info"]["modelName"]
+                miner_model = json_data["data"]["bosminer"]["info"][
+                    "modelName"
+                ].replace("S19XP", "S19 XP")
                return miner_model
        except (httpx.HTTPError, LookupError):
            pass
@@ -938,12 +959,16 @@ class MinerFactory:
            pass

    async def get_miner_model_epic(self, ip: str) -> str | None:
-        sock_json_data = await self.send_web_command(ip, ":4028/capabilities")
-        try:
-            miner_model = sock_json_data["Model"]
-            return miner_model
-        except (TypeError, LookupError):
-            pass
+        for retry_cnt in range(settings.get("get_data_retries", 1)):
+            sock_json_data = await self.send_web_command(ip, ":4028/capabilities")
+            try:
+                miner_model = sock_json_data["Model"]
+                return miner_model
+            except (TypeError, LookupError):
+                if retry_cnt < settings.get("get_data_retries", 1) - 1:
+                    continue
+                else:
+                    pass

    async def get_miner_model_hiveon(self, ip: str) -> str | None:
        sock_json_data = await self.send_api_command(ip, "version")
--- a/pyasic/miners/makes/init.py
+++ b/pyasic/miners/makes/init.py
@@ -39,3 +39,7 @@ class GoldshellMake(BaseMiner):

 class AuradineMake(BaseMiner):
    make = "Auradine"
+
+
+class ePICMake(BaseMiner):
+    make = "ePIC"
--- a/pyasic/miners/models/init.py
+++ b/pyasic/miners/models/init.py
@@ -20,3 +20,4 @@ from .avalonminer import *
 from .goldshell import *
 from .innosilicon import *
 from .whatsminer import *
+from .epic import *
--- a/pyasic/miners/models/antminer/X19/S19.py
+++ b/pyasic/miners/models/antminer/X19/S19.py
@@ -113,8 +113,28 @@ class S19kProNoPIC(AntMinerMake):
    expected_fans = 4


+class S19Hydro(AntMinerMake):
+    raw_model = "S19 Hydro"
+    expected_chips = 104
+    expected_hashboards = 4
+    expected_fans = 0
+
+
 class S19ProHydro(AntMinerMake):
    raw_model = "S19 Pro Hydro"
    expected_chips = 180
    expected_hashboards = 4
    expected_fans = 0
+
+
+class S19ProPlusHydro(AntMinerMake):
+    raw_model = "S19 Pro+ Hydro"
+    expected_chips = 180
+    expected_hashboards = 4
+    expected_fans = 0
+
+
+class S19KPro(AntMinerMake):
+    raw_model = "S19K Pro"
+    expected_chips = 77
+    expected_fans = 4
--- a/pyasic/miners/models/antminer/X19/init.py
+++ b/pyasic/miners/models/antminer/X19/init.py
@@ -20,6 +20,7 @@ from .S19 import (
    S19XP,
    S19a,
    S19aPro,
+    S19Hydro,
    S19i,
    S19j,
    S19jNoPIC,
@@ -32,5 +33,7 @@ from .S19 import (
    S19Pro,
    S19ProHydro,
    S19ProPlus,
+    S19ProPlusHydro,
+    S19KPro,
 )
 from .T19 import T19
--- a/pyasic/miners/models/antminer/X21/S21.py
+++ b/pyasic/miners/models/antminer/X21/S21.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 pyasic.miners.makes import AntMinerMake
+
+
+class S21(AntMinerMake):
+    raw_model = "S21"
+    expected_chips = 108
+    expected_fans = 4
--- a/pyasic/miners/models/antminer/X21/init.py
+++ b/pyasic/miners/models/antminer/X21/init.py
@@ -0,0 +1,19 @@
+# ------------------------------------------------------------------------------
+#  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 (
+    S21,
+)
--- a/pyasic/miners/models/antminer/init.py
+++ b/pyasic/miners/models/antminer/init.py
@@ -20,3 +20,4 @@ from .X9 import *
 from .X15 import *
 from .X17 import *
 from .X19 import *
+from .X21 import *
--- a/pyasic/miners/models/epic/init.py
+++ b/pyasic/miners/models/epic/init.py
@@ -0,0 +1 @@
+from .blockminer import *
--- a/pyasic/miners/models/epic/blockminer/init.py
+++ b/pyasic/miners/models/epic/blockminer/init.py
@@ -0,0 +1 @@
+from .blockminer import *
--- a/pyasic/miners/models/epic/blockminer/blockminer.py
+++ b/pyasic/miners/models/epic/blockminer/blockminer.py
@@ -0,0 +1,7 @@
+from pyasic.miners.makes import ePICMake
+
+
+class BlockMiner520i(ePICMake):
+    raw_model = "BlockMiner 520i"
+    expected_chips = 124
+    expected_fans = 4
--- a/pyasic/rpc/antminer.py
+++ b/pyasic/rpc/antminer.py
@@ -0,0 +1,36 @@
+from pyasic.rpc.bmminer import BMMinerRPCAPI
+
+
+class AntminerRPCAPI(BMMinerRPCAPI):
+    async def stats(self, new_api: bool = False) -> dict:
+        if new_api:
+            return await self.send_command("stats", new_api=True)
+        return await super().stats()
+
+    async def rate(self):
+        return await self.send_command("rate", new_api=True)
+
+    async def pools(self, new_api: bool = False):
+        if new_api:
+            return await self.send_command("pools", new_api=True)
+        return await self.send_command("pools")
+
+    async def reload(self):
+        return await self.send_command("reload", new_api=True)
+
+    async def summary(self, new_api: bool = False):
+        if new_api:
+            return await self.send_command("summary", new_api=True)
+        return await self.send_command("summary")
+
+    async def warning(self):
+        return await self.send_command("warning", new_api=True)
+
+    async def new_api_pools(self):
+        return await self.pools(new_api=True)
+
+    async def new_api_stats(self):
+        return await self.stats(new_api=True)
+
+    async def new_api_summary(self):
+        return await self.summary(new_api=True)
--- a/pyasic/rpc/base.py
+++ b/pyasic/rpc/base.py
@@ -196,6 +196,7 @@ If you are sure you want to use this command please use API.send_command("{comma
    async def _send_bytes(
        self,
        data: bytes,
+        *,
        port: int = None,
        timeout: int = 100,
    ) -> bytes:
--- a/pyasic/rpc/btminer.py
+++ b/pyasic/rpc/btminer.py
@@ -276,7 +276,7 @@ class BTMinerRPCAPI(BaseMinerRPCAPI):

        logging.debug(f"{self} - (Send Privileged Command) - Sending")
        try:
-            data = await self._send_bytes(enc_command, timeout)
+            data = await self._send_bytes(enc_command, timeout=timeout)
        except (asyncio.CancelledError, asyncio.TimeoutError):
            if ignore_errors:
                return {}
--- a/pyasic/settings/init.py
+++ b/pyasic/settings/init.py
@@ -28,6 +28,7 @@ _settings = {  # defaults
    "factory_get_timeout": 3,
    "get_data_retries": 1,
    "api_function_timeout": 5,
+    "antminer_mining_mode_as_str": False,
    "default_whatsminer_rpc_password": "admin",
    "default_innosilicon_web_password": "admin",
    "default_antminer_web_password": "root",
@@ -45,7 +46,9 @@ _settings = {  # defaults

 ssl_cxt = httpx.create_ssl_context()

-
+#this function configures socket options like SO_LINGER and returns an AsyncHTTPTransport instance to perform asynchronous HTTP requests 
+#using those options.
+#SO_LINGER controls what happens when you close a socket with unsent data - it allows specifying linger time for the data to be sent. 
 def transport(verify: Union[str, bool, SSLContext] = ssl_cxt):
    l_onoff = 1
    l_linger = get("so_linger_time", 1000)
--- a/pyasic/web/braiins_os/bosminer.py
+++ b/pyasic/web/braiins_os/bosminer.py
@@ -73,7 +73,9 @@ class BOSMinerWebAPI(BaseWebAPI):
        login = {"luci_username": self.username, "luci_password": self.pwd}
        url = f"http://{self.ip}:{self.port}/cgi-bin/luci"
        headers = {
-            "User-Agent": "BTC Tools v0.1",  # only seems to respond if this user-agent is set
+            "User-Agent": (
+                "BTC Tools v0.1"
+            ),  # only seems to respond if this user-agent is set
            "Content-Type": "application/x-www-form-urlencoded",
        }
        await session.post(url, headers=headers, data=login)
--- a/pyasic/web/epic.py
+++ b/pyasic/web/epic.py
@@ -44,37 +44,40 @@ class ePICWebAPI(BaseWebAPI):
        post = privileged or not parameters == {}

        async with httpx.AsyncClient(transport=settings.transport()) as client:
-            try:
-                if post:
-                    response = await client.post(
-                        f"http://{self.ip}:{self.port}/{command}",
-                        timeout=5,
-                        json={
-                            **parameters,
-                            "password": self.pwd,
-                        },
-                    )
-                else:
-                    response = await client.get(
-                        f"http://{self.ip}:{self.port}/{command}",
-                        timeout=5,
-                    )
-                if not response.status_code == 200:
-                    if not ignore_errors:
-                        raise APIError(
-                            f"Web command {command} failed with status code {response.status_code}"
+            for retry_cnt in range(settings.get("get_data_retries", 1)):
+                try:
+                    if post:
+                        response = await client.post(
+                            f"http://{self.ip}:{self.port}/{command}",
+                            timeout=5,
+                            json={
+                                **parameters,
+                                "password": self.pwd,
+                            },
                        )
-                    return {}
-                json_data = response.json()
-                if json_data:
-                    # The API can return a fail status if the miner cannot return the requested data. Catch this and pass
-                    if not json_data.get("result", True) and not post:
+                    else:
+                        response = await client.get(
+                            f"http://{self.ip}:{self.port}/{command}",
+                            timeout=5,
+                        )
+                    if not response.status_code == 200:
                        if not ignore_errors:
-                            raise APIError(json_data["error"])
-                    return json_data
-                return {"success": True}
-            except (httpx.HTTPError, json.JSONDecodeError, AttributeError):
-                pass
+                            raise APIError(
+                                f"Web command {command} failed with status code {response.status_code}"
+                            )
+                        return {}
+                    json_data = response.json()
+                    if json_data:
+                        # The API can return a fail status if the miner cannot return the requested data. Catch this and pass
+                        if not json_data.get("result", True) and not post:
+                            if retry_cnt < settings.get("get_data_retries", 1) - 1:
+                                continue
+                            if not ignore_errors:
+                                raise APIError(json_data["error"])
+                        return json_data
+                    return {"success": True}
+                except (httpx.HTTPError, json.JSONDecodeError, AttributeError):
+                    pass

    async def multicommand(
        self, *commands: str, ignore_errors: bool = False, allow_warning: bool = True
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pyasic"
-version = "0.52.0"
+version = "0.54.13"
 description = "A simplified and standardized interface for Bitcoin ASICs."
 authors = ["UpstreamData <brett@upstreamdata.ca>"]
 repository = "https://github.com/UpstreamData/pyasic"
@@ -9,7 +9,7 @@ readme = "README.md"

 [tool.poetry.dependencies]
 python = "^3.8"
-httpx = "^0.26.0"
+httpx = ">=0.26.0"
 asyncssh = "^2.14.2"
 passlib = "^1.7.4"
 pyaml = "^23.12.0"
--- a/tests/init.py
+++ b/tests/init.py
@@ -14,7 +14,7 @@
 #  limitations under the License.                                              -
 # ------------------------------------------------------------------------------

-from tests.api_tests import *
+from tests.rpc_tests import *
 from tests.config_tests import TestConfig
 from tests.miners_tests import MinersTest
 from tests.network_tests import NetworkTest
--- a/tests/config_tests/init.py
+++ b/tests/config_tests/init.py
@@ -128,9 +128,9 @@ class TestConfig(unittest.TestCase):
    def test_am_modern_serialize(self):
        correct_config = {
            "bitmain-fan-ctrl": True,
-            "bitmain-fan-pwn": "90",
+            "bitmain-fan-pwm": "90",
            "freq-level": "100",
-            "miner-mode": "0",
+            "miner-mode": 0,
            "pools": [
                {
                    "url": "stratum+tcp://stratum.test.io:3333",
--- a/tests/config_tests/fans.py
+++ b/tests/config_tests/fans.py
@@ -0,0 +1,35 @@
+import unittest
+
+from pyasic.config import FanModeConfig
+
+
+class TestFanConfig(unittest.TestCase):
+    def test_serialize_and_deserialize(self):
+        for fan_mode in FanModeConfig:
+            with self.subTest(
+                msg=f"Test serialization and deserialization of fan config",
+                fan_mode=fan_mode,
+            ):
+                conf = fan_mode()
+                dict_conf = conf.as_dict()
+                self.assertEqual(conf, FanModeConfig.from_dict(dict_conf))
+
+    def test_bosminer_deserialize_and_serialize(self):
+        for fan_mode in FanModeConfig:
+            with self.subTest(
+                msg=f"Test serialization and deserialization of bosminer fan config",
+                fan_mode=fan_mode,
+            ):
+                conf = fan_mode()
+                bos_conf = conf.as_bosminer()
+                self.assertEqual(conf, FanModeConfig.from_bosminer(bos_conf))
+
+    def test_am_modern_deserialize_and_serialize(self):
+        for fan_mode in FanModeConfig:
+            with self.subTest(
+                msg=f"Test serialization and deserialization of antminer modern fan config",
+                fan_mode=fan_mode,
+            ):
+                conf = fan_mode()
+                am_conf = conf.as_am_modern()
+                self.assertEqual(conf, FanModeConfig.from_am_modern(am_conf))
--- a/tests/rpc_tests/init.py
+++ b/tests/rpc_tests/init.py
Author	SHA1	Message	Date
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
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
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