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

bug: fix data passed by get_version to BOSminer.

Browse Source
This commit is contained in:
UpstreamData
2024-01-11 09:53:06 -07:00
parent bb481553fa
commit 014896ae1b
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pyasic/miners/backends/braiins_os.py
View File

@@ -289,16 +289,17 @@ class BOSMiner(BaseMiner):
gateway: str, gateway: str,
subnet_mask: str = "255.255.255.0", subnet_mask: str = "255.255.255.0",
): ):
cfg_data_lan = ( cfg_data_lan = "\n\t".join(
"config interface 'lan'\n\toption type 'bridge'\n\toption ifname 'eth0'\n\toption proto 'static'\n\toption ipaddr '" [
+ ip "config interface 'lan'",
+ "'\n\toption netmask '" "option type 'bridge'",
+ subnet_mask "option ifname 'eth0'",
+ "'\n\toption gateway '" "option proto 'static'",
+ gateway f"option ipaddr '{ip}'",
+ "'\n\toption dns '" f"option netmask '{subnet_mask}'",
+ dns f"option gateway '{gateway}'",
+ "'" f"option dns '{dns}'",
]
) )
data = await self.send_ssh_command("cat /etc/config/network") data = await self.send_ssh_command("cat /etc/config/network")
@@ -314,7 +315,14 @@ class BOSMiner(BaseMiner):
await conn.run("echo '" + config + "' > /etc/config/network") await conn.run("echo '" + config + "' > /etc/config/network")
async def set_dhcp(self): async def set_dhcp(self):
cfg_data_lan = "config interface 'lan'\n\toption type 'bridge'\n\toption ifname 'eth0'\n\toption proto 'dhcp'" cfg_data_lan = "\n\t".join(
[
"config interface 'lan'",
"option type 'bridge'",
"option ifname 'eth0'",
"option proto 'dhcp'",
]
)
data = await self.send_ssh_command("cat /etc/config/network") data = await self.send_ssh_command("cat /etc/config/network")
split_data = data.split("\n\n") split_data = data.split("\n\n")
@@ -335,9 +343,7 @@ class BOSMiner(BaseMiner):
async def get_mac(self, web_net_conf: Union[dict, list] = None) -> Optional[str]: async def get_mac(self, web_net_conf: Union[dict, list] = None) -> Optional[str]:
if not web_net_conf: if not web_net_conf:
try: try:
web_net_conf = await self.web.luci.send_command( web_net_conf = await self.web.luci.get_net_conf()
"admin/network/iface_status/lan"
)
except APIError: except APIError:
pass pass
@@ -361,11 +367,11 @@ class BOSMiner(BaseMiner):
return "? (BOS)" return "? (BOS)"
async def get_version( async def get_version(
self, api_version: dict = None, graphql_version: dict = None self, api_version: dict = None, web_bos_info: dict = None
) -> Tuple[Optional[str], Optional[str]]: ) -> Tuple[Optional[str], Optional[str]]:
miner_version = namedtuple("MinerVersion", "api_ver fw_ver") miner_version = namedtuple("MinerVersion", "api_ver fw_ver")
api_ver_t = asyncio.create_task(self.get_api_ver(api_version)) api_ver_t = asyncio.create_task(self.get_api_ver(api_version))
fw_ver_t = asyncio.create_task(self.get_fw_ver()) fw_ver_t = asyncio.create_task(self.get_fw_ver(web_bos_info))
await asyncio.gather(api_ver_t, fw_ver_t) await asyncio.gather(api_ver_t, fw_ver_t)
return miner_version(api_ver=api_ver_t.result(), fw_ver=fw_ver_t.result()) return miner_version(api_ver=api_ver_t.result(), fw_ver=fw_ver_t.result())