Browse Source

RPC: Add "MHS rolling" key to status mirroring "MHS %ds"

Luke Dashjr 12 years ago
parent
commit
0ea29ecc23
3 changed files with 4 additions and 2 deletions
  1. 2 1
      README.RPC
  2. 1 0
      api.c
  3. 1 1
      miner.php

+ 2 - 1
README.RPC

@@ -452,8 +452,9 @@ CPU and OpenCL devices are now included as "PGAs", to enable migration to a simp
 Added API commands:
 Added API commands:
  'pgarestart'
  'pgarestart'
 
 
-Modified API command:
+Modified API commands:
  'devs' - remove 'GPU Count' and 'CPU Count'
  'devs' - remove 'GPU Count' and 'CPU Count'
+ 'summary' - add 'MHS rolling'
 
 
 Deprecated API commands:
 Deprecated API commands:
  'cpu'
  'cpu'

+ 1 - 0
api.c

@@ -1532,6 +1532,7 @@ void devstatus_an(struct io_data *io_data, struct cgpu_info *cgpu, bool isjson,
 	char mhsname[27];
 	char mhsname[27];
 	sprintf(mhsname, "MHS %ds", opt_log_interval);
 	sprintf(mhsname, "MHS %ds", opt_log_interval);
 	root = api_add_mhs(root, mhsname, &rolling, false);
 	root = api_add_mhs(root, mhsname, &rolling, false);
+	root = api_add_mhs(root, "MHS rolling", &rolling, false);
 	root = api_add_int(root, "Accepted", &accepted, false);
 	root = api_add_int(root, "Accepted", &accepted, false);
 	root = api_add_int(root, "Rejected", &rejected, false);
 	root = api_add_int(root, "Rejected", &rejected, false);
 	root = api_add_int(root, "Hardware Errors", &hw_errors, false);
 	root = api_add_int(root, "Hardware Errors", &hw_errors, false);

+ 1 - 1
miner.php

@@ -1197,7 +1197,7 @@ function showdatetime()
 #
 #
 global $singlerigsum;
 global $singlerigsum;
 $singlerigsum = array(
 $singlerigsum = array(
- 'devs' => array('MHS av' => 1, 'MHS 5s' => 1, 'Accepted' => 1, 'Rejected' => 1,
+ 'devs' => array('MHS av' => 1, 'MHS rolling' => 1, 'Accepted' => 1, 'Rejected' => 1,
                  'Temperature' => 2,
                  'Temperature' => 2,
 			'Hardware Errors' => 1, 'Utility' => 1, 'Total MH' => 1),
 			'Hardware Errors' => 1, 'Utility' => 1, 'Total MH' => 1),
  'pools' => array('Getworks' => 1, 'Accepted' => 1, 'Rejected' => 1, 'Discarded' => 1,
  'pools' => array('Getworks' => 1, 'Accepted' => 1, 'Rejected' => 1, 'Discarded' => 1,