Skip to content

Commit 16e9d49

Browse files
committed
Better device matching for Vnish devices
1 parent 2821407 commit 16e9d49

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

ChangeLog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog for check_cgminer
22

3+
## 0.7.5.0
4+
5+
- Better device matching for vnish devices
6+
37
## 0.7.4.0
48

59
- Add support for S17 devices with Vnish firmware

package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: check-cgminer
2-
version: 0.7.4.0
2+
version: 0.7.5.0
33
github: "dmp1ce/check_cgminer"
44
license: PublicDomain
55
author: "David Parrish"

src/CgminerApi.hs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ module CgminerApi where
22

33
import GHC.Generics (Generic)
44
import Data.Text (Text)
5+
import Data.List (isPrefixOf)
56
import Data.Aeson ( ToJSON, FromJSON, toEncoding, genericToEncoding
67
, defaultOptions
78
, decode
@@ -98,14 +99,16 @@ getStats reply = flip parseEither reply $ \r -> do
9899
case mMinerType of
99100
Just (String "Antminer S9 SE") -> parseS9seStats AntminerS9SE rawStats
100101
Just (String "Antminer S9k") -> parseS9kStats AntminerS9k rawStats
101-
Just (String "Antminer S17 (vnish 0.9.2-alpha)") -> parseS17VnishStats AntminerS17Vnish rawStats
102102
Just (String "Antminer S17 Pro") -> parseS17Stats AntminerS17Pro rawStats
103103
Just (String "Antminer S17") -> parseS17Stats AntminerS17 rawStats
104104
Just (String "Antminer S15") -> parseS15Stats AntminerS15 rawStats
105105
Just (String "Antminer DR5") -> parseDR5Stats AntminerDR5 rawStats
106106
Just (String "Antminer Z9-Mini") -> parseZ9miniStats AntminerZ9Mini rawStats
107107
Just (String "braiins-am1-s9") -> parseS9Stats AntminerS9 rawStats
108-
Just (String s') -> fail $ "Unexpected miner type: '" ++ T.unpack s' ++ "'"
108+
Just (String s') ->
109+
if isPrefixOf "Antminer S17 (vnish" (T.unpack s')
110+
then parseS17VnishStats AntminerS17Vnish rawStats
111+
else fail $ "Unexpected miner type: '" ++ T.unpack s' ++ "'"
109112
Just s' -> fail $ "Unexpected miner type: " ++ show s'
110113
-- Matches S9 miner case
111114
Nothing -> parseS9Stats AntminerS9 rawStats

0 commit comments

Comments
 (0)