Merge pull request #30 from osmanyildirim/main

Fix M2 MBP device familyID

Author: aaronkollasch

jitouch/Jitouch/Gesture.m

@@ -2568,7 +2568,7 @@ - (void)updateDevicesMM:(NSTimer*)theTimer {
             int familyID;
             MTDeviceGetFamilyID(device, &familyID);
 
-            if (familyID == 112 || familyID == 113) { // magic mouse
+            if (familyID == 112) { // magic mouse
                 MTRegisterContactFrameCallback(device, magicMouseCallback);
                 MTDeviceStart(device, 0);
                 found = YES;
@@ -2954,11 +2954,11 @@ - (id)init {
                     || familyID == 102 // retina macbook with the Force Touch trackpad (2015)
                     || familyID == 103 // retina mbp 13" with the Force Touch trackpad (2015)
                     || familyID == 104
-                    || familyID == 105) { // macbook with touch bar
+                    || familyID == 105 // macbook with touch bar
+                    || familyID == 113) { // m2 mbp with touch bar
                     MTRegisterContactFrameCallback(device, trackpadCallback);
                     MTDeviceStart(device, 0);
                 } else if (familyID == 112 // magic mouse & magic mouse 2
-                    || familyID == 113 // magic mouse 3?
                     ) {
                     MTRegisterContactFrameCallback(device, magicMouseCallback);
                     MTDeviceStart(device, 0);
@@ -3075,11 +3075,11 @@ - (void)reload {
             || familyID == 102 // retina macbook with the Force Touch trackpad (2015)
             || familyID == 103 // retina mbp 13" with the Force Touch trackpad (2015)
             || familyID == 104
-            || familyID == 105) { // macbook with touch bar
+            || familyID == 105 // macbook with touch bar
+            || familyID == 113) { // m2 mbp with touch bar
             MTRegisterContactFrameCallback(device, trackpadCallback);
             MTDeviceStart(device, 0);
         } else if (familyID == 112 // magic mouse & magic mouse 2
-            || familyID == 113 // magic mouse 3?
             ) {
             MTRegisterContactFrameCallback(device, magicMouseCallback);
             MTDeviceStart(device, 0);