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

Avalon Nano3s Fixes (#374)

Browse Source 
* Avalon Nano3s Fixes

* Fix to handle both cases

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
Ryan Heideman
2025-08-30 21:04:58 -07:00
committed by GitHub
parent 1466039e08
commit 68299fa54d
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pyasic/miners/avalonminer/cgminer/nano/nano3.py
View File

@@ -178,8 +178,7 @@ class CGMinerAvalonNano3s(AvalonMiner, AvalonNano3s):
if rpc_estats is not None: if rpc_estats is not None:
try: try:
unparsed_estats = rpc_estats["STATS"][0]["MM ID0"] parsed_estats = self.parse_estats(rpc_estats)["STATS"][0]["MM ID0"]
parsed_estats = self.parse_estats(unparsed_estats)
return int(parsed_estats["PS"][6]) return int(parsed_estats["PS"][6])
except (IndexError, KeyError, ValueError, TypeError): except (IndexError, KeyError, ValueError, TypeError):
pass pass
@@ -193,8 +192,7 @@ class CGMinerAvalonNano3s(AvalonMiner, AvalonNano3s):
if rpc_estats is not None: if rpc_estats is not None:
try: try:
unparsed_estats = rpc_estats["STATS"][0]["MM ID0"] parsed_estats = self.parse_estats(rpc_estats)["STATS"][0]["MM ID0"]
parsed_estats = self.parse_estats(unparsed_estats)
return self.algo.hashrate( return self.algo.hashrate(
rate=float(parsed_estats["GHSspd"]), unit=self.algo.unit.GH rate=float(parsed_estats["GHSspd"]), unit=self.algo.unit.GH
).into(self.algo.unit.default) ).into(self.algo.unit.default)
@@ -212,14 +210,13 @@ class CGMinerAvalonNano3s(AvalonMiner, AvalonNano3s):
if rpc_estats is not None: if rpc_estats is not None:
try: try:
unparsed_estats = rpc_estats["STATS"][0]["MM ID0"] parsed_estats = self.parse_estats(rpc_estats)["STATS"][0]["MM ID0"]
parsed_estats = self.parse_estats(unparsed_estats)
except (IndexError, KeyError, ValueError, TypeError): except (IndexError, KeyError, ValueError, TypeError):
return hashboards return hashboards
for board in range(len(hashboards)): for board in range(len(hashboards)):
try: try:
board_hr = parsed_estats["GHSspd"][board] board_hr = parsed_estats["GHSspd"]
hashboards[board].hashrate = self.algo.hashrate( hashboards[board].hashrate = self.algo.hashrate(
rate=float(board_hr), unit=self.algo.unit.GH rate=float(board_hr), unit=self.algo.unit.GH
).into(self.algo.unit.default) ).into(self.algo.unit.default)

18
pyasic/miners/backends/avalonminer.py
View File

@@ -305,10 +305,12 @@ class AvalonMiner(CGMiner):
hashboards[board].chip_temp = int( hashboards[board].chip_temp = int(
parsed_estats["STATS"][0]["MM ID0"]["MTmax"][board] parsed_estats["STATS"][0]["MM ID0"]["MTmax"][board]
) )
except LookupError: except (LookupError, TypeError):
try: try:
hashboards[board].chip_temp = int( hashboards[board].chip_temp = int(
parsed_estats["STATS"][0]["MM ID0"]["Tmax"] parsed_estats["STATS"][0]["MM ID0"].get(
"Tmax", parsed_estats["STATS"][0]["MM ID0"]["TMax"]
)
) )
except LookupError: except LookupError:
pass pass
@@ -317,10 +319,12 @@ class AvalonMiner(CGMiner):
hashboards[board].temp = int( hashboards[board].temp = int(
parsed_estats["STATS"][0]["MM ID0"]["MTmax"][board] parsed_estats["STATS"][0]["MM ID0"]["MTmax"][board]
) )
except LookupError: except (LookupError, TypeError):
try: try:
hashboards[board].temp = int( hashboards[board].temp = int(
parsed_estats["STATS"][0]["MM ID0"]["Tavg"] parsed_estats["STATS"][0]["MM ID0"].get(
"Tavg", parsed_estats["STATS"][0]["MM ID0"]["TAvg"]
)
) )
except LookupError: except LookupError:
pass pass
@@ -329,7 +333,7 @@ class AvalonMiner(CGMiner):
hashboards[board].inlet_temp = int( hashboards[board].inlet_temp = int(
parsed_estats["STATS"][0]["MM ID0"]["MTavg"][board] parsed_estats["STATS"][0]["MM ID0"]["MTavg"][board]
) )
except LookupError: except (LookupError, TypeError):
try: try:
hashboards[board].inlet_temp = int( hashboards[board].inlet_temp = int(
parsed_estats["STATS"][0]["MM ID0"]["HBITemp"] parsed_estats["STATS"][0]["MM ID0"]["HBITemp"]
@@ -341,7 +345,7 @@ class AvalonMiner(CGMiner):
hashboards[board].outlet_temp = int( hashboards[board].outlet_temp = int(
parsed_estats["STATS"][0]["MM ID0"]["MTmax"][board] parsed_estats["STATS"][0]["MM ID0"]["MTmax"][board]
) )
except LookupError: except (LookupError, TypeError):
try: try:
hashboards[board].outlet_temp = int( hashboards[board].outlet_temp = int(
parsed_estats["STATS"][0]["MM ID0"]["HBOTemp"] parsed_estats["STATS"][0]["MM ID0"]["HBOTemp"]
@@ -356,7 +360,7 @@ class AvalonMiner(CGMiner):
hashboards[board].chips = len( hashboards[board].chips = len(
[item for item in chip_data if not item == "0"] [item for item in chip_data if not item == "0"]
) )
except LookupError: except (LookupError, TypeError):
try: try:
chip_data = parsed_estats["STATS"][0]["HBinfo"][f"HB{board}"][ chip_data = parsed_estats["STATS"][0]["HBinfo"][f"HB{board}"][
f"PVT_T{board}" f"PVT_T{board}"