pyasic-umhost 0.2.3.dev9__tar.gz → 0.2.3.dev11__tar.gz

{pyasic_umhost-0.2.3.dev9 → pyasic_umhost-0.2.3.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyasic-umhost
-Version: 0.2.3.dev9
+Version: 0.2.3.dev11
 Summary: A simplified and standardized interface for Bitcoin ASICs.
 License: Apache 2.0
 License-File: LICENSE.txt

{pyasic_umhost-0.2.3.dev9 → pyasic_umhost-0.2.3.dev11}/pyasic/miners/backends/antminer.py

@@ -234,7 +234,7 @@ class AntminerModern(BMMiner):
 
     async def resume_mining(self) -> bool:
         cfg = await self.get_config()
-        cfg.mining_mode = MiningModeConfig.low()
+        cfg.mining_mode = MiningModeConfig.normal()
         await self.send_config(cfg)
         return True
 

{pyasic_umhost-0.2.3.dev9 → pyasic_umhost-0.2.3.dev11}/pyasic/miners/backends/btminer.py

@@ -37,6 +37,7 @@ class BTMiner(StockFirmware):
         bases = bases[1:]
 
         def get_new(v: str | None):
+            print("TEST", v)
             if v is None:
                 return BTMinerV2
             try:
@@ -457,7 +458,6 @@ class BTMinerV2(StockFirmware):
     async def _get_hashboards(self, rpc_devs: dict | None = None) -> list[HashBoard]:
         if self.expected_hashboards is None:
             return []
-
         hashboards = [
             HashBoard(slot=i, expected_chips=self.expected_chips)
             for i in range(self.expected_hashboards)
@@ -468,7 +468,6 @@ class BTMinerV2(StockFirmware):
                 rpc_devs = await self.rpc.devs()
             except APIError:
                 pass
-
         if rpc_devs is not None:
             try:
                 for board in rpc_devs["DEVS"]:

{pyasic_umhost-0.2.3.dev9 → pyasic_umhost-0.2.3.dev11}/pyasic/miners/factory.py

@@ -605,6 +605,7 @@ MINER_CLASSES: dict[MinerTypes, dict[str | None, Any]] = {
         "ANTMINER S19I": VNishS19i,
         "ANTMINER S19 XP": VNishS19XP,
         "ANTMINER S19 XP PLUS HYD": VNishS19XPPlusHyd,
+        "ANTMINER S19 XP+ HYDRO": VNishS19XPPlusHyd,
         "ANTMINER S19 XP HYD.": VNishS19XPHydro,
         "ANTMINER S19J PRO": VNishS19jPro,
         "ANTMINER S19J PRO A": VNishS19jPro,
@@ -797,7 +798,7 @@ class MinerFactory:
             else:
                 if miner_type is not None:
                     break
-
+        print(f"{miner_type=}")
         if miner_type is not None:
             miner_model: str | None = None
             miner_model_fns = {
@@ -847,6 +848,8 @@ class MinerFactory:
             miner = self._select_miner_from_classes(
                 ip, miner_type=miner_type, miner_model=miner_model, version=version
             )
+            print(f"{miner_model=}")
+            print(f"{version=}")
             return miner
         return None
 
@@ -1231,7 +1234,7 @@ class MinerFactory:
         web_json_data = await self.send_web_command(
             ip, "/cgi-bin/get_system_info.cgi", auth=auth
         )
-
+        print(f"{web_json_data=}")
         if web_json_data is not None:
             try:
                 miner_model = web_json_data["minertype"]
@@ -1242,6 +1245,7 @@ class MinerFactory:
 
     async def _get_model_antminer_sock(self, ip: str) -> str | None:
         sock_json_data = await self.send_api_command(ip, "version")
+        print(f"{sock_json_data=}")
         if sock_json_data is not None:
             try:
                 miner_model = sock_json_data["VERSION"][0]["Type"]

{pyasic_umhost-0.2.3.dev9 → pyasic_umhost-0.2.3.dev11}/pyasic/test.py

@@ -51,15 +51,17 @@ async def main():
     # ip = "10.91.115.34"
     # ip = "10.91.115.112"
 
-    ip = "10.91.115.104" # Не выходит из сна
+    # ip = "10.91.115.104" # Не выходит из сна
     # ip = "10.91.115.105"
     # ip = "10.91.115.48"
 
+    ip = "10.7.13.119"
+
     # ip = "10.71.111.113" # AntMiner S19j Pro
     # ip = "10.81.143.178" # Antminer S19 XP+ Hyd
 
     try:
-        # networks = [f"10.7.34.{i}" for i in range(0, 256)]
+        # networks = [f"10.81.146.{i}" for i in range(0, 256)]
         # network = MinerNetwork(networks)
         # # Сканируем сеть
         # miners = await network.scan()
@@ -83,18 +85,18 @@ async def main():
 
         # await miner.reboot()
         # await asyncio.sleep(5)
-        miningMode = await miner.is_mining()
-        sleepMode = await miner.is_sleep()
-        errors = await miner.get_errors()
-        minerData = await miner.get_data()
-        # #
-        # # print("\n\n")
-        # # print(minerData.pools)
-        print(f"Is mining: {miningMode}")
-        print(f"Sleep mode: {sleepMode}")
-        print(f"Errors: {errors}")
-        # print(f"{minerData.wattage_limit=}, {minerData.wattage=}")
-        print(f"MinerData: {minerData}")
+        # miningMode = await miner.is_mining()
+        # sleepMode = await miner.is_sleep()
+        # errors = await miner.get_errors()
+        # minerData = await miner.get_data()
+        # # #
+        # # # print("\n\n")
+        # # # print(minerData.pools)
+        # print(f"Is mining: {miningMode}")
+        # print(f"Sleep mode: {sleepMode}")
+        # print(f"Errors: {errors}")
+        # # print(f"{minerData.wattage_limit=}, {minerData.wattage=}")
+        # print(f"MinerData: {minerData}")
 
         ### STOP
 

{pyasic_umhost-0.2.3.dev9 → pyasic_umhost-0.2.3.dev11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyasic-umhost"
-version = "0.2.3.dev9"
+version = "0.2.3.dev11"
 
 description = "A simplified and standardized interface for Bitcoin ASICs."
 authors = [{name = "UpstreamData", email = "brett@upstreamdata.ca"}]
@@ -124,7 +124,7 @@ line-ending = "auto"
 
 [tool.poetry]
 name = "pyasic-umhost"
-version = "0.2.3.dev8"
+version = "0.2.3.dev11"
 description = "Fork pyasic"
 
 packages = [