merge from upstream/master into main at 2023-01-06T17:07:31.322135Z
Change-Id: I9e1be119c633ffacf577d58b81fc0bf88077a99e
diff --git a/src/rust/uwb_core/protos/uwb_service.proto b/src/rust/uwb_core/protos/uwb_service.proto
index db47aba..bc71f8f 100644
--- a/src/rust/uwb_core/protos/uwb_service.proto
+++ b/src/rust/uwb_core/protos/uwb_service.proto
@@ -131,12 +131,13 @@
STATE_CHANGE_WITH_SESSION_MANAGEMENT_COMMANDS = 0;
MAX_RANGING_ROUND_RETRY_COUNT_REACHED = 1;
MAX_NUMBER_OF_MEASUREMENTS_REACHED = 2;
- ERROR_SLOT_LENGTH_NOT_SUPPORTED = 20;
- ERROR_INSUFFICIENT_SLOTS_PER_RR = 21;
- ERROR_MAC_ADDRESS_MODE_NOT_SUPPORTED = 22;
- ERROR_INVALID_RANGING_INTERVAL = 23;
- ERROR_INVALID_STS_CONFIG = 24;
- ERROR_INVALID_RFRAME_CONFIG = 25;
+ ERROR_INVALID_UL_TDOA_RANDOM_WINDOW = 29;
+ ERROR_SLOT_LENGTH_NOT_SUPPORTED = 32;
+ ERROR_INSUFFICIENT_SLOTS_PER_RR = 33;
+ ERROR_MAC_ADDRESS_MODE_NOT_SUPPORTED = 34;
+ ERROR_INVALID_RANGING_INTERVAL = 35;
+ ERROR_INVALID_STS_CONFIG = 36;
+ ERROR_INVALID_RFRAME_CONFIG = 37;
}
// Represent uwb_uci_packets::RangingMeasurementType.
diff --git a/src/rust/uwb_core/src/proto/mappings.rs b/src/rust/uwb_core/src/proto/mappings.rs
index 35622b7..1750ce8 100644
--- a/src/rust/uwb_core/src/proto/mappings.rs
+++ b/src/rust/uwb_core/src/proto/mappings.rs
@@ -169,6 +169,7 @@
STATE_CHANGE_WITH_SESSION_MANAGEMENT_COMMANDS => StateChangeWithSessionManagementCommands,
MAX_RANGING_ROUND_RETRY_COUNT_REACHED => MaxRangingRoundRetryCountReached,
MAX_NUMBER_OF_MEASUREMENTS_REACHED => MaxNumberOfMeasurementsReached,
+ ERROR_INVALID_UL_TDOA_RANDOM_WINDOW => ErrorInvalidUlTdoaRandomWindow,
ERROR_SLOT_LENGTH_NOT_SUPPORTED => ErrorSlotLengthNotSupported,
ERROR_INSUFFICIENT_SLOTS_PER_RR => ErrorInsufficientSlotsPerRr,
ERROR_MAC_ADDRESS_MODE_NOT_SUPPORTED => ErrorMacAddressModeNotSupported,
diff --git a/src/rust/uwb_uci_packets/uci_packets.pdl b/src/rust/uwb_uci_packets/uci_packets.pdl
index 14408ef..3e9a39f 100644
--- a/src/rust/uwb_uci_packets/uci_packets.pdl
+++ b/src/rust/uwb_uci_packets/uci_packets.pdl
@@ -305,6 +305,7 @@
STATE_CHANGE_WITH_SESSION_MANAGEMENT_COMMANDS = 0x00,
MAX_RANGING_ROUND_RETRY_COUNT_REACHED = 0x01,
MAX_NUMBER_OF_MEASUREMENTS_REACHED = 0x02,
+ ERROR_INVALID_UL_TDOA_RANDOM_WINDOW = 0x1D,
ERROR_SLOT_LENGTH_NOT_SUPPORTED = 0x20,
ERROR_INSUFFICIENT_SLOTS_PER_RR = 0x21,
ERROR_MAC_ADDRESS_MODE_NOT_SUPPORTED = 0x22,
