Merge branch 'rdkcentral:sprint/24Q2' into sprint/NetworkManger

.github/workflows/L2-PersistentStore-grpc.yml

@@ -27,3 +27,9 @@ jobs:
         run: |
           cmake -S ${GITHUB_REPOSITORY}/PersistentStore/grpc/l2test -B build/grpcl2test -DCMAKE_INSTALL_PREFIX="install/usr" -DCMAKE_CXX_FLAGS="-Wall -Werror"
           cmake --build build/grpcl2test --target install
+
+# (Optional)
+# Rebuild with real token (here: kToken = "Bearer TOKEN"):
+# cmake --build build/grpcl2test --target install
+# Run:
+# PATH=${PWD}/install/usr/bin:${PATH} LD_LIBRARY_PATH=${PWD}/install/usr/lib:${LD_LIBRARY_PATH} valgrind --tool=memcheck --log-file=valgrind_log --leak-check=yes --show-reachable=yes --track-fds=yes --fair-sched=try grpcl2test

.github/workflows/L2-PersistentStore.yml

@@ -0,0 +1,45 @@
+name: L2-PersistentStore
+
+on:
+  push:
+    paths:
+      - PersistentStore/**
+  pull_request:
+    paths:
+      - PersistentStore/**
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: ${{github.repository}}
+
+      - name: Install cmake, sqlite, protoc, grpc_cpp_plugin, grpc
+        run: |
+          sudo apt update
+          sudo apt install -y cmake libsqlite3-dev protobuf-compiler protobuf-compiler-grpc libgrpc++-dev
+
+      - name: Build Thunder
+        working-directory: ${{github.workspace}}
+        run: sh +x ${GITHUB_REPOSITORY}/.github/workflows/BuildThunder.sh
+
+      - name: Build
+        working-directory: ${{github.workspace}}
+        run: |
+          cmake -S ${GITHUB_REPOSITORY}/PersistentStore -B build/PersistentStore -DCMAKE_INSTALL_PREFIX="install/usr" -DCMAKE_CXX_FLAGS="-Wall -Werror" -DPLUGIN_PERSISTENTSTORE_PATH="/tmp/persistentstore/l2test/test"
+          cmake --build build/PersistentStore --target install
+
+# (Optional)
+# Thunder startup:
+# PATH=${PWD}/install/usr/bin:${PATH} LD_LIBRARY_PATH=${PWD}/install/usr/lib:${LD_LIBRARY_PATH} valgrind --tool=memcheck --log-file=valgrind_log --leak-check=yes --show-reachable=yes --track-fds=yes --fair-sched=try WPEFramework -f -c ${PWD}/install/etc/WPEFramework/config.json
+# (to stop press q & enter)
+# API test:
+# curl -d '{"jsonrpc":"2.0","id":0,"method":"org.rdk.PersistentStore.setValue","params":{"namespace":"test","key":"key1","value":"1","ttl":100}}' http://localhost:55555/jsonrpc
+# curl -d '{"jsonrpc":"2.0","id":0,"method":"org.rdk.PersistentStore.getValue","params":{"namespace":"test","key":"key1"}}' http://localhost:55555/jsonrpc
+# Crash test:
+# kill -SIGFPE $(pidof WPEProcess)
+# Deactivate test:
+# curl -d '{"jsonrpc":"2.0","id":0,"method":"Controller.1.deactivate", "params":{"callsign":"org.rdk.PersistentStore"}}' http://localhost:55555/jsonrpc

Bluetooth/Bluetooth.conf.in

@@ -1,4 +1,4 @@
 precondition = ["Platform"]
 callsign = "org.rdk.Bluetooth"
-autostart = "false"
+autostart = "@PLUGIN_BLUETOOTH_AUTOSTART@"
 startuporder = "@PLUGIN_BLUETOOTH_STARTUPORDER@"

Bluetooth/Bluetooth.config

@@ -1,4 +1,4 @@
-set (autostart false)
+set (autostart ${PLUGIN_BLUETOOTH_AUTOSTART})
 set (preconditions Platform)
 set (callsign "org.rdk.Bluetooth")
 

Bluetooth/CMakeLists.txt

@@ -19,6 +19,7 @@ set(PLUGIN_NAME Bluetooth)
 set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
 
 set(PLUGIN_BLUETOOTH_STARTUPORDER "" CACHE STRING "To configure startup order of Bluetooth plugin")
+set(PLUGIN_BLUETOOTH_AUTOSTART false CACHE STRING "To automatically start Bluetooth plugin.")
 
 find_package(${NAMESPACE}Plugins REQUIRED)
 

DataCapture/CMakeLists.txt

@@ -19,6 +19,7 @@ set(PLUGIN_NAME DataCapture)
 set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
 
 set(PLUGIN_DATACAPTURE_STARTUPORDER "" CACHE STRING "To configure startup order of DataCapture plugin")
+set(PLUGIN_DATACAPTURE_AUTOSTART false CACHE STRING "To automatically start DataCapture plugin.")
 
 find_package(${NAMESPACE}Plugins REQUIRED)
 

DataCapture/DataCapture.conf.in

@@ -1,4 +1,4 @@
 precondition = ["Platform"]
 callsign = "org.rdk.dataCapture"
-autostart = "false"
+autostart = "@PLUGIN_DATACAPTURE_AUTOSTART@"
 startuporder = "@PLUGIN_DATACAPTURE_STARTUPORDER@"

DataCapture/DataCapture.config

@@ -1,4 +1,4 @@
-set (autostart false)
+set (autostart ${PLUGIN_DATACAPTURE_AUTOSTART})
 set (preconditions Platform)
 set (callsign org.rdk.dataCapture)
 

DeviceDiagnostics/CMakeLists.txt

@@ -19,6 +19,7 @@ set(PLUGIN_NAME DeviceDiagnostics)
 set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
 
 set(PLUGIN_DEVICEDIAGNOSTICS_STARTUPORDER "" CACHE STRING "To configure startup order of DeviceDiagnostics plugin")
+set(PLUGIN_DEVICEDIAGNOSTICS_AUTOSTART false CACHE STRING "To automatically start DeviceDiagnostics plugin.")
 
 find_package(${NAMESPACE}Plugins REQUIRED)
 

DeviceDiagnostics/DeviceDiagnostics.conf.in

@@ -1,4 +1,4 @@
 precondition = ["Platform"]
 callsign = "org.rdk.DeviceDiagnostics"
-autostart = "false"
+autostart = "@PLUGIN_DEVICEDIAGNOSTICS_AUTOSTART@"
 startuporder = "@PLUGIN_DEVICEDIAGNOSTICS_STARTUPORDER@"

DeviceDiagnostics/DeviceDiagnostics.config

@@ -1,4 +1,4 @@
-set (autostart false)
+set (autostart ${PLUGIN_DEVICEDIAGNOSTICS_AUTOSTART})
 set (preconditions Platform)
 set (callsign "org.rdk.DeviceDiagnostics")
 

DeviceIdentification/Implementation/Broadcom/Broadcom.cpp

@@ -78,39 +78,63 @@ class DeviceImplementation : public PluginHost::ISubSystem::IIdentifier {
 private:
     inline void UpdateDeviceInfo(string& identifier, string& chipset, string& firmwareVersion) const
     {
-        static constexpr uint8_t MaxInfoCollection = 3;
-        static constexpr const TCHAR ChipsetKey[] = _T("Chip ID");
-        static constexpr const TCHAR IdentifierKey[] = _T("CHIPID");
-        static constexpr const TCHAR FirmwareVersionKey[] = _T("Nexus Release");
+        identifier.assign(extractSerialNumber());
+        chipset.assign(extractChipId());
+        firmwareVersion.assign(extractFirmwareVersion());
+    }
+
+    inline std::string extractSerialNumber() const
+    {
+        std::string serialNumber;
+        std::ifstream serialNumberFile("/proc/device-tree/serial-number");
+
+        if (serialNumberFile.is_open())
+        {
+                getline(serialNumberFile,serialNumber);
+                serialNumberFile.close();
+        }
+
+        return serialNumber;
+    }
+
+    inline std::string extractChipId() const
+    {
+        std::string chipId;
+        std::ifstream chipIdFile("/proc/device-tree/model");
 
+        if (chipIdFile.is_open())
+        {
+                getline(chipIdFile, chipId);
+                chipIdFile.close();
+        }
+
+        return chipId;
+    }
+
+    inline std::string extractFirmwareVersion() const
+    {
+        std::string versionIdentifier("VERSION");
+        std::ifstream versionFile("/version.txt");
         std::string line;
-        std::ifstream file(PlatformFile);
-        uint32_t collectedInfo = 0;
-
-        if (file.is_open()) {
-            while (getline(file, line) && (collectedInfo < MaxInfoCollection)) {
-                if ((identifier.empty() == true) && (line.find(IdentifierKey) != std::string::npos)) {
-                    std::size_t position = line.find(IdentifierKey) + sizeof(IdentifierKey);
-                    if (position != std::string::npos) {
-                        identifier.assign(line.substr(position, line.find(']')-position));
-                        collectedInfo++;
-                    }
-                } else if ((chipset.empty() == true) && (line.find(ChipsetKey) != std::string::npos)) {
-                    std::size_t position = line.find(ChipsetKey) + sizeof(ChipsetKey);
-                    if (position != std::string::npos) {
-                        chipset.assign(line.substr(position, std::string::npos));
-                        collectedInfo++;
-                    }
-                } else if ((firmwareVersion.empty() == true) &&
-                           (line.find(FirmwareVersionKey) != std::string::npos)) {
-                    std::size_t position = line.find(FirmwareVersionKey) + sizeof(FirmwareVersionKey);
-                    if (position != std::string::npos) {
+        std::string firmwareVersion;
+
+        if (versionFile.is_open())
+        {
+            while (getline(versionFile, line))
+            {
+                if (0 == line.find(versionIdentifier))
+                {
+                    std::size_t position = line.find(versionIdentifier) + versionIdentifier.length() + 1; // +1 is to skip '='
+                    if (position != std::string::npos)
+                    {
                         firmwareVersion.assign(line.substr(position, std::string::npos));
-                        collectedInfo++;
                     }
                 }
             }
+         versionFile.close();
         }
+
+        return firmwareVersion;
     }
 
 private:

DisplaySettings/DisplaySettings.cpp

@@ -5593,6 +5593,15 @@ void DisplaySettings::sendMsgThread()
                     m_timer.stop();
                 }
             }
+
+	    if(!isCecEnabled){
+		try {
+		    isCecEnabled = getHdmiCecSinkCecEnableStatus();
+		}
+		catch (const device::Exception& err){
+		    LOG_DEVICE_EXCEPTION1(string("HDMI_ARC0"));
+		}
+	    }
 
             if(m_subscribed) {
          	//Need to send power on request as this timer might have started based on standby out or boot up scenario

FrameRate/CMakeLists.txt

@@ -19,6 +19,7 @@ set(PLUGIN_NAME FrameRate)
 set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
 
 set(PLUGIN_FRAMERATE_STARTUPORDER "" CACHE STRING "To configure startup order of FrameRate plugin")
+set(PLUGIN_FRAMERATE_AUTOSTART false CACHE STRING "To automatically start FrameRate plugin.")
 
 find_package(${NAMESPACE}Plugins REQUIRED)
 

FrameRate/FrameRate.conf.in

@@ -1,4 +1,4 @@
 precondition = ["Platform"]
 callsign = "org.rdk.FrameRate"
-autostart = "false"
+autostart = "@PLUGIN_FRAMERATE_AUTOSTART@"
 startuporder = "@PLUGIN_FRAMERATE_STARTUPORDER@"

FrameRate/FrameRate.config

@@ -1,4 +1,4 @@
-set (autostart false)
+set (autostart ${PLUGIN_FRAMERATE_AUTOSTART})
 set (preconditions Platform)
 set (callsign "org.rdk.FrameRate")
 

FrontPanel/CMakeLists.txt

@@ -19,6 +19,7 @@ set(PLUGIN_NAME FrontPanel)
 set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
 
 set(PLUGIN_FRONTPANEL_STARTUPORDER "" CACHE STRING "To configure startup order of FrontPanel plugin")
+set(PLUGIN_FRONTPANEL_AUTOSTART false CACHE STRING "To automatically start FrontPanel plugin.")
 
 find_package(${NAMESPACE}Plugins REQUIRED)
 

FrontPanel/FrontPanel.conf.in

@@ -1,4 +1,4 @@
 precondition = ["Platform"]
 callsign = "org.rdk.FrontPanel"
-autostart = "false"
+autostart = "@PLUGIN_FRONTPANEL_AUTOSTART@"
 startuporder = "@PLUGIN_FRONTPANEL_STARTUPORDER@"

FrontPanel/FrontPanel.config

@@ -1,4 +1,4 @@
-set (autostart false)
+set (autostart ${PLUGIN_FRONTPANEL_AUTOSTART})
 set (preconditions Platform)
 set (callsign "org.rdk.FrontPanel")
 

HdmiCec_2/CMakeLists.txt

@@ -18,6 +18,7 @@ set(PLUGIN_NAME HdmiCec_2)
 set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
 
 set(PLUGIN_HDMICEC2_STARTUPORDER "" CACHE STRING "To configure startup order of HdmiCec_2 plugin")
+set(PLUGIN_HDMICEC2_AUTOSTART false CACHE STRING "To automatically start HdmiCec_2 plugin.")
 set_source_files_properties(HdmiCec_2.cpp PROPERTIES COMPILE_FLAGS "-fexceptions")
 
 find_package(${NAMESPACE}Plugins REQUIRED)

HdmiCec_2/HdmiCec_2.conf.in

@@ -1,4 +1,4 @@
 precondition = ["Platform"]
 callsign = "org.rdk.HdmiCec_2"
-autostart = "false"
+autostart = "@PLUGIN_HDMICEC2_AUTOSTART@"
 startuporder = "@PLUGIN_HDMICEC2_STARTUPORDER@"

HdmiCec_2/HdmiCec_2.config

@@ -1,4 +1,4 @@
-set (autostart false)
+set (autostart ${PLUGIN_HDMICEC2_AUTOSTART})
 set (preconditions Platform)
 set (callsign "org.rdk.HdmiCec_2")
 

LoggingPreferences/CMakeLists.txt

@@ -19,6 +19,7 @@ set(PLUGIN_NAME LoggingPreferences)
 set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
 
 set(PLUGIN_LOGGINGPREFERENCE_STARTUPORDER "" CACHE STRING "To configure startup order of LoggingPreferences plugin")
+set(PLUGIN_LOGGINGPREFERENCES_AUTOSTART false CACHE STRING "To automatically start LoggingPreferences plugin.")
 
 find_package(${NAMESPACE}Plugins REQUIRED)
 

LoggingPreferences/LoggingPreferences.conf.in

@@ -1,4 +1,4 @@
 precondition = ["Platform"]
 callsign = "org.rdk.LoggingPreferences"
-autostart = "false"
+autostart = "@PLUGIN_LOGGINGPREFERENCES_AUTOSTART@"
 startuporder = "@PLUGIN_LOGGINGPREFERENCE_STARTUPORDER@"

LoggingPreferences/LoggingPreferences.config

@@ -1,4 +1,4 @@
-set (autostart false)
+set (autostart ${PLUGIN_LOGGINGPREFERENCES_AUTOSTART})
 set (preconditions Platform)
 set (callsign "org.rdk.LoggingPreferences")