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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
UpstreamData
2022-05-31 13:18:59 -06:00
parent e7b01ccdab 38506903ea
commit e6d3ec01fe
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
miners/_backends/bmminer.py
View File

@@ -171,7 +171,7 @@ class BMMiner(BaseMiner):
if len(boards) > 0: if len(boards) > 0:
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"fan{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

8
miners/_backends/bosminer.py
View File

@@ -247,6 +247,10 @@ class BOSMiner(BaseMiner):
async def get_data(self) -> MinerData: async def get_data(self) -> MinerData:
data = MinerData(ip=str(self.ip), ideal_chips=self.nominal_chips * 3) data = MinerData(ip=str(self.ip), ideal_chips=self.nominal_chips * 3)
board_offset = -1
fan_offset = -1
model = await self.get_model() model = await self.get_model()
hostname = await self.get_hostname() hostname = await self.get_hostname()
@@ -285,7 +289,7 @@ class BOSMiner(BaseMiner):
if temp: if temp:
if len(temp) > 0: if len(temp) > 0:
board_map = {0: "left_board", 1: "center_board", 2: "right_board"} board_map = {0: "left_board", 1: "center_board", 2: "right_board"}
offset = temp[0]["ID"] offset = 6 if temp[0]["ID"] in [6, 7, 8] else temp[0]["ID"]
for board in temp: for board in temp:
_id = board["ID"] - offset _id = board["ID"] - offset
chip_temp = round(board["Chip"]) chip_temp = round(board["Chip"])
@@ -358,7 +362,7 @@ class BOSMiner(BaseMiner):
if boards: if boards:
if len(boards) > 0: if len(boards) > 0:
board_map = {0: "left_chips", 1: "center_chips", 2: "right_chips"} board_map = {0: "left_chips", 1: "center_chips", 2: "right_chips"}
offset = boards[0]["ID"] offset = 6 if boards[0]["ID"] in [6, 7, 8] else boards[0]["ID"]
for board in boards: for board in boards:
_id = board["ID"] - offset _id = board["ID"] - offset
chips = board["Chips"] chips = board["Chips"]