The keyboard is now perfect

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

@@ -1,83 +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>18E226</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>SMCLightSensor</string>
-	<key>CFBundleIdentifier</key>
-	<string>ru.usrsse2.SMCLightSensor</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>SMCLightSensor</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>10E1001</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>18E219</string>
-	<key>DTSDKName</key>
-	<string>macosx10.14</string>
-	<key>DTXcode</key>
-	<string>1020</string>
-	<key>DTXcodeBuild</key>
-	<string>10E1001</string>
-	<key>IOKitPersonalities</key>
-	<dict>
-		<key>SMCLightSensor</key>
-		<dict>
-			<key>CFBundleIdentifier</key>
-			<string>ru.usrsse2.SMCLightSensor</string>
-			<key>IOClass</key>
-			<string>SMCLightSensor</string>
-			<key>IOMatchCategory</key>
-			<string>SMCLightSensor</string>
-			<key>IOProviderClass</key>
-			<string>IOResources</string>
-			<key>IOResourceMatch</key>
-			<string>IOKit</string>
-		</dict>
-	</dict>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2018 vit9696. All rights reserved.</string>
-	<key>OSBundleCompatibleVersion</key>
-	<string>1.0.0</string>
-	<key>OSBundleLibraries</key>
-	<dict>
-		<key>as.vit9696.Lilu</key>
-		<string>1.2.0</string>
-		<key>as.vit9696.VirtualSMC</key>
-		<string>1.0.0</string>
-		<key>com.apple.iokit.IOACPIFamily</key>
-		<string>1.0.0d1</string>
-		<key>com.apple.kpi.bsd</key>
-		<string>12.0.0</string>
-		<key>com.apple.kpi.dsep</key>
-		<string>12.0.0</string>
-		<key>com.apple.kpi.iokit</key>
-		<string>12.0.0</string>
-		<key>com.apple.kpi.libkern</key>
-		<string>12.0.0</string>
-		<key>com.apple.kpi.mach</key>
-		<string>12.0.0</string>
-		<key>com.apple.kpi.unsupported</key>
-		<string>12.0.0</string>
-	</dict>
-</dict>
-</plist>

EFI-OpenCore/EFI/OC/config.plist

@@ -1303,22 +1303,6 @@
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
-			<dict>
-				<key>BundlePath</key>
-				<string>SMCLightSensor.kext</string>
-				<key>Comment</key>
-				<string></string>
-				<key>Enabled</key>
-				<true/>
-				<key>ExecutablePath</key>
-				<string>Contents/MacOS/SMCLightSensor</string>
-				<key>MaxKernel</key>
-				<string></string>
-				<key>MinKernel</key>
-				<string></string>
-				<key>PlistPath</key>
-				<string>Contents/Info.plist</string>
-			</dict>
 			<dict>
 				<key>BundlePath</key>
 				<string>WhateverGreen.kext</string>

README.md

@@ -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:
+#### Added
-    - Windows (mismapped to Left Alt by default) is now properly mapped to Left GUI
+- Setting instructions better sleep in 5_README-other.md
-    - 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
 
-Keyboard Perfection is almost here!
+- Bluetooth Toggle is now supported by [ThinkpadAssistant 1.6](https://github.com/MSzturc/ThinkpadAssistant), thank so much [@MSzturc](https://github.com/MSzturc)
-- Modified SSDT-Keyboard patch to be compatible with [ThinkpadAssistant](https://github.com/MSzturc/ThinkpadAssistant).
+- SSDT-keyboard to support ThinkpadAssistant 1.6.0
-    - 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)
 
+#### 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:
 
@@ -55,7 +48,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 [ThinkpadAssistant](https://github.com/MSzturc/ThinkpadAssistant), and [BetterTouchTool](https://folivora.ai/)                           |                                                                               |                                                                                                                                                                 |
+| 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)**

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.
+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:
-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:
 
-- F10 = Toggle Bluetooth On/Off
 - F11 = Switch Keyboard Input Language (Set in System `Preferences/Keyboard`)
-- PrtSc = Window Screen Capture  
+- PrtSc = Screen Capture (Set in System `Preferences/Keyboard`)
-  Of course, feel free to change this to your preference in BetterTouchTool.
 
 > ## Touchpad Settings in macOS:
 

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:

patches/BetterTouchTool/x1c6-functions.bttpreset

@@ -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" : [
-
-  ]
-}

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
+                // Left Shift + F17
-                // the down arrow key (scancode 0e 50), and finally an up event for the Control key (break scancode 9d).
+                Notify (\_SB.PCI0.LPCB.KBD, 0x012A)
-                // This is picked up by VoodooPS2 and sent to macOS as the Control+Down key combo.
+                Notify (\_SB.PCI0.LPCB.KBD, 0x0368)
-                Notify (\_SB.PCI0.LPCB.KBD, 0x011D)
+                Notify (\_SB.PCI0.LPCB.KBD, 0x01AA)
-                Notify (\_SB.PCI0.LPCB.KBD, 0x0450)
-                Notify (\_SB.PCI0.LPCB.KBD, 0x019D)
             }
             Else
             {