added a braiinsUpdate in main and added HR total in config tool

This commit is contained in:
UpstreamData
2021-11-03 09:36:03 -06:00
parent 26ecdde6d4
commit 3fb37f2741
2 changed files with 18 additions and 2 deletions

View File

@@ -27,16 +27,19 @@ layout = [
sg.Column([
[sg.Text("IP List:", pad=(0, 0)), sg.Text("", key="ip_count", pad=(1, 0), size=(3, 1)),
sg.Button('ALL', key="select_all_ips")],
[sg.Text("")],
[sg.Listbox([], size=(20, 32), key="ip_list", select_mode='extended')]
]),
sg.Column([
[sg.Text("Data: ", pad=(0, 0)), sg.Button('GET', key="get_data"), sg.Button('SORT IP', key="sort_data_ip"),
sg.Button('SORT HR', key="sort_data_hr"), sg.Button('SORT USER', key="sort_data_user"), sg.Button('SORT W', key="sort_data_w")],
[sg.Text("HR Total: ", pad=(0, 0)), sg.Text("", key="hr_total")],
[sg.Listbox([], size=(70, 32), key="hr_list")]
]),
sg.Column([
[sg.Text("Config"), sg.Button("IMPORT", key="import_config"), sg.Button("CONFIG", key="send_config"),
sg.Button("LIGHT", key="light"), sg.Button("GENERATE", key="generate_config")],
[sg.Text("")],
[sg.Multiline(size=(50, 34), key="config", do_not_clear=True)],
])
],
@@ -146,6 +149,8 @@ async def get_data(ip_list: list):
ips = [ipaddress.ip_address(ip) for ip in ip_list]
ips.sort()
data = await asyncio.gather(*[get_formatted_data(miner) for miner in ips])
total_hr = round(sum(d.get('TH/s', 0) for d in data), 2)
window["hr_total"].update(f"{total_hr} TH/s")
window["hr_list"].update(disabled=False)
window["hr_list"].update([item['IP'] + " | "
+ item['host'] + " | "

15
main.py
View File

@@ -16,9 +16,20 @@ async def main():
async def main_bad():
miner_network = MinerNetwork('192.168.1.1')
miners = await miner_network.scan_network_for_miners()
bad_list = list(filter(None, await asyncio.gather(*[miner.get_bad_boards() for miner in miners])))
bad_list = list(filter(None, await asyncio.gather(*[miner.get_bad_boards() for miner in miners if isinstance(miner, BOSminer)])))
print(bad_list)
print(len(bad_list))
async def braiins_update():
miners = [BOSminer('192.168.1.36')]
cmd = "wget -O /tmp/firmware.tar https://feeds.braiins-os.com/am1-s9/firmware_2021-10-27-0-a6497b86-21.09.3-plus_arm_cortex-a9_neon.tar && sysupgrade /tmp/firmware.tar"
tasks = []
for miner in miners:
if isinstance(miner, BOSminer):
tasks.append(miner.send_ssh_command(cmd))
results = await asyncio.gather(*tasks)
print(results)
if __name__ == '__main__':
asyncio.get_event_loop().run_until_complete(main())
asyncio.new_event_loop().run_until_complete(braiins_update())