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

added chip percent to config tool

Browse Source
This commit is contained in:
UpstreamData
2022-05-25 15:02:48 -06:00
parent 568f86700b
commit 3a11b173c3
4 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/cfg_util/layout.py
View File

@@ -97,6 +97,7 @@ TABLE_HEADERS = {
"Model",
"Ideal",
"Total",
"Chip %",
"Left Board",
"Center Board",
"Right Board",
@@ -176,6 +177,7 @@ WATTAGE_COL_WIDTH = 10
SPLIT_COL_WIDTH = 8
TOTAL_CHIP_WIDTH = 9
IDEAL_CHIP_WIDTH = 9
CHIP_PERCENT_WIDTH = 10
SCAN_COL_WIDTHS = [
IP_COL_WIDTH,
MODEL_COL_WIDTH,
@@ -279,6 +281,7 @@ def get_boards_layout():
MODEL_COL_WIDTH,
TOTAL_CHIP_WIDTH,
IDEAL_CHIP_WIDTH,
CHIP_PERCENT_WIDTH,
]
add_length = TABLE_TOTAL_WIDTH - sum(BOARDS_COL_WIDTHS)
for i in range(3):

4
tools/cfg_util/scan/__init__.py
View File

@@ -26,6 +26,7 @@ DATA_HEADER_MAP = {
"pool_1_user": "Pool 1 User",
"pool_2_url": "Pool 2",
"pool_2_user": "Pool 2 User",
"percent_ideal": "Chip %",
}
DEFAULT_DATA = set()
@@ -117,5 +118,6 @@ async def _get_data(miner):
_data = (await miner.get_data()).asdict()
data = {}
for item in _data.keys():
data[DATA_HEADER_MAP[item]] = _data[item]
if item in DATA_HEADER_MAP.keys():
data[DATA_HEADER_MAP[item]] = _data[item]
return data

8
tools/cfg_util/tables.py
View File

@@ -139,6 +139,11 @@ class TableManager(metaclass=Singleton):
item[
"Hashrate"
] = f"{format(float(item['Hashrate']), '.2f').rjust(6, ' ')} TH/s"
if "Chip %" in keys:
if not isinstance(item["Chip %"], str):
item["Chip %"] = f"{item['Chip %']}%"
for _key in keys:
for table in TABLE_HEADERS.keys():
for idx, header in enumerate(TABLE_HEADERS[table]):
@@ -182,6 +187,9 @@ class TableManager(metaclass=Singleton):
if self.sort_key == "IP":
return ipaddress.ip_address(self.data[data_key]["IP"])
if self.sort_key == "Chip %":
return int((self.data[data_key]["Chip %"]).replace("%", ""))
if self.sort_key == "Hashrate":
if self.data[data_key]["Hashrate"] == "":
return -1