Merge dev branch into main (#25)

This commit is contained in:
Arceris
2022-12-19 08:35:29 -07:00
committed by GitHub
parent 5bde9d7fe6
commit 82006de30f
139 changed files with 940 additions and 1412 deletions

View File

@@ -28,8 +28,8 @@ from pyasic.settings import PyasicSettings
class CGMinerInnosiliconT3HPlus(CGMiner, InnosiliconT3HPlus):
def __init__(self, ip: str) -> None:
super().__init__(ip)
def __init__(self, ip: str, api_ver: str = "1.0.0") -> None:
super().__init__(ip, api_ver=api_ver)
self.ip = ip
self.uname = "admin"
self.pwd = PyasicSettings().global_innosilicon_password
@@ -181,6 +181,11 @@ class CGMinerInnosiliconT3HPlus(CGMiner, InnosiliconT3HPlus):
data.errors = await self.get_errors()
data.fault_light = await self.check_light()
await self.get_version()
data.api_ver = self.api_ver
data.fw_ver = self.fw_ver
miner_data = None
all_data = None
for i in range(PyasicSettings().miner_get_data_retries):