Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acb835d1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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
parents 83a9d7f7 9c16dd7c

bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/ChannelSoudingRawData.aidl

+1 −0
Original line number Diff line number Diff line
@@ -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;

bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/ChannelSoundingSingleSideData.aidl

+1 −0
Original line number Diff line number Diff line
@@ -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;

bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/StepTonePct.aidl

+6 −0
Original line number Diff line number Diff line
@@ -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;

}

bluetooth/ranging/aidl/android/hardware/bluetooth/ranging/ChannelSoudingRawData.aidl

+5 −0
Original line number Diff line number Diff line
@@ -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.

     */

bluetooth/ranging/aidl/android/hardware/bluetooth/ranging/ChannelSoundingSingleSideData.aidl

+4 −0
Original line number Diff line number Diff line
@@ -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.