Skip to content

Commit

Permalink
1.5.11
Browse files Browse the repository at this point in the history 
security and bug fixes, cgminer update
  • Loading branch information
fabulouspanda committed Feb 2, 2014
1 parent afde6b5 commit 3c226bf
Show file tree
Hide file tree
Showing 16 changed files with 1,110 additions and 905 deletions.
4 changes: 2 additions & 2 deletions MacMiner/AppDelegate.m
View file
Expand Up @@ -35,7 +35,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification

NSString *hideVersion = [prefs objectForKey:@"hideVersion"];

if ([hideVersion isEqualToString:@"1510"]) {
if ([hideVersion isEqualToString:@"1511"]) {
[self.releaseNotes orderOut:nil];
}

Expand Down Expand Up @@ -547,7 +547,7 @@ - (IBAction)hideVersionStuff:(id)sender
{
NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];

[prefs setObject:@"1510" forKey:@"hideVersion"];
[prefs setObject:@"1511" forKey:@"hideVersion"];

[prefs synchronize];

Expand Down
4 changes: 2 additions & 2 deletions MacMiner/MacMiner-Info.plist
View file
Expand Up @@ -19,11 +19,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.5.10b</string>
<string>1.5.11</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1510b</string>
<string>1511</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
Expand Down
249 changes: 125 additions & 124 deletions MacMiner/asicMiner.m
View file
Expand Up @@ -23,9 +23,12 @@ - (id)initWithCoder:(NSCoder *)aDecoder
// NSLog(@"startup");
// AppDelegate *appDelegate = (AppDelegate *)[[NSApplication sharedApplication] delegate];

self.asicAPIOutput.delegate = self;


self.acceptLabel.tag = 1;

self.apiDataArray = [[NSMutableArray alloc] init];
self.apiDataArray = [[NSMutableArray alloc] init];

[self startToggling];

Expand All @@ -38,132 +41,13 @@ - (id)initWithCoder:(NSCoder *)aDecoder
self.minerAddressesArray = [[NSMutableArray alloc] init];
// self.minerAddressesArray = [self.prefs objectForKey:@"ipAddress"];

if ([[self.prefs objectForKey:@"startAsic"] isEqualToString:@"start"]) {


[self.asicStartButton setTitle:@"Stop"];
self.asicStartButton.tag = 0;
// self.asicAPIOutput.string = @"";
// [self.asicAPIOutput delete:nil];



// If the task is still sitting around from the last run, release it
if (asicTask!=nil) {
asicTask = nil;
}







self.noGPU = [self.prefs stringForKey:@"disableASICGPU"];
self.debugOutputOn = [self.prefs stringForKey:@"debugASICOutput"];
self.quietOutputOn = [self.prefs stringForKey:@"quietASICOutput"];
self.bonusOptions = [self.prefs stringForKey:@"asicOptionsValue"];
NSString *cpuThreads = [self.prefs stringForKey:@"cpuASICThreads"];



NSMutableArray *launchArray = [NSMutableArray arrayWithObjects: @"-T", @"--api-listen", @"--api-allow", @"W:0/0", nil];
if ([self.bonusOptions isNotEqualTo:@""]) {
NSArray *deviceItems = [self.bonusOptions componentsSeparatedByString:@" "];

[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];
}
if ([self.quietOutputOn isNotEqualTo:nil]) {
[launchArray addObject:self.quietOutputOn];
}

if (self.bigpicEnable.state == NSOnState) {
[launchArray addObject:@"-S"];
[launchArray addObject:@"bigpic:all"];
}
if (self.antminerEnable.state == NSOnState) {
[launchArray addObject:@"-S"];
[launchArray addObject:@"antminer:all"];
}
if (self.bflEnable.state == NSOnState) {
[launchArray addObject:@"-S"];
[launchArray addObject:@"bfl:all"];
}
if (self.bitfuryEnable.state == NSOnState) {
[launchArray addObject:@"-S"];
[launchArray addObject:@"bifury:all"];
}
if (self.erupterEnable.state == NSOnState) {
[launchArray addObject:@"-S"];
[launchArray addObject:@"erupter:all"];
}



if ([self.noGPU isNotEqualTo:nil]) {
[launchArray addObject:@"-S"];
[launchArray addObject:@"opencl:auto"];
}

cpuThreads = nil;

NSString *executableName = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleExecutable"];
NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
NSString *userpath = [paths objectAtIndex:0];
userpath = [userpath stringByAppendingPathComponent:executableName]; // The file will go in this directory
NSString *saveBTCConfigFilePath = [userpath stringByAppendingPathComponent:@"bfgurls.conf"];

[launchArray addObject:@"-c"];
[launchArray addObject:saveBTCConfigFilePath];



NSString *bundlePath2 = [[NSBundle mainBundle] resourcePath];

NSString *bfgPath = [bundlePath2 stringByAppendingString:@"/bfgminer/bin/bfgminer"];

[self.asicOutputView setString:@""];

asicTask =[[TaskWrapper alloc] initWithCommandPath:bfgPath
arguments:launchArray
environment:nil
delegate:self];
// kick off the process asynchronously

[asicTask startTask];


}

}



return self;
}
/*
- (void)alertDidEnd:(NSAlert *)pipAlert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
if (returnCode == NSAlertFirstButtonReturn) {
NSLog(@"install pip");
}
if (returnCode == NSAlertSecondButtonReturn) {
NSLog(@"quit");
}
}
*/



Expand Down Expand Up @@ -252,7 +136,7 @@ - (IBAction)start:(id)sender



NSMutableArray *launchArray = [NSMutableArray arrayWithObjects: @"-T", @"--api-listen", @"--api-allow", @"W:0/0", nil];
NSMutableArray *launchArray = [NSMutableArray arrayWithObjects: @"-T", @"--api-listen", @"--api-allow", @"R:0/0", nil];
if ([self.bonusOptions isNotEqualTo:@""]) {
NSArray *deviceItems = [self.bonusOptions componentsSeparatedByString:@" "];

Expand Down Expand Up @@ -401,7 +285,7 @@ - (void)toggleLoopTimerFired:(NSTimer*)timer



NSMutableArray *launchArray = [NSMutableArray arrayWithObjects: @"-T", @"--api-listen", @"--api-allow", @"W:0/0", nil];
NSMutableArray *launchArray = [NSMutableArray arrayWithObjects: @"-T", @"--api-listen", @"--api-allow", @"R:0/0", nil];
if ([self.bonusOptions isNotEqualTo:@""]) {
NSArray *deviceItems = [self.bonusOptions componentsSeparatedByString:@" "];

Expand Down Expand Up @@ -924,6 +808,7 @@ - (void)taskTwoWrapper:(taskTwoWrapper *)taskTwoWrapper didProduceOutput:(NSStri
// self.asicAPIOutput.string = @"";

[self.asicAPIOutput delete:nil];
[self.asicAPIOutput didChangeText];

self.asicAPIOutput.string = output;

Expand Down Expand Up @@ -1232,6 +1117,9 @@ - (IBAction)clearNetworkedMinerApply:(id)sender
// control of the UI.
-(void)awakeFromNib
{



findRunning=NO;

findTwoRunning=NO;
Expand All @@ -1247,6 +1135,119 @@ -(void)awakeFromNib
if (asicOptionsString != nil) {
[self.asicOptionsView setStringValue:asicOptionsString];
}

if ([[self.prefs objectForKey:@"startAsic"] isEqualToString:@"start"]) {

[self.asicWindow orderFront:nil];


[self.asicStartButton setTitle:@"Stop"];
self.asicStartButton.tag = 0;
// self.asicAPIOutput.string = @"";
// [self.asicAPIOutput delete:nil];



// If the task is still sitting around from the last run, release it
if (asicTask!=nil) {
asicTask = nil;
}







self.noGPU = [self.prefs stringForKey:@"disableASICGPU"];
self.debugOutputOn = [self.prefs stringForKey:@"debugASICOutput"];
self.quietOutputOn = [self.prefs stringForKey:@"quietASICOutput"];
self.bonusOptions = [self.prefs stringForKey:@"asicOptionsValue"];
NSString *cpuThreads = [self.prefs stringForKey:@"cpuASICThreads"];



NSMutableArray *launchArray = [NSMutableArray arrayWithObjects: @"-T", @"--api-listen", @"--api-allow", @"R:0/0", nil];
if ([self.bonusOptions isNotEqualTo:@""]) {
NSArray *deviceItems = [self.bonusOptions componentsSeparatedByString:@" "];

[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];
}
if ([self.quietOutputOn isNotEqualTo:nil]) {
[launchArray addObject:self.quietOutputOn];
}

if (self.bigpicEnable.state == NSOnState) {
[launchArray addObject:@"-S"];
[launchArray addObject:@"bigpic:all"];
}
if (self.antminerEnable.state == NSOnState) {
[launchArray addObject:@"-S"];
[launchArray addObject:@"antminer:all"];
}
if (self.bflEnable.state == NSOnState) {
[launchArray addObject:@"-S"];
[launchArray addObject:@"bfl:all"];
}
if (self.bitfuryEnable.state == NSOnState) {
[launchArray addObject:@"-S"];
[launchArray addObject:@"bifury:all"];
}
if (self.erupterEnable.state == NSOnState) {
[launchArray addObject:@"-S"];
[launchArray addObject:@"erupter:all"];
}



if ([self.noGPU isNotEqualTo:nil]) {
[launchArray addObject:@"-S"];
[launchArray addObject:@"opencl:auto"];
}

cpuThreads = nil;

NSString *executableName = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleExecutable"];
NSArray *paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
NSString *userpath = [paths objectAtIndex:0];
userpath = [userpath stringByAppendingPathComponent:executableName]; // The file will go in this directory
NSString *saveBTCConfigFilePath = [userpath stringByAppendingPathComponent:@"bfgurls.conf"];

[launchArray addObject:@"-c"];
[launchArray addObject:saveBTCConfigFilePath];



NSString *bundlePath2 = [[NSBundle mainBundle] resourcePath];

NSString *bfgPath = [bundlePath2 stringByAppendingString:@"/bfgminer/bin/bfgminer"];

[self.asicOutputView setString:@""];

asicTask =[[TaskWrapper alloc] initWithCommandPath:bfgPath
arguments:launchArray
environment:nil
delegate:self];
// kick off the process asynchronously

[asicTask startTask];


}


}

Expand All @@ -1260,10 +1261,10 @@ - (IBAction)asicMinerToggle:(id)sender {
[self.asicWindow orderFront:sender];
}
}


- (IBAction)optionsToggle:(id)sender {

if ([self.asicOptionsWindow isVisible]) {
[self.asicOptionsButton setState:NSOffState];
[self.asicOptionsWindow orderOut:sender];
Expand Down

0 comments on commit 3c226bf

Please sign in to comment.