From 0ecfdce6bd2086916bc0be9f1993abbd21420c37 Mon Sep 17 00:00:00 2001
From: Scott Alfter <scott@alfter.us>
Date: Fri, 4 May 2018 13:49:27 -0700
Subject: [PATCH] algo update in progress

---
 algo-map.json   |  9 +++++++--
 miners.json     | 28 ++++++++++++++++++++++++++++
 zpool-switch.py |  2 +-
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/algo-map.json b/algo-map.json
index 01795bb..41dad0a 100644
--- a/algo-map.json
+++ b/algo-map.json
@@ -3,14 +3,16 @@
   "blake2s": "Blake2S",
   "blakecoin": "Blakecoin",
   "c11": "C11",
+  "decred": "",
   "equihash": "Equihash",
   "groestl": "Groestl",
   "hmq1725": "HMQ1725",
   "hsr": "HSR",
   "keccak": "Keccak",
+  "keccakc": "Keccak-C",
   "lbry": "LBRY",
   "lyra2v2": "Lyra2RE2",
-  "lyra2z": "",
+  "lyra2z": "Lyra2Z",
   "m7m": "",
   "myr-gr": "Myriad-Groestl",
   "neoscrypt": "NeoScrypt",
@@ -21,6 +23,7 @@
   "qubit": "Qubit",
   "scrypt": "",
   "sha256": "",
+  "sha256t": "SHA256-3x",
   "sib": "Sib",
   "skein": "Skein",
   "skunk": "Skunk",
@@ -30,7 +33,9 @@
   "x11evo": "X11evo",
   "x13": "X13",
   "x14": "X14",
+  "x16r": "X16r",
   "x17": "X17",
   "xevan": "XEvan",
-  "yescrypt": ""
+  "yescrypt": "",
+  "yescryptR16": ""
 }
\ No newline at end of file
diff --git a/miners.json b/miners.json
index d54d344..9e5bccb 100644
--- a/miners.json
+++ b/miners.json
@@ -76,6 +76,13 @@
       "speed": 2.430, "power": 0.525,
       "last_benchmark": "2018-01-21"
     },
+    "Keccak-C":
+    {
+      "bin": "/usr/bin/tpccminer -a keccakc -o stratum+tcp://{HOST}:{PORT} -u {USERNAME} -p {PASSWORD}",
+      "power_limit": [115,115,115,95], "gpu_oc": [-100,-100,-100,0], "mem_oc": 0, "fan": 65,
+      "speed": 2.430, "power": 0.525,
+      "last_benchmark": "none"
+    },
     "LBRY":
     {
       "bin": "/usr/bin/tpccminer -a lbry -o stratum+tcp://{HOST}:{PORT} -u {USERNAME} -p {PASSWORD}",
@@ -90,6 +97,13 @@
       "speed": 0.124, "power": 0.505,
       "last_benchmark": "2018-01-21"
     },
+    "Lyra2Z":
+    {
+      "bin": "/usr/bin/tpccminer -a lyra2z -o stratum+tcp://{HOST}:{PORT} -u {USERNAME} -p {PASSWORD}",
+      "power_limit": [115,115,115,95], "gpu_oc": [-100,-100,-100,0], "mem_oc": 0, "fan": 65,
+      "speed": 0.124, "power": 0.505,
+      "last_benchmark": "none"
+    },
     "Myriad-Groestl":
     {
       "bin": "/usr/bin/tpccminer -a myr-gr -o stratum+tcp://{HOST}:{PORT} -u {USERNAME} -p {PASSWORD}",
@@ -139,6 +153,13 @@
       "speed": 0.0758, "power": 0.505,
       "last_benchmark": "2018-01-21"
     },
+    "SHA256-3x":
+    {
+      "bin": "/usr/bin/tpccminer -a sha256t -o stratum+tcp://{HOST}:{PORT} -u {USERNAME} -p {PASSWORD}",
+      "power_limit": [115,115,115,95], "gpu_oc": [-100,-100,-100,0], "mem_oc": 0, "fan": 65,
+      "speed": 0.0, "power": 0.480,
+      "last_benchmark": "none"
+    },
     "Sib":
     {
       "bin": "/usr/bin/tpccminer -a sib -o stratum+tcp://{HOST}:{PORT} -u {USERNAME} -p {PASSWORD}",
@@ -203,6 +224,13 @@
       "speed": 0.0347, "power": 0.475,
       "last_benchmark": "2018-01-21"
     },
+    "X16r":
+    {
+      "bin": "/usr/bin/spccminer -a x16r -o stratum+tcp://{HOST}:{PORT} -u {USERNAME} -p {PASSWORD}",
+      "power_limit": [115,115,115,95], "gpu_oc": [-100,-100,-100,0], "mem_oc": 0, "fan": 65,
+      "speed": 0.0347, "power": 0.475,
+      "last_benchmark": "none"
+    },
     "X17":
     {
       "bin": "/usr/bin/tpccminer -a x17 -o stratum+tcp://{HOST}:{PORT} -u {USERNAME} -p {PASSWORD}",
diff --git a/zpool-switch.py b/zpool-switch.py
index ae9a37c..af8900d 100755
--- a/zpool-switch.py
+++ b/zpool-switch.py
@@ -87,7 +87,7 @@ try:
   data["equihash"]["estimate"]*=1000
 except:
   pass
-for i in ["scrypt", "blakecoin", "blake2s", "decred", "x11", "quark", "qubit", "keccak"]:
+for i in ["scrypt", "blakecoin", "blake2s", "decred", "x11", "quark", "qubit", "keccak", "keccakc"]:
   try:
     data[i]["estimate"]/=1000
   except: