mirror of
https://github.com/CloverHackyColor/CloverBootloader.git
synced 2024-11-14 10:05:43 +01:00
Merge branch 'CloverHackyColor:master' into master
This commit is contained in:
commit
afbf68ab2c
76
CloverPackage/CloverV2/themespkg/cesium/theme.svg
Normal file → Executable file
76
CloverPackage/CloverV2/themespkg/cesium/theme.svg
Normal file → Executable file
@ -2687,6 +2687,49 @@ Created="December 2018"/>
|
||||
<stop offset="0.85" stop-color="#909a9d"/>
|
||||
<stop offset="1" stop-color="#535d65"/>
|
||||
</linearGradient>
|
||||
<radialGradient
|
||||
clover:conic="1" gradientTransform="matrix(0.55672937,0.48956478,-0.80186472,0.91187449,17.665704,1.3996354)"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
r="64.5"
|
||||
fy="21.474325"
|
||||
fx="0.0066088"
|
||||
cy="21.474325"
|
||||
cx="0.0066088"
|
||||
id="radialGradient869">
|
||||
<stop
|
||||
id="stop839"
|
||||
style="stop-color: #d1dfec;"
|
||||
offset="0.0" />
|
||||
<stop
|
||||
id="stop840"
|
||||
style="stop-color: #ded1e3;"
|
||||
offset="0.12" />
|
||||
<stop
|
||||
id="stop841"
|
||||
style="stop-color: #d064a4;"
|
||||
offset="0.25" />
|
||||
<stop
|
||||
id="stop842"
|
||||
style="stop-color: #a000e0;"
|
||||
offset="0.35" />
|
||||
<stop
|
||||
id="stop843"
|
||||
style="stop-color: #230872;"
|
||||
offset="0.50" />
|
||||
<stop
|
||||
id="stop843"
|
||||
style="stop-color: #230872;"
|
||||
offset="0.80" />
|
||||
<stop
|
||||
id="stop844"
|
||||
style="stop-color: #9a00bd;"
|
||||
offset="0.95" />
|
||||
<stop
|
||||
id="stop837"
|
||||
style="stop-color: #d8718f"
|
||||
offset="1" />
|
||||
</radialGradient>
|
||||
|
||||
</defs>
|
||||
<style type="text/css">
|
||||
.st0{fill:url(#SVGID_1_);stroke:#000000;stroke-miterlimit:10;}
|
||||
@ -3459,6 +3502,39 @@ d="M503 939l-34 -741q0 -1 -3 -1h-88q-3 0 -3 1l-37 741l-6 664q0 1 3 1h170q3 0 3 -
|
||||
</g>
|
||||
</g>
|
||||
|
||||
<g id="os_monterey" transform="translate(1220, 1280)">
|
||||
<rect
|
||||
height="128"
|
||||
width="128"
|
||||
y="0"
|
||||
id="BoundingRect_mt"
|
||||
visibility="hidden" />
|
||||
<g id="g12411" >
|
||||
<use
|
||||
xlink:href="#OsPlace"
|
||||
width="145"
|
||||
height="145"
|
||||
x="-72.5"
|
||||
y="-72.5"
|
||||
style="overflow:visible"
|
||||
transform="scale(0.8)"
|
||||
id="use880" />
|
||||
<ellipse
|
||||
style="fill:url(#radialGradient869);fill-opacity:1;fill-rule:evenodd;stroke-width:1.00"
|
||||
id="path902"
|
||||
cx="0"
|
||||
cy="0"
|
||||
rx="52.184414"
|
||||
ry="52.280346" />
|
||||
<text
|
||||
style="stroke-width:1.02462"
|
||||
class="st10 st11 st12"
|
||||
id="text884" transform="scale(0.8)"
|
||||
x="-20" y="42" >Monterey</text>
|
||||
|
||||
</g>
|
||||
</g>
|
||||
|
||||
|
||||
<g id="os_sierra" transform="translate(100, 0)">
|
||||
<rect visibility="hidden" id="BoundingRect_os" y="0" width="128" height="128"/>
|
||||
|
Before Width: | Height: | Size: 349 KiB After Width: | Height: | Size: 351 KiB |
@ -417,7 +417,8 @@ void afterGetUserSettings(SETTINGS_DATA& settingsData)
|
||||
GlobalConfig.EnableC6 = settingsData.getEnableC6();
|
||||
GlobalConfig.EnableC4 = settingsData.getEnableC4();
|
||||
GlobalConfig.EnableC2 = settingsData.getEnableC2();
|
||||
GlobalConfig.C3Latency = settingsData.getEnableC6();
|
||||
// GlobalConfig.C3Latency = settingsData.getC3Latency();
|
||||
// DBG("4: GlobalConfig.C3Latency=%x\n", GlobalConfig.C3Latency);
|
||||
|
||||
if (settingsData.CPU.HWPEnable && (gCPUStructure.Model >= CPU_MODEL_SKYLAKE_U)) {
|
||||
GlobalConfig.HWP = TRUE;
|
||||
|
@ -2684,7 +2684,7 @@ printf("%s", "");
|
||||
return ACPI.SSDT._EnableC2;
|
||||
}
|
||||
bool getC3Latency() const {
|
||||
if ( CPU._C3Latency.isDefined() ) return CPU._C3Latency.value();
|
||||
// if ( CPU._C3Latency.isDefined() ) return CPU._C3Latency.value();
|
||||
return ACPI.SSDT._C3Latency;
|
||||
}
|
||||
|
||||
|
@ -735,8 +735,10 @@ void ConfigManager::applySettings() const
|
||||
if ( !configPlist.ACPI.SSDT.getMinMultiplier().isDefined() )
|
||||
gSettings.ACPI.SSDT.MinMultiplier = 7;
|
||||
}
|
||||
// DBG("2: GlobalConfig.C3Latency=%x\n", GlobalConfig.C3Latency);
|
||||
if ( !configPlist.ACPI.SSDT.getC3Latency().isDefined() )
|
||||
gSettings.ACPI.SSDT._C3Latency = 0x00FA;
|
||||
// DBG("2: gSettings.ACPI.SSDT._C3Latency=%x\n", gSettings.ACPI.SSDT._C3Latency);
|
||||
}
|
||||
//gSettings.CPU.Turbo = gCPUStructure.Turbo;
|
||||
gSettings.CPU.SavingMode = 0xFF; //means not set
|
||||
|
@ -578,9 +578,9 @@ MacOsVersion GetOSVersion(int LoaderType, const XStringW& APFSTargetUUID, const
|
||||
if ( !Prop->isString() ) {
|
||||
MsgLog("ATTENTION : property not string in Kernel Flags\n");
|
||||
}else{
|
||||
if ( Prop->getString()->stringValue().contains("Install%20macOS%20BigSur") || Prop->getString()->stringValue().contains("Install%20macOS%2011.0")) {
|
||||
if ( Prop->getString()->stringValue().contains("Install%20macOS%20BigSur") || Prop->getString()->stringValue().contains("Install%20macOS%2011")) {
|
||||
OSVersion = "11"_XS8;
|
||||
} else if ( Prop->getString()->stringValue().contains("Install%20macOS%2012.0")) {
|
||||
} else if ( Prop->getString()->stringValue().contains("Install%20macOS%20Monterey") || Prop->getString()->stringValue().contains("Install%20macOS%2012")) {
|
||||
OSVersion = "12"_XS8;
|
||||
} else if ( Prop->getString()->stringValue().contains("Install%20macOS%2010.16")) {
|
||||
OSVersion = "10.16"_XS8;
|
||||
|
@ -2434,7 +2434,7 @@ void SetVariablesFromNvram()
|
||||
}
|
||||
|
||||
void
|
||||
GetListOfConfigs ()
|
||||
GetListOfConfigs()
|
||||
{
|
||||
REFIT_DIR_ITER DirIter;
|
||||
EFI_FILE_INFO *DirEntry;
|
||||
@ -2877,7 +2877,7 @@ RefitMain (IN EFI_HANDLE ImageHandle,
|
||||
DBG("SimpleTextEx Status=%s\n", efiStrError(Status));
|
||||
|
||||
gConf.InitialisePlatform();
|
||||
|
||||
// DBG("5: GlobalConfig.C3Latency=%x\n", GlobalConfig.C3Latency);
|
||||
/*
|
||||
* saving debug.log works from here
|
||||
*/
|
||||
@ -2954,7 +2954,8 @@ RefitMain (IN EFI_HANDLE ImageHandle,
|
||||
GetListOfThemes();
|
||||
GetListOfConfigs();
|
||||
}
|
||||
|
||||
// DBG("0: GlobalConfig.C3Latency=%x\n", gSettings.ACPI.SSDT._C3Latency);
|
||||
GlobalConfig.C3Latency = gSettings.ACPI.SSDT._C3Latency;
|
||||
// ThemeX.FillByEmbedded(); //init XTheme before EarlyUserSettings
|
||||
{
|
||||
void *Value = NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user