Luke Dashjr
0d30a6520f
Merge branch 'master' into workaround_icarus_uart_issue
...
Conflicts:
driver-icarus.c
2012-04-22 00:36:54 -04:00
Con Kolivas
e95384e59a
Include ztex bitstreams firmware in distribution and install if configured in.
2012-04-22 14:32:40 +10:00
Con Kolivas
b97e6aa5a0
Presumably we should return false when the capability is missing in libztex_checkCapability.
2012-04-22 10:57:23 +10:00
Con Kolivas
78a32f2ebc
Style police on driver-ztex.c
2012-04-22 10:54:26 +10:00
Con Kolivas
cfe3eb0b8a
Merge branch 'master' into ztex
...
Conflicts:
configure.ac
2012-04-22 10:43:31 +10:00
Con Kolivas
d3f46e7e6f
Merge pull request #169 from luke-jr/align_temps
...
Align temps
2012-04-21 17:32:19 -07:00
Con Kolivas
26b4b011d8
Merge pull request #170 from luke-jr/bugfix_icarus_speed
...
Bugfix: Calculate Icarus timeout-exhausted nonce count correctly
2012-04-21 17:32:10 -07:00
Con Kolivas
9641ff2ecc
Merge pull request #171 from luke-jr/icarus_longpoll
...
Icarus: Abandon a scanhash early when work restart requested
2012-04-21 17:32:00 -07:00
Luke Dashjr
d8ef28069a
work_restart should only be changed by cgminer.c now
2012-04-21 20:00:05 -04:00
Luke Dashjr
b4ba9c3f00
Bugfix: Icarus: Invalidate old job, even if no nonce found in it
2012-04-21 19:55:11 -04:00
Luke Dashjr
11234c3353
Icarus: Use gettimeofday to more accurately measure scanhash time, and calibrate scan time estimate based on actual data
2012-04-21 14:19:22 -04:00
Luke Dashjr
34f86417cc
Icarus: Abandon a scanhash early when work restart requested
2012-04-21 10:53:34 -04:00
Luke Dashjr
355a87e10b
Bugfix: Calculate Icarus timeout-exhausted nonce count correctly
...
We're only waiting 8 seconds for results from Icarus, but actually exhausing the nonce space requires 11.3
2012-04-21 10:49:17 -04:00
Luke Dashjr
1291f5a407
Icarus: Use epoll (where available) to get nonces ASAP
2012-04-21 10:21:23 -04:00
Con Kolivas
7f107fb928
Merge branch 'master' into ztex
2012-04-21 18:28:51 +10:00
Luke Dashjr
0d92069760
Merge branch 'master' into align_temps
...
Conflicts:
cgminer.c
2012-04-21 03:32:57 -04:00
Con Kolivas
9b5615d5f3
Shut down the api cleanly when the api thread is cancelled. This should allow the api socket to be closed successfully to next be reopened with app_restart.
2012-04-21 17:20:33 +10:00
Luke Dashjr
730849c988
Make a union for cgpu device handles, and rename "device" to "device_ztex" since it's Ztex-specific
2012-04-21 03:01:42 -04:00
Luke Dashjr
657716e563
Merge branch 'master' into ztex
2012-04-21 02:56:20 -04:00
Con Kolivas
127c4a5ff4
Initialise name variable.
2012-04-21 16:54:37 +10:00
Con Kolivas
e07c72687b
Remove unnecessary check for variable that always has memory allocated.
2012-04-21 16:50:02 +10:00
Con Kolivas
a5b05d9c55
Merge pull request #167 from luke-jr/bugfix_missing_stmt
...
Bugfix: Missing "break" no-op in default case
2012-04-20 23:48:36 -07:00
Luke Dashjr
7987476db3
Bugfix: Missing "break" no-op in default case
2012-04-21 02:47:28 -04:00
Luke Dashjr
7312759596
Workaround Icarus UART failures by reopening the tty every scanhash
...
ngzhang says the USB-UART chip isn't stable on some computers, and I'm experiencing some weirdness myself.
This workaround seems to fix it (tested for over 48 hours, whereas failure is usually in well under 5 hours).
2012-04-21 02:43:54 -04:00
Con Kolivas
7b947882fe
Merge pull request #157 from luke-jr/unify_drivers
...
Unify drivers as driver-*.c and add driver name to API
2012-04-20 23:41:46 -07:00
Con Kolivas
86671f80a8
Make the status window and log window as large as can fit on startup, rechecking to see if it can be enlarged after the fact. This allows any number of devices to be displayed provided the window is made long enough without corrupting the output.
2012-04-21 16:39:14 +10:00
Luke Dashjr
b8778839e9
Merge branch 'master' into unify_drivers
...
Conflicts:
cgminer.c
2012-04-21 02:36:19 -04:00
Con Kolivas
c7cc2e4226
Merge branch 'master' into ztex
2012-04-21 14:03:41 +10:00
Con Kolivas
bd46119c11
Style police on libztex.c.
2012-04-21 14:02:22 +10:00
Con Kolivas
e08936c3fb
Merge pull request #166 from kanoi/master
...
api.c escape required characters in return strings + pools returns the username
2012-04-20 15:00:39 -07:00
Kano
2e1d2017de
API add removepool like the screen interface
2012-04-21 03:15:41 +10:00
Kano
eec7c1a963
api.c escape required characters in return strings + pools returns the username
2012-04-20 23:50:27 +10:00
Con Kolivas
46faefbe82
Merge branch 'ztex-master' of https://github.com/nelisky/cgminer into ztex
2012-04-20 21:20:03 +10:00
Con Kolivas
9609dbc42d
Set lp_path to NULL after free for consistency.
2012-04-20 21:09:37 +10:00
Con Kolivas
9b2e62d339
Merge pull request #165 from nelisky/resp_hdr_cb_leak
...
Fixing leak in resp_hdr_cb
2012-04-20 04:08:11 -07:00
nelisky
17b9baa9da
Removing dmalloc import left behind by mistake
2012-04-20 03:36:42 -07:00
Con Kolivas
381107cc7b
Merge pull request #164 from kanoi/master
...
miner.php optionally support multiple rigs
2012-04-20 03:08:18 -07:00
ckolivas
b80d22b9d2
Increase maximum number of displayed devices to 14, beyond which the screen becomes corrupted.
2012-04-20 14:24:58 +10:00
nelisky
44bcb69ccd
Fixing leak in resp_hdr_cb
...
Memory is allocated for key and val, and longpoll address, when found, is stored in the header_info and prevented from being freed there. This pointer is stored during pool probing but once that's done it was just being lost.
Not so visible but also leaking was the refuse reason string.
2012-04-19 14:45:40 -07:00
Kano
8237568395
miner.php warning highlight GPU stats if they are zero (e.g. ADL not enabled)
2012-04-18 21:12:51 +10:00
Kano
d5323b7c0c
miner.php highlight any device that isn't 'Enabled'
2012-04-18 21:01:42 +10:00
Kano
39eeca263e
miner.php highlight any Status that isn't 'Alive'
2012-04-18 20:55:20 +10:00
nelisky
6970714ae1
Use detected endianness for ztex overflow detection and hash rate reporting
2012-04-18 01:59:48 -07:00
nelisky
9ba2e21793
Some cleanup
2012-04-18 01:54:51 -07:00
Kano
c52b55e244
README update details about miner.php
2012-04-18 12:55:16 +10:00
Kano
3a3912070e
miner.php optionally support multiple rigs
2012-04-18 12:50:26 +10:00
nelisky
c280dd0dae
Moving space indentation to tabs
...
For consistency with cgminer sources
2012-04-17 01:51:53 -07:00
nelisky
f9d4d92b9a
Some cleanup
2012-04-17 01:25:55 -07:00
nelisky
7fe7d18dba
removing unused libusb_context pointer
2012-04-16 14:14:52 -07:00
nelisky
0649972f69
ztex detect was broken due to bad branch split
2012-04-16 12:29:24 -07:00
