From 0d497baa454a05214aee4cadcdc64caa6a9b1369 Mon Sep 17 00:00:00 2001 From: UpstreamData Date: Fri, 3 Jun 2022 14:55:03 -0600 Subject: [PATCH] added mac for M20 series --- miners/_backends/btminer.py | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/miners/_backends/btminer.py b/miners/_backends/btminer.py index 244c4f41..888e2487 100644 --- a/miners/_backends/btminer.py +++ b/miners/_backends/btminer.py @@ -80,11 +80,22 @@ class BTMiner(BaseMiner): async def get_mac(self): mac = "" - data = await self.api.get_miner_info() - if data: - if "Msg" in data.keys(): - if "mac" in data["Msg"].keys(): - mac = data["Msg"]["mac"] + try: + data = await self.api.get_miner_info() + if data: + if "Msg" in data.keys(): + if "mac" in data["Msg"].keys(): + mac = data["Msg"]["mac"] + except APIError: + pass + if mac == "": + data = await self.api.summary() + if data: + if data.get("SUMMARY"): + if len(data["SUMMARY"]) > 0: + _mac = data["SUMMARY"][0].get("MAC") + if _mac: + mac = _mac return str(mac).upper() async def get_data(self): @@ -92,14 +103,22 @@ class BTMiner(BaseMiner): try: model = await self.get_model() - hostname = await self.get_hostname() - mac = await self.get_mac() except APIError: - logging.warning(f"Failed to get hostname, mac, and model: {self}") + logging.info(f"Failed to get model: {self}") model = None data.model = "Whatsminer" + + try: + hostname = await self.get_hostname() + except APIError: + logging.info(f"Failed to get hostname: {self}") hostname = None data.hostname = "Whatsminer" + + try: + mac = await self.get_mac() + except APIError: + logging.info(f"Failed to get mac: {self}") mac = None if model: