RDKEMW-15135: T2 RCU pairing by klu339 · Pull Request #189 · rdkcentral/control

klu339 · 2026-03-31T14:46:29Z

No description provided.

Copilot

Pull request overview

This PR adds Telemetry 2 (T2) reporting for BLE RCU pairing attempts and consolidates telemetry reporting categories by replacing separate BLE/RF4CE report types with a single RCU type.

Changes:

Rename telemetry report category from RF4CE/BLE to RCU and update TR-181 trigger constants accordingly.
Thread BlueZ pairing retry counters and pairing outcome details up through the BLE pairing state machine and controller layers.
Emit a new T2 marker (ctrlm.rcu.pairing.attempt) with a JSON payload describing pairing method, result, retries, discovered devices, and error message.

Reviewed changes

Copilot reviewed 17 out of 17 changed files in this pull request and generated 9 comments.

Show a summary per file

File	Description
src/telemetry/ctrlm_telemetry.h	Consolidates telemetry report types to include `RCU` instead of separate BLE/RF4CE.
src/telemetry/ctrlm_telemetry.cpp	Updates report trigger/string mapping to use the new `RCU` report type.
src/telemetry/ctrlm_telemetry_markers.h	Adds marker definition and schema documentation for RCU pairing attempt telemetry.
src/ctrlm_tr181.h	Replaces BLE/RF4CE telemetry report TR-181 keys with a unified `rcu` key.
src/ble/hal/blercu/bluez/blercudevice.cpp	Extends pairing error signal to include retry counters and max retries.
src/ble/hal/blercu/bluez/blercuadapter.cpp	Propagates pairing error retry details from device to adapter slots.
src/ble/hal/blercu/bluez/blercuadapter_p.h	Updates adapter pairing error handler signature to include retry details.
src/ble/hal/blercu/blercupairingstatemachine.h	Introduces pairing outcome tracking types/fields and public getters.
src/ble/hal/blercu/blercupairingstatemachine.cpp	Records pairing method/outcome, discovered devices, retry counts, and error details.
src/ble/hal/blercu/blercudevice.h	Updates device pairing error slot signature to include retry counters.
src/ble/hal/blercu/blercucontroller.h	Adds `BleRcuPairingOutcome` struct and slot for pairing outcome notifications.
src/ble/hal/blercu/blercucontroller.cpp	Emits `BleRcuPairingOutcome` on success/failure with method/result/devices/errors.
src/ble/hal/blercu/blercuadapter.h	Updates adapter pairing error slot signature to include retry counters.
src/ble/ctrlm_ble_rcu_interface.h	Adds handler registration for pairing outcome notifications.
src/ble/ctrlm_ble_rcu_interface.cpp	Wires controller pairing outcome into the interface slot fan-out.
src/ble/ctrlm_ble_network.h	Adds a BLE pairing-attempt aggregation struct for telemetry emission.
src/ble/ctrlm_ble_network.cpp	Queues pairing outcome to main thread and emits the T2 marker JSON.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

rdkcmf-jenkins · 2026-03-31T18:43:36Z

b'## Blackduck scan failure details

Summary: 0 violations, 0 files pending approval, 4 files pending identification.

Protex Server Path: /home/blackduck/github/control/189/rdk/components/generic/control
Commit: b8347e5

Report detail: gist'

Copilot

Pull request overview

Copilot reviewed 17 out of 17 changed files in this pull request and generated 6 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

rdkcmf-jenkins · 2026-03-31T20:14:43Z

b'## Blackduck scan failure details

Summary: 0 violations, 0 files pending approval, 4 files pending identification.

Protex Server Path: /home/blackduck/github/control/189/rdk/components/generic/control
Commit: 96bbf48

Report detail: gist'

rdkcmf-jenkins · 2026-04-01T11:27:16Z

b'## WARNING: A Blackduck scan failure has been waived

A prior failure has been upvoted

Upvote reason: ok
Commit: 96bbf48
'

Copilot

Pull request overview

Copilot reviewed 17 out of 17 changed files in this pull request and generated 3 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot

Pull request overview

Copilot reviewed 20 out of 20 changed files in this pull request and generated 11 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot

Pull request overview

Copilot reviewed 21 out of 21 changed files in this pull request and generated 4 comments.

Comments suppressed due to low confidence (1)

src/ble/hal/blercu/bluez/blercudevice.cpp:253

pair() sets m_maxPairingRetries but does not reset m_pairingRetryCnt. If a previous pairing attempt succeeded after one or more retries, m_pairingRetryCnt remains non-zero and subsequent pairing attempts will start “part-way through” the retry budget (and emit incorrect retry counts). Reset m_pairingRetryCnt (and optionally m_maxPairingRetries) when starting a new pairing attempt and/or on successful pairing reply.

void BleRcuDeviceBluez::pair(int timeout, int retries)
{
    m_maxPairingRetries = retries;
    m_deviceProxy->Pair(
            PendingReply<>(m_isAlive, std::bind(&BleRcuDeviceBluez::onPairRequestReply, this, std::placeholders::_1)));

    // set the flag, it may be cleared if the call fails
    m_isPairing = true;
}

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

egalla204

looks good to me

dwolaver

ready for QA test!

Copilot

Pull request overview

Copilot reviewed 21 out of 21 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot

Pull request overview

Copilot reviewed 18 out of 18 changed files in this pull request and generated 5 comments.

dwolaver

approved for QA test again

Copilot

Pull request overview

Copilot reviewed 18 out of 18 changed files in this pull request and generated 2 comments.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Reason for change: Test Procedure: Risks: Signed-off-by: Kelvin Lu <Kelvin_Lu@comcast.com>

klu339 requested a review from a team as a code owner March 31, 2026 14:46

Copilot AI review requested due to automatic review settings March 31, 2026 14:46

Copilot started reviewing on behalf of klu339 March 31, 2026 14:47 View session

Copilot AI reviewed Mar 31, 2026

View reviewed changes

Copilot AI review requested due to automatic review settings March 31, 2026 18:41

Copilot started reviewing on behalf of klu339 March 31, 2026 18:42 View session

Copilot AI reviewed Mar 31, 2026

View reviewed changes

klu339 changed the title ~~RDKEMW-15315: T2 RCU pairing~~ RDKEMW-15135: T2 RCU pairing Apr 1, 2026

Copilot AI review requested due to automatic review settings April 1, 2026 17:51

Copilot started reviewing on behalf of klu339 April 1, 2026 17:51 View session

Copilot AI reviewed Apr 1, 2026

View reviewed changes

Comment thread src/ble/hal/blercu/blercupairingstatemachine.cpp Outdated

Comment thread src/telemetry/ctrlm_telemetry_markers.h Outdated

Comment thread src/ble/ctrlm_ble_network.cpp

egalla204 self-requested a review April 3, 2026 00:45

egalla204 reviewed Apr 3, 2026

View reviewed changes

Comment thread src/ble/hal/blercu/blercupairingstatemachine.cpp Outdated

Comment thread src/ble/hal/blercu/blercupairingstatemachine.cpp Outdated

Copilot AI review requested due to automatic review settings April 8, 2026 15:55

Copilot started reviewing on behalf of klu339 April 8, 2026 15:56 View session

Copilot AI reviewed Apr 8, 2026

View reviewed changes

klu339 force-pushed the feature/RDKEMW-15315 branch from ea2cfbc to b00781c Compare April 8, 2026 16:30

Copilot AI review requested due to automatic review settings April 8, 2026 19:27

Copilot started reviewing on behalf of klu339 April 8, 2026 19:28 View session

Copilot AI reviewed Apr 8, 2026

View reviewed changes

Comment thread src/telemetry/ctrlm_telemetry_markers.h Outdated

Comment thread src/telemetry/ctrlm_telemetry_markers.h Outdated

Comment thread src/ble/hal/blercu/blercucontroller.h Outdated

