Fixed SensorEvent

Author: colemancda

Sources/AndroidHardware/SensorEvent.swift

@@ -5,6 +5,11 @@
 //  Created by Alsey Coleman Miller on 7/6/25.
 //
 
+#if canImport(Android)
+import Android
+import AndroidNDK
+#endif
+
 /// A sensor event containing a measurement from a hardware sensor.
 public struct SensorEvent: Sendable {
 
@@ -13,6 +18,23 @@ public struct SensorEvent: Sendable {
     internal init(_ raw: ASensorEvent) {
         self.raw = raw
     }
+
+    @inline(__always)
+    internal func withRawDataBytes<R>(
+        _ body: (UnsafeRawBufferPointer) -> R
+    ) -> R {
+        withUnsafeBytes(of: raw) { rawBytes in
+            // ASensorEvent layout:
+            // version(4) + sensor(4) + type(4) + reserved0(4) + timestamp(8) + data(64)
+            let dataOffset = (MemoryLayout<Int32>.size * 4) + MemoryLayout<Int64>.size
+            let dataStart = rawBytes.baseAddress!.advanced(by: dataOffset)
+            let dataBytes = UnsafeRawBufferPointer(
+                start: dataStart,
+                count: MemoryLayout<Float>.size * 16
+            )
+            return body(dataBytes)
+        }
+    }
 }
 
 // MARK: - Properties
@@ -33,7 +55,7 @@ public extension SensorEvent {
     /// The layout depends on `type`. For most sensors the relevant values
     /// are in the first 3 elements (x, y, z).
     var data: [Float] {
-        withUnsafeBytes(of: raw._data) { bytes in
+        withRawDataBytes { bytes in
             Array(bytes.bindMemory(to: Float.self))
         }
     }
@@ -46,23 +68,23 @@ public extension SensorEvent {
     /// Acceleration vector in m/s² (x, y, z) — valid for `.accelerometer`,
     /// `.linearAcceleration`, and `.gravity` events.
     var acceleration: (x: Float, y: Float, z: Float) {
-        withUnsafeBytes(of: raw._data) { bytes in
+        withRawDataBytes { bytes in
             let f = bytes.bindMemory(to: Float.self)
             return (f[0], f[1], f[2])
         }
     }
 
     /// Rotation rate in rad/s (x, y, z) — valid for `.gyroscope` events.
     var angularVelocity: (x: Float, y: Float, z: Float) {
-        withUnsafeBytes(of: raw._data) { bytes in
+        withRawDataBytes { bytes in
             let f = bytes.bindMemory(to: Float.self)
             return (f[0], f[1], f[2])
         }
     }
 
     /// Magnetic field in μT (x, y, z) — valid for `.magneticField` events.
     var magneticField: (x: Float, y: Float, z: Float) {
-        withUnsafeBytes(of: raw._data) { bytes in
+        withRawDataBytes { bytes in
             let f = bytes.bindMemory(to: Float.self)
             return (f[0], f[1], f[2])
         }
@@ -71,44 +93,44 @@ public extension SensorEvent {
     /// Rotation vector (x, y, z, w) — valid for `.rotationVector` and
     /// related events.
     var rotationVector: (x: Float, y: Float, z: Float, w: Float) {
-        withUnsafeBytes(of: raw._data) { bytes in
+        withRawDataBytes { bytes in
             let f = bytes.bindMemory(to: Float.self)
             return (f[0], f[1], f[2], f[3])
         }
     }
 
     /// Illuminance in lx — valid for `.light` events.
     var light: Float {
-        withUnsafeBytes(of: raw._data) { $0.bindMemory(to: Float.self)[0] }
+        withRawDataBytes { $0.bindMemory(to: Float.self)[0] }
     }
 
     /// Distance in cm — valid for `.proximity` events.
     var distance: Float {
-        withUnsafeBytes(of: raw._data) { $0.bindMemory(to: Float.self)[0] }
+        withRawDataBytes { $0.bindMemory(to: Float.self)[0] }
     }
 
     /// Temperature in °C — valid for `.ambientTemperature` events.
     var temperature: Float {
-        withUnsafeBytes(of: raw._data) { $0.bindMemory(to: Float.self)[0] }
+        withRawDataBytes { $0.bindMemory(to: Float.self)[0] }
     }
 
     /// Pressure in hPa — valid for `.pressure` events.
     var pressure: Float {
-        withUnsafeBytes(of: raw._data) { $0.bindMemory(to: Float.self)[0] }
+        withRawDataBytes { $0.bindMemory(to: Float.self)[0] }
     }
 
     /// Relative humidity as a percentage — valid for `.relativeHumidity` events.
     var relativeHumidity: Float {
-        withUnsafeBytes(of: raw._data) { $0.bindMemory(to: Float.self)[0] }
+        withRawDataBytes { $0.bindMemory(to: Float.self)[0] }
     }
 
     /// Cumulative step count since last reboot — valid for `.stepCounter` events.
     var stepCount: UInt64 {
-        withUnsafeBytes(of: raw._data) { $0.bindMemory(to: UInt64.self)[0] }
+        withRawDataBytes { $0.bindMemory(to: UInt64.self)[0] }
     }
 
     /// Hinge angle in degrees — valid for `.hingeAngle` events.
     var hingeAngle: Float {
-        withUnsafeBytes(of: raw._data) { $0.bindMemory(to: Float.self)[0] }
+        withRawDataBytes { $0.bindMemory(to: Float.self)[0] }
     }
 }

Sources/AndroidHardware/SensorManager.swift

@@ -48,10 +48,13 @@ public extension SensorManager {
 
     /// Returns all sensors available on the device.
     var sensors: [Sensor] {
-        var list: UnsafePointer<OpaquePointer>?
+        var list: UnsafePointer<OpaquePointer?>?
         let count = ASensorManager_getSensorList(pointer, &list)
         guard count > 0, let list else { return [] }
-        return (0 ..< Int(count)).map { Sensor(list[$0]) }
+        return (0 ..< Int(count)).compactMap { index in
+            guard let pointer = list[index] else { return nil }
+            return Sensor(pointer)
+        }
     }
 
     /// Returns the default sensor of the given type, or `nil` if none exists.

Sources/AndroidHardware/Syscalls.swift

@@ -17,6 +17,8 @@ func stub() -> Never {
     fatalError("Not running on Android")
 }
 
+typealias ALooper_callbackFunc = @convention(c) (Int32, Int32, UnsafeMutableRawPointer?) -> Int32
+
 // MARK: - ASensorEvent
 
 /**
@@ -50,7 +52,7 @@ public struct ASensorEvent {
 // MARK: - ASensorManager
 
 func ASensorManager_getInstanceForPackage(_ packageName: UnsafePointer<CChar>?) -> OpaquePointer? { stub() }
-func ASensorManager_getSensorList(_ manager: OpaquePointer, _ list: UnsafeMutablePointer<UnsafePointer<OpaquePointer>?>) -> Int32 { stub() }
+func ASensorManager_getSensorList(_ manager: OpaquePointer, _ list: UnsafeMutablePointer<UnsafePointer<OpaquePointer?>?>) -> Int32 { stub() }
 func ASensorManager_getDefaultSensor(_ manager: OpaquePointer, _ type: Int32) -> OpaquePointer? { stub() }
 func ASensorManager_getDefaultSensorEx(_ manager: OpaquePointer, _ type: Int32, _ wakeUp: Bool) -> OpaquePointer? { stub() }
 func ASensorManager_createEventQueue(_ manager: OpaquePointer, _ looper: OpaquePointer, _ ident: Int32, _ callback: ALooper_callbackFunc?, _ data: UnsafeMutableRawPointer?) -> OpaquePointer? { stub() }