Merge pull request #102 from jpcomps/master

fix send_config for ePIC
This commit is contained in:
b-rowan
2024-01-27 09:05:23 -07:00
committed by GitHub
3 changed files with 7 additions and 14 deletions

View File

@@ -265,15 +265,7 @@ class PoolGroup(MinerConfigValue):
return [p.as_auradine(user_suffix=user_suffix) for p in self.pools]
def as_epic(self, user_suffix: str = None) -> dict:
if len(self.pools) > 0:
conf = {
"name": self.name,
"pool": [pool.as_epic(user_suffix=user_suffix) for pool in self.pools],
}
if self.quota is not None:
conf["quota"] = self.quota
return conf
return {"name": self.name, "pool": []}
return [p.as_epic(user_suffix=user_suffix) for p in self.pools]
@classmethod
def from_dict(cls, dict_conf: dict | None) -> "PoolGroup":
@@ -421,9 +413,7 @@ class PoolConfig(MinerConfigValue):
return {
"pools": {
"coin": "Btc",
"stratum_configs": [
g.as_epic(user_suffix=user_suffix) for g in self.groups
],
"stratum_configs": self.groups[0].as_epic(user_suffix=user_suffix),
"unique_id": False,
}
}

View File

@@ -119,7 +119,10 @@ class ePIC(BaseMiner):
if not conf["fans"].get("Manual", {}) == {}:
await self.web.set_fan({"Manual": conf["fans"]["Manual"]})
elif not conf["fans"].get("Auto", {}) == {}:
await self.web.set_fan({"Auto": conf["fans"]["Auto"]})
target_temp = {"Target Temperature": conf["fans"]["Target Temperature"]}
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
if conf["ptune"].get("enabled", True):

View File

@@ -51,7 +51,7 @@ class ePICWebAPI(BaseWebAPI):
f"http://{self.ip}:{self.port}/{command}",
timeout=5,
json={
**parameters,
"param": parameters["parameters"],
"password": self.pwd,
},
)