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

bug: fix some issues with epic send config.

Browse Source
This commit is contained in:
b-rowan
2024-01-27 09:25:20 -07:00
parent a821357b4f
commit 4f0eb49a02
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pyasic/config/mining.py
View File

@@ -184,7 +184,7 @@ class MiningModePowerTune(MinerConfigValue):
return {"mode": {"mode": "custom", "tune": "power", "power": self.power}} return {"mode": {"mode": "custom", "tune": "power", "power": self.power}}
def as_epic(self) -> dict: def as_epic(self) -> dict:
return {"ptune": {**self.algo.as_epic(), "target": self.power}} return {"ptune": {"algo": self.algo.as_epic(), "target": self.power}}
@dataclass @dataclass

4
pyasic/config/temperature.py
View File

@@ -43,9 +43,9 @@ class TemperatureConfig(MinerConfigValue):
def as_epic(self) -> dict: def as_epic(self) -> dict:
temps_config = {"temps": {}, "fans": {"Auto": {}}} temps_config = {"temps": {}, "fans": {"Auto": {}}}
if self.target is not None: if self.target is not None:
temps_config["fans"]["Target Temperature"] = self.target temps_config["fans"]["Auto"]["Target Temperature"] = self.target
else: else:
temps_config["fans"]["Target Temperature"] = 60 temps_config["fans"]["Auto"]["Target Temperature"] = 60
if self.danger is not None: if self.danger is not None:
temps_config["temps"]["shutdown"] = self.danger temps_config["temps"]["shutdown"] = self.danger
return temps_config return temps_config

6
pyasic/miners/backends/epic.py
View File

@@ -116,13 +116,11 @@ class ePIC(BaseMiner):
if not conf.get("temps", {}) == {}: if not conf.get("temps", {}) == {}:
await self.web.set_shutdown_temp(conf["temps"]["shutdown"]) await self.web.set_shutdown_temp(conf["temps"]["shutdown"])
# Fans # Fans
# set with sub-keys instead of conf["fans"] because sometimes both can be set
if not conf["fans"].get("Manual", {}) == {}: if not conf["fans"].get("Manual", {}) == {}:
await self.web.set_fan({"Manual": conf["fans"]["Manual"]}) await self.web.set_fan({"Manual": conf["fans"]["Manual"]})
elif not conf["fans"].get("Auto", {}) == {}: elif not conf["fans"].get("Auto", {}) == {}:
target_temp = {"Target Temperature": conf["fans"]["Target Temperature"]} await self.web.set_fan({"Auto": conf["fans"]["Auto"]})
await self.web.set_fan(
{"Auto": {**conf["fans"]["Auto"], **target_temp}}
)
# Mining Mode -- Need to handle that you may not be able to change while miner is tuning # Mining Mode -- Need to handle that you may not be able to change while miner is tuning
if conf["ptune"].get("enabled", True): if conf["ptune"].get("enabled", True):

12
pyasic/web/epic.py
View File

@@ -51,7 +51,7 @@ class ePICWebAPI(BaseWebAPI):
f"http://{self.ip}:{self.port}/{command}", f"http://{self.ip}:{self.port}/{command}",
timeout=5, timeout=5,
json={ json={
"param": parameters["parameters"], **parameters,
"password": self.pwd, "password": self.pwd,
}, },
) )
@@ -95,19 +95,19 @@ class ePICWebAPI(BaseWebAPI):
return await self.send_command("reboot", privileged=True) return await self.send_command("reboot", privileged=True)
async def set_shutdown_temp(self, params: int) -> dict: async def set_shutdown_temp(self, params: int) -> dict:
return await self.send_command("shutdowntemp", parameters=params) return await self.send_command("shutdowntemp", param=params)
async def set_fan(self, params: dict) -> dict: async def set_fan(self, params: dict) -> dict:
return await self.send_command("fanspeed", parameters=params) return await self.send_command("fanspeed", param=params)
async def set_ptune_enable(self, params: bool) -> dict: async def set_ptune_enable(self, params: bool) -> dict:
return await self.send_command("perpetualtune", parameters=params) return await self.send_command("perpetualtune", param=params)
async def set_ptune_algo(self, params: dict) -> dict: async def set_ptune_algo(self, params: dict) -> dict:
return await self.send_command("perpetualtune/algo", parameters=params) return await self.send_command("perpetualtune/algo", param=params)
async def set_pools(self, params: dict) -> dict: async def set_pools(self, params: dict) -> dict:
return await self.send_command("coin", parameters=params) return await self.send_command("coin", param=params)
async def pause_mining(self) -> dict: async def pause_mining(self) -> dict:
return await self.send_command("miner", param="Stop") return await self.send_command("miner", param="Stop")