From a4dd28edc3c1fc58f2204da831bc948e903d8754 Mon Sep 17 00:00:00 2001 From: Avery Black Date: Wed, 19 Feb 2020 17:09:14 -0800 Subject: [PATCH] Updated building --- VoodooPS2Controller.xcodeproj/project.pbxproj | 4 ++-- VoodooPS2Trackpad/alps.cpp | 24 ++++++++++++++++--- makefile | 8 +++++-- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/VoodooPS2Controller.xcodeproj/project.pbxproj b/VoodooPS2Controller.xcodeproj/project.pbxproj index 7971a32..05eb7fc 100644 --- a/VoodooPS2Controller.xcodeproj/project.pbxproj +++ b/VoodooPS2Controller.xcodeproj/project.pbxproj @@ -537,7 +537,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; LLVM_LTO = YES_THIN; "LLVM_LTO[arch=x86_64]" = YES_THIN; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.13; MODULE_VERSION = 6.0.0; ONLY_ACTIVE_ARCH = YES; "OTHER_LDFLAGS[arch=x86_64]" = "-dead_strip"; @@ -586,7 +586,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; LLVM_LTO = YES_THIN; "LLVM_LTO[arch=x86_64]" = YES_THIN; - MACOSX_DEPLOYMENT_TARGET = 10.14; + MACOSX_DEPLOYMENT_TARGET = 10.13; MODULE_VERSION = 6.0.0; ONLY_ACTIVE_ARCH = YES; "OTHER_LDFLAGS[arch=x86_64]" = "-dead_strip"; diff --git a/VoodooPS2Trackpad/alps.cpp b/VoodooPS2Trackpad/alps.cpp index 768b8a5..8c27d00 100644 --- a/VoodooPS2Trackpad/alps.cpp +++ b/VoodooPS2Trackpad/alps.cpp @@ -511,9 +511,27 @@ int ALPS::alps_process_bitmap(struct alps_data *priv, fields->mt[0] = fields->st; fields->mt[1] = corner[priv->second_touch]; - - //IOLog("ALPS: Process Bitmap, Corner=%d, Fingers=%d, x1=%d, x2=%d, y1=%d, y2=%d\n", priv->second_touch, fingers, fields->mt[0].x, fields->mt[1].x, fields->mt[0].y, fields->mt[1].y); - return fingers; + +#if DEBUG + IOLog("ALPS: BITMAP\n"); + + unsigned int ymap = fields->y_map; + + for (int i = 0; ymap != 0; i++, ymap >>= 1) { + unsigned int xmap = fields->x_map; + char bitLog[160]; + strlcpy(bitLog, "ALPS: ", sizeof("ALPS: ") + 1); + + for (int j = 0; xmap != 0; j++, xmap >>= 1) { + strcat(bitLog, (ymap & 1 && xmap & 1) ? "1 " : "0 "); + } + + IOLog("%s\n", bitLog); + } + + IOLog("ALPS: Process Bitmap, Corner=%d, Fingers=%d, x1=%d, x2=%d, y1=%d, y2=%d xmap=%d ymap=%d\n", priv->second_touch, fingers, fields->mt[0].x, fields->mt[1].x, fields->mt[0].y, fields->mt[1].y, fields->x_map, fields->y_map); +#endif // DEBUG + return fingers; } void ALPS::alps_process_trackstick_packet_v3(UInt8 *packet) { diff --git a/makefile b/makefile index 47c07c1..098594f 100644 --- a/makefile +++ b/makefile @@ -14,8 +14,12 @@ endif .PHONY: all all: - xcodebuild build $(OPTIONS) -scheme All -configuration Debug - xcodebuild build $(OPTIONS) -scheme All -configuration Release + xcodebuild build $(OPTIONS) -scheme VoodooPS2Trackpad -configuration Debug + xcodebuild build $(OPTIONS) -scheme VoodooPS2Keyboard -configuration Debug + xcodebuild build $(OPTIONS) -scheme VoodooPS2Controller -configuration Debug + xcodebuild build $(OPTIONS) -scheme VoodooPS2Trackpad -configuration Release + xcodebuild build $(OPTIONS) -scheme VoodooPS2Keyboard -configuration Release + xcodebuild build $(OPTIONS) -scheme VoodooPS2Controller -configuration Release .PHONY: clean clean: