Skip to content

Commit 844b7a7

Browse files
saltyminersaltyminer
authored
Merge pull request #41 from BitPoolMining/Dev
Release 1.0.1.9
2 parents 8570cdd + a5b8cc3 commit 844b7a7

127 files changed

Lines changed: 4663 additions & 11 deletions

File tree

Some content is hidden

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

‎BitPoolMiner/BitPoolMiner.csproj‎

Lines changed: 123 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>9</ApplicationRevision>
37+
<ApplicationRevision>10</ApplicationRevision>
3838
<ApplicationVersion>1.0.1.%2a</ApplicationVersion>
3939
<UseApplicationTrust>false</UseApplicationTrust>
4040
<CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -2566,6 +2566,128 @@
25662566
<None Include="publish\Application Files\BitPoolMiner_1_0_1_8\ThinkSharp.FeatureTour.dll.deploy" />
25672567
<None Include="publish\Application Files\BitPoolMiner_1_0_1_8\ToastNotifications.dll.deploy" />
25682568
<None Include="publish\Application Files\BitPoolMiner_1_0_1_8\ToastNotifications.Messages.dll.deploy" />
2569+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\bitpool.ico.deploy" />
2570+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\BitPoolMiner.application" />
2571+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\BitPoolMiner.exe.config.deploy" />
2572+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\BitPoolMiner.exe.deploy" />
2573+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\BitPoolMiner.exe.manifest" />
2574+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\LiveCharts.dll.deploy" />
2575+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\LiveCharts.Wpf.dll.deploy" />
2576+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\Microsoft.Expression.Interactions.dll.deploy" />
2577+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\ccminer-2.2-mod-r2\ccminer.exe.deploy" />
2578+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\ccminer-2.2-mod-r2\README.txt.deploy" />
2579+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\ccminer-2.2-mod-r2\vcruntime140.dll.deploy" />
2580+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\ccminer-ravencoin-v2.6\ccminer.bat.deploy" />
2581+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\ccminer-ravencoin-v2.6\ccminer.exe.deploy" />
2582+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\ccminer-ravencoin-v2.6\Changelog.txt.deploy" />
2583+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\ccminer-ravencoin-v2.6\color.txt.deploy" />
2584+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\ccminer-ravencoin-v2.6\msvcr120.dll.deploy" />
2585+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\ccminer-x64-2.2.4-cuda9\ccminer-x64.exe.deploy" />
2586+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\ccminer-x64-2.2.4-cuda9\msvcr120.dll.deploy" />
2587+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\ccminer-x64-2.2.4-cuda9\README.txt.deploy" />
2588+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\ccminer-x86-2.2.4-cuda9\ccminer.exe.deploy" />
2589+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\ccminer-x86-2.2.4-cuda9\msvcr120.dll.deploy" />
2590+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\config.txt.deploy" />
2591+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\cuda6.5\cudart64_65.dll.deploy" />
2592+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\cuda7.5\cudart64_75.dll.deploy" />
2593+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\cuda7.5\EthDcrMiner64.exe.deploy" />
2594+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\cuda9.1\cudart64_91.dll.deploy" />
2595+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\cudart64_80.dll.deploy" />
2596+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data.bin.deploy" />
2597+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1a1.bin.deploy" />
2598+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1a1.bin2.deploy" />
2599+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1b1.bin.deploy" />
2600+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1b1.bin2.deploy" />
2601+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1c1.bin.deploy" />
2602+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1c1.bin2.deploy" />
2603+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1c2.bin.deploy" />
2604+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1c2.bin2.deploy" />
2605+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1d1.bin.deploy" />
2606+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1d1.bin2.deploy" />
2607+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1e1.bin.deploy" />
2608+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1e1.bin2.deploy" />
2609+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1e2.bin.deploy" />
2610+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1e2.bin2.deploy" />
2611+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1g1.bin.deploy" />
2612+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1g1.bin2.deploy" />
2613+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1g2.bin.deploy" />
2614+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1g2.bin2.deploy" />
2615+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1h1.bin.deploy" />
2616+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1h1.bin2.deploy" />
2617+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1h2.bin.deploy" />
2618+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1h2.bin2.deploy" />
2619+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1i1.bin.deploy" />
2620+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1i1.bin2.deploy" />
2621+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1j1.bin.deploy" />
2622+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Data1j1.bin2.deploy" />
2623+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\dpools.txt.deploy" />
2624+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\epools.txt.deploy" />
2625+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\EthDcrMiner64.exe.deploy" />
2626+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\History.txt.deploy" />
2627+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\libcurl.dll.deploy" />
2628+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\License.txt.deploy" />
2629+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\msvcr110.dll.deploy" />
2630+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Readme!!!.txt.deploy" />
2631+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Remote manager\API.txt.deploy" />
2632+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Remote manager\EthMan.exe.deploy" />
2633+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Remote manager\libeay32.dll.deploy" />
2634+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Remote manager\readme.txt.deploy" />
2635+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Remote manager\sample.bat.deploy" />
2636+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\Remote manager\ssleay32.dll.deploy" />
2637+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\start_eth+pasc.bat.deploy" />
2638+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\Claymore\start_only_eth.bat.deploy" />
2639+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\DSTM\pthreadVC2.dll.deploy" />
2640+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\DSTM\vcruntime140.dll.deploy" />
2641+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\DSTM\zm.exe.deploy" />
2642+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\EWBF\cudart32_80.dll.deploy" />
2643+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\EWBF\cudart64_80.dll.deploy" />
2644+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\EWBF\miner.exe.deploy" />
2645+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\EWBF\msvcp120.dll.deploy" />
2646+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\EWBF\msvcr120.dll.deploy" />
2647+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\EWBF_NO_ASIC\cudart32_91.dll.deploy" />
2648+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\EWBF_NO_ASIC\cudart64_91.dll.deploy" />
2649+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\EWBF_NO_ASIC\miner.cfg.deploy" />
2650+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\EWBF_NO_ASIC\miner.exe.deploy" />
2651+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\EWBF_NO_ASIC\vcruntime140.dll.deploy" />
2652+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\lyclMiner015\kernels\lyra441p3\lyra441p3.cl.deploy" />
2653+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\lyclMiner015\kernels\skein\skein.cl.deploy" />
2654+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\t-rex-0.7.2-win-cuda10.0\BCD-failover.bat.deploy" />
2655+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\t-rex-0.7.2-win-cuda10.0\BCD-icemining.bat.deploy" />
2656+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\t-rex-0.7.2-win-cuda10.0\config_example.deploy" />
2657+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\t-rex-0.7.2-win-cuda10.0\msvcr71.dll.deploy" />
2658+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\t-rex-0.7.2-win-cuda10.0\RVN-gos.cx.bat.deploy" />
2659+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\t-rex-0.7.2-win-cuda10.0\t-rex-help.txt.deploy" />
2660+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\t-rex-0.7.2-win-cuda10.0\t-rex.exe.deploy" />
2661+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\wildrig-multi-0.12.7-beta\kernel-baffin.bin.deploy" />
2662+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\wildrig-multi-0.12.7-beta\kernel-ellesmere.bin.deploy" />
2663+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\wildrig-multi-0.12.7-beta\kernel-fiji.bin.deploy" />
2664+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\wildrig-multi-0.12.7-beta\kernel-gfx900.bin.deploy" />
2665+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\wildrig-multi-0.12.7-beta\kernel-tonga.bin.deploy" />
2666+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\wildrig-multi-0.12.7-beta\start-help.bat.deploy" />
2667+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\wildrig-multi-0.12.7-beta\start.bat.deploy" />
2668+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\MinerApps\wildrig-multi-0.12.7-beta\wildrig.exe.deploy" />
2669+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\Newtonsoft.Json.dll.deploy" />
2670+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\NLog.config.deploy" />
2671+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\NLog.dll.deploy" />
2672+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\OpenHardwareMonitorLib.dll.deploy" />
2673+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\publish\setup.exe.deploy" />
2674+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\Resources\Images\bitpool.png.deploy" />
2675+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\Resources\Images\btcp.png.deploy" />
2676+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\Resources\Images\btg.png.deploy" />
2677+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\Resources\Images\etc.png.deploy" />
2678+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\Resources\Images\eth.png.deploy" />
2679+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\Resources\Images\exp.png.deploy" />
2680+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\Resources\Images\hush.png.deploy" />
2681+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\Resources\Images\kmd.png.deploy" />
2682+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\Resources\Images\mona.png.deploy" />
2683+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\Resources\Images\rvn.png.deploy" />
2684+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\Resources\Images\vtc.png.deploy" />
2685+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\Resources\Images\zcl.png.deploy" />
2686+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\Resources\Images\zencash.png.deploy" />
2687+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\System.Windows.Interactivity.dll.deploy" />
2688+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\ThinkSharp.FeatureTour.dll.deploy" />
2689+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\ToastNotifications.dll.deploy" />
2690+
<None Include="publish\Application Files\BitPoolMiner_1_0_1_9\ToastNotifications.Messages.dll.deploy" />
25692691
<None Include="publish\BitPoolMiner.application" />
25702692
</ItemGroup>
25712693
<ItemGroup>

