Fix June Update

EFI-OpenCore/EFI/OC/Kexts/ECEnabler.kext/Contents/Info.plist

@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>19H524</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>ECEnabler</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.1Revenger1.ECEnabler</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>ECEnabler</string>
-	<key>CFBundlePackageType</key>
-	<string>KEXT</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>12B45b</string>
-	<key>DTPlatformName</key>
-	<string>macosx</string>
-	<key>DTPlatformVersion</key>
-	<string>11.0</string>
-	<key>DTSDKBuild</key>
-	<string>20A2408</string>
-	<key>DTSDKName</key>
-	<string>macosx11.0</string>
-	<key>DTXcode</key>
-	<string>1220</string>
-	<key>DTXcodeBuild</key>
-	<string>12B45b</string>
-	<key>IOKitPersonalities</key>
-	<dict>
-		<key>com.1Revenger1.ECEnabler</key>
-		<dict>
-			<key>CFBundleIdentifier</key>
-			<string>com.1Revenger1.ECEnabler</string>
-			<key>IOClass</key>
-			<string>ECEnabler</string>
-			<key>IOClassCategory</key>
-			<string>ECEnabler</string>
-			<key>IOProviderClass</key>
-			<string>IOResources</string>
-			<key>IOResourceMatch</key>
-			<string>IOKit</string>
-		</dict>
-	</dict>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.7</string>
-	<key>OSBundleLibraries</key>
-	<dict>
-		<key>as.vit9696.Lilu</key>
-		<string>1.4.9</string>
-		<key>com.apple.kpi.bsd</key>
-		<string>11.0.0</string>
-		<key>com.apple.kpi.dsep</key>
-		<string>11.0.0</string>
-		<key>com.apple.kpi.iokit</key>
-		<string>11.0.0</string>
-		<key>com.apple.kpi.libkern</key>
-		<string>11.0.0</string>
-		<key>com.apple.kpi.mach</key>
-		<string>11.0.0</string>
-		<key>com.apple.kpi.unsupported</key>
-		<string>11.0.0</string>
-	</dict>
-	<key>OSBundleRequired</key>
-	<string>Root</string>
-</dict>
-</plist>

EFI-OpenCore/EFI/OC/config.plist

@@ -30,6 +30,14 @@
 				<key>Path</key>
 				<string>SSDT-AC.aml</string>
 			</dict>
+			<dict>
+				<key>Comment</key>
+				<string>Patch Battery</string>
+				<key>Enabled</key>
+				<true/>
+				<key>Path</key>
+				<string>SSDT-Battery.aml</string>
+			</dict>
 			<dict>
 				<key>Comment</key>
 				<string>Battery: fix access to 16byte-EC-field HWAC: depends on / patches/ OpenCore Patches/ HWAC.plist</string>
@@ -1422,24 +1430,6 @@
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
-			<dict>
-				<key>Arch</key>
-				<string>x86_64</string>
-				<key>BundlePath</key>
-				<string>ECEnabler.kext</string>
-				<key>Comment</key>
-				<string>Allows reading Embedded Controller fields over 1 byte long</string>
-				<key>Enabled</key>
-				<true/>
-				<key>ExecutablePath</key>
-				<string>Contents/MacOS/ECEnabler</string>
-				<key>MaxKernel</key>
-				<string></string>
-				<key>MinKernel</key>
-				<string></string>
-				<key>PlistPath</key>
-				<string>Contents/Info.plist</string>
-			</dict>
 		</array>
 		<key>Block</key>
 		<array/>
@@ -1538,7 +1528,7 @@
 			<key>PickerMode</key>
 			<string>External</string>
 			<key>PickerVariant</key>
-			<string>Auto</string>
+			<string>Acidanthera\GoldenGate</string>
 			<key>PollAppleHotKeys</key>
 			<true/>
 			<key>ShowPicker</key>

README.md

@@ -26,14 +26,13 @@
 
 ##### Recent | [Changelog Archive](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/docs/CHANGELOG.md)
 
-> ### 2021-6-8
+> ### 2021-6-21
 
 #### Changed
 
-- OC to 0.7.0 and upgraded various Acidanthera kexts.
+- Fixed `Resources` folder structuring and added new support files.
-- Big Sur to 11.4
+- Revert `ECEnabler.kext` in favor of `SSDT-Battery` (`ECEnabler` had some trouble updating charge level for me).
-- Deprecate `SSDT-Battery` in favor of `ECEnabler.kext`
+- Fix brightness adjustment patch.
-- Fixed Brightness Adjustment issue (forgot to add patch entry when removing AppleBacklightSmoother.kext two commits back)
 
 #### Notice
 - This will likely be the last repo update until macOS Monterey is stable. At which I plan:

docs/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.  
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+> ### 2021-6-21
+
+#### Changed
+
+- Fixed `Resources` folder structuring and added new support files.
+- Revert `ECEnabler.kext` in favor of `SSDT-Battery` (`ECEnabler` had some trouble updating charge level for me).
+- Fix brightness adjustment patch.
+
+#### Notice
+- This will likely be the last repo update until macOS Monterey is stable. At which I plan:
+  - Implement AX200 is the network card with the OpenIntelWireless kexts.
+
 > ### 2021-6-8
 
 #### Changed

patches/SSDT-PNLF.dsl

@@ -41,7 +41,7 @@ DefinitionBlock("", "SSDT", 2, "tyler", "_PNLF", 0)
             //  0x11 - 17: custom LMAX=0x7a1
             //  0x12 - 18: custom LMAX=0x1499
             //  0x13 - 19: CoffeeLake 0xffff
-            Name (_UID, 0x16)  // _UID: Unique ID
+            Name (_UID, 0x10)  // _UID: Unique ID
 
             Method (_STA, 0, NotSerialized)
             {