Merge changes from topic "Bluetooth_Ranging_Params_Update" into main
* changes: Add CS mode 2 and mode 3 param for Channel Sounding HAL Add CS mode 0 params for Channel Sounding HAL
This commit is contained in:
commit
acb835d146
6 changed files with 37 additions and 0 deletions
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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.
|
||||
*/
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue