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

added X19 temp support

Browse Source
This commit is contained in:
UpstreamData
2022-01-06 10:12:18 -07:00
parent 23d465a733
commit 6db7cd4a1f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cfg_util/func/miners.py
View File

@@ -182,7 +182,7 @@ async def scan_and_get_data(network):
async def get_formatted_data(ip: ipaddress.ip_address): async def get_formatted_data(ip: ipaddress.ip_address):
miner = await miner_factory.get_miner(ip) miner = await miner_factory.get_miner(ip)
try: try:
miner_data = await miner.api.multicommand("summary", "devs", "temps", "tunerstatus", "pools") miner_data = await miner.api.multicommand("summary", "devs", "temps", "tunerstatus", "pools", "stats")
except APIError: except APIError:
return {'TH/s': "Unknown", 'IP': str(miner.ip), 'host': "Unknown", 'user': "Unknown", 'wattage': 0} return {'TH/s': "Unknown", 'IP': str(miner.ip), 'host': "Unknown", 'user': "Unknown", 'wattage': 0}
host = await miner.get_hostname() host = await miner.get_hostname()
@@ -201,19 +201,24 @@ async def get_formatted_data(ip: ipaddress.ip_address):
else: else:
th5s = 0 th5s = 0
temps = 0 temps = 0
if "temps" in miner_data.keys() and not miner_data["temps"][0]['TEMPS'] == []: if "temps" in miner_data.keys() and not miner_data["temps"][0]['TEMPS'] == []:
if "Chip" in miner_data["temps"][0]['TEMPS'][0].keys(): if "Chip" in miner_data["temps"][0]['TEMPS'][0].keys():
for board in miner_data["temps"][0]['TEMPS']: for board in miner_data["temps"][0]['TEMPS']:
if board["Chip"] is not None and not board["Chip"] == 0.0: if board["Chip"] is not None and not board["Chip"] == 0.0:
temps = board["Chip"] temps = board["Chip"]
elif "devs" in miner_data.keys() and not miner_data["devs"][0]['DEVS'] == []: if "devs" in miner_data.keys() and not miner_data["devs"][0]['DEVS'] == []:
if "Chip Temp Avg" in miner_data["devs"][0]['DEVS'][0].keys(): if "Chip Temp Avg" in miner_data["devs"][0]['DEVS'][0].keys():
for board in miner_data["devs"][0]['DEVS']: for board in miner_data["devs"][0]['DEVS']:
if board['Chip Temp Avg'] is not None and not board['Chip Temp Avg'] == 0.0: if board['Chip Temp Avg'] is not None and not board['Chip Temp Avg'] == 0.0:
temps = board['Chip Temp Avg'] temps = board['Chip Temp Avg']
if "stats" in miner_data.keys() and not miner_data["stats"][0]['STATS'] == []:
for temp in ["temp2", "temp1", "temp3"]:
if temp in miner_data["stats"][0]['STATS'][1].keys():
if miner_data["stats"][0]['STATS'][1][temp] is not None and not miner_data["stats"][0]['STATS'][1][temp] == 0.0:
temps = miner_data["stats"][0]['STATS'][1][temp]
if "pools" not in miner_data.keys(): if "pools" not in miner_data.keys():
user = "?" user = "?"
elif not miner_data['pools'][0]['POOLS'] == []: elif not miner_data['pools'][0]['POOLS'] == []: