diff --git a/Classes/Constants.h b/Classes/Constants.h index 0070982..ba5d403 100644 --- a/Classes/Constants.h +++ b/Classes/Constants.h @@ -26,3 +26,4 @@ #define PREF_FAN_SELSPEED @"selspeed" #define PREF_FAN_SYNC @"sync" #define PREF_FAN_SHOWMENU @"menu" +#define PREF_FAN_AUTO @"auto" diff --git a/Classes/FanControl.m b/Classes/FanControl.m index e1e3b44..751494c 100755 --- a/Classes/FanControl.m +++ b/Classes/FanControl.m @@ -542,7 +542,8 @@ NSUserDefaults *defaults; if ([[MachineDefaults computerModel] rangeOfString:@"MacBookPro15"].location != NSNotFound) { for (i=0;i<[[FavoritesController arrangedObjects][cIndex][PREF_FAN_ARRAY] count];i++) { - [smcWrapper setKey_external:[NSString stringWithFormat:@"F%dMd",i] value:@"01"]; + bool is_auto = [[FanController arrangedObjects][i][PREF_FAN_AUTO] boolValue]; + [smcWrapper setKey_external:[NSString stringWithFormat:@"F%dMd",i] value:is_auto ? @"00" : @"01"]; float f_val = [[FanController arrangedObjects][i][PREF_FAN_SELSPEED] floatValue]; uint8 *vals = (uint8*)&f_val; //NSString str_val = ; diff --git a/Ressources/Dutch.lproj/MainMenu.nib/designable.nib b/Ressources/Dutch.lproj/MainMenu.nib/designable.nib index 44b6a82..6b256e6 100644 --- a/Ressources/Dutch.lproj/MainMenu.nib/designable.nib +++ b/Ressources/Dutch.lproj/MainMenu.nib/designable.nib @@ -1,33 +1,33 @@ - + - + - + - + - + - + - + - + @@ -109,6 +109,21 @@ + + + + + + + + + + + + + + + @@ -125,7 +140,7 @@ - + @@ -181,10 +196,10 @@ - + - + - + @@ -219,7 +234,7 @@ - + @@ -239,7 +254,7 @@ - + @@ -344,7 +359,7 @@ - + @@ -376,7 +391,7 @@ - + @@ -390,30 +405,6 @@ - - + + @@ -483,7 +498,7 @@ - + GNU GENERAL PUBLIC LICENSE @@ -1055,7 +1070,7 @@ Gw - + diff --git a/Ressources/Dutch.lproj/MainMenu.nib/keyedobjects.nib b/Ressources/Dutch.lproj/MainMenu.nib/keyedobjects.nib index 4fca668..83a5d18 100644 Binary files a/Ressources/Dutch.lproj/MainMenu.nib/keyedobjects.nib and b/Ressources/Dutch.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/Ressources/English.lproj/MainMenu.nib/designable.nib b/Ressources/English.lproj/MainMenu.nib/designable.nib index 0786d1e..8e6a67c 100644 --- a/Ressources/English.lproj/MainMenu.nib/designable.nib +++ b/Ressources/English.lproj/MainMenu.nib/designable.nib @@ -1,33 +1,33 @@ - - + + - - + + - + - + - + - + - + - + @@ -109,24 +109,38 @@ + + + + + + + + + + + + + + + - - @@ -182,10 +196,10 @@ - + - + - + @@ -220,7 +234,7 @@ - + @@ -240,7 +254,7 @@ - + @@ -345,7 +359,7 @@ - + @@ -377,7 +391,7 @@ - + @@ -390,33 +404,7 @@ - - - - + + + @@ -476,16 +489,17 @@ - + - + - + - + + - + GNU GENERAL PUBLIC LICENSE @@ -770,23 +784,21 @@ POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS + - - - - + @@ -961,6 +974,7 @@ POSSIBILITY OF SUCH DAMAGES. selspeed sync menu + auto @@ -990,7 +1004,7 @@ POSSIBILITY OF SUCH DAMAGES. - + @@ -1051,28 +1065,26 @@ be used. - + - + - + + - + - - - - + + + + + + + + + + + + + + + @@ -117,7 +132,7 @@ - + @@ -181,10 +196,10 @@ - + - + - + - + - + @@ -219,14 +234,14 @@ - + - + - + @@ -239,14 +254,14 @@ - + - + - + @@ -344,14 +359,14 @@ - + - + - + @@ -376,7 +391,7 @@ - + @@ -390,30 +405,6 @@ - - + + @@ -483,7 +498,7 @@ - + GNU GENERAL PUBLIC LICENSE @@ -1055,7 +1070,7 @@ Gw - + diff --git a/Ressources/French.lproj/MainMenu.nib/keyedobjects.nib b/Ressources/French.lproj/MainMenu.nib/keyedobjects.nib index b4650af..bcade7b 100644 Binary files a/Ressources/French.lproj/MainMenu.nib/keyedobjects.nib and b/Ressources/French.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/Ressources/German.lproj/MainMenu.nib/designable.nib b/Ressources/German.lproj/MainMenu.nib/designable.nib index a1854cd..339a2a3 100644 --- a/Ressources/German.lproj/MainMenu.nib/designable.nib +++ b/Ressources/German.lproj/MainMenu.nib/designable.nib @@ -1,8 +1,8 @@ - + - + @@ -12,26 +12,26 @@ - + - + - + - + - + - + @@ -117,6 +117,21 @@ + + + + + + + + + + + + + + + @@ -133,7 +148,7 @@ - + @@ -189,10 +204,10 @@ - + - + - + @@ -227,7 +242,7 @@ - + @@ -247,7 +262,7 @@ - + @@ -352,7 +367,7 @@ - + @@ -384,7 +399,7 @@ - + @@ -398,30 +413,6 @@ - - + + + @@ -483,7 +499,7 @@ - + @@ -491,7 +507,7 @@ - + GNU GENERAL PUBLIC LICENSE @@ -1058,7 +1074,7 @@ werden die Einstellungen des Favoriten - + @@ -1066,7 +1082,7 @@ werden die Einstellungen des Favoriten - + diff --git a/Ressources/German.lproj/MainMenu.nib/keyedobjects.nib b/Ressources/German.lproj/MainMenu.nib/keyedobjects.nib index 60eed20..04975b7 100644 Binary files a/Ressources/German.lproj/MainMenu.nib/keyedobjects.nib and b/Ressources/German.lproj/MainMenu.nib/keyedobjects.nib differ diff --git a/Ressources/Machines.plist b/Ressources/Machines.plist index 2fde844..66ff3c5 100644 --- a/Ressources/Machines.plist +++ b/Ressources/Machines.plist @@ -572,5 +572,38 @@ NumFans 4 + + Fans + + + Description + Left Fan + Maxspeed + 5927 + Minspeed + 2160 + selspeed + 2160 + + + Description + Right Fan + Maxspeed + 5489 + Minspeed + 2000 + selspeed + 2000 + + + Machine + MacBookPro15,1 + Maxspeed + 5927 + Minspeed + 2000 + NumFans + 2 + diff --git a/Ressources/Spanish.lproj/MainMenu.nib/designable.nib b/Ressources/Spanish.lproj/MainMenu.nib/designable.nib index 1acce51..e79b481 100644 --- a/Ressources/Spanish.lproj/MainMenu.nib/designable.nib +++ b/Ressources/Spanish.lproj/MainMenu.nib/designable.nib @@ -1,33 +1,33 @@ - + - + - + - + - + - + - + - + @@ -109,6 +109,21 @@ + + + + + + + + + + + + + + + @@ -125,7 +140,7 @@ - + @@ -181,10 +196,10 @@ - + - + - + @@ -219,7 +234,7 @@ - + @@ -239,7 +254,7 @@ - + @@ -344,7 +359,7 @@ - + @@ -376,7 +391,7 @@ - + @@ -483,7 +498,7 @@ - + GNU GENERAL PUBLIC LICENSE @@ -1055,7 +1070,7 @@ Gw - + diff --git a/Ressources/Spanish.lproj/MainMenu.nib/keyedobjects.nib b/Ressources/Spanish.lproj/MainMenu.nib/keyedobjects.nib index 4afbbfc..661ba89 100644 Binary files a/Ressources/Spanish.lproj/MainMenu.nib/keyedobjects.nib and b/Ressources/Spanish.lproj/MainMenu.nib/keyedobjects.nib differ