Skip to content

Commit 645e24d

Browse files
author
Rafal Miecznik
committed
CI/CD: Synchronize ncs-aliro@6c9b1473dbc4 and ncs-door-lock-app
Source commit ID: @6c9b1473dbc4 sync-ncs-aliro-6c9b1473dbc4 Signed-off-by: Rafal Miecznik <rafal.miecznik@nordicsemi.com>
1 parent 1087854 commit 645e24d

8 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎app/src/platform/uwb_impl/uwb_dummy_impl/uwb_impl.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,48 +8,48 @@
88

99
namespace Aliro::Uwb {
1010

11-
AliroError UltraWideBandImpl::_Init([[maybe_unused]] const Callbacks &) const
11+
AliroError UltraWideBandImpl::_Init([[maybe_unused]] const Callbacks &)
1212
{
1313
return ALIRO_ERROR_NOT_IMPLEMENTED;
1414
}
1515

16-
AliroError UltraWideBandImpl::_Deinit() const
16+
AliroError UltraWideBandImpl::_Deinit()
1717
{
1818
return ALIRO_ERROR_NOT_IMPLEMENTED;
1919
}
2020

21-
void UltraWideBandImpl::_BleTimeSync()
22-
const { /* No operation for dummy implementation; override in derived classes if needed. */ };
21+
void UltraWideBandImpl::
22+
_BleTimeSync() { /* No operation for dummy implementation; override in derived classes if needed. */ };
2323

2424
AliroError UltraWideBandImpl::_HandleBleMessage([[maybe_unused]] const uint8_t *, [[maybe_unused]] size_t,
25-
[[maybe_unused]] SessionContextHandle) const
25+
[[maybe_unused]] SessionContextHandle)
2626
{
2727
return ALIRO_ERROR_NOT_IMPLEMENTED;
2828
}
2929

3030
AliroError UltraWideBandImpl::_ConfigureRangingSession([[maybe_unused]] SessionIdentifier,
3131
[[maybe_unused]] const CryptoTypes::Ursk &,
32-
[[maybe_unused]] SessionContextHandle) const
32+
[[maybe_unused]] SessionContextHandle)
3333
{
3434
return ALIRO_ERROR_NOT_IMPLEMENTED;
3535
}
3636

37-
AliroError UltraWideBandImpl::_InitiateRangingSession([[maybe_unused]] SessionContextHandle) const
37+
AliroError UltraWideBandImpl::_InitiateRangingSession([[maybe_unused]] SessionContextHandle)
3838
{
3939
return ALIRO_ERROR_NOT_IMPLEMENTED;
4040
}
4141

42-
AliroError UltraWideBandImpl::_TerminateRangingSession([[maybe_unused]] SessionContextHandle) const
42+
AliroError UltraWideBandImpl::_TerminateRangingSession([[maybe_unused]] SessionContextHandle)
4343
{
4444
return ALIRO_ERROR_NOT_IMPLEMENTED;
4545
}
4646

47-
AliroError UltraWideBandImpl::_SuspendRangingSession([[maybe_unused]] SessionContextHandle) const
47+
AliroError UltraWideBandImpl::_SuspendRangingSession([[maybe_unused]] SessionContextHandle, [[maybe_unused]] bool)
4848
{
4949
return ALIRO_ERROR_NOT_IMPLEMENTED;
5050
}
5151

52-
AliroError UltraWideBandImpl::_ResumeRangingSession([[maybe_unused]] SessionContextHandle) const
52+
AliroError UltraWideBandImpl::_ResumeRangingSession([[maybe_unused]] SessionContextHandle)
5353
{
5454
return ALIRO_ERROR_NOT_IMPLEMENTED;
5555
}

‎app/src/platform/uwb_impl/uwb_dummy_impl/uwb_impl.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ class UltraWideBandImpl : public UltraWideBand<UltraWideBandImpl> {
3333
return sInstance;
3434
}
3535

36-
AliroError _Init(const Callbacks &callbacks) const;
37-
AliroError _Deinit() const;
38-
void _BleTimeSync() const;
39-
AliroError _HandleBleMessage(const uint8_t *data, size_t length, SessionContextHandle sessionContextData) const;
36+
AliroError _Init(const Callbacks &callbacks);
37+
AliroError _Deinit();
38+
void _BleTimeSync();
39+
AliroError _HandleBleMessage(const uint8_t *data, size_t length, SessionContextHandle sessionContextData);
4040
AliroError _ConfigureRangingSession(SessionIdentifier sessionId, const CryptoTypes::Ursk &ursk,
41-
SessionContextHandle sessionContextData) const;
42-
AliroError _InitiateRangingSession(SessionContextHandle sessionContextData) const;
43-
AliroError _TerminateRangingSession(SessionContextHandle sessionContextData) const;
44-
AliroError _SuspendRangingSession(SessionContextHandle sessionContextData) const;
45-
AliroError _ResumeRangingSession(SessionContextHandle sessionContextData) const;
41+
SessionContextHandle sessionContextData);
42+
AliroError _InitiateRangingSession(SessionContextHandle sessionContextData);
43+
AliroError _TerminateRangingSession(SessionContextHandle sessionContextData);
44+
AliroError _SuspendRangingSession(SessionContextHandle sessionContextData, bool force);
45+
AliroError _ResumeRangingSession(SessionContextHandle sessionContextData);
4646

4747
// Delete copy and move constructors and assignment operators.
4848
UltraWideBandImpl(const UltraWideBandImpl &) = delete;

‎app/src/platform/uwb_impl/uwb_qm35_impl/uwb_impl.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ AliroError UltraWideBandImpl::_Deinit()
317317
return ALIRO_NO_ERROR;
318318
}
319319

320-
void UltraWideBandImpl::_BleTimeSync() const
320+
void UltraWideBandImpl::_BleTimeSync()
321321
{
322322
LOG_INF("Start Bluetooth LE and UWB time synchronization, procedure 0");
323323
}

‎app/src/platform/uwb_impl/uwb_qm35_impl/uwb_impl.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class UltraWideBandImpl : public UltraWideBand<UltraWideBandImpl> {
4444

4545
AliroError _Init(const Callbacks &callbacks);
4646
AliroError _Deinit();
47-
void _BleTimeSync() const;
47+
void _BleTimeSync();
4848
AliroError _HandleBleMessage(const uint8_t *data, size_t length, SessionContextHandle sessionContextData);
4949
AliroError _ConfigureRangingSession(SessionIdentifier sessionId, const CryptoTypes::Ursk &ursk,
5050
SessionContextHandle sessionContextData);

‎lib/aliro/bin/cortex-m33/libaliro.a‎

0 Bytes
Binary file not shown.

‎lib/aliro/bin/cortex-m33/libaliro_ble.a‎

0 Bytes
Binary file not shown.

‎lib/aliro/bin/cortex-m4/libaliro.a‎

0 Bytes
Binary file not shown.

‎lib/aliro/interfaces/uwb/uwb.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ template <typename IfaceImpl> class UltraWideBand {
9090
* @note In implementation of this method for example, the GPIO pin can be used to trigger time
9191
* synchronnization between BLE and UWB modules.
9292
*/
93-
void BleTimeSync() const { Impl()->_BleTimeSync(); }
93+
void BleTimeSync() { Impl()->_BleTimeSync(); }
9494

9595
/**
9696
* @brief Transmits deserialized and decrypted Aliro BLE messages to the UWB module.

0 commit comments

Comments
 (0)