Skip to content

Commit

Permalink
v1.7.2 initial
Browse files Browse the repository at this point in the history
  • Loading branch information
MaynardMiner committed Nov 9, 2018
1 parent 1653b3e commit b9c37e8
Show file tree
Hide file tree
Showing 14 changed files with 107 additions and 132 deletions.
1 change: 0 additions & 1 deletion SWARM.1.7.1.conf

This file was deleted.

Empty file added SWARM.1.7.2.conf
Empty file.
4 changes: 2 additions & 2 deletions algopools/ahashpool.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ $ahashpool_Request | Get-Member -MemberType NoteProperty -ErrorAction Ignore | S
User1 = $Wallet1
User2 = $Wallet2
User3 = $Wallet3
CPUser = $CPUWallet
CPUPass = "c=$CPUcurrency,ID=$Rigname1"
CPUser = $Wallet1
CPUPass = "c=$Passwordcurrency1,ID=$Rigname1"
Pass1 = "c=$Passwordcurrency1,ID=$Rigname1"
Pass2 = "c=$Passwordcurrency2,ID=$Rigname2"
Pass3 = "c=$Passwordcurrency3,ID=$Rigname3"
Expand Down
4 changes: 2 additions & 2 deletions algopools/blazepool.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ $blazepool_Request | Get-Member -MemberType NoteProperty -ErrorAction Ignore | S
User1 = $Wallet1
User2 = $Wallet2
User3 = $Wallet3
CPUser = $CPUWallet
CPUPass = "c=$CPUcurrency,ID=$Rigname1"
CPUser = $Wallet1
CPUPass = "c=$Passwordcurrency1,ID=$Rigname1"
Pass1 = "c=$Passwordcurrency1,ID=$Rigname1"
Pass2 = "c=$Passwordcurrency2,ID=$Rigname2"
Pass3 = "c=$Passwordcurrency3,ID=$Rigname3"
Expand Down
8 changes: 4 additions & 4 deletions algopools/blockmasters.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ $blockpool_Request | Get-Member -MemberType NoteProperty -ErrorAction Ignore | S
If($AltWallet1 -ne ''){$blockWallet1 = $AltWallet1}
else{$blockWallet1 = $Wallet1}
if($AltWallet2 -ne ''){$blockWallet2 = $AltWallet2}
else{$AltWallet2 = $Wallet2}
else{$blockWallet2 = $Wallet2}
if($AltWallet3 -ne ''){$blockWallet3 = $AltWallet3}
else{$blockWallet3 = $Wallet3}
if($AltPassword1 -ne ''){$blockpass1 = $Altpassword1}
Expand All @@ -63,11 +63,11 @@ $blockpool_Request | Get-Member -MemberType NoteProperty -ErrorAction Ignore | S
User1 = $blockwallet1
User2 = $blockwallet2
User3 = $blockwallet3
CPUser = $CPUWallet
CPUPass = "c=$CPUcurrency,ID=$Rigname1"
CPUser = $blockwallet1
CPUPass = "c=$blockpass1,ID=$Rigname1"
Pass1 = "c=$blockpass1,ID=$Rigname1"
Pass2 = "c=$blockpass2,ID=$Rigname2"
Pass3 = "c=$blockpass3,ID=$Rigname3"
Pass3 = "c=$blockpass3,ID=$Rigname3"
Location = $Location
SSL = $false
}
Expand Down
4 changes: 2 additions & 2 deletions algopools/fairpool.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ $fairpool_Request | Get-Member -MemberType NoteProperty -ErrorAction Ignore | Se
User1 = $Wallet1
User2 = $Wallet2
User3 = $Wallet3
CPUser = $CPUWallet
CPUPass = "c=$CPUcurrency,ID=$Rigname1"
CPUser = $Wallet1
CPUPass = "c=$Passwordcurrency1,ID=$Rigname1"
Pass1 = "c=$Passwordcurrency1,ID=$Rigname1"
Pass2 = "c=$Passwordcurrency2,ID=$Rigname2"
Pass3 = "c=$Passwordcurrency3,ID=$Rigname3"
Expand Down
8 changes: 4 additions & 4 deletions algopools/hashrefinery.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@
Host = $Hashrefinery_Host
Port = $Hashrefinery_Port
User1 = $Wallet1
User2 = $Wallet2
User2 = $Wallet2
User3 = $Wallet3
CPUser = $CPUWallet
CPUPass = "c=$CPUcurrency,ID=$Rigname1"
CPUser = $Wallet1
CPUPass = "c=$Passwordcurrency1,ID=$Rigname1"
Pass1 = "c=$Passwordcurrency1,ID=$Rigname1"
Pass2 = "c=$Passwordcurrency2,ID=$Rigname2"
Pass3 = "c=$Passwordcurrency3,ID=$Rigname3"
Pass3 = "c=$Passwordcurrency3,ID=$Rigname3"
Location = $Location
SSL = $false
}
Expand Down
4 changes: 2 additions & 2 deletions algopools/nlpool.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ $nlpoolAlgo_Request = [PSCustomObject]@{}
User1 = $nWallet1
User2 = $nWallet2
User3 = $nWallet3
CPUser = $CPUWallet
CPUPass = "c=$CPUcurrency,ID=$Rigname1"
CPUser = $nWallet1
CPUPass = "c=$npass1,ID=$Rigname1"
Pass1 = "c=$npass1,ID=$Rigname1"
Pass2 = "c=$npass2,ID=$Rigname2"
Pass3 = "c=$npass3,ID=$Rigname3"
Expand Down
4 changes: 1 addition & 3 deletions algopools/starpool.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ $starpool_Request | Get-Member -MemberType NoteProperty -ErrorAction Ignore | Se
else{$Spass2 = $Passwordcurrency2}
If($AltPassword3 -ne ''){if($AltPassword3 -eq "DASH" -or $AltPassword3 -eq "LTC" -or $AltPassword3 -eq "CANN" -or $AltPassword3 -eq "DGB"){$SPass3 = $AltPassword3}}
else{$Spass3 = $Passwordcurrency3}

