Skip to content

Commit

Permalink
windows fix
Browse files Browse the repository at this point in the history
  • Loading branch information
MaynardMiner committed Dec 4, 2018
1 parent 458e025 commit f5d6ae3
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 5 deletions.
1 change: 1 addition & 0 deletions build/powershell/icserver.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ $Update = $SWARMParams.Update
$Cuda = $SWARMParams.Cuda
$WattOMeter = $SWARMParams.WattOMeter
$HiveID = $SWARMParams.HiveId
$Farm_Hash = $SWARMParams.Farm_Hash
$HivePassword = $SWARMParams.HivePassword
$HiveMirror = $SWARMParams.HiveMirror
$Rejections = $SWARMParams.Rejections
Expand Down
4 changes: 2 additions & 2 deletions build/powershell/peekaboo.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ $cpuid = $cpud.DeviceID
$disk = $(Get-WMIObject win32_diskdrive).model
$url = $HiveMirror


$Hello = @{
method = "hello"
jsonrpc = "2.0"
Expand Down Expand Up @@ -76,7 +77,6 @@ $Hello = @{
server_url = "$url"
}
}


Write-Host "Saying Hello To Hive"
$Hello | ConvertTo-Json -Depth 3 -Compress | Set-Content ".\build\txt\hello.txt"
Expand All @@ -103,7 +103,7 @@ try{
$message = $hiveresponse
}
else{$message = $response.result.config}
}
}
catch{$message = "Failed To Contact HiveOS.Farm"}

return $message
Expand Down
2 changes: 1 addition & 1 deletion help files/Change.log
Original file line number Diff line number Diff line change
Expand Up @@ -1142,7 +1142,7 @@ Use -Farm_Hash argument for Windows version.
This is a HUGE update. Please note any issues,
so they can be patched asap.

-AMDPlatform is no longer needed: it was removed
-AMDPlatform is no longer needed: it was removed (not for windows)
-OnboardCard is no longer needed: it was removed

Bleeding Edge is now supported and working.
Expand Down
16 changes: 14 additions & 2 deletions swarm.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,9 @@ param(
[Parameter(Mandatory=$false)]
[Int]$MinerBanCount = 4,
[Parameter(Mandatory=$false)]
[String]$Lite = "No"
[String]$Lite = "No",
[Parameter(Mandatory=$false)]
[String]$AMDPlatform
)


Expand Down Expand Up @@ -188,13 +190,15 @@ $CurrentParams.Add("Update",$Update)
$CurrentParams.Add("Cuda",$Cuda)
$CurrentParams.Add("WattOMeter",$WattOMeter)
$CurrentParams.Add("HiveId",$HiveId)
$CurrentParams.Add("Farm_Hash",$Farm_Hash)
$CurrentParams.Add("HivePassword",$HivePassword)
$CurrentParams.Add("HiveMirror",$HiveMirror)
$CurrentParams.Add("Rejections",$Rejections)
$CurrentParams.Add("PoolBans",$PoolBans)
$CurrentParams.Add("PoolBanCount",$PoolBanCount)
$CurrentParams.Add("AlgoBanCount",$AlgoBanCount)
$CurrentParams.Add("MinerBanCount",$MinerBanCount)
if($Platform -eq "windows"){$CurrentParams.Add("AMDPlatform",$AMDPlatform)}
$CurrentParams.Add("Lite",$Lite)
$StartParams = $CurrentParams | ConvertTo-Json
$StartingParams = $CurrentParams | ConvertTo-Json -Compress
Expand Down Expand Up @@ -260,13 +264,15 @@ $Update = $SWARMParams.Update
$Cuda = $SWARMParams.Cuda
$WattOMeter = $SWARMParams.WattOMeter
$HiveID = $SWARMParams.HiveId
$Farm_Hash = $SWARMParams.Farm_Hash
$HivePassword = $SWARMParams.HivePassword
$HiveMirror = $SWARMParams.HiveMirror
$Rejections = $SWARMParams.Rejections
$PoolBans = $SWARMParams.PoolBans
$PoolBanCount = $SWARMParams.PoolBanCount
$AlgoBanCount = $SWARMParams.AlgoBanCount
$Lite = $SWARMParams.Lite
if($Platform -eq "windows"){$AMDPlatform = $SWARMParams.AMDPlatform}
}

$Version = Split-Path ($script:MyInvocation.MyCommand.Path) -Parent
Expand Down Expand Up @@ -368,9 +374,13 @@ start-update -Update $update
if($HiveOS -eq "Yes"){
Write-Host "Getting Data"
Get-Data -CmdDir $dir
if($Type -like "*AMD*"){[string]$AMDPlatform = get-AMDPlatform -Platforms $Platform}
if($Type -like "*AMD*"){
[string]$AMDPlatform = get-AMDPlatform -Platforms $Platform
Write-Host "AMD OpenCL Platform is $AMDPlatform"
}
}
}

Write-Host "HiveOS = $HiveOS"
#Startings Settings:
$BenchmarkMode = "No"
Expand Down Expand Up @@ -552,13 +562,15 @@ $Update = $SWARMParams.Update
$Cuda = $SWARMParams.Cuda
$WattOMeter = $SWARMParams.WattOMeter
$HiveID = $SWARMParams.HiveId
$Farm_Hash = $SWARMParams.Farm_Hash
$HivePassword = $SWARMParams.HivePassword
$HiveMirror = $SWARMParams.HiveMirror
$Rejections = $SWARMParams.Rejections
$PoolBans = $SWARMParams.PoolBans
$PoolBanCount = $SWARMParams.PoolBanCount
$AlgoBanCount = $SWARMParams.AlgoBanCount
$Lite = $SWARMParams.Lite
if($Platform -eq "windows"){$AMDPlatform = $SWARMParams.AMDPlatform}

if($SWARMParams.Rigname1 -eq "Donate"){$Donating = $True}
else{$Donating = $False}
Expand Down

0 comments on commit f5d6ae3

Please sign in to comment.