@glassly/bluetooth-sdk 0.1.0-dev.97 → 0.1.0-dev.99
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/src/main/java/com/glassly/bluetoothsdk/GeneratedReleaseMetadata.kt +3 -3
- package/android/src/main/java/com/glassly/bluetoothsdk/sgcs/G2.kt +11 -3
- package/build/generated/releaseMetadata.js +3 -3
- package/build/generated/releaseMetadata.js.map +1 -1
- package/ios/Source/BluetoothSdkDefaults.swift +1 -1
- package/ios/Source/GeneratedReleaseMetadata.swift +3 -3
- package/ios/Source/sgcs/G2.swift +14 -9
- package/package.json +1 -1
- package/src/generated/releaseMetadata.ts +3 -3
|
@@ -3,9 +3,9 @@ package com.glassly.bluetoothsdk
|
|
|
3
3
|
/** Generated by release CI. Do not edit in a release checkout. */
|
|
4
4
|
internal object GeneratedReleaseMetadata {
|
|
5
5
|
const val FAMILY_BASE_VERSION: String = "0.1.0"
|
|
6
|
-
const val RELEASE_IDENTITY: String = "0.1.0-dev.
|
|
7
|
-
const val RELEASE_SET_ID: String = "glassly-0.1.0-dev.
|
|
8
|
-
const val SOURCE_COMMIT: String = "
|
|
6
|
+
const val RELEASE_IDENTITY: String = "0.1.0-dev.99"
|
|
7
|
+
const val RELEASE_SET_ID: String = "glassly-0.1.0-dev.99"
|
|
8
|
+
const val SOURCE_COMMIT: String = "2aeea5db8ad4e84303faf84a92d025f0d1930ebf"
|
|
9
9
|
const val OTA_MANIFEST_URL: String = ""
|
|
10
10
|
const val OTA_MANIFEST_SHA256: String = ""
|
|
11
11
|
}
|
|
@@ -267,8 +267,11 @@ private enum class OsEventType(val value: Int) {
|
|
|
267
267
|
ABNORMAL_EXIT(6),
|
|
268
268
|
SYSTEM_EXIT(7),
|
|
269
269
|
IMU_DATA_REPORT(8), // IMU_DATA_REPORT — Sys_ItemEvent carries imuData
|
|
270
|
-
|
|
271
|
-
|
|
270
|
+
// 9/10 are the SDK 0.0.14 LONG_PRESS/RELEASE pair; the 2.2.9 CFW forwards
|
|
271
|
+
// them while our fbguard lease is active. Names stay tap_start/tap_end.
|
|
272
|
+
TAP_START(9), // press recognized (hold start)
|
|
273
|
+
TAP_END(10), // released
|
|
274
|
+
TAP_THEN_HOLD(11); // CFW extension: 2.2.9 tap-then-hold (stock Menu gesture)
|
|
272
275
|
|
|
273
276
|
companion object {
|
|
274
277
|
fun fromInt(v: Int): OsEventType? = entries.find { it.value == v }
|
|
@@ -450,7 +453,8 @@ private object EvenHubProto {
|
|
|
450
453
|
containerID: Int,
|
|
451
454
|
containerName: String? = null,
|
|
452
455
|
isEventCapture: Boolean = false,
|
|
453
|
-
content: String? = null
|
|
456
|
+
content: String? = null,
|
|
457
|
+
textColor: Int? = null
|
|
454
458
|
): ByteArray {
|
|
455
459
|
val w = ProtobufWriter()
|
|
456
460
|
w.writeInt32Field(1, x)
|
|
@@ -465,6 +469,9 @@ private object EvenHubProto {
|
|
|
465
469
|
containerName?.let { w.writeStringField(10, it) }
|
|
466
470
|
w.writeInt32Field(11, if (isEventCapture) 1 else 0)
|
|
467
471
|
content?.let { w.writeStringField(12, it) }
|
|
472
|
+
// SDK 0.0.14 text brightness level 0-4 (4 = default). Field number is a
|
|
473
|
+
// guess: proto dump is 2.1.0-era (last field 12) — verify on-device.
|
|
474
|
+
textColor?.let { w.writeInt32Field(13, it) }
|
|
468
475
|
return w.toByteArray()
|
|
469
476
|
}
|
|
470
477
|
|
|
@@ -6145,6 +6152,7 @@ class G2 : SGCManager() {
|
|
|
6145
6152
|
OsEventType.SYSTEM_EXIT -> "system_exit"
|
|
6146
6153
|
OsEventType.TAP_START -> "tap_start"
|
|
6147
6154
|
OsEventType.TAP_END -> "tap_end"
|
|
6155
|
+
OsEventType.TAP_THEN_HOLD -> "tap_then_hold"
|
|
6148
6156
|
OsEventType.IMU_DATA_REPORT -> null
|
|
6149
6157
|
OsEventType.ABNORMAL_EXIT -> null // don't report abnormal exits as gestures
|
|
6150
6158
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
export const BLUETOOTH_SDK_RELEASE_METADATA = Object.freeze({
|
|
2
2
|
"schemaVersion": 1,
|
|
3
3
|
"familyBaseVersion": "0.1.0",
|
|
4
|
-
"releaseIdentity": "0.1.0-dev.
|
|
5
|
-
"releaseSetId": "glassly-0.1.0-dev.
|
|
6
|
-
"sourceCommit": "
|
|
4
|
+
"releaseIdentity": "0.1.0-dev.99",
|
|
5
|
+
"releaseSetId": "glassly-0.1.0-dev.99",
|
|
6
|
+
"sourceCommit": "2aeea5db8ad4e84303faf84a92d025f0d1930ebf",
|
|
7
7
|
"otaManifestUrl": null,
|
|
8
8
|
"otaManifestSha256": null
|
|
9
9
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"releaseMetadata.js","sourceRoot":"","sources":["../../src/generated/releaseMetadata.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,8BAA8B,GAA0C,MAAM,CAAC,MAAM,CAAC;IACjG,eAAe,EAAE,CAAC;IAClB,mBAAmB,EAAE,OAAO;IAC5B,iBAAiB,EAAE,cAAc;IACjC,cAAc,EAAE,sBAAsB;IACtC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,IAAI;IACtB,mBAAmB,EAAE,IAAI;CAC1B,CAAC,CAAA","sourcesContent":["/** Generated by release CI. Do not edit in a release checkout. */\nexport interface BluetoothSdkReleaseMetadata {\n schemaVersion: 1\n familyBaseVersion: string | null\n releaseIdentity: string | null\n releaseSetId: string | null\n sourceCommit: string | null\n otaManifestUrl: string | null\n otaManifestSha256: string | null\n}\n\nexport const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({\n \"schemaVersion\": 1,\n \"familyBaseVersion\": \"0.1.0\",\n \"releaseIdentity\": \"0.1.0-dev.
|
|
1
|
+
{"version":3,"file":"releaseMetadata.js","sourceRoot":"","sources":["../../src/generated/releaseMetadata.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,8BAA8B,GAA0C,MAAM,CAAC,MAAM,CAAC;IACjG,eAAe,EAAE,CAAC;IAClB,mBAAmB,EAAE,OAAO;IAC5B,iBAAiB,EAAE,cAAc;IACjC,cAAc,EAAE,sBAAsB;IACtC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,IAAI;IACtB,mBAAmB,EAAE,IAAI;CAC1B,CAAC,CAAA","sourcesContent":["/** Generated by release CI. Do not edit in a release checkout. */\nexport interface BluetoothSdkReleaseMetadata {\n schemaVersion: 1\n familyBaseVersion: string | null\n releaseIdentity: string | null\n releaseSetId: string | null\n sourceCommit: string | null\n otaManifestUrl: string | null\n otaManifestSha256: string | null\n}\n\nexport const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({\n \"schemaVersion\": 1,\n \"familyBaseVersion\": \"0.1.0\",\n \"releaseIdentity\": \"0.1.0-dev.99\",\n \"releaseSetId\": \"glassly-0.1.0-dev.99\",\n \"sourceCommit\": \"2aeea5db8ad4e84303faf84a92d025f0d1930ebf\",\n \"otaManifestUrl\": null,\n \"otaManifestSha256\": null\n})\n"]}
|
|
@@ -11,7 +11,7 @@ enum BluetoothSdkDefaults {
|
|
|
11
11
|
static let voiceActivityDetectionEnabled = false
|
|
12
12
|
static let loudnessGateEnabled = true
|
|
13
13
|
private static let infoSdkVersionKey = "BluetoothSdkVersion"
|
|
14
|
-
private static let swiftPackageSdkVersion = "0.1.0-dev.
|
|
14
|
+
private static let swiftPackageSdkVersion = "0.1.0-dev.99"
|
|
15
15
|
private static let swiftPackageSdkVersionPlaceholder = "__GLASSLY" + "_BLUETOOTH_SDK_VERSION__"
|
|
16
16
|
|
|
17
17
|
private static func normalizedSdkVersion(_ value: String?) -> String? {
|
|
@@ -3,9 +3,9 @@ import Foundation
|
|
|
3
3
|
/// Generated by release CI. Do not edit in a release checkout.
|
|
4
4
|
enum GeneratedReleaseMetadata {
|
|
5
5
|
static let familyBaseVersion = "0.1.0"
|
|
6
|
-
static let releaseIdentity = "0.1.0-dev.
|
|
7
|
-
static let releaseSetId = "glassly-0.1.0-dev.
|
|
8
|
-
static let sourceCommit = "
|
|
6
|
+
static let releaseIdentity = "0.1.0-dev.99"
|
|
7
|
+
static let releaseSetId = "glassly-0.1.0-dev.99"
|
|
8
|
+
static let sourceCommit = "2aeea5db8ad4e84303faf84a92d025f0d1930ebf"
|
|
9
9
|
static let otaManifestUrl = ""
|
|
10
10
|
static let otaManifestSha256 = ""
|
|
11
11
|
}
|
package/ios/Source/sgcs/G2.swift
CHANGED
|
@@ -125,14 +125,12 @@ private enum OsEventType: Int32 {
|
|
|
125
125
|
case abnormalExit = 6
|
|
126
126
|
case systemExit = 7
|
|
127
127
|
case imuDataReport = 8 // IMU_DATA_REPORT — Sys_ItemEvent carries imuData
|
|
128
|
-
// 9/10 are
|
|
129
|
-
//
|
|
130
|
-
//
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
//
|
|
134
|
-
case tapStart = 9 // finger down on the touch bar
|
|
135
|
-
case tapEnd = 10 // finger lifted
|
|
128
|
+
// 9/10 are the SDK 0.0.14 LONG_PRESS/RELEASE pair. The 2.2.9 CFW forwards
|
|
129
|
+
// them (ET_LONG/ET_REL) while our fbguard lease is active; the gesture
|
|
130
|
+
// names stay tap_start/tap_end for API stability.
|
|
131
|
+
case tapStart = 9 // press recognized (hold start)
|
|
132
|
+
case tapEnd = 10 // released
|
|
133
|
+
case tapThenHold = 11 // CFW extension: 2.2.9 tap-then-hold (stock Menu gesture)
|
|
136
134
|
}
|
|
137
135
|
|
|
138
136
|
/// g2_settingCommandId from g2_setting.proto
|
|
@@ -479,7 +477,7 @@ private enum EvenHubProto {
|
|
|
479
477
|
borderWidth: Int32 = 0, borderColor: Int32 = 0, borderRadius: Int32 = 0,
|
|
480
478
|
paddingLength: Int32 = 0, containerID: Int32,
|
|
481
479
|
containerName: String? = nil, isEventCapture: Bool = false,
|
|
482
|
-
content: String? = nil
|
|
480
|
+
content: String? = nil, textColor: Int32? = nil
|
|
483
481
|
) -> Data {
|
|
484
482
|
var w = ProtobufWriter()
|
|
485
483
|
w.writeInt32Field(1, x) // XPosition
|
|
@@ -498,6 +496,12 @@ private enum EvenHubProto {
|
|
|
498
496
|
if let content = content {
|
|
499
497
|
w.writeStringField(12, content) // Content
|
|
500
498
|
}
|
|
499
|
+
if let textColor = textColor {
|
|
500
|
+
// SDK 0.0.14 text brightness level 0-4 (4 = default). Field number
|
|
501
|
+
// is a guess: our proto dump is 2.1.0-era (last field 12) and the
|
|
502
|
+
// 2.2.9 firmware's tag isn't extracted — verify on-device.
|
|
503
|
+
w.writeInt32Field(13, textColor) // TextColor (unverified)
|
|
504
|
+
}
|
|
501
505
|
return w.data
|
|
502
506
|
}
|
|
503
507
|
|
|
@@ -6247,6 +6251,7 @@ final class G2: NSObject, SGCManager {
|
|
|
6247
6251
|
case .systemExit: return "system_exit"
|
|
6248
6252
|
case .tapStart: return "tap_start"
|
|
6249
6253
|
case .tapEnd: return "tap_end"
|
|
6254
|
+
case .tapThenHold: return "tap_then_hold"
|
|
6250
6255
|
case .imuDataReport: return nil
|
|
6251
6256
|
case .abnormalExit: return nil // don't report abnormal exits as gestures
|
|
6252
6257
|
}
|
package/package.json
CHANGED
|
@@ -12,9 +12,9 @@ export interface BluetoothSdkReleaseMetadata {
|
|
|
12
12
|
export const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({
|
|
13
13
|
"schemaVersion": 1,
|
|
14
14
|
"familyBaseVersion": "0.1.0",
|
|
15
|
-
"releaseIdentity": "0.1.0-dev.
|
|
16
|
-
"releaseSetId": "glassly-0.1.0-dev.
|
|
17
|
-
"sourceCommit": "
|
|
15
|
+
"releaseIdentity": "0.1.0-dev.99",
|
|
16
|
+
"releaseSetId": "glassly-0.1.0-dev.99",
|
|
17
|
+
"sourceCommit": "2aeea5db8ad4e84303faf84a92d025f0d1930ebf",
|
|
18
18
|
"otaManifestUrl": null,
|
|
19
19
|
"otaManifestSha256": null
|
|
20
20
|
})
|