清理，将USB类型从XHCI改为XHC

EFI/OC/Kexts/ACPIBatteryManager.kext/Contents/Info.plist

@@ -0,0 +1,115 @@
+<?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>18A391</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>ACPIBatteryManager</string>
+	<key>CFBundleGetInfoString</key>
+	<string>1.90.1, Copyright 2011 Apple Inc., RehabMan 2012</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.rehabman.driver.AppleSmartBatteryManager</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>ACPIBatteryManager</string>
+	<key>CFBundlePackageType</key>
+	<string>KEXT</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.90.1</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>1.90.1</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>9F2000</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>12D75</string>
+	<key>DTSDKName</key>
+	<string>macosx10.8</string>
+	<key>DTXcode</key>
+	<string>0941</string>
+	<key>DTXcodeBuild</key>
+	<string>9F2000</string>
+	<key>IOKitPersonalities</key>
+	<dict>
+		<key>ACPI AC Adapter</key>
+		<dict>
+			<key>CFBundleIdentifier</key>
+			<string>org.rehabman.driver.AppleSmartBatteryManager</string>
+			<key>IOClass</key>
+			<string>ACPIACAdapter</string>
+			<key>IONameMatch</key>
+			<string>ACPI0003</string>
+			<key>IOProbeScore</key>
+			<integer>1000</integer>
+			<key>IOProviderClass</key>
+			<string>IOACPIPlatformDevice</string>
+		</dict>
+		<key>ACPI Battery Manager</key>
+		<dict>
+			<key>CFBundleIdentifier</key>
+			<string>org.rehabman.driver.AppleSmartBatteryManager</string>
+			<key>Configuration</key>
+			<dict>
+				<key>Correct16bitSignedCurrentRate</key>
+				<true/>
+				<key>CorrectCorruptCapacities</key>
+				<true/>
+				<key>CurrentDischargeRateMax</key>
+				<integer>20000</integer>
+				<key>EstimateCycleCountDivisor</key>
+				<integer>6</integer>
+				<key>FirstPollDelay</key>
+				<integer>4000</integer>
+				<key>StartupDelay</key>
+				<integer>0</integer>
+				<key>UseDesignVoltageForCurrentCapacity</key>
+				<true/>
+				<key>UseDesignVoltageForDesignCapacity</key>
+				<true/>
+				<key>UseDesignVoltageForMaxCapacity</key>
+				<true/>
+				<key>UseExtendedBatteryInformationMethod</key>
+				<true/>
+				<key>UseExtraBatteryInformationMethod</key>
+				<true/>
+			</dict>
+			<key>IOClass</key>
+			<string>AppleSmartBatteryManager</string>
+			<key>IONameMatch</key>
+			<string>PNP0C0A</string>
+			<key>IOProbeScore</key>
+			<integer>1000</integer>
+			<key>IOProviderClass</key>
+			<string>IOACPIPlatformDevice</string>
+		</dict>
+	</dict>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2011 Apple Inc. All rights reserved, RehabMan 2012</string>
+	<key>OSBundleLibraries</key>
+	<dict>
+		<key>com.apple.iokit.IOACPIFamily</key>
+		<string>1.0d1</string>
+		<key>com.apple.kpi.iokit</key>
+		<string>9.0</string>
+		<key>com.apple.kpi.libkern</key>
+		<string>9.0</string>
+	</dict>
+	<key>OSBundleRequired</key>
+	<string>Root</string>
+	<key>Source Code</key>
+	<string>https://github.com/RehabMan/OS-X-ACPI-Battery-Driver</string>
+</dict>
+</plist>

EFI/OC/Kexts/USBPorts.kext/Contents/Info.plist

@@ -22,14 +22,14 @@
 	<string>1.0</string>
 	<key>IOKitPersonalities</key>
 	<dict>
