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

bug: fix goldshell config/power modes.

Browse Source
This commit is contained in:
Brett Rowan
2024-02-10 15:46:55 -07:00
parent d2abae947c
commit 07d1c48e33
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pyasic/config/mining.py
View File

@@ -51,7 +51,7 @@ class MiningModeNormal(MinerConfigValue):
return {"ptune": {"enabled": False}} return {"ptune": {"enabled": False}}
def as_goldshell(self) -> dict: def as_goldshell(self) -> dict:
return {"settings": {"select": 0}} return {"settings": {"level": 0}}
@dataclass @dataclass
@@ -75,7 +75,7 @@ class MiningModeSleep(MinerConfigValue):
return {"ptune": {"algo": "Sleep", "target": 0}} return {"ptune": {"algo": "Sleep", "target": 0}}
def as_goldshell(self) -> dict: def as_goldshell(self) -> dict:
return {"settings": {"select": 3}} return {"settings": {"level": 3}}
@dataclass @dataclass
@@ -96,7 +96,7 @@ class MiningModeLPM(MinerConfigValue):
return {"mode": {"mode": "eco"}} return {"mode": {"mode": "eco"}}
def as_goldshell(self) -> dict: def as_goldshell(self) -> dict:
return {"settings": {"select": 1}} return {"settings": {"level": 1}}
@dataclass @dataclass

17
pyasic/miners/backends/goldshell.py
View File

@@ -106,8 +106,9 @@ class GoldshellMiner(BFGMiner):
) )
settings = await self.web.setting() settings = await self.web.setting()
for new_setting in cfg["settings"]: for idx, plan in settings["powerplans"]:
settings[new_setting] = cfg["settings"][new_setting] if plan["level"] == cfg["settings"]["level"]:
settings["select"] = idx
await self.web.set_setting(settings) await self.web.set_setting(settings)
async def _get_mac(self, web_setting: dict = None) -> str: async def _get_mac(self, web_setting: dict = None) -> str:
@@ -190,8 +191,10 @@ class GoldshellMiner(BFGMiner):
settings = await self.web.setting() settings = await self.web.setting()
mode = MiningModeConfig.sleep() mode = MiningModeConfig.sleep()
cfg = mode.as_goldshell() cfg = mode.as_goldshell()
for new_setting in cfg["settings"]: level = cfg["settings"]["level"]
settings[new_setting] = cfg["settings"][new_setting] for idx, plan in settings["powerplans"]:
if plan["level"] == level:
settings["select"] = idx
await self.web.set_setting(settings) await self.web.set_setting(settings)
return True return True
@@ -199,7 +202,9 @@ class GoldshellMiner(BFGMiner):
settings = await self.web.setting() settings = await self.web.setting()
mode = MiningModeConfig.normal() mode = MiningModeConfig.normal()
cfg = mode.as_goldshell() cfg = mode.as_goldshell()
for new_setting in cfg["settings"]: level = cfg["settings"]["level"]
settings[new_setting] = cfg["settings"][new_setting] for idx, plan in settings["powerplans"]:
if plan["level"] == level:
settings["select"] = idx
await self.web.set_setting(settings) await self.web.set_setting(settings)
return True return True