Browse Source

Merge branch 'api-compatibility'

djm34
Noel Maersk 11 years ago
parent
commit
2f3e08a12c
  1. 3
      api.c
  2. 14
      doc/API

3
api.c

@ -1555,7 +1555,8 @@ static void apiversion(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __m
message(io_data, MSG_VERSION, 0, NULL, isjson); message(io_data, MSG_VERSION, 0, NULL, isjson);
io_open = io_add(io_data, isjson ? COMSTR JSON_VERSION : _VERSION COMSTR); io_open = io_add(io_data, isjson ? COMSTR JSON_VERSION : _VERSION COMSTR);
root = api_add_string(root, "SGMiner", VERSION, false); root = api_add_string(root, "Miner", PACKAGE " " VERSION, false);
root = api_add_string(root, "CGMiner", VERSION, false);
root = api_add_const(root, "API", APIVERSION, false); root = api_add_const(root, "API", APIVERSION, false);
root = print_data(root, buf, isjson, false); root = print_data(root, buf, isjson, false);

14
doc/API

@ -145,8 +145,9 @@ The list of requests - a (*) means it requires privileged access - and replies:
Request Reply Section Details Request Reply Section Details
------- ------------- ------- ------- ------------- -------
version VERSION SGMiner=sgminer, version version VERSION Miner="sgminer " sgminer version
API=API| version CGMiner=sgminer version
API=API version
config CONFIG Some miner configuration information: config CONFIG Some miner configuration information:
GPU Count=N, <- the number of GPUs GPU Count=N, <- the number of GPUs
@ -519,7 +520,7 @@ api-example.c - a 'C' program to access the API (with source code)
miner.php - an example web page to access the API miner.php - an example web page to access the API
This includes buttons and inputs to attempt access to the privileged commands This includes buttons and inputs to attempt access to the privileged commands
See the end of this API-README for details of how to tune the display See the end of this API readme for details of how to tune the display
and also to use the option to display a multi-rig summary and also to use the option to display a multi-rig summary
---------- ----------
@ -527,6 +528,13 @@ miner.php - an example web page to access the API
Feature Changelog for external applications using the API: Feature Changelog for external applications using the API:
API V
Modified API commands:
'version' - add 'Miner'
----------
API V3.1 (cgminer v3.12.1) API V3.1 (cgminer v3.12.1)
Multiple report request command with '+' e.g. summary+devs Multiple report request command with '+' e.g. summary+devs

Loading…
Cancel
Save