diff --git a/EFI-OpenCore/EFI/OC/ACPI/SSDT-Keyboard.aml b/EFI-OpenCore/EFI/OC/ACPI/SSDT-Keyboard.aml index 6de8375..564e879 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/EFI-OpenCore/EFI/OC/Kexts/SMCLightSensor.kext/Contents/Info.plist b/EFI-OpenCore/EFI/OC/Kexts/SMCLightSensor.kext/Contents/Info.plist deleted file mode 100755 index 443ea95..0000000 --- a/EFI-OpenCore/EFI/OC/Kexts/SMCLightSensor.kext/Contents/Info.plist +++ /dev/null @@ -1,83 +0,0 @@ - - - - - BuildMachineOSBuild - 18E226 - CFBundleDevelopmentRegion - en - CFBundleExecutable - SMCLightSensor - CFBundleIdentifier - ru.usrsse2.SMCLightSensor - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - SMCLightSensor - CFBundlePackageType - KEXT - CFBundleShortVersionString - 1.0 - CFBundleSupportedPlatforms - - MacOSX - - CFBundleVersion - 1 - DTCompiler - com.apple.compilers.llvm.clang.1_0 - DTPlatformBuild - 10E1001 - DTPlatformVersion - GM - DTSDKBuild - 18E219 - DTSDKName - macosx10.14 - DTXcode - 1020 - DTXcodeBuild - 10E1001 - IOKitPersonalities - - SMCLightSensor - - CFBundleIdentifier - ru.usrsse2.SMCLightSensor - IOClass - SMCLightSensor - IOMatchCategory - SMCLightSensor - IOProviderClass - IOResources - IOResourceMatch - IOKit - - - NSHumanReadableCopyright - Copyright © 2018 vit9696. All rights reserved. - OSBundleCompatibleVersion - 1.0.0 - OSBundleLibraries - - as.vit9696.Lilu - 1.2.0 - as.vit9696.VirtualSMC - 1.0.0 - com.apple.iokit.IOACPIFamily - 1.0.0d1 - com.apple.kpi.bsd - 12.0.0 - com.apple.kpi.dsep - 12.0.0 - com.apple.kpi.iokit - 12.0.0 - com.apple.kpi.libkern - 12.0.0 - com.apple.kpi.mach - 12.0.0 - com.apple.kpi.unsupported - 12.0.0 - - - diff --git a/EFI-OpenCore/EFI/OC/Kexts/SMCLightSensor.kext/Contents/MacOS/SMCLightSensor b/EFI-OpenCore/EFI/OC/Kexts/SMCLightSensor.kext/Contents/MacOS/SMCLightSensor deleted file mode 100755 index b2c2d44..0000000 Binary files a/EFI-OpenCore/EFI/OC/Kexts/SMCLightSensor.kext/Contents/MacOS/SMCLightSensor and /dev/null differ diff --git a/EFI-OpenCore/EFI/OC/config.plist b/EFI-OpenCore/EFI/OC/config.plist old mode 100755 new mode 100644 index e1a7dd8..ca29651 --- a/EFI-OpenCore/EFI/OC/config.plist +++ b/EFI-OpenCore/EFI/OC/config.plist @@ -1303,22 +1303,6 @@ PlistPath Contents/Info.plist - - BundlePath - SMCLightSensor.kext - Comment - - Enabled - - ExecutablePath - Contents/MacOS/SMCLightSensor - MaxKernel - - MinKernel - - PlistPath - Contents/Info.plist - BundlePath WhateverGreen.kext diff --git a/README.md b/README.md index 98dfe80..0d7c25c 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ #### I am not responsible for any damages you may cause. -### Should you find an error, or improve anything, be it in the config itself or in the my documentation, please consider opening an issue or a pull request to contribute. +### Should you find an error, or improve anything, be it in the config itself or in the my documentation, please consider opening an issue or a pull request to contribute. `I AM A ONE MAN TEAM, AND A FULL TIME STUDENT. SO, I MIGHT NOT BE ABLE TO RESPOND OR HELP YOU IN A TIMELY MANNER. BUT, I PROMISE I WILL GET TO YOU EVENTUALLY. PLEASE UNDERSTAND.` @@ -25,26 +25,19 @@ ##### Recent | [Changelog Archive](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/docs/CHANGELOG.md) -> ### 2020-5-22 +> ### 2020-5-24 -- 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 +#### Added +- Setting instructions better sleep in 5_README-other.md #### Changed -Keyboard Perfection is almost here! -- Modified SSDT-Keyboard patch to be compatible with [ThinkpadAssistant](https://github.com/MSzturc/ThinkpadAssistant). - - Mute/unMute Microphone with F4, with LED, and HUD! - - Disable WiFi with F8 with HUD - - Mirror with F7 with HUD - - Bluetooth, F10 still has to be handled by BetterTouchTool, but hopefully supported will be added soon. See my [request](https://github.com/MSzturc/ThinkpadAssistant/issues/9) +- Bluetooth Toggle is now supported by [ThinkpadAssistant 1.6](https://github.com/MSzturc/ThinkpadAssistant), thank so much [@MSzturc](https://github.com/MSzturc) +- SSDT-keyboard to support ThinkpadAssistant 1.6.0 +#### Removed +- BetterTouchTool is no longer needed for Fn key functions and has been removed. +- `SMCLightSensor.kext` has been removed as the x1c6 has no ambient light sensor. > ## SUMMARY: @@ -53,10 +46,10 @@ Keyboard Perfection is almost here! | Fully functional | Non-functional | Semi-functional. Additional pulls needed and welcomed. | | ------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- | | 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) ⚠️ | +| 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 [ThinkpadAssistant](https://github.com/MSzturc/ThinkpadAssistant), and [BetterTouchTool](https://folivora.ai/) | | | -| PM981 installation. ✅ See [Issue #43](https://github.com/tylernguyen/x1c6-hackintosh/issues/43) | | | +| Multimedia Fn keys ✅ \*need [ThinkpadAssistant](https://github.com/MSzturc/ThinkpadAssistant) | | | +| 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 8138127..5929ec7 100644 --- a/docs/5_README-other.md +++ b/docs/5_README-other.md @@ -11,16 +11,17 @@ - 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). +> ## Sleep: +- Disable Power Nap for both [`Battery`](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/docs/assets/img/macOS%20Settings/Batter_powernap.png) and [`Power Adapter`](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/docs/assets/img/macOS%20Settings/Poweradt_powernap.png). +- Disable [`Wake for Network Access`](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/docs/assets/img/macOS%20Settings/Poweradt_powernap.png) in `Power Adapter`. +- Uncheck [`Allow Bluetooth devices to wake this computer`](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/docs/assets/img/macOS%20Settings/Bluetooth_wake.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. -The Fn key not yet supported by ThinkPadAssistant is F10: Bluetooth Toggle. So BetterTouchTool is required to program F10. Keyboard Mastero is also an alternative but I've found that BetterTouchTool is a simpler and easier option. But generally speaking, BetterTouchTool is a useful productivity program that I recommend to everyone. -Simply import `patches/BetterTouchTool/x1c6-functions.bttpreset`. My settings are as followed: +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. Additionally, my settings are: -- F10 = Toggle Bluetooth On/Off - F11 = Switch Keyboard Input Language (Set in System `Preferences/Keyboard`) -- PrtSc = Window Screen Capture - Of course, feel free to change this to your preference in BetterTouchTool. +- PrtSc = Screen Capture (Set in System `Preferences/Keyboard`) > ## Touchpad Settings in macOS: diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index dffd21c..2b710f9 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -3,6 +3,20 @@ 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-24 + +#### Added +- Setting instructions better sleep in 5_README-other.md + +#### Changed + +- Bluetooth Toggle is now supported by [ThinkpadAssistant 1.6](https://github.com/MSzturc/ThinkpadAssistant), thank so much [@MSzturc](https://github.com/MSzturc) +- SSDT-keyboard to support ThinkpadAssistant 1.6.0 + +#### Removed +- BetterTouchTool is no longer needed for Fn key functions and has been removed. +- `SMCLightSensor.kext` has been removed as the x1c6 has no ambient light sensor. + > ### 2020-5-22 - Further SSDT-Keyboard tweaks: diff --git a/docs/assets/img/macOS Settings/Battery_powernap.png b/docs/assets/img/macOS Settings/Battery_powernap.png new file mode 100644 index 0000000..ad62944 Binary files /dev/null and b/docs/assets/img/macOS Settings/Battery_powernap.png differ diff --git a/docs/assets/img/macOS Settings/Bluetooth_wake.png b/docs/assets/img/macOS Settings/Bluetooth_wake.png new file mode 100644 index 0000000..c019442 Binary files /dev/null and b/docs/assets/img/macOS Settings/Bluetooth_wake.png differ diff --git a/docs/assets/img/macOS Settings/Poweradt_powernap.png b/docs/assets/img/macOS Settings/Poweradt_powernap.png new file mode 100644 index 0000000..25d888e Binary files /dev/null and b/docs/assets/img/macOS Settings/Poweradt_powernap.png differ diff --git a/patches/BetterTouchTool/x1c6-functions.bttpreset b/patches/BetterTouchTool/x1c6-functions.bttpreset deleted file mode 100644 index 66af9ea..0000000 --- a/patches/BetterTouchTool/x1c6-functions.bttpreset +++ /dev/null @@ -1,101 +0,0 @@ -{ - "BTTPresetName" : "x1c6-functions", - "BTTPresetColor" : "78.353000, 224.400000, 65.076000, 255.000000", - "BTTPresetUUID" : "6FD39F6E-967D-44EE-A00F-F3EAB1E65424", - "BTTPresetContent" : [ - { - "BTTAppBundleIdentifier" : "com.apple.finder", - "BTTAppName" : "Finder", - "BTTAppAutoInvertIcon" : 1, - "BTTTriggers" : [ - - ] - }, - { - "BTTAppBundleIdentifier" : "BT.G", - "BTTAppName" : "Global", - "BTTAppAutoInvertIcon" : 1, - "BTTTriggers" : [ - { - "BTTTriggerType" : 630, - "BTTTriggerTypeDescription" : "Group", - "BTTTriggerClass" : "BTTTriggerTypeKeyboardShortcut", - "BTTPredefinedActionType" : -1, - "BTTPredefinedActionName" : "No Action", - "BTTEnabled2" : 1, - "BTTKeyboardShortcutKeyboardType" : 0, - "BTTRepeatDelay" : 0, - "BTTUUID" : "41C56E38-AFF2-47DE-A652-8C40D498BC80", - "BTTTriggerOnDown" : 1, - "BTTNotesInsteadOfDescription" : 0, - "BTTGroupName" : "x1c6-functions", - "BTTEnabled" : 1, - "BTTModifierMode" : 0, - "BTTShortcutKeyCode" : -1, - "BTTShortcutModifierKeys" : -1, - "BTTOrder" : 0, - "BTTDisplayOrder" : 0, - "BTTAutoAdaptToKeyboardLayout" : 0, - "BTTAdditionalActions" : [ - { - "BTTGestureNotes" : "PrtSc = Window Screen Capture", - "BTTTriggerType" : 0, - "BTTTriggerClass" : "BTTTriggerTypeKeyboardShortcut", - "BTTPredefinedActionType" : 169, - "BTTPredefinedActionName" : "Capture Screenshot (Configurable)", - "BTTScreenshotOptions" : "-i;;-W;;-t;;png;;BTTAdditionallyCopyToClipboard;;\/Users\/jessica\/Pictures\/Screenshot_{datetime}_{random}.png;;", - "BTTScreenshotDateFormat" : "yyyy-MM-dd HH.mm.ss", - "BTTAdditionalConfiguration" : "8388608", - "BTTEnabled2" : 1, - "BTTKeyboardShortcutScope" : 1, - "BTTKeyboardShortcutKeyboardType" : 0, - "BTTRepeatDelay" : 0, - "BTTUUID" : "523CDC75-1C67-43A9-BFA9-7A38AFE1BBC1", - "BTTTriggerOnDown" : 1, - "BTTNotesInsteadOfDescription" : 0, - "BTTLayoutIndependentChar" : "F13", - "BTTEnabled" : 1, - "BTTModifierMode" : 0, - "BTTShortcutKeyCode" : 105, - "BTTShortcutModifierKeys" : 8388608, - "BTTOrder" : 0, - "BTTDisplayOrder" : 0, - "BTTAutoAdaptToKeyboardLayout" : 0, - "BTTTriggerConfig" : { - "BTTKeyboardShortcutScope" : 1 - } - }, - { - "BTTTriggerType" : 0, - "BTTTriggerClass" : "BTTTriggerTypeKeyboardShortcut", - "BTTPredefinedActionType" : 279, - "BTTPredefinedActionName" : "Toggle Bluetooth Enabled\/Disabled", - "BTTAdditionalConfiguration" : "9437200", - "BTTEnabled2" : 1, - "BTTKeyboardShortcutScope" : 1, - "BTTKeyboardShortcutKeyboardType" : 0, - "BTTRepeatDelay" : 0, - "BTTUUID" : "75218731-75FE-4B53-8C93-43D49F9A9734", - "BTTTriggerOnDown" : 1, - "BTTNotesInsteadOfDescription" : 0, - "BTTLayoutIndependentChar" : "DOWN", - "BTTEnabled" : 1, - "BTTModifierMode" : 0, - "BTTShortcutKeyCode" : 125, - "BTTShortcutModifierKeys" : 9437184, - "BTTOrder" : 1, - "BTTDisplayOrder" : 0, - "BTTAutoAdaptToKeyboardLayout" : 0, - "BTTTriggerConfig" : { - "BTTKeyboardShortcutScope" : 1 - } - } - ] - } - ] - } - ], - "BTTPresetSnapAreas" : [ - - ] -} \ No newline at end of file diff --git a/patches/SSDT-Keyboard.dsl b/patches/SSDT-Keyboard.dsl index 6f5619e..87e90fc 100644 --- a/patches/SSDT-Keyboard.dsl +++ b/patches/SSDT-Keyboard.dsl @@ -120,12 +120,10 @@ DefinitionBlock("", "SSDT", 2, "OCLT", "x1input", 0) If (_OSI ("Darwin")) { - // // Send a down event for the Control key (scancode 1d), then a one-shot event (down then up) for - // the down arrow key (scancode 0e 50), and finally an up event for the Control key (break scancode 9d). - // This is picked up by VoodooPS2 and sent to macOS as the Control+Down key combo. - Notify (\_SB.PCI0.LPCB.KBD, 0x011D) - Notify (\_SB.PCI0.LPCB.KBD, 0x0450) - Notify (\_SB.PCI0.LPCB.KBD, 0x019D) + // Left Shift + F17 + Notify (\_SB.PCI0.LPCB.KBD, 0x012A) + Notify (\_SB.PCI0.LPCB.KBD, 0x0368) + Notify (\_SB.PCI0.LPCB.KBD, 0x01AA) } Else {