From 40bacbf41cc7d59de516478898c432e4a7ac7012 Mon Sep 17 00:00:00 2001 From: UpstreamData Date: Mon, 16 May 2022 15:00:52 -0600 Subject: [PATCH] add getting mac for whatsminers --- miners/__init__.py | 3 +++ miners/_backends/btminer.py | 9 +++++++++ miners/miner_factory.py | 1 - 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/miners/__init__.py b/miners/__init__.py index 0af18dd0..fe182a33 100644 --- a/miners/__init__.py +++ b/miners/__init__.py @@ -83,6 +83,9 @@ class BaseMiner: async def send_config(self, *args, **kwargs): return None + async def get_mac(self): + return None + async def get_data(self): data = { "IP": str(self.ip), diff --git a/miners/_backends/btminer.py b/miners/_backends/btminer.py index 2d656eaf..936fb856 100644 --- a/miners/_backends/btminer.py +++ b/miners/_backends/btminer.py @@ -72,6 +72,15 @@ class BTMiner(BaseMiner): logging.debug(f"Found board data for {self}: {boards}") return boards + 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"] + return str(mac).upper() + async def get_data(self): data = { "IP": str(self.ip), diff --git a/miners/miner_factory.py b/miners/miner_factory.py index 6a95d56a..3c13b4da 100644 --- a/miners/miner_factory.py +++ b/miners/miner_factory.py @@ -252,7 +252,6 @@ class MinerFactory(metaclass=Singleton): miner = CGMiner(str(ip)) elif "BTMiner" in api: miner = BTMiner(str(ip)) - print(miner) elif "BMMiner" in api: miner = BMMiner(str(ip))