Fix ApplePencilSupport OptionSet raw values to use non-overlapping bits

Zandor300 · claude · Zandor300 · commit 46fce1b0c7f2 · 2026-03-02T17:34:37.000+01:00
The firstGenerationUsbC raw value (0x03) overlapped with firstGeneration
(0x01) and secondGeneration (0x02), causing contains() checks to return
incorrect results. Changed to proper power-of-2 values.

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@
 
 - Fixed iPhone Air incorrectly marked as having ultra-wide camera. ([#463](https://github.com/devicekit/DeviceKit/pull/463))
 - Fixed Apple Pencil compatibility for M4 iPad Pro, M2/M3 iPad Air, iPad (10th gen), and iPad (A16) models. ([#474](https://github.com/devicekit/DeviceKit/pull/474))
+- Fixed `ApplePencilSupport` OptionSet raw values so that `.firstGenerationUsbC` no longer incorrectly overlaps with `.firstGeneration` and `.secondGeneration`. ([#474](https://github.com/devicekit/DeviceKit/pull/474))
 
 ## Version 5.7.0
 
diff --git a/Source/Device.generated.swift b/Source/Device.generated.swift
@@ -2217,8 +2217,8 @@ extension Device {
 
     public static let firstGeneration = ApplePencilSupport(rawValue: 0x01)
     public static let secondGeneration = ApplePencilSupport(rawValue: 0x02)
-    public static let firstGenerationUsbC = ApplePencilSupport(rawValue: 0x03)
-    public static let pro = ApplePencilSupport(rawValue: 0x04)
+    public static let firstGenerationUsbC = ApplePencilSupport(rawValue: 0x04)
+    public static let pro = ApplePencilSupport(rawValue: 0x08)
   }
 
   /// All Apple Pencil Capable Devices
diff --git a/Source/Device.swift.gyb b/Source/Device.swift.gyb
@@ -1332,8 +1332,8 @@ extension Device {
 
     public static let firstGeneration = ApplePencilSupport(rawValue: 0x01)
     public static let secondGeneration = ApplePencilSupport(rawValue: 0x02)
-    public static let firstGenerationUsbC = ApplePencilSupport(rawValue: 0x03)
-    public static let pro = ApplePencilSupport(rawValue: 0x04)
+    public static let firstGenerationUsbC = ApplePencilSupport(rawValue: 0x04)
+    public static let pro = ApplePencilSupport(rawValue: 0x08)
   }
 
   /// All Apple Pencil Capable Devices

Original file line number	Diff line number	Diff line change
`@@ -2217,8 +2217,8 @@ extension Device {`
`2217`	`2217`
`2218`	`2218`	`public static let firstGeneration = ApplePencilSupport(rawValue: 0x01)`
`2219`	`2219`	`public static let secondGeneration = ApplePencilSupport(rawValue: 0x02)`
`2220`		`- public static let firstGenerationUsbC = ApplePencilSupport(rawValue: 0x03)`
`2221`		`- public static let pro = ApplePencilSupport(rawValue: 0x04)`
	`2220`	`+ public static let firstGenerationUsbC = ApplePencilSupport(rawValue: 0x04)`
	`2221`	`+ public static let pro = ApplePencilSupport(rawValue: 0x08)`
`2222`	`2222`	`}`
`2223`	`2223`
`2224`	`2224`	`/// All Apple Pencil Capable Devices`
Original file line number	Diff line number	Diff line change
`@@ -1332,8 +1332,8 @@ extension Device {`
`1332`	`1332`
`1333`	`1333`	`public static let firstGeneration = ApplePencilSupport(rawValue: 0x01)`
`1334`	`1334`	`public static let secondGeneration = ApplePencilSupport(rawValue: 0x02)`
`1335`		`- public static let firstGenerationUsbC = ApplePencilSupport(rawValue: 0x03)`
`1336`		`- public static let pro = ApplePencilSupport(rawValue: 0x04)`
	`1335`	`+ public static let firstGenerationUsbC = ApplePencilSupport(rawValue: 0x04)`
	`1336`	`+ public static let pro = ApplePencilSupport(rawValue: 0x08)`
`1337`	`1337`	`}`
`1338`	`1338`
`1339`	`1339`	`/// All Apple Pencil Capable Devices`