diff --git a/pyasic/device/models.py b/pyasic/device/models.py index a9090966..8317c49a 100644 --- a/pyasic/device/models.py +++ b/pyasic/device/models.py @@ -16,6 +16,7 @@ class AntminerModels(str, Enum): S9j = "S9j" T9 = "T9" Z15 = "Z15" + Z15Pro = "Z15 Pro" S17 = "S17" S17Plus = "S17+" S17Pro = "S17 Pro" diff --git a/pyasic/miners/antminer/bmminer/X15/Z15.py b/pyasic/miners/antminer/bmminer/X15/Z15.py new file mode 100644 index 00000000..50ac6933 --- /dev/null +++ b/pyasic/miners/antminer/bmminer/X15/Z15.py @@ -0,0 +1,22 @@ +# ------------------------------------------------------------------------------ +# Copyright 2022 Upstream Data Inc - +# - +# Licensed under the Apache License, Version 2.0 (the "License"); - +# you may not use this file except in compliance with the License. - +# You may obtain a copy of the License at - +# - +# http://www.apache.org/licenses/LICENSE-2.0 - +# - +# Unless required by applicable law or agreed to in writing, software - +# distributed under the License is distributed on an "AS IS" BASIS, - +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - +# See the License for the specific language governing permissions and - +# limitations under the License. - +# ------------------------------------------------------------------------------ + +from pyasic.miners.backends import AntminerModern +from pyasic.miners.device.models import Z15Pro + + +class BMMinerZ15Pro(AntminerModern, Z15Pro): + pass diff --git a/pyasic/miners/antminer/bmminer/X15/__init__.py b/pyasic/miners/antminer/bmminer/X15/__init__.py new file mode 100644 index 00000000..b6912420 --- /dev/null +++ b/pyasic/miners/antminer/bmminer/X15/__init__.py @@ -0,0 +1,16 @@ +# ------------------------------------------------------------------------------ +# Copyright 2022 Upstream Data Inc - +# - +# Licensed under the Apache License, Version 2.0 (the "License"); - +# you may not use this file except in compliance with the License. - +# You may obtain a copy of the License at - +# - +# http://www.apache.org/licenses/LICENSE-2.0 - +# - +# Unless required by applicable law or agreed to in writing, software - +# distributed under the License is distributed on an "AS IS" BASIS, - +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - +# See the License for the specific language governing permissions and - +# limitations under the License. - +# ------------------------------------------------------------------------------ +from .Z15 import BMMinerZ15Pro diff --git a/pyasic/miners/antminer/bmminer/__init__.py b/pyasic/miners/antminer/bmminer/__init__.py index c14a102d..9701835d 100644 --- a/pyasic/miners/antminer/bmminer/__init__.py +++ b/pyasic/miners/antminer/bmminer/__init__.py @@ -17,6 +17,7 @@ from .X3 import * from .X5 import * from .X7 import * from .X9 import * +from .X15 import * from .X17 import * from .X19 import * from .X21 import * diff --git a/pyasic/miners/device/models/antminer/X15/Z15.py b/pyasic/miners/device/models/antminer/X15/Z15.py index 8b22f056..001347cf 100644 --- a/pyasic/miners/device/models/antminer/X15/Z15.py +++ b/pyasic/miners/device/models/antminer/X15/Z15.py @@ -21,3 +21,9 @@ class Z15(AntMinerMake): raw_model = MinerModel.ANTMINER.Z15 expected_chips = 3 + + +class Z15Pro(AntMinerMake): + raw_model = MinerModel.ANTMINER.Z15Pro + + expected_chips = 6 diff --git a/pyasic/miners/device/models/antminer/X15/__init__.py b/pyasic/miners/device/models/antminer/X15/__init__.py index dbce4b44..7c529851 100644 --- a/pyasic/miners/device/models/antminer/X15/__init__.py +++ b/pyasic/miners/device/models/antminer/X15/__init__.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and - # limitations under the License. - # ------------------------------------------------------------------------------ -from .Z15 import Z15 +from .Z15 import Z15, Z15Pro diff --git a/pyasic/miners/factory.py b/pyasic/miners/factory.py index aea04385..276ed3a3 100644 --- a/pyasic/miners/factory.py +++ b/pyasic/miners/factory.py @@ -78,6 +78,7 @@ MINER_CLASSES = { "ANTMINER S9J": BMMinerS9j, "ANTMINER T9": BMMinerT9, "ANTMINER Z15": CGMinerZ15, + "ANTMINER Z15 PRO": BMMinerZ15Pro, "ANTMINER S17": BMMinerS17, "ANTMINER S17+": BMMinerS17Plus, "ANTMINER S17 PRO": BMMinerS17Pro,