BTC, c=DASH, c=LTC, c=CANN, c=DGB
[PSCustomObject]@{
Coin = "No"
Symbol = $starpool_Algorithm
Expand All @@ -61,7 +59,7 @@ $starpool_Request | Get-Member -MemberType NoteProperty -ErrorAction Ignore | Se
User1 = $SWallet1
User2 = $SWallet2
User3 = $SWallet3
CPUser = $SPass1
CPUser = $SWallet1
CPUPass = "c=$SPass1,ID=$Rigname1"
Pass1 = "c=$SPass1,ID=$Rigname1"
Pass2 = "c=$SPass2,ID=$Rigname2"
Expand Down
31 changes: 4 additions & 27 deletions build/powershell/background.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -124,30 +124,11 @@ $GetMiners | Foreach {
}

##Set-OC
$OC = $false
$GetMiners | foreach {
if($_.Type -like "*NVIDIA*" -or $_.Type -like "*AMD*" -and $OC -eq $false)
{
Write-Host "Starting Tuning"
Start-OC -Platforms $Platforms
$OC = $true
}
}

##Set-OC
$OC = $false
$GetMiners | foreach {
if($_.Type -like "*NVIDIA*" -or $_.Type -like "*AMD*" -and $OC -eq $false)
{
Write-Host "Starting Tuning"
Start-OC -Platforms $Platforms
$OC = $true
}
}
Write-Host "Starting Tuning"
Start-OC -Platforms $Platforms

Start-Sleep -S 10
$CPUOnly = $true

$GetMiners | Foreach {
if($_.Type -like "*NVIDIA*" -or $_.Type -like "*AMD*"){$CPUOnly = $false; "GPU" | Set-Content ".\build\txt\miner.txt"}
}
Expand All @@ -174,10 +155,6 @@ for($i=0; $i -lt $GCount.CPU.PSObject.Properties.Value.Count; $i++){$CPUHashrate
if($DevAMD -eq $true){for($i=0; $i -lt $GCount.AMD.PSObject.Properties.Value.Count; $i++){$GPUHashrates | Add-Member -MemberType NoteProperty -Name "$($GCount.AMD.$i)" -Value 0; $GPUFans | Add-Member -MemberType NoteProperty -Name "$($GCount.AMD.$i)" -Value 0; $GPUTemps | Add-Member -MemberType NoteProperty -Name "$($GCount.AMD.$i)" -Value 0; $GPUPower | Add-Member -MemberType NoteProperty -Name "$($GCount.AMD.$i)" -Value 0}}
if($DevNVIDIA -eq $true){for($i=0; $i -lt $GCount.NVIDIA.PSObject.Properties.Value.Count; $i++){$GPUHashrates | Add-Member -MemberType NoteProperty -Name "$($GCount.NVIDIA.$i)" -Value 0; $GPUFans | Add-Member -MemberType NoteProperty -Name "$($GCount.NVIDIA.$i)" -Value 0; $GPUTemps | Add-Member -MemberType NoteProperty -Name "$($GCount.NVIDIA.$i)" -Value 0; $GPUPower | Add-Member -MemberType NoteProperty -Name "$($GCount.NVIDIA.$i)" -Value 0}}

Write-Host "Initial Hash Array $GPUHashrates"
if($RAW -ne $null){Write-Host "Initial hashes = $RAW"}
if($HashRates -ne $null){Write-host "Initial Stats = $HashRates"}

if($Platforms -eq "windows")
{
$CheckTimer = New-Object -TypeName System.Diagnostics.Stopwatch
Expand Down Expand Up @@ -534,7 +511,7 @@ if($Platforms -eq "windows" -and $HiveId -ne $null)
'lyclminer'
{
$HS = "khs"
Write-Host "Miner $MinerType is tdxminer (logging) api"
Write-Host "Miner $MinerType is lyclminer (logging) api"
Write-Host "Miner Devices is $Devices"
$HashArray =@()
$Hashed = @()
Expand Down Expand Up @@ -588,7 +565,7 @@ if($Platforms -eq "windows" -and $HiveId -ne $null)
$KHS += [Double]$TotalRaw/1000
$ALGO = $MinerAlgo
$TotalRaw | Set-Content ".\build\txt\$MinerType-hash.txt"
Write-Host "Miner $Name was clocked at $([Double]$RAW/1000)" -foreground Yellow
Write-Host "Miner $Name was clocked at $([Double]$TotalRaw/1000)" -foreground Yellow
$Process = Get-Process | Where Name -clike "*$($MinerType)*"
Write-Host "Current Running instances: $($Process.Name)"
$AA = $A | Select-String "Accepted" | Select -Last 1
Expand Down
13 changes: 11 additions & 2 deletions build/powershell/get.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ get [item] [argument2] [argument3] [argument4] [argument5]
EXAMPLE USES:
get miner NVIDIA1 trex x16r difficulty
get miner CPU jayddee all
get miners NVIDIA1 trex x16r difficulty
get miners CPU jayddee all
get screen miner
get stats
get oc NVIDIA1 aergo power
Expand Down Expand Up @@ -213,6 +213,15 @@ else{Write-Host "No Stats History Found"}
if(Test-Path ".\build\bash\mineractive.sh"){Get-Content ".\build\bash\mineractive.sh"}
else{Write-Host "No Miner History Found"}
}
"parameters"
{
if(Test-Path ".\config\parameters\arguments.json")
{
$MinerArgs = Get-Content ".\config\parameters\arguments.json" | ConvertFrom-Json
$MinerArgs
}
else{Write-Host "No Parameters For SWARM found"}
}
default
{
$default =
Expand Down
6 changes: 0 additions & 6 deletions build/powershell/octune.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,12 @@ if($_.Type -like "*NVIDIA*")
{
if($_.Devices -eq $null){$OCDevices = Get-DeviceString -TypeCount $GCount.NVIDIA.PSObject.Properties.Value.Count}
else{$OCDevices = Get-DeviceString -TypeDevices $_.Devices}
Write-Host "$($_.Type) is mining with $($_.Name)"
Write-Host "Platform is $Platforms"
$Core = $_.occore -split ' '
$Mem = $_.ocmem -split ' '
$Power = $_.ocpower -split ' '
$Core = $Core -split ","
$Mem = $Mem -split ","
$Power = $Power -split ","
$NScreenMiners += "$($_.Type) is using $($_.Name) mining $($_.Algo) "
if($Card)
{
if($Core)
Expand Down Expand Up @@ -148,14 +145,11 @@ if($_.Type -like "*AMD*")
{
if($_.Devices -eq $null){$OCDevices = Get-DeviceString -TypeCount $GCount.AMD.PSObject.Properties.Value.Count}
else{$OCDevices = Get-DeviceString -TypeDevices $_.Devices}
Write-Host "$($_.Type) is mining with $($_.Name)"
Write-Host "Platform is $Platforms"
$CoreClock = $_.occore -split ' '
$CoreState = $_.ocdpm -split ' '
$MemClock = $_.ocmem -split ' '
$MemState = $_.ocmdmp -split ' '
$Voltage = $_.ocv -split ' '
$AScreenMiners += "$($_.Type) is using $($_.Name) mining $($_.Algo) "
if($Card)
{

Expand Down
32 changes: 31 additions & 1 deletion help files/Change.log
Original file line number Diff line number Diff line change
Expand Up @@ -902,4 +902,34 @@ but API is awaiting stats.
``get benchmarks``
``get stats``
``get active``
-will add more in near future
-will add more in near future

1.7.2

-Remote Updates Are Safe.
-AMD Users
``-AMDPlatform`` to specify OpenCL platform
``-OnboardCard`` Yes or No to specify motherboard has integrated GPU
-Argument Changes IMPORTANT!!
-NlWallet1 2 3 removed
-NlPassword1 2 3 removed
-BlockmastersWallet1 2 3 removed
-BlockmastersWallet1 2 3 removed
-New ARGUMENTS!
``-AltWallet1`` 2 and 3
``-AltPassword1`` 2 and 3
specify these if you wish to use a wallet other than BTC
check with pool to confirm wallet is accepted. Is meant
to be used in conjucntion with -Wallet1/-PasswordCurrency1 (BTC address)
-New COMMANDS!
``get parameters``
used to see current arguments you have specified.
can be used to troubleshoot issues.
-Updated teamredminer
-Updated CryptoDredge
-Updated T-Rex
-Moved lyclMiner to project folder after multiple user requests.
-Fixed OC system, both platforms. OC tuning should now work
without fail from SWARM.
-

Loading

0 comments on commit b9c37e8

Please sign in to comment.