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

added wattage for whatsminers when scanning

Browse Source
This commit is contained in:
UpstreamData
2022-01-05 11:58:42 -07:00
parent e0d8078bf1
commit c26a2cc99e
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cfg_util/func/__init__.py
View File

@@ -13,6 +13,7 @@ from cfg_util.layout import window
from cfg_util.miner_factory import miner_factory from cfg_util.miner_factory import miner_factory
from config.bos import bos_config_convert, general_config_convert_bos from config.bos import bos_config_convert, general_config_convert_bos
from settings import CFG_UTIL_CONFIG_THREADS as CONFIG_THREADS from settings import CFG_UTIL_CONFIG_THREADS as CONFIG_THREADS
from miners.btminer import BTMiner
async def update_ui_with_data(key, message, append=False): async def update_ui_with_data(key, message, append=False):
@@ -224,7 +225,10 @@ async def get_formatted_data(ip: ipaddress.ip_address):
if "tunerstatus" in miner_data.keys(): if "tunerstatus" in miner_data.keys():
wattage = await safe_parse_api_data(miner_data, "tunerstatus", 0, 'TUNERSTATUS', 0, "PowerLimit") wattage = await safe_parse_api_data(miner_data, "tunerstatus", 0, 'TUNERSTATUS', 0, "PowerLimit")
# data['tunerstatus'][0]['TUNERSTATUS'][0]['PowerLimit'] # data['tunerstatus'][0]['TUNERSTATUS'][0]['PowerLimit']
elif "Power" in miner_data["summary"][0]["SUMMARY"][0].keys():
wattage = await safe_parse_api_data(miner_data, "summary", 0, 'SUMMARY', 0, "Power")
else: else:
print(miner_data)
wattage = 0 wattage = 0
if "summary" in miner_data.keys(): if "summary" in miner_data.keys():
if 'MHS 5s' in miner_data['summary'][0]['SUMMARY'][0].keys(): if 'MHS 5s' in miner_data['summary'][0]['SUMMARY'][0].keys():

7
miners/btminer.py
View File

@@ -1,5 +1,6 @@
from API.btminer import BTMinerAPI from API.btminer import BTMinerAPI
from miners import BaseMiner from miners import BaseMiner
from API import APIError
class BTMiner(BaseMiner): class BTMiner(BaseMiner):
@@ -11,7 +12,11 @@ class BTMiner(BaseMiner):
return f"BTMiner: {str(self.ip)}" return f"BTMiner: {str(self.ip)}"
async def get_hostname(self) -> str: async def get_hostname(self) -> str:
return "BTMiner Unknown" try:
host_data = await self.api.get_miner_info("hostname")
print(host_data)
except APIError:
return "BTMiner Unknown"
async def send_config(self, _): async def send_config(self, _):
return None # ignore for now return None # ignore for now