diff --git a/EFI-OpenCore/EFI/OC/ACPI/SSDT-Keyboard.aml b/EFI-OpenCore/EFI/OC/ACPI/SSDT-Keyboard.aml index 8ad074d..6de8375 100644 Binary files a/EFI-OpenCore/EFI/OC/ACPI/SSDT-Keyboard.aml and b/EFI-OpenCore/EFI/OC/ACPI/SSDT-Keyboard.aml differ diff --git a/README.md b/README.md index b8411e0..98dfe80 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,16 @@ > ## Update -##### Recent | [Changelog Archive](https://github.com/tylernguyen/x1c6-hackintosh/docs/CHANGELOG.md) +##### Recent | [Changelog Archive](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/docs/CHANGELOG.md) + +> ### 2020-5-22 + +- Further SSDT-Keyboard tweaks: + - Windows (mismapped to Left Alt by default) is now properly mapped to Left GUI + - Left Alt (mismapped to Left GUI by default) is now properly mapped to Left Alt + - Right Alt (mismapped to Right GUI by default) is now properly mapped to Right Alt +- This means that Karabiner-Elements is no longer a necessary for this project. Once less program! unless you need it for other purposes (like a hyper key). +- *Similarly, once Bluetooth toggle is implemented in ThinkpadAssistant, BetterTouchTool can also go away. > ### 2020-5-21 @@ -46,7 +55,7 @@ Keyboard Perfection is almost here! | WiFi, Bluetooth, Apple Continuity ✅ \*need [network card replacement](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/docs/1_README-HARDWAREandBIOS.md) | Fingerprint Reader (not needed, DISABLED at BIOS) ❌ | Video Output: Currently only output `2560x1440`. Though capable of 4K `4096x2150`. See [Issue #40](https://github.com/tylernguyen/x1c6-hackintosh/issues/40) ⚠️ | | USB A, USB C, Webcam, Audio Playback/Recording Sleep, Ethernet, Intel Graphics, TrackPoint and Trackpad, MicroSD card reader ✅ | Wireless WAN (DISABLED at BIOS) \*ENABLED if you have a 2nd drive connected❌ | Thunderbolt 3 hotplug partially working. See [Issue #24](https://github.com/tylernguyen/x1c6-hackintosh/issues/24#issuecomment-603183002) ⚠️ | | iCloud suite: App Store, iMessage, FaceTime, iCloud Drive, etc... ✅ | Hibernation ❌ | Power management and optimizations. See [Issue #28](https://github.com/tylernguyen/x1c6-hackintosh/issues/28) ⚠️ | -| Multimedia Fn keys ✅ \*need [Karabiner Elements](https://ke-complex-modifications.pqrs.org/), [ThinkpadAssistant](https://github.com/MSzturc/ThinkpadAssistant), and [BetterTouchTool](https://folivora.ai/) | | | +| Multimedia Fn keys ✅ \*need [ThinkpadAssistant](https://github.com/MSzturc/ThinkpadAssistant), and [BetterTouchTool](https://folivora.ai/) | | | | PM981 installation. ✅ See [Issue #43](https://github.com/tylernguyen/x1c6-hackintosh/issues/43) | | | **For more information regarding certain features, please refer to [`docs/3_README-POSTinstallation.md`](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/docs/3_README-POSTinstallation.md)** diff --git a/docs/5_README-other.md b/docs/5_README-other.md index e8d9f1a..8138127 100644 --- a/docs/5_README-other.md +++ b/docs/5_README-other.md @@ -11,11 +11,6 @@ - I've found that dual booting with OpenCore can be quite troublesome. Instead, what I recommend is to use rEFInd Boot Manager should you need to dual boot Windows or Linux. - It is possible to share Bluetooth pairing keys between Windows and macOS when dual booting. See [oc-laptop-guide](https://dortania.github.io/oc-laptop-guide/extras/dual-booting-with-bluetooth-devices.html). -> ## Modifier Key Patching: - -By default, Windows, Left Alt, and Right Alt are mismapped. An easy fix for this is to install [Karabiner-Elements](https://karabiner-elements.pqrs.org/) and configure it as: -![karabiner_modifier](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/docs/assets/img/macOS%20Settings/karabiner_modifier.png) - > ## Multimedia Fn Key Patching: Since macOS doesn't not natively support some multimedia Fn key actions. [ThinkpadAssistant](https://github.com/MSzturc/ThinkpadAssistant) is required for the Fn actions to be implemented. diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 93fafd5..dffd21c 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -3,6 +3,15 @@ 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/). +> ### 2020-5-22 + +- Further SSDT-Keyboard tweaks: + - Windows (mismapped to Left Alt by default) is now properly mapped to Left GUI + - Left Alt (mismapped to Left GUI by default) is now properly mapped to Left Alt + - Right Alt (mismapped to Right GUI by default) is now properly mapped to Right Alt +- This means that Karabiner-Elements is no longer a necessary for this project. Once less program! unless you need it for other purposes (like a hyper key). +- *Similarly, once Bluetooth toggle is implemented in ThinkpadAssistant, BetterTouchTool can also go away. + > ### 2020-5-21 #### Changed diff --git a/docs/assets/img/macOS Settings/karabiner_modifier.png b/docs/assets/img/macOS Settings/karabiner_modifier.png deleted file mode 100644 index afe6b46..0000000 Binary files a/docs/assets/img/macOS Settings/karabiner_modifier.png and /dev/null differ diff --git a/patches/SSDT-Keyboard.dsl b/patches/SSDT-Keyboard.dsl index 6bfa990..6f5619e 100644 --- a/patches/SSDT-Keyboard.dsl +++ b/patches/SSDT-Keyboard.dsl @@ -215,6 +215,9 @@ DefinitionBlock("", "SSDT", 2, "OCLT", "x1input", 0) "e037=64", // PrtSc = F13 "46=80", // Fn + K = Deadkey "e045=80", // Fn + P = Deadkey + "38=e05b", // Left Alt (mismapped to Left GUI by default) = Left Alt + "e038=e05c", // Right Alt (mismapped to Right GUI by default) = Right Alt + "e05b=38", // Windows (mismapped to Left Alt by default) = Left GUI // "1d=80", // Fn + B = Deadkey // "54=80", // Fn + S = Deadkey },