Skip to content

Commit 0d17158

Browse files
saltyminersaltyminer
authored
Merge pull request #39 from BitPoolMining/Dev
Release 1.0.1.7
2 parents edee0ae + bdc2b60 commit 0d17158

File tree

118 files changed

+4550
-9
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+4550
-9
lines changed

‎BitPoolMiner/BitPoolMiner.csproj

Lines changed: 115 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<ProductName>BitPoolMiner</ProductName>
3535
<PublisherName>BitPoolMining</PublisherName>
3636
<SuiteName>BitPoolMining</SuiteName>
37-
<ApplicationRevision>7</ApplicationRevision>
37+
<ApplicationRevision>8</ApplicationRevision>
3838
<ApplicationVersion>1.0.1.%2a</ApplicationVersion>
3939
<UseApplicationTrust>false</UseApplicationTrust>
4040
<CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -2304,6 +2304,120 @@
23042304
<None Include="publish\Application Files\BitPoolMiner_1_0_1_6\ThinkSharp.FeatureTour.dll.deploy" />
23052305
<None Include="publish\Application Files\BitPoolMiner_1_0_1_6\ToastNotifications.dll.deploy" />
23062306
<None Include="publish\Application Files\BitPoolMiner_1_0_1_6\ToastNotifications.Messages.dll.deploy" />
2307+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\bitpool.ico.deploy" />
2308+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\BitPoolMiner.application" />
2309+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\BitPoolMiner.exe.config.deploy" />
2310+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\BitPoolMiner.exe.deploy" />
2311+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\BitPoolMiner.exe.manifest" />
2312+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\LiveCharts.dll.deploy" />
2313+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\LiveCharts.Wpf.dll.deploy" />
2314+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\Microsoft.Expression.Interactions.dll.deploy" />
2315+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\ccminer-2.2-mod-r2\ccminer.exe.deploy" />
2316+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\ccminer-2.2-mod-r2\README.txt.deploy" />
2317+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\ccminer-2.2-mod-r2\vcruntime140.dll.deploy" />
2318+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\ccminer-ravencoin-v2.6\ccminer.bat.deploy" />
2319+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\ccminer-ravencoin-v2.6\ccminer.exe.deploy" />
2320+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\ccminer-ravencoin-v2.6\Changelog.txt.deploy" />
2321+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\ccminer-ravencoin-v2.6\color.txt.deploy" />
2322+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\ccminer-ravencoin-v2.6\msvcr120.dll.deploy" />
2323+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\ccminer-x64-2.2.4-cuda9\ccminer-x64.exe.deploy" />
2324+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\ccminer-x64-2.2.4-cuda9\msvcr120.dll.deploy" />
2325+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\ccminer-x64-2.2.4-cuda9\README.txt.deploy" />
2326+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\ccminer-x86-2.2.4-cuda9\ccminer.exe.deploy" />
2327+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\ccminer-x86-2.2.4-cuda9\msvcr120.dll.deploy" />
2328+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\config.txt.deploy" />
2329+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\cuda6.5\cudart64_65.dll.deploy" />
2330+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\cuda7.5\cudart64_75.dll.deploy" />
2331+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\cuda7.5\EthDcrMiner64.exe.deploy" />
2332+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\cuda9.1\cudart64_91.dll.deploy" />
2333+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\cudart64_80.dll.deploy" />
2334+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data.bin.deploy" />
2335+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1a1.bin.deploy" />
2336+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1a1.bin2.deploy" />
2337+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1b1.bin.deploy" />
2338+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1b1.bin2.deploy" />
2339+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1c1.bin.deploy" />
2340+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1c1.bin2.deploy" />
2341+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1c2.bin.deploy" />
2342+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1c2.bin2.deploy" />
2343+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1d1.bin.deploy" />
2344+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1d1.bin2.deploy" />
2345+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1e1.bin.deploy" />
2346+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1e1.bin2.deploy" />
2347+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1e2.bin.deploy" />
2348+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1e2.bin2.deploy" />
2349+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1g1.bin.deploy" />
2350+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1g1.bin2.deploy" />
2351+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1g2.bin.deploy" />
2352+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1g2.bin2.deploy" />
2353+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1h1.bin.deploy" />
2354+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1h1.bin2.deploy" />
2355+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1h2.bin.deploy" />
2356+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1h2.bin2.deploy" />
2357+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1i1.bin.deploy" />
2358+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1i1.bin2.deploy" />
2359+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1j1.bin.deploy" />
2360+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Data1j1.bin2.deploy" />
2361+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\dpools.txt.deploy" />
2362+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\epools.txt.deploy" />
2363+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\EthDcrMiner64.exe.deploy" />
2364+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\History.txt.deploy" />
2365+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\libcurl.dll.deploy" />
2366+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\License.txt.deploy" />
2367+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\msvcr110.dll.deploy" />
2368+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Readme!!!.txt.deploy" />
2369+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Remote manager\API.txt.deploy" />
2370+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Remote manager\EthMan.exe.deploy" />
2371+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Remote manager\libeay32.dll.deploy" />
2372+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Remote manager\readme.txt.deploy" />
2373+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Remote manager\sample.bat.deploy" />
2374+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\Remote manager\ssleay32.dll.deploy" />
2375+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\start_eth+pasc.bat.deploy" />
2376+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\Claymore\start_only_eth.bat.deploy" />
2377+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\DSTM\pthreadVC2.dll.deploy" />
2378+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\DSTM\vcruntime140.dll.deploy" />
2379+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\DSTM\zm.exe.deploy" />
2380+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\EWBF\cudart32_80.dll.deploy" />
2381+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\EWBF\cudart64_80.dll.deploy" />
2382+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\EWBF\miner.exe.deploy" />
2383+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\EWBF\msvcp120.dll.deploy" />
2384+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\EWBF\msvcr120.dll.deploy" />
2385+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\EWBF_NO_ASIC\cudart32_91.dll.deploy" />
2386+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\EWBF_NO_ASIC\cudart64_91.dll.deploy" />
2387+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\EWBF_NO_ASIC\miner.cfg.deploy" />
2388+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\EWBF_NO_ASIC\miner.exe.deploy" />
2389+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\EWBF_NO_ASIC\vcruntime140.dll.deploy" />
2390+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\lyclMiner015\kernels\lyra441p3\lyra441p3.cl.deploy" />
2391+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\lyclMiner015\kernels\skein\skein.cl.deploy" />
2392+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\t-rex-0.7.2-win-cuda10.0\BCD-failover.bat.deploy" />
2393+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\t-rex-0.7.2-win-cuda10.0\BCD-icemining.bat.deploy" />
2394+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\t-rex-0.7.2-win-cuda10.0\config_example.deploy" />
2395+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\t-rex-0.7.2-win-cuda10.0\msvcr71.dll.deploy" />
2396+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\t-rex-0.7.2-win-cuda10.0\RVN-gos.cx.bat.deploy" />
2397+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\t-rex-0.7.2-win-cuda10.0\t-rex-help.txt.deploy" />
2398+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\MinerApps\t-rex-0.7.2-win-cuda10.0\t-rex.exe.deploy" />
2399+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\Newtonsoft.Json.dll.deploy" />
2400+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\NLog.config.deploy" />
2401+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\NLog.dll.deploy" />
2402+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\OpenHardwareMonitorLib.dll.deploy" />
2403+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\publish\setup.exe.deploy" />
2404+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\Resources\Images\bitpool.png.deploy" />
2405+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\Resources\Images\btcp.png.deploy" />
2406+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\Resources\Images\btg.png.deploy" />
2407+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\Resources\Images\etc.png.deploy" />
2408+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\Resources\Images\eth.png.deploy" />
2409+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\Resources\Images\exp.png.deploy" />
2410+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\Resources\Images\hush.png.deploy" />
2411+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\Resources\Images\kmd.png.deploy" />
2412+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\Resources\Images\mona.png.deploy" />
2413+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\Resources\Images\rvn.png.deploy" />
2414+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\Resources\Images\vtc.png.deploy" />
2415+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\Resources\Images\zcl.png.deploy" />
2416+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\Resources\Images\zencash.png.deploy" />
2417+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\System.Windows.Interactivity.dll.deploy" />
2418+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\ThinkSharp.FeatureTour.dll.deploy" />
2419+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\ToastNotifications.dll.deploy" />
2420+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_7\ToastNotifications.Messages.dll.deploy" />
23072421
<None Include="publish\BitPoolMiner.application" />
23082422
</ItemGroup>
23092423
<ItemGroup>

‎BitPoolMiner/Miners/TRex.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,13 +158,13 @@ private MinerMonitorStat MapRPCResponse(TRexTemplate trexTemplate)
158158
GPUID = trexGPU.device_id,
159159
HashRate = trexGPU.hashrate,
160160
FanSpeed = (short)trexGPU.fan_speed,
161-
Temp = 0,
162-
Power = 0,
161+
Temp = (short)trexGPU.temperature,
162+
Power = (short)trexGPU.power,
163163
HardwareType = Hardware
164164
};
165165

166166
// Sum up power and hashrate
167-
minerMonitorStat.Power += 0;
167+
minerMonitorStat.Power += trexGPU.power;
168168
minerMonitorStat.HashRate += trexGPU.hashrate;
169169

170170
// Add GPU stats to list

‎BitPoolMiner/Models/RPCResponse/TRexTemplate.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public class GPUList
5555
public int temperature { get; set; }
5656
public string vendor { get; set; }
5757
public bool disabled { get; set; }
58+
public int power { get; set; }
5859
public int disabled_at_temperature { get; set; }
5960
}
6061

0 commit comments

Comments
 (0)