From 198eedcd4389df05dcdd41b434d1385e3dda0036 Mon Sep 17 00:00:00 2001 From: UpstreamData Date: Fri, 10 Jun 2022 11:03:09 -0600 Subject: [PATCH] added env_temp for whatsminers --- data/__init__.py | 1 + miners/_backends/btminer.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/data/__init__.py b/data/__init__.py index f4639359..a2f9c845 100644 --- a/data/__init__.py +++ b/data/__init__.py @@ -40,6 +40,7 @@ class MinerData: hostname: str = "Unknown" hashrate: float = 0 temperature_avg: int = field(init=False) + env_temp: int = 0 left_board_temp: int = 0 left_board_chip_temp: int = 0 center_board_temp: int = 0 diff --git a/miners/_backends/btminer.py b/miners/_backends/btminer.py index 040d80cc..e8c9aa33 100644 --- a/miners/_backends/btminer.py +++ b/miners/_backends/btminer.py @@ -30,7 +30,7 @@ class BTMiner(BaseMiner): logging.warning(f"Failed to get model for miner: {self}") return None - async def get_hostname(self) -> str: + async def get_hostname(self) -> str or None: if self.hostname: return self.hostname try: @@ -42,10 +42,10 @@ class BTMiner(BaseMiner): return self.hostname except APIError: logging.info(f"Failed to get hostname for miner: {self}") - return "?" + return None except Exception: logging.warning(f"Failed to get hostname for miner: {self}") - return "?" + return None async def get_board_info(self) -> dict: """Gets data on each board and chain in the miner.""" @@ -147,6 +147,9 @@ class BTMiner(BaseMiner): if summary_data[0].get("MAC"): mac = summary_data[0]["MAC"] + if summary_data[0].get("Env Temp"): + data.env_temp = summary_data[0]["Env Temp"] + data.fan_1 = summary_data[0]["Fan Speed In"] data.fan_2 = summary_data[0]["Fan Speed Out"]