Commit 17973c59c417d0786019b58191c321d3f9367752
2012-09-21T11:25:43
API don't change 'Diff1 Shares' - backward compatability FTW
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
diff --git a/API-README b/API-README
index d0653d4..6d0dda0 100644
--- a/API-README
+++ b/API-README
@@ -391,7 +391,6 @@ Added API commands:
'setconfig|name,N'
Modified API commands:
- Change pool field name 'Diff1 Shares' to 'Diff1 Work'
'devs' - add 'Diff1 Work', 'Difficulty Accepted', 'Difficulty Rejected',
'Last Share Difficulty' to all devices
'gpu|N' - add 'Diff1 Work', 'Difficulty Accepted',
diff --git a/api.c b/api.c
index ec07b44..0b6d54d 100644
--- a/api.c
+++ b/api.c
@@ -1882,7 +1882,7 @@ static void poolstatus(__maybe_unused SOCKETTYPE c, __maybe_unused char *param,
root = api_add_uint(root, "Remote Failures", &(pool->remotefail_occasions), false);
root = api_add_escape(root, "User", pool->rpc_user, false);
root = api_add_time(root, "Last Share Time", &(pool->last_share_time), false);
- root = api_add_int(root, "Diff1 Work", &(pool->diff1), false);
+ root = api_add_int(root, "Diff1 Shares", &(pool->diff1), false);
if (pool->rpc_proxy) {
root = api_add_const(root, "Proxy Type", proxytype(pool->rpc_proxytype), false);
root = api_add_escape(root, "Proxy", pool->rpc_proxy, false);
diff --git a/miner.php b/miner.php
index 2c28f6f..f6250f0 100644
--- a/miner.php
+++ b/miner.php
@@ -799,12 +799,11 @@ function fmt($section, $name, $value, $when, $alldata)
case 'SUMMARY.Discarded':
case 'POOL.Discarded':
case 'total.Discarded':
+ case 'POOL.Diff1 Shares':
+ case 'total.Diff1 Shares':
case 'GPU.Diff1 Work':
case 'PGA.Diff1 Work':
- case 'POOL.Diff1 Work':
case 'total.Diff1 Work':
- case 'POOL.Diff1 Shares': // old name
- case 'total.Diff1 Shares': // old name
$parts = explode('.', $value, 2);
if (count($parts) == 1)
$dec = '';
@@ -893,7 +892,7 @@ $singlerigsum = array(
'Hardware Errors' => 1, 'Utility' => 1, 'Total MH' => 1),
'pools' => array('Getworks' => 1, 'Accepted' => 1, 'Rejected' => 1, 'Discarded' => 1,
'Stale' => 1, 'Get Failures' => 1, 'Remote Failures' => 1,
- 'Diff1 Work' => 1),
+ 'Diff1 Shares' => 1),
'notify' => array('*' => 1));
#
function showtotal($total, $when, $oldvalues)
@@ -2100,7 +2099,7 @@ function display()
newtable();
doforeach('version', 'rig summary', array(), array(), true);
- $sum = array('MHS av', 'Getworks', 'Found Blocks', 'Accepted', 'Rejected', 'Discarded', 'Stale', 'Utility', 'Local Work', 'Total MH', 'Work Utility', 'Diff1 Work');
+ $sum = array('MHS av', 'Getworks', 'Found Blocks', 'Accepted', 'Rejected', 'Discarded', 'Stale', 'Utility', 'Local Work', 'Total MH', 'Work Utility', 'Diff1 Shares', 'Diff1 Work');
doforeach('summary', 'summary information', $sum, array(), false);
endtable();
otherrow('<td><br><br></td>');