Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0ed7559aef | ||
|
|
275d87e4fe | ||
|
|
c3ab814d77 | ||
|
|
05a8569205 |
@@ -89,6 +89,8 @@ class PoolMetrics:
|
|||||||
@staticmethod
|
@staticmethod
|
||||||
def _calculate_percentage(value: int, total: int) -> float:
|
def _calculate_percentage(value: int, total: int) -> float:
|
||||||
"""Calculate the percentage."""
|
"""Calculate the percentage."""
|
||||||
|
if value is None or total is None:
|
||||||
|
return 0
|
||||||
if total == 0:
|
if total == 0:
|
||||||
return 0
|
return 0
|
||||||
return (value / total) * 100
|
return (value / total) * 100
|
||||||
|
|||||||
@@ -597,49 +597,44 @@ class AntminerOld(CGMiner):
|
|||||||
pass
|
pass
|
||||||
|
|
||||||
if rpc_stats is not None:
|
if rpc_stats is not None:
|
||||||
try:
|
board_offset = -1
|
||||||
board_offset = -1
|
boards = rpc_stats["STATS"]
|
||||||
boards = rpc_stats["STATS"]
|
if len(boards) > 1:
|
||||||
if len(boards) > 1:
|
for board_num in range(1, 16, 5):
|
||||||
for board_num in range(1, 16, 5):
|
for _b_num in range(5):
|
||||||
for _b_num in range(5):
|
b = boards[1].get(f"chain_acn{board_num + _b_num}")
|
||||||
b = boards[1].get(f"chain_acn{board_num + _b_num}")
|
|
||||||
|
|
||||||
if b and not b == 0 and board_offset == -1:
|
if b and not b == 0 and board_offset == -1:
|
||||||
board_offset = board_num
|
board_offset = board_num
|
||||||
if board_offset == -1:
|
if board_offset == -1:
|
||||||
board_offset = 1
|
board_offset = 1
|
||||||
|
|
||||||
for i in range(
|
for i in range(board_offset, board_offset + self.expected_hashboards):
|
||||||
board_offset, board_offset + self.expected_hashboards
|
hashboard = HashBoard(
|
||||||
):
|
slot=i - board_offset, expected_chips=self.expected_chips
|
||||||
hashboard = HashBoard(
|
)
|
||||||
slot=i - board_offset, expected_chips=self.expected_chips
|
|
||||||
)
|
|
||||||
|
|
||||||
chip_temp = boards[1].get(f"temp{i}")
|
chip_temp = boards[1].get(f"temp{i}")
|
||||||
if chip_temp:
|
if chip_temp:
|
||||||
hashboard.chip_temp = round(chip_temp)
|
hashboard.chip_temp = round(chip_temp)
|
||||||
|
|
||||||
temp = boards[1].get(f"temp2_{i}")
|
temp = boards[1].get(f"temp2_{i}")
|
||||||
if temp:
|
if temp:
|
||||||
hashboard.temp = round(temp)
|
hashboard.temp = round(temp)
|
||||||
|
|
||||||
hashrate = boards[1].get(f"chain_rate{i}")
|
hashrate = boards[1].get(f"chain_rate{i}")
|
||||||
if hashrate:
|
if hashrate:
|
||||||
hashboard.hashrate = AlgoHashRate.SHA256(
|
hashboard.hashrate = AlgoHashRate.SHA256(
|
||||||
hashrate, HashUnit.SHA256.GH
|
float(hashrate), HashUnit.SHA256.GH
|
||||||
).into(self.algo.unit.default)
|
).into(self.algo.unit.default)
|
||||||
|
|
||||||
chips = boards[1].get(f"chain_acn{i}")
|
chips = boards[1].get(f"chain_acn{i}")
|
||||||
if chips:
|
if chips:
|
||||||
hashboard.chips = chips
|
hashboard.chips = chips
|
||||||
hashboard.missing = False
|
hashboard.missing = False
|
||||||
if (not chips) or (not chips > 0):
|
if (not chips) or (not chips > 0):
|
||||||
hashboard.missing = True
|
hashboard.missing = True
|
||||||
hashboards.append(hashboard)
|
hashboards.append(hashboard)
|
||||||
except (LookupError, ValueError, TypeError):
|
|
||||||
pass
|
|
||||||
|
|
||||||
return hashboards
|
return hashboards
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[tool.poetry]
|
[tool.poetry]
|
||||||
name = "pyasic"
|
name = "pyasic"
|
||||||
version = "0.61.10"
|
version = "0.61.12"
|
||||||
description = "A simplified and standardized interface for Bitcoin ASICs."
|
description = "A simplified and standardized interface for Bitcoin ASICs."
|
||||||
authors = ["UpstreamData <brett@upstreamdata.ca>"]
|
authors = ["UpstreamData <brett@upstreamdata.ca>"]
|
||||||
repository = "https://github.com/UpstreamData/pyasic"
|
repository = "https://github.com/UpstreamData/pyasic"
|
||||||
|
|||||||
Reference in New Issue
Block a user