Browse Source

Merge commit 'e5347ed' into bfgminer

Conflicts:
	API-README
Luke Dashjr 13 years ago
parent
commit
e1b2b302d3
2 changed files with 4 additions and 1 deletions
  1. 3 0
      API-README
  2. 1 1
      api.c

+ 3 - 0
API-README

@@ -360,6 +360,9 @@ API V1.19
 Added API commands:
  'debug'
 
+Modified API commands:
+ Change pool field name 'Diff1 Shares' to 'Diff1 Work'
+
 ----------
 
 API V1.18 (BFGMiner v2.7.4)

+ 1 - 1
api.c

@@ -1718,7 +1718,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 Shares", &(pool->diff1), false);
+		root = api_add_int(root, "Diff1 Work", &(pool->diff1), false);
 
 		if (isjson && (i > 0))
 			strcat(io_buffer, COMMA);