Comment thread src/ble/ctrlm_ble_network.cpp

egalla204 reviewed Apr 14, 2026

View reviewed changes

dwolaver reviewed Apr 14, 2026

View reviewed changes

Comment thread src/telemetry/ctrlm_telemetry_event.cpp

klu339 force-pushed the feature/RDKEMW-15315 branch from 14c5cce to a699481 Compare April 15, 2026 17:03

Copilot AI review requested due to automatic review settings April 21, 2026 20:12

Copilot started reviewing on behalf of klu339 April 21, 2026 20:12 View session

Copilot AI reviewed Apr 21, 2026

View reviewed changes

Comment thread src/ble/hal/blercu/blercupairingstatemachine.cpp Outdated

Comment thread src/ble/hal/blercu/blercucontroller.h Outdated

Copilot AI review requested due to automatic review settings April 23, 2026 15:30

klu339 force-pushed the feature/RDKEMW-15315 branch 2 times, most recently from a049da6 to c95a39d Compare May 20, 2026 20:55

klu339 marked this pull request as ready for review May 21, 2026 19:34

Copilot AI review requested due to automatic review settings May 21, 2026 19:34

Copilot started reviewing on behalf of klu339 May 21, 2026 19:35 View session

Copilot AI reviewed May 21, 2026

View reviewed changes

Comment thread src/ble/ctrlm_ble_network.cpp

Comment thread src/ble/ctrlm_ble_network.cpp Outdated

Comment thread src/ble/hal/blercu/blercupairingstatemachine.h

Comment thread src/ble/hal/blercu/bluez/blercuadapter.cpp

Comment thread src/ble/hal/blercu/blercucontroller.cpp

dwolaver reviewed May 22, 2026

View reviewed changes

Copilot AI review requested due to automatic review settings May 29, 2026 20:44

klu339 force-pushed the feature/RDKEMW-15315 branch from fc5b9df to 0978438 Compare May 29, 2026 20:44

Copilot started reviewing on behalf of klu339 May 29, 2026 20:45 View session

Copilot AI reviewed May 29, 2026

View reviewed changes

Comment thread src/telemetry/ctrlm_telemetry_markers.h

Comment thread src/ble/hal/blercu/bluez/blercudevice.cpp

dwolaver approved these changes May 29, 2026

View reviewed changes

klu339 and others added 14 commits June 1, 2026 09:08

RDKEMW-15315: T2 RCU pairing

3b46edb

Apply suggestions from code review

e1c120b

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

RDKEMW-15135: Copilot fixes and array of bluez errors

5930f71

RDKEMW-15135: Fix vector msg and clean up

c27af47

RDKEMW-15135: another round of Copilot review comments

9fff784

RDKEMW-15135: Re-formatted marker

0b23468

RDKEMW-15135: copilot comments

6eca269

Reason for change: Test Procedure: Risks: Signed-off-by: Kelvin Lu <Kelvin_Lu@comcast.com>

copilot code review comments

3f1809a

Removing RCU mac address for PII concerns

17f903e

another round of copilot comments

d437212

compile error

88227db

rebase and marker needs accum suffix

7db2094

remove rfc changes (no longer needed)

fa3c09f

more copilot comments

b982b2d

klu339 force-pushed the feature/RDKEMW-15315 branch from 0978438 to b982b2d Compare June 1, 2026 13:08

klu339 merged commit 6e4a8b5 into develop Jun 1, 2026
8 of 10 checks passed

klu339 deleted the feature/RDKEMW-15315 branch June 1, 2026 13:13

github-actions Bot locked and limited conversation to collaborators Jun 1, 2026

Conversation

klu339 commented Mar 31, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rdkcmf-jenkins commented Mar 31, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rdkcmf-jenkins commented Mar 31, 2026

Uh oh!

rdkcmf-jenkins commented Apr 1, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

egalla204 left a comment

Choose a reason for hiding this comment

Uh oh!

dwolaver left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview