change keyboard abilities2

Signed-off-by: Sergey Isakov <[email protected]>
SergeySlice · Aug 20, 2019 · db13ed6 · db13ed6
1 parent 605cd7e
commit db13ed6
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 75 deletions.
diff --git a/VoodooPS2Controller.xcodeproj/project.pbxproj b/VoodooPS2Controller.xcodeproj/project.pbxproj
@@ -728,13 +728,16 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = "$(MODULE_VERSION)";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "VoodooPS2Controller/VoodooPS2Controller-Prefix.pch";
 				INFOPLIST_FILE = "VoodooPS2Controller/VoodooPS2Controller-Info.plist";
 				MODULE_NAME = com.rehabman.driver.VoodooPS2Controller;
+				MODULE_VERSION = 6.0.2;
 				OTHER_CFLAGS = "-fno-stack-protector";
 				PRODUCT_BUNDLE_IDENTIFIER = org.rehabman.voodoo.driver.PS2Controller;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx10.11;
 				STRIP_INSTALLED_PRODUCT = YES;
 				STRIP_STYLE = "non-global";
 			};
@@ -745,13 +748,16 @@
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "";
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = "$(MODULE_VERSION)";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "VoodooPS2Controller/VoodooPS2Controller-Prefix.pch";
 				INFOPLIST_FILE = "VoodooPS2Controller/VoodooPS2Controller-Info.plist";
 				MODULE_NAME = com.rehabman.driver.VoodooPS2Controller;
+				MODULE_VERSION = 6.0.2;
 				OTHER_CFLAGS = "-fno-stack-protector";
 				PRODUCT_BUNDLE_IDENTIFIER = org.rehabman.voodoo.driver.PS2Controller;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx10.11;
 				STRIP_INSTALLED_PRODUCT = YES;
 				STRIP_STYLE = "non-global";
 			};

diff --git a/VoodooPS2Controller/VoodooPS2Controller-Info.plist b/VoodooPS2Controller/VoodooPS2Controller-Info.plist
@@ -139,6 +139,6 @@
 	<key>OSBundleRequired</key>
 	<string>Console</string>
 	<key>Source Code</key>
-	<string>https://github.com/RehabMan/OS-X-Voodoo-PS2-Controller</string>
+	<string>https://github.com/SergeySlice/OS-X-ALPS-DRIVER</string>
 </dict>
 </plist>
diff --git a/VoodooPS2Keyboard/ApplePS2ToADBMap.h b/VoodooPS2Keyboard/ApplePS2ToADBMap.h
@@ -121,20 +121,20 @@ static const UInt8 PS2ToADBMapStock[ADB_CONVERTER_LEN] =
     0x41,   // 53  Keypad . Delete
     0x44,   // 54  SysReq
     0x46,   // 55
-    0x0a,   // 56  Europe 2(ISO)
+    0x0a,   // 56  Europe 2(ISO) º\ª (Spanish)
     0x67,   // 57  F11
     0x6f,   // 58  F12
     0x51,   // 59  Keypad =
-    DEADKEY,// 5a
-    DEADKEY,// 5b
+    0x4f,   // 5a Custom WWW
+    0x50,   // 5b Custom My Documents
     0x5f,   // 5c  Keyboard Int'l 6 (PC9800 Keypad , )
     DEADKEY,// 5d
     DEADKEY,// 5e
     DEADKEY,// 5f
-    DEADKEY,// 60
-    DEADKEY,// 61
-    DEADKEY,// 62
-    DEADKEY,// 63
+    0x3e,   // 60  Right Ctrl
+    0x3d,   // 61  Right Alt
+    0x4c,   // 62  Keypad Enter
+    0x4b,   // 63  Keypad / //??
     0x69,   // 64  F13
     0x6b,   // 65  F14
     0x71,   // 66  F15
@@ -143,27 +143,27 @@ static const UInt8 PS2ToADBMapStock[ADB_CONVERTER_LEN] =
     0x4f,   // 69  F18
     0x50,   // 6a  F19
     0x5a,   // 6b  F20
-    DEADKEY,// 6c  F21
-    DEADKEY,// 6d  F22
-    DEADKEY,// 6e  F23
-    DEADKEY,// 6f
-    0x68,   // 70  Keyboard Intl'2 (Japanese Katakana/Hiragana)
-    DEADKEY,// 71
-    DEADKEY,// 72
-    0x5e,   // 73  Keyboard Int'l 1 (Japanese Ro)
+    0x73,   // 6c  Home
+    0x77,   // 6d  End
+    0x69,   // 6e  Print Scrn
+    0x71,   // 6f  Pause
+    0x37,   // 70  Left Window
+    0x36,   // 71  Right Window
+    0x6e,   // 72  Applications
+    0x34,   // 73 Custom Play/Pause
     DEADKEY,// 74
     DEADKEY,// 75
-    DEADKEY,// 76  F24 , Keyboard Lang 5 (Japanese Zenkaku/Hankaku)
-    0x68,   // 77  Keyboard Lang 4 (Japanese Hiragana)
-    0x68,   // 78  Keyboard Lang 3 (Japanese Katakana)
+    0x3f,   // 76 Custom Stop
+    0x40,   // 77 Custom Prev Track
+    0x42,   // 78 Custom Next Track
     0x68,   // 79  Keyboard Int'l 4 (Japanese Henkan)
-    DEADKEY,// 7a
+    0x4d,   // 7a VidMirror
     0x66,   // 7b  Keyboard Int'l 5 (Japanese Muhenkan)
-    DEADKEY,// 7c
-    0x5d,   // 7d  Keyboard Int'l 3 (Japanese Yen)
-    0x5f,   // 7e  Keypad , (Brazilian Keypad .)
-    DEADKEY,// 7f 
-    DEADKEY,// 80 
+    0x7f,   // 7c
+    0x48,   // 7d Volume Up
+    0x49,   // 7e Volume Down
+    0x4a,   // 7f Volume Mute
+    DEADKEY,// 80
     DEADKEY,// 81 
     DEADKEY,// 82 
     DEADKEY,// 83 

diff --git a/VoodooPS2Keyboard/VoodooPS2Keyboard-Breakless-Info.plist b/VoodooPS2Keyboard/VoodooPS2Keyboard-Breakless-Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>Source Code</key>
-	<string>https://github.com/RehabMan/OS-X-Voodoo-PS2-Controller</string>
+	<string>https://github.com/SergeySlice/OS-X-ALPS-DRIVER</string>
 	<key>CFBundleGetInfoString</key>
 	<string>${MODULE_VERSION}, Copyright Apple Computer, Inc. 2000-2003, RehabMan 2012-2013</string>
 	<key>CFBundleExecutable</key>

diff --git a/VoodooPS2Keyboard/VoodooPS2Keyboard-Info.plist b/VoodooPS2Keyboard/VoodooPS2Keyboard-Info.plist
@@ -188,15 +188,9 @@
 						<array>
 							<string>;This section maps ps2 codes (packet format) received quickly (macros) into fake ps2 codes (packet format)</string>
 							<string>;Fn+F1</string>
-							<data>
-							//8CbgAAAAACWwEZ
-							</data>
-							<data>
-							//8C7gAAAAAC2wGZ
-							</data>
-							<data>
-							//8C7gAAAAABmQLb
-							</data>
+							<data>//8CbgAAAAACWwEZ</data>
+							<data>//8C7gAAAAAC2wGZ</data>
+							<data>//8C7gAAAAABmQLb</data>
 						</array>
 						<key>MaximumMacroTime</key>
 						<integer>35000000</integer>
@@ -220,7 +214,7 @@
 						<array>
 							<string>e01b=70</string>
 							<string>e06e=83</string>
-                                                        <string>e005=6b</string>
+							<string>e005=6b</string>
 							<string>e006=71</string>
 						</array>
 						<key>Custom PS2 Map</key>
@@ -627,47 +621,23 @@
 						<array>
 							<string>;This section maps ps2 codes (packet format) received quickly (macros) into fake ps2 codes (packet format)</string>
 							<string>;Fn+F4</string>
-							<data>
-							//8CZAAAAAABOAE+
-							</data>
-							<data>
-							//8C5AAAAAABvgG4
-							</data>
+							<data>//8CZAAAAAABOAE+</data>
+							<data>//8C5AAAAAABvgG4</data>
 							<string>;F5 (without Fn)</string>
-							<data>
-							//8CZQEAAAABPw==
-							</data>
-							<data>
-							//8C5QEAAAABvw==
-							</data>
+							<data>//8CZQEAAAABPw==</data>
+							<data>//8C5QEAAAABvw==</data>
 							<string>;Fn+Ctrl+F6</string>
-							<data>
-							//8CJwAD//8CZg==
-							</data>
-							<data>
-							//8CpwAD//8C5g==
-							</data>
+							<data>//8CJwAD//8CZg==</data>
+							<data>//8CpwAD//8C5g==</data>
 							<string>;Ctrl+F6</string>
-							<data>
-							//8CJwAD//8CQA==
-							</data>
-							<data>
-							//8CpwAD//8CwA==
-							</data>
+							<data>//8CJwAD//8CQA==</data>
+							<data>//8CpwAD//8CwA==</data>
 							<string>;Fn+F8</string>
-							<data>
-							//8CaAAAAAACHQE4AQ8=
-							</data>
-							<data>
-							//8C6AAAAAABjwG4Ap0=
-							</data>
+							<data>//8CaAAAAAACHQE4AQ8=</data>
+							<data>//8C6AAAAAABjwG4Ap0=</data>
 							<string>;Fn+F10</string>
-							<data>
-							//8CagAAAAACWwEZ
-							</data>
-							<data>
-							//8C6gAAAAABmQLb
-							</data>
+							<data>//8CagAAAAACWwEZ</data>
+							<data>//8C6gAAAAABmQLb</data>
 						</array>
 						<key>Macro Translation</key>
 						<array>
@@ -716,6 +686,6 @@
 	<key>OSBundleRequired</key>
 	<string>Console</string>
 	<key>Source Code</key>
-	<string>https://github.com/RehabMan/OS-X-Voodoo-PS2-Controller</string>
+	<string>https://github.com/SergeySlice/OS-X-ALPS-DRIVER</string>
 </dict>
 </plist>
diff --git a/VoodooPS2Keyboard/VoodooPS2Keyboard.cpp b/VoodooPS2Keyboard/VoodooPS2Keyboard.cpp
@@ -92,7 +92,7 @@ void* _org_rehabman_dontstrip_[] =
 
 // get some keyboard id information from IOHIDFamily/IOHIDKeyboard.h and Gestalt.h
 //#define APPLEPS2KEYBOARD_DEVICE_TYPE	205 // Generic ISO keyboard
-#define APPLEPS2KEYBOARD_DEVICE_TYPE	3   // Unknown ANSI keyboard
+//#define APPLEPS2KEYBOARD_DEVICE_TYPE	3   // Unknown ANSI keyboard
 
 OSDefineMetaClassAndStructors(ApplePS2Keyboard, IOHIKeyboard);
 

diff --git a/VoodooPS2Trackpad/VoodooPS2Trackpad-Info.plist b/VoodooPS2Trackpad/VoodooPS2Trackpad-Info.plist
@@ -192,6 +192,6 @@
 	<key>OSBundleRequired</key>
 	<string>Console</string>
 	<key>Source Code</key>
-	<string>https://github.com/RehabMan/OS-X-Voodoo-PS2-Controller</string>
+	<string>https://github.com/SergeySlice/OS-X-ALPS-DRIVER</string>
 </dict>
 </plist>