Skip to content

libpebble3: drop kable types from the public scan API #232

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

Open
SalvatoreT wants to merge 1 commit into
base: master
Choose a base branch
from
Open

libpebble3: drop kable types from the public scan API #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion libindex/src/commonMain/kotlin/coredevices/libindex/device/RealScanning.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ class RealScanning(
identifier = it.identifier.asPebbleBleIdentifier(),
name = name,
rssi = it.rssi,
manufacturerData = manufacturerData
manufacturerCode = manufacturerData.code,
manufacturerData = manufacturerData.data,
)
}
}
Expand Down
8 changes: 4 additions & 4 deletions libpebble3/src/commonMain/kotlin/io/rebble/libpebblecommon/connection/Scanning.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.rebble.libpebblecommon.connection

import co.touchlab.kermit.Logger
import com.juul.kable.ManufacturerData
import com.oldguy.common.getShortAt
import io.rebble.libpebblecommon.ErrorTracker
import io.rebble.libpebblecommon.WatchConfigFlow
Expand All @@ -28,7 +27,8 @@ data class BleScanResult(
val identifier: PebbleBleIdentifier,
val name: String,
val rssi: Int,
val manufacturerData: ManufacturerData,
val manufacturerCode: Int,
val manufacturerData: ByteArray,
)

data class PebbleScanResult(
Expand Down Expand Up @@ -82,10 +82,10 @@ class RealScanning(
}
try {
scanResults.collect {
if (it.manufacturerData.code !in VENDOR_IDS) {
if (it.manufacturerCode !in VENDOR_IDS) {
return@collect
}
val pebbleScanRecord = it.manufacturerData.data.decodePebbleScanRecord()
val pebbleScanRecord = it.manufacturerData.decodePebbleScanRecord()
if (shouldHideLegacyClassicWatch(pebbleScanRecord)) {
return@collect
}
Expand Down
3 changes: 2 additions & 1 deletion ...Main/kotlin/io/rebble/libpebblecommon/connection/bt/ble/transport/impl/KableBleScanner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ class KableBleScanner : BleScanner {
identifier = it.identifier.asPebbleBleIdentifier(),
name = name,
rssi = it.rssi,
manufacturerData = manufacturerData
manufacturerCode = manufacturerData.code,
manufacturerData = manufacturerData.data,
)
}
}
Expand Down