Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Loads and works, sorta #6

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Loads and works, sorta #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30eb6b4
Loads and works, sorta
1Revenger1 Nov 11, 2021
fc81936
VPS2 integration
1Revenger1 Nov 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@ DerivedData/
!*.xcodeproj/xcshareddata/
!*.xcworkspace/contents.xcworkspacedata
/*.gcno

**/.DS_STORE
2 changes: 1 addition & 1 deletion Dependencies/VoodooInput
Open in desktop
Submodule VoodooInput updated 13 files
+87 −0 .github/workflows/main.yml
+0 −33 .travis.yml
+12 −0 Changelog.md
+3 −3 README.md
+21 −3 VoodooInput.xcodeproj/project.pbxproj
+54 −0 VoodooInput/Trackpoint/TrackpointDevice.cpp
+35 −0 VoodooInput/Trackpoint/TrackpointDevice.hpp
+54 −14 VoodooInput/VoodooInput.cpp
+2 −0 VoodooInput/VoodooInput.hpp
+15 −0 VoodooInput/VoodooInputMultitouch/VoodooInputEvent.h
+3 −0 VoodooInput/VoodooInputMultitouch/VoodooInputMessages.h
+10 −76 VoodooInput/VoodooInputSimulator/VoodooInputSimulatorDevice.cpp
+13 −1 VoodooInput/VoodooInputSimulator/VoodooInputSimulatorDevice.hpp
87 changes: 10 additions & 77 deletions VoodooElan.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,11 @@
objects = {

/* Begin PBXBuildFile section */
B37556B2252BDCBE0031F50A /* VoodooSMBus.xcodeproj in Frameworks */ = {isa = PBXBuildFile; fileRef = B3B79E56252BC9B300E19884 /* VoodooSMBus.xcodeproj */; };
B3B79E3D252BB36100E19884 /* ELANTouchpadDriver.hpp in Headers */ = {isa = PBXBuildFile; fileRef = B3B79E3B252BB36100E19884 /* ELANTouchpadDriver.hpp */; };
B3B79E3E252BB36100E19884 /* ELANTouchpadDriver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3B79E3C252BB36100E19884 /* ELANTouchpadDriver.cpp */; };
B3B79E4D252BB87200E19884 /* helpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B3B79E4B252BB87200E19884 /* helpers.cpp */; };
B3B79E4E252BB87200E19884 /* helpers.hpp in Headers */ = {isa = PBXBuildFile; fileRef = B3B79E4C252BB87200E19884 /* helpers.hpp */; };
B3B79E70252BCA3400E19884 /* VoodooInput.kext in CopyFiles */ = {isa = PBXBuildFile; fileRef = B3B79E65252BCA1E00E19884 /* VoodooInput.kext */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
B3B79E71252BCA3800E19884 /* VoodooTrackpoint.kext in CopyFiles */ = {isa = PBXBuildFile; fileRef = B3B79E6B252BCA2800E19884 /* VoodooTrackpoint.kext */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
B3B79E72252BCA6E00E19884 /* VoodooSMBus.kext in CopyFiles */ = {isa = PBXBuildFile; fileRef = B3B79E5B252BC9B300E19884 /* VoodooSMBus.kext */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -25,41 +22,13 @@
remoteGlobalIDString = B3953FF922D8DBC100473323;
remoteInfo = VoodooSMBus;
};
B3B79E5C252BC9B900E19884 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = B3B79E56252BC9B300E19884 /* VoodooSMBus.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = B3953FF822D8DBC100473323;
remoteInfo = VoodooSMBus;
};
B3B79E64252BCA1E00E19884 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = B3B79E60252BCA1D00E19884 /* VoodooInput.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 7BBAB1F922E3A2F800B2941A;
remoteInfo = VoodooInput;
};
B3B79E6A252BCA2800E19884 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = B3B79E66252BCA2800E19884 /* VoodooTrackpoint.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = B33179B224AA310A00200168;
remoteInfo = VoodooTrackpoint;
};
B3B79E6C252BCA2D00E19884 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = B3B79E66252BCA2800E19884 /* VoodooTrackpoint.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = B33179B124AA310A00200168;
remoteInfo = VoodooTrackpoint;
};
B3B79E6E252BCA3000E19884 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = B3B79E60252BCA1D00E19884 /* VoodooInput.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 7BBAB1F822E3A2F800B2941A;
remoteInfo = VoodooInput;
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
Expand All @@ -69,8 +38,6 @@
dstPath = "";
dstSubfolderSpec = 13;
files = (
B3B79E72252BCA6E00E19884 /* VoodooSMBus.kext in CopyFiles */,
B3B79E71252BCA3800E19884 /* VoodooTrackpoint.kext in CopyFiles */,
B3B79E70252BCA3400E19884 /* VoodooInput.kext in CopyFiles */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -86,15 +53,13 @@
B3B79E4C252BB87200E19884 /* helpers.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = helpers.hpp; sourceTree = "<group>"; };
B3B79E56252BC9B300E19884 /* VoodooSMBus.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = VoodooSMBus.xcodeproj; path = Dependencies/VoodooSMBus/VoodooSMBus.xcodeproj; sourceTree = "<group>"; };
B3B79E60252BCA1D00E19884 /* VoodooInput.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = VoodooInput.xcodeproj; path = Dependencies/VoodooInput/VoodooInput.xcodeproj; sourceTree = "<group>"; };
B3B79E66252BCA2800E19884 /* VoodooTrackpoint.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = VoodooTrackpoint.xcodeproj; path = Dependencies/VoodooTrackpoint/VoodooTrackpoint.xcodeproj; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
B3B79E2B252BB08D00E19884 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
B37556B2252BDCBE0031F50A /* VoodooSMBus.xcodeproj in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -111,7 +76,6 @@
B3B79E24252BB08D00E19884 = {
isa = PBXGroup;
children = (
B3B79E66252BCA2800E19884 /* VoodooTrackpoint.xcodeproj */,
B3B79E60252BCA1D00E19884 /* VoodooInput.xcodeproj */,
B3B79E56252BC9B300E19884 /* VoodooSMBus.xcodeproj */,
B3B79E30252BB08D00E19884 /* VoodooElan */,
Expand Down Expand Up @@ -156,14 +120,6 @@
name = Products;
sourceTree = "<group>";
};
B3B79E67252BCA2800E19884 /* Products */ = {
isa = PBXGroup;
children = (
B3B79E6B252BCA2800E19884 /* VoodooTrackpoint.kext */,
);
name = Products;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand Down Expand Up @@ -192,9 +148,6 @@
buildRules = (
);
dependencies = (
B3B79E6F252BCA3000E19884 /* PBXTargetDependency */,
B3B79E6D252BCA2D00E19884 /* PBXTargetDependency */,
B3B79E5D252BC9B900E19884 /* PBXTargetDependency */,
);
name = VoodooElan;
productName = VoodooElan;
Expand All @@ -207,7 +160,7 @@
B3B79E25252BB08D00E19884 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1020;
LastUpgradeCheck = 1310;
ORGANIZATIONNAME = VoodooSMBus;
TargetAttributes = {
B3B79E2D252BB08D00E19884 = {
Expand All @@ -221,6 +174,7 @@
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = B3B79E24252BB08D00E19884;
productRefGroup = B3B79E2F252BB08D00E19884 /* Products */;
Expand All @@ -234,10 +188,6 @@
ProductGroup = B3B79E57252BC9B300E19884 /* Products */;
ProjectRef = B3B79E56252BC9B300E19884 /* VoodooSMBus.xcodeproj */;
},
{
ProductGroup = B3B79E67252BCA2800E19884 /* Products */;
ProjectRef = B3B79E66252BCA2800E19884 /* VoodooTrackpoint.xcodeproj */;
},
);
projectRoot = "";
targets = (
Expand All @@ -261,13 +211,6 @@
remoteRef = B3B79E64252BCA1E00E19884 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
B3B79E6B252BCA2800E19884 /* VoodooTrackpoint.kext */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = VoodooTrackpoint.kext;
remoteRef = B3B79E6A252BCA2800E19884 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */

/* Begin PBXResourcesBuildPhase section */
Expand All @@ -292,24 +235,6 @@
};
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
B3B79E5D252BC9B900E19884 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = VoodooSMBus;
targetProxy = B3B79E5C252BC9B900E19884 /* PBXContainerItemProxy */;
};
B3B79E6D252BCA2D00E19884 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = VoodooTrackpoint;
targetProxy = B3B79E6C252BCA2D00E19884 /* PBXContainerItemProxy */;
};
B3B79E6F252BCA3000E19884 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = VoodooInput;
targetProxy = B3B79E6E252BCA3000E19884 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
B3B79E36252BB08D00E19884 /* Debug */ = {
isa = XCBuildConfiguration;
Expand Down Expand Up @@ -337,6 +262,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -396,6 +322,7 @@
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -425,6 +352,10 @@
B3B79E39252BB08D00E19884 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_DEADCODE_DEADSTORES = NO;
CLANG_ANALYZER_DIVIDE_BY_ZERO = NO;
CLANG_ANALYZER_NULL_DEREFERENCE = NO;
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1.0.0d1;
Expand All @@ -433,13 +364,15 @@
MODULE_VERSION = 1.0.0d1;
PRODUCT_BUNDLE_IDENTIFIER = com.VoodooSMBus.VoodooElan;
PRODUCT_NAME = "$(TARGET_NAME)";
RUN_CLANG_STATIC_ANALYZER = YES;
WRAPPER_EXTENSION = kext;
};
name = Debug;
};
B3B79E3A252BB08D00E19884 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_IDENTITY = "-";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1.0.0d1;
Expand Down
Loading