RDKEMW-18979: onStatus event contain data from all networks#238
Open
egalla204 wants to merge 11 commits into
Open
RDKEMW-18979: onStatus event contain data from all networks#238egalla204 wants to merge 11 commits into
egalla204 wants to merge 11 commits into
Conversation
… giving iarm_thunder access to network pointers
There was a problem hiding this comment.
Pull request overview
Updates the Thunder/IARM RCU status event payload so onStatus reports remote/controller data aggregated across all networks (rather than only the triggering network), aligning the event output with the existing “get RCU status” multi-network behavior.
Changes:
- Build
onStatusJSON payload from an all-networks RCU status map and flatten controller status into a singleremoteDataarray. - Add a new
ctrlm_main_network_rcu_status_map_get()helper API to gather per-networkctrlm_rcp_ipc_net_status_treplies. - Add a ctrlm-main helper to invoke a network handler across all registered networks.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
src/ipc/ctrlm_rcp_ipc_iarm_thunder.cpp |
Reworks on_status() to assemble a multi-network status payload (remote list + supported network types + default RF4CE-derived state). |
src/ctrlm.h |
Declares the new ctrlm_main_network_rcu_status_map_get() API and forward-declares ctrlm_rcp_ipc_net_status_t. |
src/ctrlm_main.cpp |
Implements ctrlm_main_network_rcu_status_map_get() by executing req_process_get_rcu_status across all networks. |
Comment on lines
+119
to
+123
| json_t *ret = json_object(); | ||
| json_t *status = json_object(); | ||
| json_t *net_type_supported = json_array(); | ||
| json_t *remote_array = json_array(); | ||
| std::map<ctrlm_network_id_t, ctrlm_rcp_ipc_net_status_t> status_map = ctrlm_main_network_rcu_status_map_get(); |
egalla204
changed the title
Comment on lines
+129
to
+138
| err |= json_object_set_new_nocheck(status, REMOTE_DATA, remote_array); | ||
| err |= json_object_set_new_nocheck(status, NET_TYPES_SUPPORTED, net_type_supported); | ||
| err |= json_object_set_new_nocheck(status, NET_TYPE, json_integer(type)); | ||
| err |= json_object_set_new_nocheck(status, IR_PROG_STATE, json_string(ctrlm_ir_state_str(ir_prog_state))); | ||
| err |= json_object_set_new_nocheck(status, PAIRING_STATE, json_string(ctrlm_rf_pair_state_str(rf_pair_state))); | ||
|
|
||
| if (err) { | ||
| XLOGD_ERROR("JSON object set error"); | ||
| json_decref(status); | ||
| return nullptr; |
Comment on lines
+191
to
+201
| json_config config(payload); | ||
|
|
||
| if (!payload) { | ||
| XLOGD_ERROR("payload NULL"); | ||
| return(IARM_RESULT_INVALID_PARAM); | ||
| } else if (!config.current_object_get()) { | ||
| XLOGD_ERROR("Bad payload from call data"); | ||
| json_decref(payload); | ||
| return(IARM_RESULT_INVALID_PARAM); | ||
| } | ||
|
|
Comment on lines
+66
to
+69
| json_t *build_rcu_status_json(const std::map<ctrlm_network_id_t, ctrlm_rcp_ipc_net_status_t> &status_map, | ||
| ctrlm_ir_state_t ir_prog_state, | ||
| ctrlm_rf_pair_state_t rf_pair_state, | ||
| ctrlm_network_type_t type) const; |
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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.