-		<key>MacBookPro12,1-XHCI</key>
+		<key>MacBookPro12,1-XHC</key>
 		<dict>
 			<key>CFBundleIdentifier</key>
 			<string>com.apple.driver.AppleUSBMergeNub</string>
 			<key>IOClass</key>
 			<string>AppleUSBMergeNub</string>
 			<key>IONameMatch</key>
-			<string>XHCI</string>
+			<string>XHC</string>
 			<key>IOPCIPrimaryMatch</key>
 			<string>0x9cb18086</string>
 			<key>IOProbeScore</key>

EFI/OC/config.plist

@@ -130,32 +130,6 @@
 				<key>TableSignature</key>
 				<data></data>
 			</dict>
-			<dict>
-				<key>Comment</key>
-				<string>(GBIX,3,N) ---&gt; XBIX Battery</string>
-				<key>Count</key>
-				<integer>0</integer>
-				<key>Enabled</key>
-				<false/>
-				<key>Find</key>
-				<data>R0JJWAM=</data>
-				<key>Limit</key>
-				<integer>0</integer>
-				<key>Mask</key>
-				<data></data>
-				<key>OemTableId</key>
-				<data></data>
-				<key>Replace</key>
-				<data>WEJJWAM=</data>
-				<key>ReplaceMask</key>
-				<data></data>
-				<key>Skip</key>
-				<integer>0</integer>
-				<key>TableLength</key>
-				<integer>0</integer>
-				<key>TableSignature</key>
-				<data></data>
-			</dict>
 			<dict>
 				<key>Comment</key>
 				<string>(GBST,4,N) ---&gt; XBST Battery</string>
@@ -182,6 +156,32 @@
 				<key>TableSignature</key>
 				<data></data>
 			</dict>
+			<dict>
+				<key>Comment</key>
+				<string>(GBIX,3,N) ---&gt; XBIX Battery</string>
+				<key>Count</key>
+				<integer>0</integer>
+				<key>Enabled</key>
+				<false/>
+				<key>Find</key>
+				<data>R0JJWAM=</data>
+				<key>Limit</key>
+				<integer>0</integer>
+				<key>Mask</key>
+				<data></data>
+				<key>OemTableId</key>
+				<data></data>
+				<key>Replace</key>
+				<data>WEJJWAM=</data>
+				<key>ReplaceMask</key>
+				<data></data>
+				<key>Skip</key>
+				<integer>0</integer>
+				<key>TableLength</key>
+				<integer>0</integer>
+				<key>TableSignature</key>
+				<data></data>
+			</dict>
 			<dict>
 				<key>Comment</key>
 				<string>Notify (BAT1, 0x80) ---&gt; BATC  Battery</string>
@@ -338,6 +338,32 @@
 				<key>TableSignature</key>
 				<data></data>
 			</dict>
+			<dict>
+				<key>Comment</key>
+				<string>PNLF to XNLF</string>
+				<key>Count</key>
+				<integer>0</integer>
+				<key>Enabled</key>
+				<false/>
+				<key>Find</key>
+				<data>UE5MRg==</data>
+				<key>Limit</key>
+				<integer>0</integer>
+				<key>Mask</key>
+				<data></data>
+				<key>OemTableId</key>
+				<data></data>
+				<key>Replace</key>
+				<data>WE5MRg==</data>
+				<key>ReplaceMask</key>
+				<data></data>
+				<key>Skip</key>
+				<integer>0</integer>
+				<key>TableLength</key>
+				<integer>0</integer>
+				<key>TableSignature</key>
+				<data></data>
+			</dict>
 			<dict>
 				<key>Comment</key>
 				<string>Mutex:MDGS=0</string>
@@ -786,7 +812,7 @@
 				<key>Count</key>
 				<integer>0</integer>
 				<key>Enabled</key>
-				<false/>
+				<true/>
 				<key>Find</key>
 				<data>WEhDSQ==</data>
 				<key>Limit</key>
@@ -1354,7 +1380,7 @@
 			</dict>
 			<dict>
 				<key>Comment</key>
