Noel Maersk
8079d054d6
Merge branch 'nfactor'
...
Conflicts (resolved):
Makefile.am
winbuild/sgminer.vcxproj.filters
2014-03-14 17:46:54 +02:00
Noel Maersk
e59e4f5f8d
Bump version to 4.1.153.
2014-03-14 17:37:57 +02:00
Noel Maersk
0db99d66c0
algorithm: add nfactor aliases "adaptive-n-factor" and "nscrypt".
...
Also change whitespace back to "4 spaces".
2014-03-14 17:05:23 +02:00
Noel Maersk
2b75a67cdf
Merge pull request #147 from troky/nfactor
...
Added algorithm name to "coin" API command. Changed default algo name to "scrypt".
2014-03-14 16:58:05 +02:00
unknown
0e37fc24b0
Added algorrithm name to "coin" API command. Changed default algo name to "scrypt".
2014-03-13 23:02:51 +01:00
Noel Maersk
609b4f0c5f
Merge pull request #145 from troky/master
...
API: Fixed timeval struct formatting.
2014-03-13 17:38:10 +02:00
unknown
25242861c7
API: Fixed timeval struct formatting .
2014-03-12 09:32:00 +01:00
Noel Maersk
07f5787386
Merge pull request #144 from troky/master
...
Bugfix and cleanup.
2014-03-11 01:35:01 +02:00
Noel Maersk
2ff4234b29
Merge pull request #143 from Bllacky/patch-4
...
Update winbuild/README.txt
2014-03-11 01:34:52 +02:00
unknown
e7fbdf3f7a
Removed orphan file.
2014-03-10 20:13:58 +01:00
unknown
f7f582732a
Fixed bufsize type.
2014-03-10 20:13:17 +01:00
Bllacky
e2763e7a2e
Update README.txt
2014-03-10 16:52:31 +02:00
Noel Maersk
549d01e946
Merge pull request #142 from Bllacky/patch-3
...
Update winbuild/README.txt (instructions for compiling in Windows 7 64-bit)
2014-03-10 16:09:17 +02:00
Bllacky
6a32e173ad
Update README.txt
2014-03-10 15:42:29 +02:00
Noel Maersk
95e397d3b5
Merge pull request #140 from troky/nfactor
...
Added algorithm.* and inttypes.h for MSVS build
2014-03-09 15:58:42 +02:00
Noel Maersk
a697c663a4
Merge pull request #139 from Bllacky/patch-1
...
Update winbuild/README.txt
2014-03-09 15:57:40 +02:00
unknown
201036dd92
Added algorithm.* and inttypes.h for MSVS build
2014-03-09 11:29:53 +01:00
Bllacky
0b5aace1e1
Update README.txt
...
In order to compile curl, you need to have Windows SDK installed.
Windows SDK is not needed to compiled the other libraries.
2014-03-09 12:04:42 +02:00
Noel Maersk
4ed13e44a3
doc: update configuration.md with latest on --algorithm and --nfactor.
...
Should close https://github.com/veox/sgminer/issues/126
2014-03-07 02:35:57 +02:00
Noel Maersk
a3f9b24c69
core: set default algorithm for when neither --algorithm nor --nfactor are provided.
2014-03-07 02:27:06 +02:00
Noel Maersk
c6a27709f8
core: use global algorithm structure instead of opt_nfactor.
...
Also squashed:
config: add log messages to set_algo() and set_nfactor().
algorithm: use set_algorithm_nfactor() when setting default nfactor in set_algorithm().
Otherwise algorithm->n defaults to 0.
P.S. Did I already mention how this could have been C++?..
2014-03-07 02:27:06 +02:00
Noel Maersk
a0c52bf67c
config: introduce set_nfactor() and use it to call set_algorithm_nfactor().
...
Had two bugs:
1. Will not compile due to unknown algorithm_t size.
2. nfactor is set to 0 (bad calling, fix later).
So squashed two commits:
1. algorithm: move algorithm_t definition to header.
2. config: if --nfactor is specified, properly set algorithm->nfactor.
2014-03-07 02:27:06 +02:00
Noel Maersk
92b7770212
config: add --algorithm
option and documentation.
...
Doc in `doc/configuration.md` (has to be started sometime, no?).
Configuration function has to be lamely-named set_algo(), because
set_algorithm() is already declared in algorithm.h (prevent namespace
conflict).
algorithm has to be added as global variable due to the way the
callback is done (by CCAN/opt, which in itself is nice).
This can be cleaned up significantly by (at least) introducing a
global configuration struct, but there is no reason to do it now
just for this - better a wholesale manana.
2014-03-07 02:27:00 +02:00
Noel Maersk
50a792f2cd
algorithm: initial set_algorithm() and set_algorithm_nfactor().
2014-03-06 21:23:13 +02:00
Noel Maersk
776eec2e11
algorithm: initial structure definition.
2014-03-06 21:23:10 +02:00
Noel Maersk
c2c8231b9e
kernel: zuikkis supports all worksizes.
...
Closes https://github.com/veox/sgminer/issues/130
2014-03-04 16:43:11 +02:00
Noel Maersk
28ade9f4e4
Merge remote-tracking branch 'troky/build-msvs2010-upd2'
2014-03-02 21:27:28 +02:00
Noel Maersk
ded4452316
ui: check for opt_incognito is Display settings menu.
2014-03-02 20:41:49 +02:00
Noel Maersk
8f014effeb
util: add missing include.
2014-03-02 19:15:30 +02:00
Noel Maersk
9c0f912434
core: remove ifdef from opt_compact and opt_incognito declaration.
2014-03-02 19:13:08 +02:00
unknown
747efda902
MSVS2010: Added pool.c and pool.h to project.
2014-03-01 13:19:46 +01:00
Noel Maersk
428061e416
pool: display URL instead of "Pool N" if no poolname provided.
...
This works since get_pool_name() in pool.c checks if an empty string is
provided, and uses the URL instead if so.
2014-02-28 23:56:14 +02:00
Noel Maersk
4059780d01
pool: do not use defines, just inline strings.
2014-02-28 23:53:53 +02:00
Noel Maersk
d58de45c0e
pool: use get_pool_name() where appropriate.
2014-02-28 23:22:40 +02:00
Noel Maersk
0a4f71882c
pool: use get_pool_user().
2014-02-28 22:45:07 +02:00
Noel Maersk
934c4f5f14
pool: introduce get_pool_user() for simpler opt_incognito use.
...
Use immediately.
2014-02-28 22:44:50 +02:00
Noel Maersk
bd6766f231
pool: define and use POOL_NAME_INCOGNITO.
2014-02-28 22:16:18 +02:00
Noel Maersk
8e4fb3c554
pool: abstract get_pool_name()
...
The introduction of get_pool_name() warrants a separate function
so opt_incognito does not litter everywhere.
2014-02-28 22:15:39 +02:00
Noel Maersk
0d562ffbf5
core: use opt_incognito in a few more applog() places.
2014-02-28 22:13:42 +02:00
Noel Maersk
888fab437f
ui: <incognito> pool name in incognito mode, too.
...
Ah, what the heck. If it's a pool-related, we'll just ask.
2014-02-28 04:13:22 +02:00
Noel Maersk
2bab1d7b8a
doc: update BUGS.md.
2014-02-28 04:00:58 +02:00
Noel Maersk
4c4b909be6
doc: in example.conf, remove boolean values (and ones related to them) set to non-default states.
...
The config parser has a bug, and can only set boolean options to
non-default state. If a default state is given to an OPT_WITHOUT_ARG
option (as defined in the config table), it is set to the non-default state
anyway, because a CCAN function opt_set_[inv]bool() is used, which is not
meant for this.
Therefore, using such options from the command line is fine, but specifying
them in the .conf file results in above-described behaviour.
E.g., a user tests
"api-listen" : true
in the config, but changes it later to
"api-listen" : false
The option will be set true anyway.
A previous commit (8dd1c2d4af
) has allowed
this, whereas previously only setting to true was allowed.
Currently boolead options that default to true and can be set false by
the user are explicitly defined as true, e.g.:
bool opt_restart = true;
There is no simple or right way around this. This is an issue with the
design.
2014-02-28 03:45:11 +02:00
Noel Maersk
a511266959
doc: minor fix for --help message on --incognito
.
2014-02-28 03:35:32 +02:00
Noel Maersk
5a8f84b49b
ui: allow switching to incognito mode through ncurses interface.
2014-02-28 03:00:12 +02:00
Noel Maersk
d78f372712
core: undo some of previous two commits and andd conditionals to display user name as <incognito>
instead.
...
Fix whitspace (squashed).
2014-02-28 02:46:56 +02:00
Noel Maersk
2561295e3d
log: do not set poolname in log in incognito mode.
2014-02-28 02:11:26 +02:00
Noel Maersk
f737992f41
core: introduce --incognito
+ minimal revision of --compact
.
...
`--incognito` is for sharing output without disclosing login
information.
NCurses interface code, as stated before, is pretty lousy.
2014-02-27 23:29:03 +02:00
Noel Maersk
8ff624618f
doc: verbose FAQ answer on running per-instance.
2014-02-27 17:20:48 +02:00
Noel Maersk
9eba0153e5
doc: update example.conf.
...
Reorder settings by category, add `poolname` and `state` to pool settings.
2014-02-27 17:15:07 +02:00
Noel Maersk
394c200c88
doc: minor FAQ update (formatting and reference a Q from another).
2014-02-27 17:14:45 +02:00