RDKEMW-13607: merge pair code with mac hash methods#191
Merged
egalla204 merged 5 commits intoApr 29, 2026
Conversation
There was a problem hiding this comment.
Pull request overview
This PR unifies BLE targeted pairing so the system uses a single “pair with code” path for both advertising-name-based pairing and MAC-hash-based pairing, removing the separate MAC-hash pairing APIs and the need to pass the originating IR key code through IPC.
Changes:
- Remove
pairWithMacHash/startPairingWithMacHash/startWithMacHashAPIs and route all targeted pairing through the existing “pair with code” flow. - Update the BLE model config parsing to use a new
advertisingNamesobject (requiredregexPairing, optional targeted pairing format + reconnect regex). - Simplify IPC for
Main_StartPairWithCodeby removing thekey_codefield.
Reviewed changes
Copilot reviewed 11 out of 11 changed files in this pull request and generated 6 comments.
Show a summary per file
| File | Description |
|---|---|
src/ctrlm_ir_controller.cpp |
Stops sending key_code in the pair-with-code request and only forwards the pairing byte. |
src/ble/hal/configsettings/configmodelsettings.cpp |
Parses new advertisingNames config structure; adjusts optional/required behavior and logging. |
src/ble/hal/blercu/blercupairingstatemachine.h |
Removes startWithMacHash() declaration. |
src/ble/hal/blercu/blercupairingstatemachine.cpp |
Merges MAC-hash and code pairing behavior into startWithCode() and keeps MAC-hash matching as a fallback. |
src/ble/hal/blercu/blercucontroller.h |
Removes startPairingWithMacHash() from the controller interface. |
src/ble/hal/blercu/blercucontroller.cpp |
Removes the controller implementation of MAC-hash pairing. |
src/ble/hal/blercu/blercucontroller_p.h |
Removes override for startPairingWithMacHash(). |
src/ble/ctrlm_ble_rcu_interface.h |
Removes pairWithMacHash() from the BLE RCU interface. |
src/ble/ctrlm_ble_rcu_interface.cpp |
Removes pairWithMacHash() implementation; pairing is done via pairWithCode(). |
src/ble/ctrlm_ble_network.cpp |
Always calls pairWithCode() for targeted pairing requests. |
include/ctrlm_ipc.h |
Removes key_code from ctrlm_iarm_call_StartPairWithCode_params_t. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 12 out of 12 changed files in this pull request and generated 4 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
dwolaver
reviewed
Apr 6, 2026
Contributor
dwolaver
left a comment
dwolaver
left a comment
There was a problem hiding this comment.
Looks good! Just a couple of comments...
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 12 out of 12 changed files in this pull request and generated 3 comments.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
egalla204
deleted the
feature/RDKEMW-13607_ctrlm_standardize_pairing_methods
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.