-				<string>WNTF to XXXX</string>
+				<string>WNTF to XNTF</string>
 				<key>Count</key>
 				<integer>1</integer>
 				<key>Enabled</key>
@@ -1368,7 +1394,7 @@
 				<key>OemTableId</key>
 				<data>AAAAAAAAAAA=</data>
 				<key>Replace</key>
-				<data>WFhYWA==</data>
+				<data>WE5URg==</data>
 				<key>ReplaceMask</key>
 				<data></data>
 				<key>Skip</key>
@@ -1380,7 +1406,7 @@
 			</dict>
 			<dict>
 				<key>Comment</key>
-				<string>WXPF to YYYY</string>
+				<string>WXPF to XXPF</string>
 				<key>Count</key>
 				<integer>1</integer>
 				<key>Enabled</key>
@@ -1394,7 +1420,7 @@
 				<key>OemTableId</key>
 				<data>AAAAAAAAAAA=</data>
 				<key>Replace</key>
-				<data>WVlZWQ==</data>
+				<data>WFhQRg==</data>
 				<key>ReplaceMask</key>
 				<data></data>
 				<key>Skip</key>
@@ -1898,6 +1924,24 @@
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>Any</string>
+				<key>BundlePath</key>
+				<string>ACPIBatteryManager.kext</string>
+				<key>Comment</key>
+				<string></string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/ACPIBatteryManager</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string></string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
 			<dict>
 				<key>Arch</key>
 				<string>Any</string>

README-English.md

@@ -4,12 +4,24 @@
 
 - This is a full ThinkPad T450s macOS Big Sur + DW1820a configuration.
 - Sound card default Layout-id = 32, earphone noise please use the sound card repair script(ALCPlugFix).
-- Support touch screen
-- support Catalina
-- support ThinkPad X250
+- Support touch screen (With multi-touch and touchscreen gestures).
+- support Catalina.
+- support ThinkPad X250 ThinkPad T450.
+
+## Hardware information
+
+```  
+- CPU：Intel Core i7-5600U 2.6GHz (Boots 3.2GHz)
+
+- The core graphics：Intel HD 5500 Graphics 
+
+- sound card：ALC292
+
+- Wireless network card：DW1820A
+```
 
 # ThinkPad Assistant 
-- Allows you to use all function keys on Thinkpad T450s laptop (test the X250 yourself).
+- Allows you to use all function keys on Thinkpad T450s X250 T450 laptop.
 - Copy the ThinkpadAssistant into the Application folder.
 - Start ThinkpadAssistant and check "Start when logged in" in the menu bar.
 - F4: Mute / Unmute Microphone (with Status LED indication).
@@ -24,18 +36,6 @@
 -----------------------------------------------------------------------------------------------------------------
 ![demo](./picture/demo.gif)
 
-## Hardware information
-
-```  
-- CPU：Intel Core i7-5600U 2.6GHz (Boots 3.2GHz)
-
-- The core graphics：Intel HD 5500 Graphics 
-
-- sound card：ALC292
-
-- Wireless network card：DW1820A
-```
-
 ## BIOS (1.37)
 -  Security -> Security Chip`: **Disabled**;
 -  Memory Protection -> Execution Prevention`: **Enabled**;

README.md

@@ -3,11 +3,24 @@
 ## 简介
 - 这是一个完整的ThinkPad T450s macOS Big Sur + DW1820a 配置。
 - 声卡默认 layout-id = 32，耳机杂音请使用声卡修复脚本(ALCPlugFix)。 
-- 支持触摸屏 
-- 支持Catalina
-- 支持ThinkPad X250
+- 支持触摸屏（带有多点触控和触屏手势）。
+- 支持 Catalina。
+- 支持 ThinkPad X250 ThinkPad T450。
+
+## 硬件信息
+
+```  
+- CPU：Intel Core i7-5600U 2.6GHz (Boots 3.2GHz)
+
+- 核心显卡：Intel HD 5500 Graphics 
+
+- 声卡：ALC292
+
+- 无线网卡：DW1820A
+```
+
 # ThinkPad助手(ThinkpadAssistant)
-- 可让您在Thinkpad T450s笔记本电脑上使用所有功能键 (X250请自行测试)。
+- 可让您在Thinkpad T450s X250 T450笔记本电脑上使用所有功能键。
 - 复制ThinkpadAssistant到应用程序文件夹。
 - 启动ThinkpadAssistant，并在菜单栏中勾选“登录时启动”。
 - F4：麦克风静音/取消静音（带有状态LED指示）。
@@ -22,18 +35,6 @@
 -------------------------------------------------------------------------------------------------------------
 ![demo](./picture/demo.gif)
 
-## 硬件信息
-
-```  
-- CPU：Intel Core i7-5600U 2.6GHz (Boots 3.2GHz)
-
-- 核心显卡：Intel HD 5500 Graphics 
-
-- 声卡：ALC292
-
-- 无线网卡：DW1820A
-```
-
 ## BIOS (1.37)
 -  Security -> Security Chip`: **Disabled**;
 -  Memory Protection -> Execution Prevention`: **Enabled**;

ThinkpadAssistant.app/Contents/Library/LoginItems/AutoLaunchHelper.app/Contents/Resources/cs.lproj/Main.strings

@@ -1,3 +0,0 @@
-
-/* Class = "NSMenu"; title = "Main Menu"; ObjectID = "AYu-sK-qS6"; */
-"AYu-sK-qS6.title" = "Hlavní menu";

ThinkpadAssistant.app/Contents/Library/LoginItems/AutoLaunchHelper.app/Contents/Resources/de.lproj/Main.strings

@@ -1,3 +0,0 @@
-/* Class = "NSMenu"; title = "Main Menu"; ObjectID = "AYu-sK-qS6"; */
-"AYu-sK-qS6.title" = "Hauptmenü";
-

ThinkpadAssistant.app/Contents/Library/LoginItems/AutoLaunchHelper.app/Contents/Resources/it.lproj/Main.strings

@@ -1,2 +0,0 @@
-/* Class = "NSMenu"; title = "Main Menu"; ObjectID = "AYu-sK-qS6"; */
-"AYu-sK-qS6.title" = "Menu Principale";

ThinkpadAssistant.app/Contents/Resources/cs.lproj/Main.strings

@@ -1,24 +0,0 @@
-
-/* Class = "NSMenu"; title = "Main Menu"; ObjectID = "AYu-sK-qS6"; */
-"AYu-sK-qS6.title" = "Hlavní menu";
-
-/* Class = "NSTextFieldCell"; title = "Copyright © 2020 Matthäus Szturc. All rights reserved."; ObjectID = "Dsc-bK-vCJ"; */
-"Dsc-bK-vCJ.title" = "Copyright © 2020 Matthäus Szturc. Všechna práva vyhrazena.";
-
-/* Class = "NSMenuItem"; title = "About Thinkpad Assistant"; ObjectID = "Kql-K9-yoI"; */
-"Kql-K9-yoI.title" = "O aplikaci Thinkpad Assistant";
-
-/* Class = "NSMenuItem"; title = "Launch on Login"; ObjectID = "Lcb-4h-zk2"; */
-"Lcb-4h-zk2.title" = "Otevřít při přihlášení";
-
-/* Class = "NSMenuItem"; title = "Quit"; ObjectID = "Q77-Nx-rEG"; */
-"Q77-Nx-rEG.title" = "Ukončit";
-
-/* Class = "NSMenuItem"; title = "Monitor Capslock"; ObjectID = "Nth-Jo-BIN"; */
-"Nth-Jo-BIN.title" = "Kontrola Caps Locku";
-
-/* Class = "NSTextFieldCell"; title = "Version 1.0.0"; ObjectID = "Yvs-Nm-uAg"; */
-"Yvs-Nm-uAg.title" = "Verze 1.0.0";
-
-/* Class = "NSWindow"; title = "About Thinkpad Assistant"; ObjectID = "eOf-uU-tUq"; */
-"eOf-uU-tUq.title" = "O aplikaci Thinkpad Assistant";

