tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topic "Bluetooth_Ranging_Params_Update" into main am: acb835d146 am: 18509df8a1 am: 5f35013bc0

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2873574

Change-Id: I3c834e116fce457ac9b3fef3b2a964d500abb102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-12-15 09:57:32 +00:00 committed by Automerger Merge Worker
commit 28029ccf51
6 changed files with 37 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/ChannelSoudingRawData.aidl
View file

@ -35,6 +35,7 @@ package android.hardware.bluetooth.ranging;
@VintfStability
parcelable ChannelSoudingRawData {
int procedureCounter;
int[] frequencyCompensation;
boolean aborted;
android.hardware.bluetooth.ranging.ChannelSoundingSingleSideData initiatorData;
android.hardware.bluetooth.ranging.ChannelSoundingSingleSideData reflectorData;

1
bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/ChannelSoundingSingleSideData.aidl
View file

@ -38,6 +38,7 @@ parcelable ChannelSoundingSingleSideData {
@nullable byte[] packetQuality;
@nullable byte[] packetRssiDbm;
@nullable android.hardware.bluetooth.ranging.Nadm[] packetNadm;
@nullable int[] measuredFreqOffset;
@nullable List<android.hardware.bluetooth.ranging.ComplexNumber> packetPct1;
@nullable List<android.hardware.bluetooth.ranging.ComplexNumber> packetPct2;
byte referencePowerDbm;

6
bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/StepTonePct.aidl
View file

@ -36,6 +36,7 @@ package android.hardware.bluetooth.ranging;
parcelable StepTonePct {
List<android.hardware.bluetooth.ranging.ComplexNumber> tonePcts;
byte[] toneQualityIndicator;
byte toneExtensionAntennaIndex;
const int TONE_QUALITY_GOOD = 0;
const int TONE_QUALITY_MEDIUM = 1;
const int TONE_QUALITY_LOW = 2;
@ -44,4 +45,9 @@ parcelable StepTonePct {
const int EXTENSION_SLOT_TONE_NOT_EXPECTED_TO_BE_PRESENT = 1;
const int EXTENSION_SLOT_TONE_EXPECTED_TO_BE_PRESENT = 2;
const int EXTENSION_SLOT_SHIFT_AMOUNT = 4;
const byte TONE_EXTENSION_ANTENNA_1 = 0x0;
const byte TONE_EXTENSION_ANTENNA_2 = 0x1;
const byte TONE_EXTENSION_ANTENNA_3 = 0x2;
const byte TONE_EXTENSION_ANTENNA_4 = 0x3;
const byte TONE_EXTENSION_UNUSED = 0xFFu8;
}

5
bluetooth/ranging/aidl/android/hardware/bluetooth/ranging/ChannelSoudingRawData.aidl
View file

@ -28,6 +28,11 @@ parcelable ChannelSoudingRawData {
* Procedure counter of the CS procedure.
*/
int procedureCounter;
/**
* Frequency Compensation indicates fractional frequency
* offset (FFO) value of initiator, in 0.01ppm
*/
int[] frequencyCompensation;
/**
* Indicate if the procedure aborted.
*/

4
bluetooth/ranging/aidl/android/hardware/bluetooth/ranging/ChannelSoundingSingleSideData.aidl
View file

@ -41,6 +41,10 @@ parcelable ChannelSoundingSingleSideData {
* Packet NADM of mode-1 or mode-3 step data for attack detection.
*/
@nullable Nadm[] packetNadm;
/**
* Measured Frequency Offset from mode 0, relative to the remote device, in 0.01ppm
*/
@nullable int[] measuredFreqOffset;
/**
* Packet_PCT1 or packet_PCT2 of mode-1 or mode-3, if sounding sequence is used and sounding
* phase-based ranging is supported.

20
bluetooth/ranging/aidl/android/hardware/bluetooth/ranging/StepTonePct.aidl
View file

@ -23,6 +23,10 @@ import android.hardware.bluetooth.ranging.ComplexNumber;
*/
@VintfStability
parcelable StepTonePct {
/**
* PCT measured from mode-2 or mode-3 steps
* (in ascending order of antenna position with tone extension data at the end).
*/
List<ComplexNumber> tonePcts;
const int TONE_QUALITY_GOOD = 0;
const int TONE_QUALITY_MEDIUM = 1;
@ -52,4 +56,20 @@ parcelable StepTonePct {
* See: https://bluetooth.com/specifications/specs/channel-sounding-cr-pr/
*/
byte[] toneQualityIndicator;
const byte TONE_EXTENSION_ANTENNA_1 = 0x0;
const byte TONE_EXTENSION_ANTENNA_2 = 0x1;
const byte TONE_EXTENSION_ANTENNA_3 = 0x2;
const byte TONE_EXTENSION_ANTENNA_4 = 0x3;
const byte TONE_EXTENSION_UNUSED = 0xFFu8;
/**
* Tone Extension Antenna Index indicates the Antenna position used in tone extension slot
*
* 0x00 = A1
* 0x01 = A2
* 0x02 = A3
* 0x03 = A4
* 0xFF = Tone extension not used
*/
byte toneExtensionAntennaIndex;
}