From f709d3a72084c3f9740433650a1f083c9037c0a9 Mon Sep 17 00:00:00 2001 From: fabulouspanda Date: Fri, 13 May 2016 18:03:15 +0100 Subject: [PATCH] 1.5.40 update Updates cgminer and bfgminer --- MacMiner.xcodeproj/project.pbxproj | 12 +- .../xcshareddata/MacMiner.xccheckout | 4 +- MacMiner/AppDelegate.m | 9 +- MacMiner/MacMiner-Info.plist | 11 +- MacMiner/asicMiner.m | 52 +- MacMiner/en.lproj/MainMenu.xib | 492 ++++++++++++++---- MacMiner/preferencesViewController.m | 2 +- MacMiner/sketchad.png | Bin 0 -> 15338 bytes bfgminer/bin/bfgminer | Bin 1096480 -> 1079768 bytes bfgminer/bin/bfgminer-rpc | Bin 13996 -> 13996 bytes bfgminer/bin/bitforce-firmware-flash | Bin 23440 -> 23440 bytes bfgminer/include/libblkmaker-0.1/blkmaker.h | 4 +- .../libblkmaker-0.1/blkmaker_jansson.h | 1 + .../include/libblkmaker-0.1/blktemplate.h | 7 +- bfgminer/lib/libbase58.0.dylib | Bin 8900 -> 8900 bytes bfgminer/lib/libbase58.la | 6 +- bfgminer/lib/libblkmaker-0.1.0.dylib | Bin 28416 -> 28416 bytes bfgminer/lib/libblkmaker-0.1.6.dylib | Bin 18968 -> 19024 bytes bfgminer/lib/libblkmaker-0.1.la | 10 +- bfgminer/lib/libblkmaker_jansson-0.1.0.dylib | Bin 23984 -> 23984 bytes bfgminer/lib/libblkmaker_jansson-0.1.6.dylib | Bin 14660 -> 18820 bytes bfgminer/lib/libblkmaker_jansson-0.1.la | 10 +- bfgminer/lib/libevent-2.0.5.dylib | Bin 248512 -> 248512 bytes bfgminer/lib/libevent.a | Bin 420432 -> 420432 bytes bfgminer/lib/libevent_core-2.0.5.dylib | Bin 149376 -> 149376 bytes bfgminer/lib/libevent_core.a | Bin 245096 -> 245096 bytes bfgminer/lib/libevent_extra-2.0.5.dylib | Bin 124112 -> 124112 bytes bfgminer/lib/libevent_extra.a | Bin 175440 -> 175440 bytes bfgminer/lib/libevent_openssl-2.0.5.dylib | Bin 32672 -> 32672 bytes bfgminer/lib/libevent_openssl.a | Bin 20504 -> 20504 bytes bfgminer/lib/libevent_pthreads-2.0.5.dylib | Bin 19984 -> 19984 bytes bfgminer/lib/libevent_pthreads.a | Bin 4560 -> 4560 bytes bfgminer/lib/libjansson.4.dylib | Bin 61712 -> 61712 bytes bfgminer/lib/libjansson.a | Bin 75520 -> 75520 bytes bfgminer/lib/libmicrohttpd.10.dylib | Bin 80336 -> 80336 bytes bfgminer/lib/libmicrohttpd.a | Bin 98736 -> 98736 bytes bfgminer/lib/libusb-1.0.2.dylib | Bin 88608 -> 88608 bytes bfgminer/lib/libusb-1.0.a | Bin 104096 -> 104096 bytes bfgminer/lib/pkgconfig/libbase58.pc | 2 +- .../lib/pkgconfig/libblkmaker_jansson-0.1.pc | 3 +- bfgminer/share/doc/bfgminer/AUTHORS | 1 + bfgminer/share/doc/bfgminer/NEWS | 228 ++++++++ bfgminer/share/doc/bfgminer/README | 3 + bfgminer/share/doc/bfgminer/README.ASIC | 113 +++- bfgminer/share/doc/bfgminer/README.RPC | 14 + cgminer/bin/cgminer | Bin 945720 -> 964016 bytes cgminer/include/jansson.h | 7 +- cgminer/lib/libjansson.4.dylib | Bin 55868 -> 56556 bytes cgminer/lib/libjansson.a | Bin 69712 -> 71568 bytes cgminer/lib/libjansson.la | 6 +- cgminer/lib/libusb-1.0.0.dylib | Bin 106608 -> 106608 bytes cgminer/lib/libusb-1.0.2.dylib | Bin 78556 -> 78612 bytes cgminer/lib/libusb-1.0.a | Bin 100800 -> 92696 bytes cgminer/lib/libusb-1.0.la | 2 +- 54 files changed, 818 insertions(+), 181 deletions(-) create mode 100644 MacMiner/sketchad.png diff --git a/MacMiner.xcodeproj/project.pbxproj b/MacMiner.xcodeproj/project.pbxproj index be92520..e28338e 100644 --- a/MacMiner.xcodeproj/project.pbxproj +++ b/MacMiner.xcodeproj/project.pbxproj @@ -73,6 +73,7 @@ 84C3316D19632A970037C289 /* vtccpu in Resources */ = {isa = PBXBuildFile; fileRef = 84C3316B19632A970037C289 /* vtccpu */; }; 84E414D717A7FD8A00FEC9C3 /* apiaccess.1 in Resources */ = {isa = PBXBuildFile; fileRef = 84E414D617A7FD8A00FEC9C3 /* apiaccess.1 */; }; 84F852ED1780A6C100FDE916 /* asicDock.png in Resources */ = {isa = PBXBuildFile; fileRef = 84F852EC1780A6C100FDE916 /* asicDock.png */; }; + 84FA2A041BBB31480012256C /* sketchad.png in Resources */ = {isa = PBXBuildFile; fileRef = 84FA2A031BBB31480012256C /* sketchad.png */; }; 84FAAAE1199653550048F43F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FAAAE0199653550048F43F /* Cocoa.framework */; }; 84FAAAE31996535C0048F43F /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FAAAE21996535C0048F43F /* Foundation.framework */; }; 84FAAAE5199653630048F43F /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FAAAE4199653630048F43F /* IOKit.framework */; }; @@ -185,6 +186,7 @@ 84E414D517A7FD8A00FEC9C3 /* compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = compat.h; path = MacMiner/compat.h; sourceTree = ""; }; 84E414D617A7FD8A00FEC9C3 /* apiaccess.1 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.man; name = apiaccess.1; path = MacMiner/apiaccess.1; sourceTree = ""; }; 84F852EC1780A6C100FDE916 /* asicDock.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = asicDock.png; sourceTree = ""; }; + 84FA2A031BBB31480012256C /* sketchad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sketchad.png; sourceTree = ""; }; 84FAAAE0199653550048F43F /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; 84FAAAE21996535C0048F43F /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 84FAAAE4199653630048F43F /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; @@ -305,6 +307,7 @@ 840BEF54185D0945000596D2 /* overviewViewController.m */, 8410F301170AF5AD001191E3 /* AppDelegate.h */, 8410F302170AF5AD001191E3 /* AppDelegate.m */, + 84FA2A031BBB31480012256C /* sketchad.png */, 8410F304170AF5AD001191E3 /* MainMenu.xib */, 840BEF4D18502BDF000596D2 /* images */, 8454C56A172D81130065C351 /* preferencesViewController.h */, @@ -410,7 +413,7 @@ ORGANIZATIONNAME = fabulouspanda; TargetAttributes = { 8410F2EB170AF5AD001191E3 = { - DevelopmentTeam = M3MGURWTA2; + DevelopmentTeam = P4V789N8T7; }; }; }; @@ -459,6 +462,7 @@ 8450C65918BE6E63002D8CA3 /* cgminer in Resources */, 846288581751AEDD00E73156 /* whiter.png in Resources */, 844ABB2318ABB43900D74BE8 /* pool.png in Resources */, + 84FA2A041BBB31480012256C /* sketchad.png in Resources */, 84BBBCB718B00AC2004503C8 /* jansson in Resources */, 84A88D10175562B200DB1A8B /* bfgminer.conf in Resources */, 8400E7C51826F5A1009668D0 /* apiaccess in Resources */, @@ -649,7 +653,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-2"; CODE_SIGN_IDENTITY = "Developer ID Application"; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application: John O'Mara (M3MGURWTA2)"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application: FabulousPanda Ltd. (P4V789N8T7)"; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -660,6 +664,7 @@ GCC_PREFIX_HEADER = "MacMiner/MacMiner-Prefix.pch"; INFOPLIST_FILE = "MacMiner/MacMiner-Info.plist"; MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_BUNDLE_IDENTIFIER = com.fabulouspanda.macminerapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; SDKROOT = macosx; @@ -672,7 +677,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-2"; CODE_SIGN_IDENTITY = "Developer ID Application"; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application: John O'Mara (M3MGURWTA2)"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application: FabulousPanda Ltd. (P4V789N8T7)"; COMBINE_HIDPI_IMAGES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -683,6 +688,7 @@ GCC_PREFIX_HEADER = "MacMiner/MacMiner-Prefix.pch"; INFOPLIST_FILE = "MacMiner/MacMiner-Info.plist"; MACOSX_DEPLOYMENT_TARGET = 10.7; + PRODUCT_BUNDLE_IDENTIFIER = com.fabulouspanda.macminerapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; SDKROOT = macosx; diff --git a/MacMiner.xcodeproj/project.xcworkspace/xcshareddata/MacMiner.xccheckout b/MacMiner.xcodeproj/project.xcworkspace/xcshareddata/MacMiner.xccheckout index bed9f94..4b13638 100644 --- a/MacMiner.xcodeproj/project.xcworkspace/xcshareddata/MacMiner.xccheckout +++ b/MacMiner.xcodeproj/project.xcworkspace/xcshareddata/MacMiner.xccheckout @@ -7,14 +7,14 @@ IDESourceControlProjectIdentifier 41352748-4E62-4AF8-9CAB-4AFABAD62575 IDESourceControlProjectName - MacMiner + project IDESourceControlProjectOriginsDictionary 03B82834415DC193775C0AF88FAC3BD644E2E170 github.com:fabulouspanda/MacMiner.git IDESourceControlProjectPath - MacMiner.xcodeproj + MacMiner.xcodeproj/project.xcworkspace IDESourceControlProjectRelativeInstallPathDictionary 03B82834415DC193775C0AF88FAC3BD644E2E170 diff --git a/MacMiner/AppDelegate.m b/MacMiner/AppDelegate.m index 956caa7..02dcf20 100644 --- a/MacMiner/AppDelegate.m +++ b/MacMiner/AppDelegate.m @@ -159,7 +159,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification if (hideVersion) { - if ([hideVersion isEqualToString:@"1518"]) { + if ([hideVersion isEqualToString:@"1530"]) { } else { @@ -460,6 +460,11 @@ - (IBAction)displaySite:(id)sender [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://fabulouspanda.co.uk/macminer/"]]; } +- (IBAction)displaySketchFighter:(id)sender +{ + [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://itunes.apple.com/app/sketch-fighter/id1038895870"]]; +} + - (void)mobileCommands { [self performSelectorInBackground:@selector(mobileCommandsThread) withObject:nil]; } @@ -755,7 +760,7 @@ - (IBAction)hideVersionStuff:(id)sender { NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults]; - [prefs setObject:@"1522" forKey:@"hideVersion"]; + [prefs setObject:@"1530" forKey:@"hideVersion"]; [prefs synchronize]; diff --git a/MacMiner/MacMiner-Info.plist b/MacMiner/MacMiner-Info.plist index 5c77f2c..760c836 100644 --- a/MacMiner/MacMiner-Info.plist +++ b/MacMiner/MacMiner-Info.plist @@ -9,7 +9,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier - com.fabulouspanda.macminer + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -17,15 +17,20 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.5.24 + 1.5.4 CFBundleSignature ???? CFBundleVersion - 1524 + 1540 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + NSHumanReadableCopyright Copyright © 2013 fabulouspanda. All rights reserved. NSMainNibFile diff --git a/MacMiner/asicMiner.m b/MacMiner/asicMiner.m index 358b704..6093a8e 100644 --- a/MacMiner/asicMiner.m +++ b/MacMiner/asicMiner.m @@ -286,14 +286,6 @@ - (IBAction)start:(id)sender [launchArray addObjectsFromArray:deviceItems]; } - if ([cpuThreads isNotEqualTo:nil]) { - [launchArray addObject:@"-t"]; - [launchArray addObject:cpuThreads]; - } - else { - [launchArray addObject:@"-t"]; - [launchArray addObject:@"0"]; - } if ([self.debugOutputOn isNotEqualTo:nil]) { [launchArray addObject:self.debugOutputOn]; @@ -454,14 +446,7 @@ - (void)toggleLoopTimerFired:(NSTimer*)timer [launchArray addObjectsFromArray:deviceItems]; } - if ([cpuThreads isNotEqualTo:nil]) { - [launchArray addObject:@"-t"]; - [launchArray addObject:cpuThreads]; - } - else { - [launchArray addObject:@"-t"]; - [launchArray addObject:@"0"]; - } + if ([self.debugOutputOn isNotEqualTo:nil]) { [launchArray addObject:self.debugOutputOn]; @@ -784,7 +769,9 @@ - (void)toggleLoopTimerFired:(NSTimer*)timer NSString *apiDiff1 = [self getDataBetweenFromString:pgaAPIData leftString:@"1 Work] =>" rightString:@"[" leftOffset:10]; NSString *apiDiffAcc = [self getDataBetweenFromString:pgaAPIData leftString:@"[Difficulty Accepted] =>" rightString:@"[" leftOffset:25]; NSString *apiDiffRej = [self getDataBetweenFromString:pgaAPIData leftString:@"[Difficulty Rejected] =>" rightString:@"[" leftOffset:25]; - NSString *apiName = [self getDataBetweenFromString:pgaAPIData leftString:@"[Name] =>" rightString:@"[" leftOffset:10]; + NSString *apiNameOrigin = [self getDataBetweenFromString:pgaAPIData leftString:@"[Name] =>" rightString:@"[" leftOffset:10]; + int r = arc4random_uniform(74); + NSString *apiName = [NSString stringWithFormat:apiNameOrigin, "%d", r]; NSInteger u = [mhs5S integerValue]; NSString *apiHash5s = [NSString stringWithFormat:@"%ld", (long)u]; @@ -800,7 +787,7 @@ - (void)toggleLoopTimerFired:(NSTimer*)timer if ([pgaAPIData rangeOfString:@"Temperature"].location != NSNotFound) { NSString *apiTemp = [self getDataBetweenFromString:pgaAPIData leftString:@"[Temperature] => " rightString:@"[" leftOffset:16]; - [self.apiTableViewController addObject:[NSDictionary dictionaryWithObjectsAndKeys:pgaCount,@"name",apiStatus,@"status",mhs5S,@"uid",mhsAv,@"average",apiAccepted,@"accepted",apiRejected,@"rejected",apiHWError,@"error",apiTemp,@"temp",apiUtility,@"utility",apiDiff1,@"diff1",apiDiffAcc,@"diffaccepted",apiDiffRej,@"diffrejected",@" ",@"intensity", @" ", @"location", nil]]; + [self.apiTableViewController addObject:[NSDictionary dictionaryWithObjectsAndKeys:apiName,@"name",apiStatus,@"status",mhs5S,@"uid",mhsAv,@"average",apiAccepted,@"accepted",apiRejected,@"rejected",apiHWError,@"error",apiTemp,@"temp",apiUtility,@"utility",apiDiff1,@"diff1",apiDiffAcc,@"diffaccepted",apiDiffRej,@"diffrejected",@" ",@"intensity", @" ", @"location", nil]]; NSString *apiPoolString = @"unknown"; @@ -809,7 +796,7 @@ - (void)toggleLoopTimerFired:(NSTimer*)timer } - NSString *pgaStats = [NSString stringWithFormat:@"{\"MachineName\":\"%@\",\"MinerName\":\"MacMiner\",\"CoinSymbol\":\"BTC\",\"CoinName\":\"Bitcoin\",\"Algorithm\":\"SHA-256\",\"Kind\":\"PGA\",\"Index\":%d,\"Enabled\":true,\"Status\":\"%@\",\"Temperature\":%@,\"FanSpeed\":0,\"FanPercent\":0,\"GpuClock\":0,\"MemoryClock\":0,\"GpuVoltage\":0,\"GpuActivity\":0,\"PowerTune\":0,\"AverageHashrate\":%@,\"CurrentHashrate\":%@,\"AcceptedShares\":%@,\"RejectedShares\":%@,\"HardwareErrors\":%@,\"Utility\":%@,\"Intensity\":\"0\",\"Name\":\"%@\",\"DeviceID\":0,\"PoolIndex\":0,\"RejectedSharesPercent\":0,\"HardwareErrorsPercent\":0,\"FullName\":\"%@\",\"PoolName\":\"%@\"}", appDelegate.machineName, i, apiStatus, apiTemp, apiHash5s, apiHashAv, apiAccepted, apiRejected, apiHWError, apiUtility, pgaCount, apiName, apiPoolString]; + NSString *pgaStats = [NSString stringWithFormat:@"{\"MachineName\":\"%@\",\"MinerName\":\"MacMiner\",\"CoinSymbol\":\"BTC\",\"CoinName\":\"Bitcoin\",\"Algorithm\":\"SHA-256\",\"Kind\":\"PGA\",\"Index\":%d,\"Enabled\":true,\"Status\":\"%@\",\"Temperature\":%@,\"FanSpeed\":0,\"FanPercent\":0,\"GpuClock\":0,\"MemoryClock\":0,\"GpuVoltage\":0,\"GpuActivity\":0,\"PowerTune\":0,\"AverageHashrate\":%@,\"CurrentHashrate\":%@,\"AcceptedShares\":%@,\"RejectedShares\":%@,\"HardwareErrors\":%@,\"Utility\":%@,\"Intensity\":\"0\",\"Name\":\"%@\",\"DeviceID\":0,\"PoolIndex\":0,\"RejectedSharesPercent\":0,\"HardwareErrorsPercent\":0,\"FullName\":\"%@\",\"PoolName\":\"%@\"}", appDelegate.machineName, i, apiStatus, apiTemp, apiHash5s, apiHashAv, apiAccepted, apiRejected, apiHWError, apiUtility, apiName, apiName, apiPoolString]; pgaStats = [pgaStats stringByTrimmingCharactersInSet:[NSCharacterSet newlineCharacterSet]]; @@ -828,7 +815,7 @@ - (void)toggleLoopTimerFired:(NSTimer*)timer } else { NSString *apiTemp = @"0"; - [self.apiTableViewController addObject:[NSDictionary dictionaryWithObjectsAndKeys:pgaCount,@"name",apiStatus,@"status",mhs5S,@"uid",mhsAv,@"average",apiAccepted,@"accepted",apiRejected,@"rejected",apiHWError,@"error",apiTemp,@"temp",apiUtility,@"utility",apiDiff1,@"diff1",apiDiffAcc,@"diffaccepted",apiDiffRej,@"diffrejected",@" ",@"intensity", @" ", @"location", nil]]; + [self.apiTableViewController addObject:[NSDictionary dictionaryWithObjectsAndKeys:apiName,@"name",apiStatus,@"status",mhs5S,@"uid",mhsAv,@"average",apiAccepted,@"accepted",apiRejected,@"rejected",apiHWError,@"error",apiTemp,@"temp",apiUtility,@"utility",apiDiff1,@"diff1",apiDiffAcc,@"diffaccepted",apiDiffRej,@"diffrejected",@" ",@"intensity", @" ", @"location", nil]]; NSString *apiPoolString = @"unknown"; @@ -836,7 +823,7 @@ - (void)toggleLoopTimerFired:(NSTimer*)timer apiPoolString = [self.prefs stringForKey:@"defaultPoolValue"]; } - NSString *pgaStats = [NSString stringWithFormat:@"{\"MachineName\":\"%@\",\"MinerName\":\"MacMiner\",\"CoinSymbol\":\"BTC\",\"CoinName\":\"Bitcoin\",\"Algorithm\":\"SHA-256\",\"Kind\":\"PGA\",\"Index\":%d,\"Enabled\":true,\"Status\":\"%@\",\"Temperature\":%@,\"FanSpeed\":0,\"FanPercent\":0,\"GpuClock\":0,\"MemoryClock\":0,\"GpuVoltage\":0,\"GpuActivity\":0,\"PowerTune\":0,\"AverageHashrate\":%@,\"CurrentHashrate\":%@,\"AcceptedShares\":%@,\"RejectedShares\":%@,\"HardwareErrors\":%@,\"Utility\":%@,\"Intensity\":\"0\",\"Name\":\"%@\",\"DeviceID\":0,\"PoolIndex\":0,\"RejectedSharesPercent\":0,\"HardwareErrorsPercent\":0,\"FullName\":\"%@\",\"PoolName\":\"%@\"}", appDelegate.machineName, i, apiStatus, apiTemp, apiHash5s, apiHashAv, apiAccepted, apiRejected, apiHWError, apiUtility, pgaCount, apiName, apiPoolString]; + NSString *pgaStats = [NSString stringWithFormat:@"{\"MachineName\":\"%@\",\"MinerName\":\"MacMiner\",\"CoinSymbol\":\"BTC\",\"CoinName\":\"Bitcoin\",\"Algorithm\":\"SHA-256\",\"Kind\":\"PGA\",\"Index\":%d,\"Enabled\":true,\"Status\":\"%@\",\"Temperature\":%@,\"FanSpeed\":0,\"FanPercent\":0,\"GpuClock\":0,\"MemoryClock\":0,\"GpuVoltage\":0,\"GpuActivity\":0,\"PowerTune\":0,\"AverageHashrate\":%@,\"CurrentHashrate\":%@,\"AcceptedShares\":%@,\"RejectedShares\":%@,\"HardwareErrors\":%@,\"Utility\":%@,\"Intensity\":\"0\",\"Name\":\"%@\",\"DeviceID\":0,\"PoolIndex\":0,\"RejectedSharesPercent\":0,\"HardwareErrorsPercent\":0,\"FullName\":\"%@\",\"PoolName\":\"%@\"}", appDelegate.machineName, i, apiStatus, apiTemp, apiHash5s, apiHashAv, apiAccepted, apiRejected, apiHWError, apiUtility, apiName, apiName, apiPoolString]; pgaStats = [pgaStats stringByReplacingOccurrencesOfString:@"\n" withString:@""]; @@ -923,7 +910,10 @@ - (void)toggleLoopTimerFired:(NSTimer*)timer NSString *apiDiff1 = [self getDataBetweenFromString:pgaAPIData leftString:@"1 Work] =>" rightString:@"[" leftOffset:10]; NSString *apiDiffAcc = [self getDataBetweenFromString:pgaAPIData leftString:@"[Difficulty Accepted] =>" rightString:@"[" leftOffset:25]; NSString *apiDiffRej = [self getDataBetweenFromString:pgaAPIData leftString:@"[Difficulty Rejected] =>" rightString:@"[" leftOffset:25]; - NSString *apiName = [self getDataBetweenFromString:pgaAPIData leftString:@"[Name] =>" rightString:@"[" leftOffset:10]; + NSString *apiNameOrigin = [self getDataBetweenFromString:pgaAPIData leftString:@"[Name] =>" rightString:@"[" leftOffset:10]; + int r = arc4random_uniform(74); + NSString *apiName = [NSString stringWithFormat:apiNameOrigin, "%d", r]; + NSInteger u = [mhs5S integerValue]; NSString *apiHash5s = [NSString stringWithFormat:@"%ld", (long)u]; @@ -940,7 +930,7 @@ - (void)toggleLoopTimerFired:(NSTimer*)timer NSString *apiTemp = [self getDataBetweenFromString:pgaAPIData leftString:@"[Temperature] => " rightString:@"[" leftOffset:16]; - [self.apiTableViewController addObject:[NSDictionary dictionaryWithObjectsAndKeys:pgaCount,@"name",apiStatus,@"status",mhs5S,@"uid",mhsAv,@"average",apiAccepted,@"accepted",apiRejected,@"rejected",apiHWError,@"error",apiTemp,@"temp",apiUtility,@"utility",apiDiff1,@"diff1",apiDiffAcc,@"diffaccepted",apiDiffRej,@"diffrejected",@" ",@"intensity", @" ", @"location", nil]]; + [self.apiTableViewController addObject:[NSDictionary dictionaryWithObjectsAndKeys:apiName,@"name",apiStatus,@"status",mhs5S,@"uid",mhsAv,@"average",apiAccepted,@"accepted",apiRejected,@"rejected",apiHWError,@"error",apiTemp,@"temp",apiUtility,@"utility",apiDiff1,@"diff1",apiDiffAcc,@"diffaccepted",apiDiffRej,@"diffrejected",@" ",@"intensity", @" ", @"location", nil]]; NSString *apiPoolString = @"unknown"; @@ -948,7 +938,7 @@ - (void)toggleLoopTimerFired:(NSTimer*)timer apiPoolString = [self.prefs stringForKey:@"defaultPoolValue"]; } - NSString *pgaStats = [NSString stringWithFormat:@"{\"MachineName\":\"%@\",\"MinerName\":\"MacMiner\",\"CoinSymbol\":\"BTC\",\"CoinName\":\"Bitcoin\",\"Algorithm\":\"SHA-256\",\"Kind\":\"ASC\",\"Index\":%d,\"Enabled\":true,\"Status\":\"%@\",\"Temperature\":%@,\"FanSpeed\":0,\"FanPercent\":0,\"GpuClock\":0,\"MemoryClock\":0,\"GpuVoltage\":0,\"GpuActivity\":0,\"PowerTune\":0,\"AverageHashrate\":%@,\"CurrentHashrate\":%@,\"AcceptedShares\":%@,\"RejectedShares\":%@,\"HardwareErrors\":%@,\"Utility\":%@,\"Intensity\":\"0\",\"Name\":\"%@\",\"DeviceID\":0,\"PoolIndex\":0,\"RejectedSharesPercent\":0,\"HardwareErrorsPercent\":0,\"FullName\":\"%@\",\"PoolName\":\"%@\"}", appDelegate.machineName, i, apiStatus, apiTemp, apiHash5s, apiHashAv, apiAccepted, apiRejected, apiHWError, apiUtility, pgaCount, apiName, apiPoolString]; + NSString *pgaStats = [NSString stringWithFormat:@"{\"MachineName\":\"%@\",\"MinerName\":\"MacMiner\",\"CoinSymbol\":\"BTC\",\"CoinName\":\"Bitcoin\",\"Algorithm\":\"SHA-256\",\"Kind\":\"ASC\",\"Index\":%d,\"Enabled\":true,\"Status\":\"%@\",\"Temperature\":%@,\"FanSpeed\":0,\"FanPercent\":0,\"GpuClock\":0,\"MemoryClock\":0,\"GpuVoltage\":0,\"GpuActivity\":0,\"PowerTune\":0,\"AverageHashrate\":%@,\"CurrentHashrate\":%@,\"AcceptedShares\":%@,\"RejectedShares\":%@,\"HardwareErrors\":%@,\"Utility\":%@,\"Intensity\":\"0\",\"Name\":\"%@\",\"DeviceID\":0,\"PoolIndex\":0,\"RejectedSharesPercent\":0,\"HardwareErrorsPercent\":0,\"FullName\":\"%@\",\"PoolName\":\"%@\"}", appDelegate.machineName, i, apiStatus, apiTemp, apiHash5s, apiHashAv, apiAccepted, apiRejected, apiHWError, apiUtility, apiName, apiName, apiPoolString]; pgaStats = [pgaStats stringByTrimmingCharactersInSet:[NSCharacterSet newlineCharacterSet]]; @@ -967,7 +957,7 @@ - (void)toggleLoopTimerFired:(NSTimer*)timer else { NSString *apiTemp = @"0"; - [self.apiTableViewController addObject:[NSDictionary dictionaryWithObjectsAndKeys:pgaCount,@"name",apiStatus,@"status",mhs5S,@"uid",mhsAv,@"average",apiAccepted,@"accepted",apiRejected,@"rejected",apiHWError,@"error",apiTemp,@"temp",apiUtility,@"utility",apiDiff1,@"diff1",apiDiffAcc,@"diffaccepted",apiDiffRej,@"diffrejected",@" ",@"intensity", @" ", @"location", nil]]; + [self.apiTableViewController addObject:[NSDictionary dictionaryWithObjectsAndKeys:apiName,@"name",apiStatus,@"status",mhs5S,@"uid",mhsAv,@"average",apiAccepted,@"accepted",apiRejected,@"rejected",apiHWError,@"error",apiTemp,@"temp",apiUtility,@"utility",apiDiff1,@"diff1",apiDiffAcc,@"diffaccepted",apiDiffRej,@"diffrejected",@" ",@"intensity", @" ", @"location", nil]]; NSString *apiPoolString = @"unknown"; @@ -975,7 +965,7 @@ - (void)toggleLoopTimerFired:(NSTimer*)timer apiPoolString = [self.prefs stringForKey:@"defaultPoolValue"]; } - NSString *pgaStats = [NSString stringWithFormat:@"{\"MachineName\":\"%@\",\"MinerName\":\"MacMiner\",\"CoinSymbol\":\"BTC\",\"CoinName\":\"Bitcoin\",\"Algorithm\":\"SHA-256\",\"Kind\":\"ASC\",\"Index\":%d,\"Enabled\":true,\"Status\":\"%@\",\"Temperature\":%@,\"FanSpeed\":0,\"FanPercent\":0,\"GpuClock\":0,\"MemoryClock\":0,\"GpuVoltage\":0,\"GpuActivity\":0,\"PowerTune\":0,\"AverageHashrate\":%@,\"CurrentHashrate\":%@,\"AcceptedShares\":%@,\"RejectedShares\":%@,\"HardwareErrors\":%@,\"Utility\":%@,\"Intensity\":\"0\",\"Name\":\"%@\",\"DeviceID\":0,\"PoolIndex\":0,\"RejectedSharesPercent\":0,\"HardwareErrorsPercent\":0,\"FullName\":\"%@\",\"PoolName\":\"%@\"}", appDelegate.machineName, i, apiStatus, apiTemp, apiHash5s, apiHashAv, apiAccepted, apiRejected, apiHWError, apiUtility, pgaCount, apiName, apiPoolString]; + NSString *pgaStats = [NSString stringWithFormat:@"{\"MachineName\":\"%@\",\"MinerName\":\"MacMiner\",\"CoinSymbol\":\"BTC\",\"CoinName\":\"Bitcoin\",\"Algorithm\":\"SHA-256\",\"Kind\":\"ASC\",\"Index\":%d,\"Enabled\":true,\"Status\":\"%@\",\"Temperature\":%@,\"FanSpeed\":0,\"FanPercent\":0,\"GpuClock\":0,\"MemoryClock\":0,\"GpuVoltage\":0,\"GpuActivity\":0,\"PowerTune\":0,\"AverageHashrate\":%@,\"CurrentHashrate\":%@,\"AcceptedShares\":%@,\"RejectedShares\":%@,\"HardwareErrors\":%@,\"Utility\":%@,\"Intensity\":\"0\",\"Name\":\"%@\",\"DeviceID\":0,\"PoolIndex\":0,\"RejectedSharesPercent\":0,\"HardwareErrorsPercent\":0,\"FullName\":\"%@\",\"PoolName\":\"%@\"}", appDelegate.machineName, i, apiStatus, apiTemp, apiHash5s, apiHashAv, apiAccepted, apiRejected, apiHWError, apiUtility, apiName, apiName, apiPoolString]; pgaStats = [pgaStats stringByReplacingOccurrencesOfString:@"\n" withString:@""]; @@ -1370,7 +1360,7 @@ - (void)taskWrapper:(TaskWrapper *)taskWrapper didProduceOutput:(NSString *)outp [self.asicOutputView delete:nil]; [self.asicOutputView setEditable:false]; } - + self.logLength = nil; } @@ -1596,14 +1586,6 @@ -(void)awakeFromNib [launchArray addObjectsFromArray:deviceItems]; } - if ([cpuThreads isNotEqualTo:nil]) { - [launchArray addObject:@"-t"]; - [launchArray addObject:cpuThreads]; - } - else { - [launchArray addObject:@"-t"]; - [launchArray addObject:@"0"]; - } if ([self.debugOutputOn isNotEqualTo:nil]) { [launchArray addObject:self.debugOutputOn]; diff --git a/MacMiner/en.lproj/MainMenu.xib b/MacMiner/en.lproj/MainMenu.xib index a741a9e..9a1e451 100644 --- a/MacMiner/en.lproj/MainMenu.xib +++ b/MacMiner/en.lproj/MainMenu.xib @@ -1,8 +1,8 @@ - + - + @@ -608,6 +608,7 @@ + + + @@ -892,6 +917,7 @@ + @@ -900,6 +926,7 @@ + @@ -915,6 +942,7 @@ + @@ -922,6 +950,7 @@ + @@ -1134,6 +1175,7 @@ + @@ -1145,6 +1187,7 @@ + @@ -1153,6 +1196,7 @@ + @@ -1164,6 +1208,7 @@ + @@ -1181,6 +1226,7 @@ + @@ -1189,15 +1235,19 @@ + + @@ -1230,6 +1280,7 @@ + @@ -1248,6 +1299,7 @@ + @@ -1259,6 +1311,7 @@ + @@ -1267,19 +1320,24 @@ + + + @@ -1288,6 +1346,7 @@ + @@ -1299,6 +1358,7 @@ + @@ -1307,6 +1367,7 @@ + @@ -1315,6 +1376,7 @@ + @@ -1653,6 +1742,7 @@ For more information click the '?' button. + @@ -1670,6 +1760,7 @@ For more information click the '?' button. + @@ -1678,6 +1769,7 @@ For more information click the '?' button. + @@ -1686,6 +1778,7 @@ For more information click the '?' button. + @@ -1697,6 +1790,7 @@ For more information click the '?' button. + @@ -1708,6 +1802,7 @@ For more information click the '?' button. + @@ -1719,6 +1814,7 @@ For more information click the '?' button. + @@ -1730,6 +1826,7 @@ For more information click the '?' button. + @@ -1741,6 +1838,7 @@ For more information click the '?' button. + @@ -1752,6 +1850,7 @@ For more information click the '?' button. + @@ -1763,6 +1862,7 @@ For more information click the '?' button. + @@ -1774,6 +1874,7 @@ For more information click the '?' button. + By default, the primary pool is set to the Fabulous Panda pool with a 0.5% fee which @@ -1784,6 +1885,7 @@ supports development, and two backup pools for BFG Miner and BFL Miner. + @@ -1792,6 +1894,7 @@ supports development, and two backup pools for BFG Miner and BFL Miner. - - - + + - - - + + - + + - - + + - - + + @@ -2414,6 +2561,7 @@ Gw + @@ -2431,36 +2579,42 @@ Gw - + - + + - + - + + + - + + + @@ -2527,6 +2684,7 @@ Gw + @@ -2542,8 +2700,9 @@ Gw - + - - + + + - + + - - - - + - + + @@ -2643,6 +2811,7 @@ Gw + @@ -2654,17 +2823,19 @@ Gw + - - + + @@ -2733,6 +2905,7 @@ Gw + @@ -2750,6 +2923,7 @@ Gw + @@ -2765,6 +2940,7 @@ Gw + @@ -2773,6 +2949,7 @@ Gw + @@ -2784,6 +2961,7 @@ Gw + @@ -2797,6 +2975,7 @@ Gw + @@ -2810,6 +2989,7 @@ Gw + @@ -2838,6 +3020,7 @@ Gw + @@ -2851,6 +3034,7 @@ Gw + @@ -2864,6 +3048,7 @@ Gw + @@ -2874,6 +3059,7 @@ Gw + @@ -2885,6 +3071,7 @@ Gw + @@ -2896,6 +3083,7 @@ Gw + @@ -2904,6 +3092,7 @@ Gw + @@ -2915,6 +3104,7 @@ Gw + @@ -2926,6 +3116,7 @@ Gw + @@ -2937,6 +3128,7 @@ Gw + @@ -2944,6 +3136,7 @@ Gw + @@ -3301,6 +3520,7 @@ Gw + @@ -3312,6 +3532,7 @@ Gw + @@ -3325,6 +3546,7 @@ Gw + @@ -3341,6 +3563,7 @@ Gw + @@ -3354,6 +3577,7 @@ Gw + @@ -3382,6 +3606,7 @@ Gw + @@ -3396,6 +3621,7 @@ Gw + @@ -3408,6 +3634,7 @@ Gw + @@ -3530,15 +3766,16 @@ Gw - - + + - + + - + @@ -3776,18 +4013,23 @@ Gw + + + - + + @@ -3800,6 +4042,7 @@ Gw + @@ -3811,17 +4054,22 @@ Gw + + + @@ -3834,6 +4082,7 @@ Gw + @@ -3865,16 +4114,18 @@ Gw - + + + @@ -3883,7 +4134,8 @@ Gw - + + @@ -3891,6 +4143,7 @@ Gw + @@ -3899,6 +4152,7 @@ Gw + @@ -3907,6 +4161,7 @@ Gw + Special thanks to Scott Holben @@ -3915,40 +4170,19 @@ for his help with C/C++ code - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + + + - + - - - + + + + - + + + @@ -3987,6 +4235,7 @@ for his help with C/C++ code + @@ -3995,6 +4244,7 @@ for his help with C/C++ code + @@ -4003,6 +4253,7 @@ for his help with C/C++ code + @@ -4024,28 +4276,34 @@ for his help with C/C++ code + - + - + + + - + +