Commit 5e2c1323a940b363a1ca5eacc59fb8e53565932f
2012-08-21T00:29:05
Merge pull request #300 from kanoi/api miner.php format new Work Utility and Diff1 Shares
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
diff --git a/miner.php b/miner.php
index c61992e..eace29d 100644
--- a/miner.php
+++ b/miner.php
@@ -635,6 +635,10 @@ function fmt($section, $name, $value, $when, $alldata)
$class = $hiclass;
}
break;
+ case 'SUMMARY.Work Utility':
+ case 'total.Work Utility':
+ $ret = $value.'/m';
+ break;
case 'PGA.Temperature':
case 'GPU.Temperature':
case 'DEVS.Temperature':
@@ -732,6 +736,8 @@ function fmt($section, $name, $value, $when, $alldata)
case 'SUMMARY.Discarded':
case 'POOL.Discarded':
case 'total.Discarded':
+ case 'POOL.Diff1 Shares':
+ case 'total.Diff1 Shares':
$parts = explode('.', $value, 2);
if (count($parts) == 1)
$dec = '';
@@ -818,7 +824,8 @@ $singlerigsum = array(
'devs' => array('MHS av' => 1, 'MHS 5s' => 1, 'Accepted' => 1, 'Rejected' => 1,
'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),
+ 'Stale' => 1, 'Get Failures' => 1, 'Remote Failures' => 1,
+ 'Diff1 Shares' => 1),
'notify' => array('*' => 1));
#
function showtotal($total, $when, $oldvalues)
@@ -2023,7 +2030,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');
+ $sum = array('MHS av', 'Getworks', 'Found Blocks', 'Accepted', 'Rejected', 'Discarded', 'Stale', 'Utility', 'Local Work', 'Total MH', 'Work Utility', 'Diff1 Shares');
doforeach('summary', 'summary information', $sum, array(), false);
endtable();
otherrow('<td><br><br></td>');