Skip to content

RDKEMW-11483: Fix the EntServices-peripherals to support R5.3 #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tabbas651 wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

RDKEMW-11483: Fix the EntServices-peripherals to support R5.3 #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3425df3
RDKEMW-11483: Fix the EntServices-peripherals to support R5.3
tabbas651 Feb 7, 2026
e251ef4
Modified the fina package name for Thunder
tabbas651 Feb 9, 2026
eb25506
Update CMakeLists.txt
karuna2git Feb 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

cmake_minimum_required(VERSION 3.3)

find_package(WPEFramework)
find_package(Thunder NAMES WPEFramework Thunder)

Comment on lines 20 to 23
Copy link

Copilot AI Feb 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Refer: https://github.com/rdkcentral/entservices-peripherals/blob/develop/.github/instructions/Plugincmake.instructions.md#namespace-usage

Copilot generated this review using guidance from repository custom instructions.
# All packages that did not deliver a CMake Find script (and some deprecated scripts that need to be removed)
# are located in the cmake directory. Include it in the search.
Expand Down
2 changes: 1 addition & 1 deletion LEDControl/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**

Check failure on line 1 in LEDControl/Module.h

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'LEDControl/Module.h' (Match: rdkcentral/rdkservices/1, 28 lines, url: https://github.com/rdkcentral/rdkservices/archive/refs/tags/GRT_v1.tar.gz, file: LEDControl/Module.h)
* If not stated otherwise in this file or this component's LICENSE
* file the following copyright and licenses apply:
*
Expand All @@ -22,8 +22,8 @@
#define MODULE_NAME Plugin_LEDControl
#endif

#include <core/core.h>
#include <plugins/plugins.h>
#include <tracing/tracing.h>

#undef EXTERNAL
#define EXTERNAL
2 changes: 1 addition & 1 deletion MotionDetection/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**

Check failure on line 1 in MotionDetection/Module.h

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'MotionDetection/Module.h' (Match: rdkcentral/rdkservices/1, 32 lines, url: https://github.com/rdkcentral/rdkservices/archive/refs/tags/GRT_v1.tar.gz, file: MotionDetection/Module.h)
* If not stated otherwise in this file or this component's LICENSE
* file the following copyright and licenses apply:
*
Expand All @@ -24,8 +24,8 @@
#define MODULE_NAME Plugin_MotionDetection
#endif

#include <core/core.h>
#include <plugins/plugins.h>
#include <tracing/tracing.h>

#undef EXTERNAL
#define EXTERNAL
Expand Down
2 changes: 1 addition & 1 deletion RemoteControl/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**

Check failure on line 1 in RemoteControl/Module.h

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'RemoteControl/Module.h' (Match: rdkcentral/rdkservices/1, 24 lines, url: https://github.com/rdkcentral/rdkservices/archive/refs/tags/GRT_v1.tar.gz, file: RemoteControl/test/Module.h)

Check failure on line 1 in RemoteControl/Module.h

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'RemoteControl/Module.h' (Match: rdkcentral/rdkservices/1, 28 lines, url: https://github.com/rdkcentral/rdkservices/archive/refs/tags/GRT_v1.tar.gz, file: RemoteControl/Module.h)
* If not stated otherwise in this file or this component's LICENSE
* file the following copyright and licenses apply:
*
Expand All @@ -22,8 +22,8 @@
#define MODULE_NAME RemoteControl
#endif

#include <core/core.h>
#include <plugins/plugins.h>
#include <tracing/tracing.h>

#undef EXTERNAL
#define EXTERNAL
10 changes: 1 addition & 9 deletions RemoteControl/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@
set(PLUGIN_NAME remoteControlTestClient)
find_package(${NAMESPACE}Core REQUIRED)

if (USE_THUNDER_R4)
find_package(${NAMESPACE}COM REQUIRED)
else ()
find_package(${NAMESPACE}Protocols REQUIRED)
endif (USE_THUNDER_R4)
find_package(${NAMESPACE}COM REQUIRED)

add_executable(${PLUGIN_NAME} remoteControlTestClient.cpp)

Expand All @@ -35,11 +31,7 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES

target_link_libraries(${PLUGIN_NAME} PRIVATE ${NAMESPACE}Core::${NAMESPACE}Core)

if (USE_THUNDER_R4)
target_link_libraries(${PLUGIN_NAME} PRIVATE ${NAMESPACE}COM::${NAMESPACE}COM ${NAMESPACE}WebSocket::${NAMESPACE}WebSocket)
else ()
target_link_libraries(${PLUGIN_NAME} PRIVATE ${NAMESPACE}Protocols::${NAMESPACE}Protocols)
endif (USE_THUNDER_R4)


install(TARGETS ${PLUGIN_NAME} DESTINATION bin)
2 changes: 1 addition & 1 deletion VoiceControl/Module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**

Check failure on line 1 in VoiceControl/Module.h

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'VoiceControl/Module.h' (Match: rdkcentral/rdkservices/1, 28 lines, url: https://github.com/rdkcentral/rdkservices/archive/refs/tags/GRT_v1.tar.gz, file: StateObserver/Module.h)
* If not stated otherwise in this file or this component's LICENSE
* file the following copyright and licenses apply:
*
Expand All @@ -22,8 +22,8 @@
#define MODULE_NAME VoiceControl
#endif

#include <core/core.h>
#include <plugins/plugins.h>
#include <tracing/tracing.h>

#undef EXTERNAL
#define EXTERNAL
9 changes: 0 additions & 9 deletions helpers/UtilsController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**

Check failure on line 1 in helpers/UtilsController.h

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'helpers/UtilsController.h' (Match: rdkcentral/rdkservices/1, 214 lines, url: https://github.com/rdkcentral/rdkservices/archive/refs/tags/GRT_v1.tar.gz, file: DisplaySettings/DisplaySettings.cpp)
* If not stated otherwise in this file or this component's LICENSE
* file the following copyright and licenses apply:
*
Expand Down Expand Up @@ -158,11 +158,7 @@
return thunderClient;
}

#ifndef USE_THUNDER_R4
class Job : public Core::IDispatchType<void>
#else
class Job : public Core::IDispatch
#endif /* USE_THUNDER_R4 */
{
public:
Job(std::function<void()> work)
Expand Down Expand Up @@ -202,13 +198,8 @@
uint32_t result = Core::ERROR_ASYNC_FAILED;
Core::Event event(false, true);

#ifndef USE_THUNDER_R4
Core::IWorkerPool::Instance().Submit(Core::ProxyType<Core::IDispatchType<void>>(Core::ProxyType<Job>::Create([&]()
{
#else
Core::IWorkerPool::Instance().Submit(Core::ProxyType<Core::IDispatch>(Core::ProxyType<Job>::Create([&]()
{
#endif /* USE_THUNDER_R4 */
auto interface = shell->QueryInterfaceByCallsign<PluginHost::IShell>(callsign);
if (interface == nullptr) {
result = Core::ERROR_UNAVAILABLE;
Expand Down
18 changes: 0 additions & 18 deletions helpers/UtilsJsonRpc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* limitations under the License.
**/

#pragma once

Check failure on line 20 in helpers/UtilsJsonRpc.h

View workflow job for this annotation

GitHub Actions / call-fossid-workflow / Fossid Annotate PR

FossID License Issue Detected 

Source code with 'Apache-2.0' license found in local file 'helpers/UtilsJsonRpc.h' (Match: rdkcentral/rdkservices/6.1.7, 130 lines, url: https://github.com/rdkcentral/rdkservices/archive/refs/tags/AML_BSP_REL_VERSION_RDK6.1.7.tar.gz, file: helpers/UtilsJsonRpc.h)

#include "UtilsLogging.h"

Expand Down Expand Up @@ -69,8 +69,6 @@
* You should be capable of just using "Notify".
*/

#if ((THUNDER_VERSION >= 4) && (THUNDER_VERSION_MINOR == 4))

#define sendNotify(event,params) { \
std::string json; \
params.ToString(json); \
Expand All @@ -85,22 +83,6 @@
Notify(event,params); \
}

#else

#define sendNotify(event,params) { \
std::string json; \
params.ToString(json); \
LOGINFO("Notify %s %s", event, json.c_str()); \
for (uint8_t i = 1; GetHandler(i); i++) GetHandler(i)->Notify(event,params); \
}
#define sendNotifyMaskParameters(event,params) { \
std::string json; \
params.ToString(json); \
LOGINFO("Notify %s <***>", event); \
for (uint8_t i = 1; GetHandler(i); i++) GetHandler(i)->Notify(event,params); \
}

#endif
/**
* DO NOT USE THIS.
*
Expand Down
1 change: 1 addition & 0 deletions helpers/frontpanel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include <list>
#include <vector>

#include <core/core.h>
#include <plugins/plugins.h>

namespace WPEFramework
Expand Down
Loading