diff --git a/pyasic/miners/antminer/bosminer/X19/S19.py b/pyasic/miners/antminer/bosminer/X19/S19.py index 9f799f1c..0b044df4 100644 --- a/pyasic/miners/antminer/bosminer/X19/S19.py +++ b/pyasic/miners/antminer/bosminer/X19/S19.py @@ -23,7 +23,9 @@ from pyasic.miners.models import ( S19j, S19jNoPIC, S19jPro, + S19jProNoPIC, S19jProPlus, + S19jProPlusNoPIC, S19kProNoPIC, S19Plus, S19Pro, @@ -58,6 +60,10 @@ class BOSMinerS19jPro(BOSer, S19jPro): pass +class BOSMinerS19jProNoPIC(BOSer, S19jProNoPIC): + pass + + class BOSMinerS19kProNoPIC(BOSer, S19kProNoPIC): pass @@ -70,5 +76,9 @@ class BOSMinerS19jProPlus(BOSer, S19jProPlus): pass +class BOSMinerS19jProPlusNoPIC(BOSer, S19jProPlusNoPIC): + pass + + class BOSMinerS19XP(BOSer, S19XP): pass diff --git a/pyasic/miners/antminer/bosminer/X19/__init__.py b/pyasic/miners/antminer/bosminer/X19/__init__.py index d83f0084..f95c90e1 100644 --- a/pyasic/miners/antminer/bosminer/X19/__init__.py +++ b/pyasic/miners/antminer/bosminer/X19/__init__.py @@ -21,7 +21,9 @@ from .S19 import ( BOSMinerS19j, BOSMinerS19jNoPIC, BOSMinerS19jPro, + BOSMinerS19jProNoPIC, BOSMinerS19jProPlus, + BOSMinerS19jProPlusNoPIC, BOSMinerS19kProNoPIC, BOSMinerS19Plus, BOSMinerS19Pro, diff --git a/pyasic/miners/factory.py b/pyasic/miners/factory.py index 15e6c02a..468a35f1 100644 --- a/pyasic/miners/factory.py +++ b/pyasic/miners/factory.py @@ -359,8 +359,10 @@ MINER_CLASSES = { "ANTMINER S19J": BOSMinerS19j, "ANTMINER S19J88NOPIC": BOSMinerS19jNoPIC, "ANTMINER S19J PRO": BOSMinerS19jPro, - "ANTMINER S19J PRO NOPIC": BOSMinerS19jPro, + "ANTMINER S19J PRO NOPIC": BOSMinerS19jProNoPIC, "ANTMINER S19J PRO+": BOSMinerS19jProPlus, + "ANTMINER S19J PRO PLUS": BOSMinerS19jProPlus, + "ANTMINER S19J PRO PLUS NO PIC": BOSMinerS19jProPlusNoPIC, "ANTMINER S19K PRO NOPIC": BOSMinerS19kProNoPIC, "ANTMINER S19 XP": BOSMinerS19XP, "ANTMINER T19": BOSMinerT19, diff --git a/pyasic/miners/models/antminer/X19/S19.py b/pyasic/miners/models/antminer/X19/S19.py index 8ac5b2a3..ff17014d 100644 --- a/pyasic/miners/models/antminer/X19/S19.py +++ b/pyasic/miners/models/antminer/X19/S19.py @@ -89,12 +89,24 @@ class S19jPro(AntMinerMake): expected_fans = 4 +class S19jProNoPIC(AntMinerMake): + raw_model = "S19j Pro No PIC" + expected_chips = 126 + expected_fans = 4 + + class S19jProPlus(AntMinerMake): raw_model = "S19j Pro+" expected_chips = 120 expected_fans = 4 +class S19jProPlusNoPIC(AntMinerMake): + raw_model = "S19j Pro+ No PIC" + expected_chips = 120 + expected_fans = 4 + + class S19kPro(AntMinerMake): raw_model = "S19k Pro" expected_chips = 77 diff --git a/pyasic/miners/models/antminer/X19/__init__.py b/pyasic/miners/models/antminer/X19/__init__.py index 2317a685..1ac2cdc6 100644 --- a/pyasic/miners/models/antminer/X19/__init__.py +++ b/pyasic/miners/models/antminer/X19/__init__.py @@ -25,8 +25,11 @@ from .S19 import ( S19j, S19jNoPIC, S19jPro, + S19jProNoPIC, S19jProPlus, + S19jProPlusNoPIC, S19kPro, + S19KPro, S19kProNoPIC, S19NoPIC, S19Plus, @@ -34,6 +37,5 @@ from .S19 import ( S19ProHydro, S19ProPlus, S19ProPlusHydro, - S19KPro, ) from .T19 import T19