ThinkpadAssistant.app/Contents/Resources/de.lproj/Main.strings

@@ -1,24 +0,0 @@
-/* Class = "NSMenu"; title = "Main Menu"; ObjectID = "AYu-sK-qS6"; */
-"AYu-sK-qS6.title" = "Hauptmenü";
-
-/* Class = "NSTextFieldCell"; title = "Copyright © 2020 Matthäus Szturc. All rights reserved."; ObjectID = "Dsc-bK-vCJ"; */
-"Dsc-bK-vCJ.title" = "Copyright © 2020 Matthäus Szturc. Alle Rechte vorbehalten.";
-
-/* Class = "NSWindow"; title = "About Thinkpad Assistant"; ObjectID = "eOf-uU-tUq"; */
-"eOf-uU-tUq.title" = "Über Thinkpad Assistant";
-
-/* Class = "NSMenuItem"; title = "About Thinkpad Assistant"; ObjectID = "Kql-K9-yoI"; */
-"Kql-K9-yoI.title" = "Über Thinkpad Assistant";
-
-/* Class = "NSMenuItem"; title = "Launch on Login"; ObjectID = "Lcb-4h-zk2"; */
-"Lcb-4h-zk2.title" = "Mit MacOS starten";
-
-/* Class = "NSMenuItem"; title = "Monitor Capslock"; ObjectID = "Nth-Jo-BIN"; */
-"Nth-Jo-BIN.title" = "Capslock überwachen";
-
-/* Class = "NSMenuItem"; title = "Quit"; ObjectID = "Q77-Nx-rEG"; */
-"Q77-Nx-rEG.title" = "Beenden";
-
-/* Class = "NSTextFieldCell"; title = "Version 1.0.0"; ObjectID = "Yvs-Nm-uAg"; */
-"Yvs-Nm-uAg.title" = "Version  1.0.0";
-

ThinkpadAssistant.app/Contents/Resources/it.lproj/Main.strings

@@ -1,23 +0,0 @@
-/* Class = "NSMenu"; title = "Main Menu"; ObjectID = "AYu-sK-qS6"; */
-"AYu-sK-qS6.title" = "Menu Principale";
-
-/* Class = "NSTextFieldCell"; title = "Copyright © 2020 Matthäus Szturc. All rights reserved."; ObjectID = "Dsc-bK-vCJ"; */
-"Dsc-bK-vCJ.title" = "Copyright © 2020 Matthäus Szturc. Tutti i diritti riservati.";
-
-/* Class = "NSWindow"; title = "About Thinkpad Assistant"; ObjectID = "eOf-uU-tUq"; */
-"eOf-uU-tUq.title" = "Thinkpad Assistant";
-
-/* Class = "NSMenuItem"; title = "About Thinkpad Assistant"; ObjectID = "Kql-K9-yoI"; */
-"Kql-K9-yoI.title" = "Informazioni";
-
-/* Class = "NSMenuItem"; title = "Launch on Login"; ObjectID = "Lcb-4h-zk2"; */
-"Lcb-4h-zk2.title" = "Avvia al Login";
-
-/* Class = "NSMenuItem"; title = "Monitor Capslock"; ObjectID = "Nth-Jo-BIN"; */
-"Nth-Jo-BIN.title" = "Monitoraggio Blocco Maiuscolo";
-
-/* Class = "NSMenuItem"; title = "Quit"; ObjectID = "Q77-Nx-rEG"; */
-"Q77-Nx-rEG.title" = "Esci";
-
-/* Class = "NSTextFieldCell"; title = "Version 1.0.0"; ObjectID = "Yvs-Nm-uAg"; */
-"Yvs-Nm-uAg.title" = "Versione  1.0.0";