RDKEMW-11483: Fix the EntServices-peripherals to support R5.3#133
RDKEMW-11483: Fix the EntServices-peripherals to support R5.3#133
Conversation
Reason for change: Added entservices-peripherals changes to support the Thunder R5.3 Test Procedure: please refer the ticket comments Risks: Medium Signed-off-by: Thamim Razith Abbas Ali tabbas651@cable.comcast.com
There was a problem hiding this comment.
Pull request overview
This PR updates entservices-peripherals to build against Thunder R5.3 by aligning includes, build configuration, and a few helper abstractions with newer Thunder header/layout expectations.
Changes:
- Switch top-level CMake discovery from
WPEFrameworktoThunder. - Update multiple Module/helper headers to include
<core/core.h>and remove legacy tracing include usage. - Simplify/standardize helper macros and worker-pool dispatch code by removing older-version conditionals.
Reviewed changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| CMakeLists.txt | Updates framework package discovery to Thunder for R5.3 builds. |
| helpers/frontpanel.h | Adds <core/core.h> include for Core/JSON-related types usage. |
| helpers/UtilsJsonRpc.h | Removes Thunder-version conditional branches, standardizing notifications via Notify(). |
| helpers/UtilsController.h | Removes USE_THUNDER_R4 dispatch-type branching and uses Core::IDispatch consistently. |
| VoiceControl/Module.h | Adjusts includes for R5.3 compatibility (adds Core include, drops tracing include). |
| RemoteControl/Module.h | Adjusts includes for R5.3 compatibility (adds Core include, drops tracing include). |
| MotionDetection/Module.h | Adjusts includes for R5.3 compatibility (adds Core include, drops tracing include). |
| LEDControl/Module.h | Adjusts includes for R5.3 compatibility (adds Core include, drops tracing include). |
| RemoteControl/test/CMakeLists.txt | Simplifies dependency discovery/linking to always use ${NAMESPACE}COM (and WebSocket target). |
| cmake_minimum_required(VERSION 3.3) | ||
|
|
||
| find_package(WPEFramework) | ||
| find_package(Thunder) | ||
|
|
There was a problem hiding this comment.
find_package(Thunder) hardcodes the framework name, which goes against the repo convention of using the ${NAMESPACE} variable for CMake find_package/targets to keep WPEFramework↔Thunder transitions smooth. Consider setting NAMESPACE as a cache variable (defaulting to Thunder) and calling find_package(${NAMESPACE} REQUIRED) so downstream builds can override it without editing this file.
| #ifndef MODULE_NAME | ||
| #define MODULE_NAME VoiceControl | ||
| #endif | ||
|
|
||
| #include <core/core.h> |
There was a problem hiding this comment.
MODULE_NAME does not follow the required Plugin_ prefix convention (it’s currently VoiceControl). Thunder uses MODULE_NAME to identify the plugin module, and this repo’s convention requires Plugin_<Name>. Update this to something like Plugin_VoiceControl and ensure any dependent references remain consistent.
| #ifndef MODULE_NAME | ||
| #define MODULE_NAME RemoteControl | ||
| #endif | ||
|
|
||
| #include <core/core.h> |
There was a problem hiding this comment.
MODULE_NAME does not follow the required Plugin_ prefix convention (it’s currently RemoteControl). Thunder uses MODULE_NAME to identify the plugin module, and this repo’s convention requires Plugin_<Name>. Update this to something like Plugin_RemoteControl and ensure any dependent references remain consistent.
Reason for change: Added entservices-peripherals changes to support the Thunder R5.3
Test Procedure: please refer the ticket comments
Risks: Medium
Signed-off-by: Thamim Razith Abbas Ali tabbas651@cable.comcast.com