add new Antminer models (S19jPro+ and S19k Pro) (#75)

* Add S19jPro+ and S19K Pro * typo
UpstreamData · Dec 8, 2023 · 9f42e6a · 9f42e6a
1 parent 362b204
commit 9f42e6a
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 0 deletions.
diff --git a/pyasic/miners/antminer/epic/X19/S19.py b/pyasic/miners/antminer/epic/X19/S19.py
@@ -20,6 +20,8 @@
     S19Pro,
     S19j,
     S19jPro,
+    S19jProPlus,
+    S19kPro,
     S19XP,
 )
 
@@ -36,5 +38,11 @@ class ePICS19j(ePIC, S19j):
 class ePICS19jPro(ePIC, S19jPro):
     pass
 
+class ePICS19jProPlus(ePIC, S19jProPlus):
+    pass
+
+class ePICS19kPro(ePIC, S19kPro):
+    pass
+
 class ePICS19XP(ePIC, S19XP):
     pass
diff --git a/pyasic/miners/antminer/epic/X19/__init__.py b/pyasic/miners/antminer/epic/X19/__init__.py
@@ -19,5 +19,7 @@
     ePICS19Pro,
     ePICS19j,
     ePICS19jPro,
+    ePICS19jProPlus,
+    ePICS19kPro,
     ePICS19XP,
 )
diff --git a/pyasic/miners/miner_factory.py b/pyasic/miners/miner_factory.py
@@ -354,6 +354,8 @@ class MinerTypes(enum.Enum):
         "ANTMINER S19 PRO": ePICS19Pro,
         "ANTMINER S19J": ePICS19j,
         "ANTMINER S19J PRO": ePICS19jPro,
+        "ANTMINER S19J PRO+": ePICS19jProPlus,
+        "ANTMINER S19K PRO": ePICS19kPro,
         "ANTMINER S19 XP": ePICS19XP,
     },
     MinerTypes.HIVEON: {

diff --git a/pyasic/miners/types/antminer/X19/S19.py b/pyasic/miners/types/antminer/X19/S19.py
@@ -124,6 +124,22 @@ def __init__(self, ip: str, api_ver: str = "0.0.0"):
         self.nominal_chips = 126
         self.fan_count = 4
 
+class S19jProPlus(AntMiner):  # noqa - ignore ABC method implementation
+    def __init__(self, ip: str, api_ver: str = "0.0.0"):
+        super().__init__(ip, api_ver)
+        self.ip = ip
+        self.model = "S19j Pro+"
+        self.nominal_chips = 120
+        self.fan_count = 4
+
+class S19kPro(AntMiner):  # noqa - ignore ABC method implementation
+    def __init__(self, ip: str, api_ver: str = "0.0.0"):
+        super().__init__(ip, api_ver)
+        self.ip = ip
+        self.model = "S19k Pro"
+        self.nominal_chips = 77
+        self.fan_count = 4
+
 
 class S19L(AntMiner):  # noqa - ignore ABC method implementation
     def __init__(self, ip: str, api_ver: str = "0.0.0"):

diff --git a/pyasic/miners/types/antminer/X19/__init__.py b/pyasic/miners/types/antminer/X19/__init__.py
@@ -24,6 +24,8 @@
     S19j,
     S19jNoPIC,
     S19jPro,
+    S19jProPlus,
+    S19kPro,
     S19NoPIC,
     S19Plus,
     S19Pro,