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

reformatted the board util slightly

Browse Source
This commit is contained in:
UpstreamData
2022-01-26 15:35:44 -07:00
parent 3178083533
commit 58f0ce8e2d
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/bad_board_util/func/miners.py
View File

@@ -158,16 +158,19 @@ async def scan_and_get_data(network):
row_colors.append((ip_table_index, "white", "red")) row_colors.append((ip_table_index, "white", "red"))
else: else:
row_colors.append((ip_table_index, "white", "red")) row_colors.append((ip_table_index, "white", "red"))
board_left_chips = "\n".join(split_chips(board_left, 3))
board_center_chips = "\n".join(split_chips(board_center, 3))
board_right_chips = "\n".join(split_chips(board_right, 3))
data = [ data = [
data_point["IP"], data_point["IP"],
data_point["model"], data_point["model"],
len(board_left), len(board_left),
board_left, board_left_chips,
len(board_center), len(board_center),
board_center, board_center_chips,
len(board_right), len(board_right),
board_right board_right_chips
] ]
ip_table_data[ip_table_index] = data ip_table_data[ip_table_index] = data
window["ip_table"].update(ip_table_data, row_colors=row_colors) window["ip_table"].update(ip_table_data, row_colors=row_colors)
@@ -176,6 +179,11 @@ async def scan_and_get_data(network):
await update_ui_with_data("status", "") await update_ui_with_data("status", "")
def split_chips(string, number_of_splits):
k, m = divmod(len(string), number_of_splits)
return (string[i*k+min(i, m):(i+1)*k+min(i+1, m)] for i in range(number_of_splits))
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)
model = await miner.get_model() model = await miner.get_model()

20
tools/bad_board_util/layout.py
View File

@@ -4,20 +4,23 @@ icon_of_window = b'iVBORw0KGgoAAAANSUhEUgAAAF4AAABeCAYAAACq0qNuAAAAAXNSR0IArs4c6
layout = [ layout = [
[sg.Text("", key="status", size=(9, 1)), [sg.Text("", key="status", size=(9, 1)),
sg.ProgressBar(1000, key="progress", size=(104, 20), orientation='h'), sg.ProgressBar(1000, key="progress", size=(40, 20), orientation='h'),
sg.Text("", key="progress_percent", size=(9, 1))], sg.Text("", key="progress_percent", size=(9, 1)),
],
[sg.Text("", size=(100, 1))], [sg.Text("", size=(100, 1))],
[sg.Text('Network IP:', size=(9, 1)), [sg.Text('Network IP:', size=(9, 1)),
sg.InputText(key='miner_network', do_not_clear=True, size=(123, 1)), sg.InputText(key='miner_network', do_not_clear=True, size=(103, 1)),
sg.Button('Scan', key='scan')], sg.Button('Scan', key='scan'),
],
[sg.Text('IP List File:', size=(9, 1)), [sg.Text('IP List File:', size=(9, 1)),
sg.Input(key="file_iplist", do_not_clear=True, size=(123, 1)), sg.Input(key="file_iplist", do_not_clear=True, size=(103, 1)),
sg.FileBrowse(), sg.FileBrowse(),
sg.Button('Import', key="import_iplist"), sg.Button('Import', key="import_iplist"),
sg.Button('Export', key="export_iplist")], sg.Button('Export', key="export_iplist"),
],
[sg.Text(" IP List:", pad=(0, 0)), [sg.Text(" IP List:", pad=(0, 0)),
sg.Text("", key="ip_count", pad=(0, 0), size=(3, 1)), sg.Text("", key="ip_count", pad=(0, 0), size=(3, 1)),
@@ -39,14 +42,15 @@ layout = [
"R Count", "R Count",
"Right Board Chips" "Right Board Chips"
], ],
row_height=45,
auto_size_columns=False, auto_size_columns=False,
max_col_width=15, max_col_width=15,
justification="center", justification="center",
key="ip_table", key="ip_table",
col_widths=[9, 7, 7, 40, 7, 40, 7, 40], col_widths=[11, 7, 7, 30, 7, 30, 7, 30],
background_color="white", background_color="white",
text_color="black", text_color="black",
size=(125, 27), size=(100, 8),
expand_x=True, expand_x=True,
enable_click_events=True, enable_click_events=True,
)] )]