‎BitPoolMiner/Miners/Miner.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
using BitPoolMiner.Persistence.API;
44
using BitPoolMiner.Process;
55
using System;
6-
using System.Collections.Generic;
76
using System.Collections.ObjectModel;
87
using System.Linq;
9-
using BitPoolMiner.Utils;
108

119
// This is the Miner base class.
1210

@@ -131,7 +129,11 @@ private MinerMonitorStat SupplementMinerMonitorStatData(MinerMonitorStat stats)
131129
// Iterate through each GPUMonitorStat and add missing data
132130
foreach (GPUMonitorStat gpuMonitorStat in stats.GPUMonitorStatList)
133131
{
134-
gpuMonitorStat.FanSpeed = gpuSettingsList.Where(x => x.GPUID == gpuMonitorStat.GPUID).FirstOrDefault().Fanspeed;
132+
if (gpuMonitorStat.FanSpeed == 0)
133+
gpuMonitorStat.FanSpeed = gpuSettingsList.Where(x => x.GPUID == gpuMonitorStat.GPUID).FirstOrDefault().Fanspeed;
134+
135+
if (gpuMonitorStat.Temp == 0)
136+
gpuMonitorStat.Temp = gpuSettingsList.Where(x => x.GPUID == gpuMonitorStat.GPUID).FirstOrDefault().Temp;
135137
}
136138
}
137139
catch (Exception)
@@ -152,7 +154,7 @@ private bool CheckMinerMonitorStatDataMissing(MinerMonitorStat stats)
152154
{
153155
bool IsDataMissing = false;
154156

155-
foreach(GPUMonitorStat gpuMonitorStat in stats.GPUMonitorStatList)
157+
foreach (GPUMonitorStat gpuMonitorStat in stats.GPUMonitorStatList)
156158
{
157159
// Check if FanSpeed is showing 0
158160
if (gpuMonitorStat.FanSpeed == 0)

‎BitPoolMiner/Models/GPUSettings.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@ public CoinType CoinSelectedForMining
7575
/// </summary>
7676
public Int16 Fanspeed { get; set; }
7777

78+
/// <summary>
79+
/// GPU Temp
80+
/// </summary>
81+
public Int16 Temp { get; set; }
82+
7883
/// <summary>
7984
/// Limit Coin's to be mined based on hardware type
8085
/// </summary>

‎BitPoolMiner/Utils/OpenHardwareMonitor/OpenHardwareMonitor.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public ObservableCollection<GPUSettings> ScanHardware()
3535
gpuSettings.WorkerName = Application.Current.Properties["WorkerName"].ToString();
3636
gpuSettings.HardwareName = hardwareItem.Name;
3737
gpuSettings.EnabledForMining = true;
38-
38+
3939
try
4040
{
4141
gpuSettings.Fanspeed = Convert.ToInt16(hardwareItem.Sensors.Where(x => x.SensorType == SensorType.Control && x.Name == "GPU Fan").FirstOrDefault().Value);
@@ -45,6 +45,15 @@ public ObservableCollection<GPUSettings> ScanHardware()
4545
gpuSettings.Fanspeed = 0;
4646
}
4747

48+
try
49+
{
50+
gpuSettings.Temp = Convert.ToInt16(hardwareItem.Sensors.Where(x => x.SensorType == SensorType.Temperature).FirstOrDefault().Value);
51+
}
52+
catch
53+
{
54+
gpuSettings.Temp = 0;
55+
}
56+
4857
gpuSettings.EnabledForMining = true;
4958

5059
if (hardwareItem.HardwareType == HardwareType.GpuNvidia)

0 commit comments

Comments
 (0)