Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1ea4f4e124 | ||
|
|
a8a0e4a5fe | ||
|
|
5f2f6e01da | ||
|
|
41b4c23d45 |
@@ -63,6 +63,7 @@ class AntminerModels(MinerModelType):
|
||||
S21Pro = "S21 Pro"
|
||||
S21Hydro = "S21 Hydro"
|
||||
T21 = "T21"
|
||||
S19XPHydro = "S19 XP Hydro"
|
||||
|
||||
def __str__(self):
|
||||
return self.value
|
||||
|
||||
@@ -30,6 +30,7 @@ from pyasic.miners.device.models import (
|
||||
S19Plus,
|
||||
S19Pro,
|
||||
S19ProPlusHydro,
|
||||
S19XPHydro,
|
||||
)
|
||||
|
||||
|
||||
@@ -87,3 +88,7 @@ class BOSMinerS19XP(BOSer, S19XP):
|
||||
|
||||
class BOSMinerS19ProPlusHydro(BOSer, S19ProPlusHydro):
|
||||
pass
|
||||
|
||||
|
||||
class BOSMinerS19XPHydro(BOSer, S19XPHydro):
|
||||
pass
|
||||
|
||||
@@ -29,5 +29,6 @@ from .S19 import (
|
||||
BOSMinerS19Pro,
|
||||
BOSMinerS19ProPlusHydro,
|
||||
BOSMinerS19XP,
|
||||
BOSMinerS19XPHydro,
|
||||
)
|
||||
from .T19 import BOSMinerT19
|
||||
|
||||
@@ -115,11 +115,18 @@ class ESPMiner(BaseMiner):
|
||||
|
||||
if web_system_info is not None:
|
||||
try:
|
||||
expected_hashrate = (
|
||||
web_system_info.get("smallCoreCount")
|
||||
* web_system_info.get("asicCount")
|
||||
* web_system_info.get("frequency")
|
||||
)
|
||||
small_core_count = web_system_info.get("smallCoreCount")
|
||||
asic_count = web_system_info.get("asicCount")
|
||||
frequency = web_system_info.get("frequency")
|
||||
|
||||
if asic_count is None:
|
||||
try:
|
||||
asic_info = await self.web.asic_info()
|
||||
asic_count = asic_info.get("asicCount")
|
||||
except APIError:
|
||||
pass
|
||||
|
||||
expected_hashrate = small_core_count * asic_count * frequency
|
||||
|
||||
return self.algo.hashrate(
|
||||
rate=float(expected_hashrate), unit=self.algo.unit.MH
|
||||
|
||||
@@ -223,3 +223,12 @@ class S19jXP(AntMinerMake):
|
||||
expected_fans = 4
|
||||
expected_hashboards = 3
|
||||
algo = MinerAlgo.SHA256
|
||||
|
||||
|
||||
class S19XPHydro(AntMinerMake):
|
||||
raw_model = MinerModel.ANTMINER.S19XPHydro
|
||||
|
||||
expected_chips = 204
|
||||
expected_fans = 0
|
||||
expected_hashboards = 3
|
||||
algo = MinerAlgo.SHA256
|
||||
|
||||
@@ -38,5 +38,6 @@ from .S19 import (
|
||||
S19ProHydro,
|
||||
S19ProPlus,
|
||||
S19ProPlusHydro,
|
||||
S19XPHydro,
|
||||
)
|
||||
from .T19 import T19
|
||||
|
||||
@@ -561,6 +561,7 @@ MINER_CLASSES = {
|
||||
"ANTMINER T21": BOSMinerT21,
|
||||
"BRAIINS MINI MINER BMM 100": BraiinsBMM100,
|
||||
"BRAIINS MINI MINER BMM 101": BraiinsBMM101,
|
||||
"ANTMINER S19 XP HYD.": BOSMinerS19XPHydro,
|
||||
},
|
||||
MinerTypes.VNISH: {
|
||||
None: VNish,
|
||||
|
||||
@@ -96,3 +96,6 @@ class ESPMinerWebAPI(BaseWebAPI):
|
||||
|
||||
async def update_settings(self, **config):
|
||||
return await self.send_command("system", patch=True, **config)
|
||||
|
||||
async def asic_info(self):
|
||||
return await self.send_command("system/asic")
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[project]
|
||||
name = "pyasic"
|
||||
version = "0.72.9"
|
||||
version = "0.72.11"
|
||||
|
||||
description = "A simplified and standardized interface for Bitcoin ASICs."
|
||||
authors = [{name = "UpstreamData", email = "brett@upstreamdata.ca"}]
|
||||
|
||||
Reference in New Issue
Block a user