CAT_TOM/pyasic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature: add antminer mode as str setting.

Browse Source
This commit is contained in:
Upstream Data
2024-03-12 16:16:15 -06:00
parent 15d1dc5bb6
commit 0e00fe3114
4 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/index.md
View File

@@ -253,6 +253,7 @@ settings.update("default_antminer_password", "my_pwd")
"factory_get_timeout": 3, "factory_get_timeout": 3,
"get_data_retries": 1, "get_data_retries": 1,
"api_function_timeout": 5, "api_function_timeout": 5,
"antminer_mining_mode_as_str": False,
"default_whatsminer_password": "admin", "default_whatsminer_password": "admin",
"default_innosilicon_password": "admin", "default_innosilicon_password": "admin",
"default_antminer_password": "root", "default_antminer_password": "root",

1
docs/settings/settings.md
View File

@@ -12,6 +12,7 @@ Settings options:
- `factory_get_timeout` - `factory_get_timeout`
- `get_data_retries` - `get_data_retries`
- `api_function_timeout` - `api_function_timeout`
- `antminer_mining_mode_as_str`
- `default_whatsminer_password` - `default_whatsminer_password`
- `default_innosilicon_password` - `default_innosilicon_password`
- `default_antminer_password` - `default_antminer_password`

17
pyasic/config/mining.py
View File

@@ -17,6 +17,7 @@ from __future__ import annotations
from dataclasses import dataclass, field from dataclasses import dataclass, field
from pyasic import settings
from pyasic.config.base import MinerConfigOption, MinerConfigValue from pyasic.config.base import MinerConfigOption, MinerConfigValue
from pyasic.web.braiins_os.proto.braiins.bos.v1 import ( from pyasic.web.braiins_os.proto.braiins.bos.v1 import (
HashrateTargetMode, HashrateTargetMode,
@@ -39,7 +40,9 @@ class MiningModeNormal(MinerConfigValue):
return cls() return cls()
def as_am_modern(self) -> dict: def as_am_modern(self) -> dict:
if settings.get("antminer_mining_mode_as_str", False):
return {"miner-mode": "0"} return {"miner-mode": "0"}
return {"miner-mode": 0}
def as_wm(self) -> dict: def as_wm(self) -> dict:
return {"mode": self.mode} return {"mode": self.mode}
@@ -63,7 +66,9 @@ class MiningModeSleep(MinerConfigValue):
return cls() return cls()
def as_am_modern(self) -> dict: def as_am_modern(self) -> dict:
if settings.get("antminer_mining_mode_as_str", False):
return {"miner-mode": "1"} return {"miner-mode": "1"}
return {"miner-mode": 1}
def as_wm(self) -> dict: def as_wm(self) -> dict:
return {"mode": self.mode} return {"mode": self.mode}
@@ -87,7 +92,9 @@ class MiningModeLPM(MinerConfigValue):
return cls() return cls()
def as_am_modern(self) -> dict: def as_am_modern(self) -> dict:
if settings.get("antminer_mining_mode_as_str", False):
return {"miner-mode": "3"} return {"miner-mode": "3"}
return {"miner-mode": 3}
def as_wm(self) -> dict: def as_wm(self) -> dict:
return {"mode": self.mode} return {"mode": self.mode}
@@ -108,7 +115,9 @@ class MiningModeHPM(MinerConfigValue):
return cls() return cls()
def as_am_modern(self) -> dict: def as_am_modern(self) -> dict:
if settings.get("antminer_mining_mode_as_str", False):
return {"miner-mode": "0"} return {"miner-mode": "0"}
return {"miner-mode": 0}
def as_wm(self) -> dict: def as_wm(self) -> dict:
return {"mode": self.mode} return {"mode": self.mode}
@@ -165,7 +174,9 @@ class MiningModePowerTune(MinerConfigValue):
return cls(**cls_conf) return cls(**cls_conf)
def as_am_modern(self) -> dict: def as_am_modern(self) -> dict:
if settings.get("antminer_mining_mode_as_str", False):
return {"miner-mode": "0"} return {"miner-mode": "0"}
return {"miner-mode": 0}
def as_wm(self) -> dict: def as_wm(self) -> dict:
if self.power is not None: if self.power is not None:
@@ -204,7 +215,9 @@ class MiningModeHashrateTune(MinerConfigValue):
return cls(dict_conf.get("hashrate")) return cls(dict_conf.get("hashrate"))
def as_am_modern(self) -> dict: def as_am_modern(self) -> dict:
if settings.get("antminer_mining_mode_as_str", False):
return {"miner-mode": "0"} return {"miner-mode": "0"}
return {"miner-mode": 0}
def as_boser(self) -> dict: def as_boser(self) -> dict:
return { return {
@@ -239,7 +252,9 @@ class ManualBoardSettings(MinerConfigValue):
return cls(freq=dict_conf["freq"], volt=dict_conf["volt"]) return cls(freq=dict_conf["freq"], volt=dict_conf["volt"])
def as_am_modern(self) -> dict: def as_am_modern(self) -> dict:
if settings.get("antminer_mining_mode_as_str", False):
return {"miner-mode": "0"} return {"miner-mode": "0"}
return {"miner-mode": 0}
@dataclass @dataclass
@@ -259,7 +274,9 @@ class MiningModeManual(MinerConfigValue):
) )
def as_am_modern(self) -> dict: def as_am_modern(self) -> dict:
if settings.get("antminer_mining_mode_as_str", False):
return {"miner-mode": "0"} return {"miner-mode": "0"}
return {"miner-mode": 0}
@classmethod @classmethod
def from_vnish(cls, web_overclock_settings: dict) -> "MiningModeManual": def from_vnish(cls, web_overclock_settings: dict) -> "MiningModeManual":

1
pyasic/settings/__init__.py
View File

@@ -28,6 +28,7 @@ _settings = { # defaults
"factory_get_timeout": 3, "factory_get_timeout": 3,
"get_data_retries": 1, "get_data_retries": 1,
"api_function_timeout": 5, "api_function_timeout": 5,
"antminer_mining_mode_as_str": False,
"default_whatsminer_rpc_password": "admin", "default_whatsminer_rpc_password": "admin",
"default_innosilicon_web_password": "admin", "default_innosilicon_web_password": "admin",
"default_antminer_web_password": "root", "default_antminer_web_password": "root",