Merge branch 'rdkcentral:main' into main

AVOutput/AVOutputTV.h

@@ -25,10 +25,10 @@
 
 #include "tvTypes.h"
 #include "tvSettings.h"
+#include "tvSettingsExtODM.h"
 #include <pthread.h>
 #include "Module.h"
 #include "tvError.h"
-#include "tvTypes.h"
 #include "tr181api.h"
 #include "AVOutputBase.h"
 #include "libIARM.h"

AVOutput/CHANGELOG.md

@@ -15,6 +15,9 @@ All notable changes to this RDK Service will be documented in this file.
 * Changes in CHANGELOG should be updated when commits are added to the main or release branches. There should be one CHANGELOG entry per JIRA Ticket. This is not enforced on sprint branches since there could be multiple changes for the same JIRA ticket during development. 
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
+## [1.0.5] - 2024-03-19
+### Fixed
+- Header cleanup
 
 ## [1.0.4] - 2024-03-01
 ### Fixed

PersistentStore/CHANGELOG.md

@@ -16,6 +16,10 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
+## [1.0.7] - 2024-03-18
+### Fixed
+- PersistentStore.json is not generated  in R2 build due to write_config() empty parameter & its fixed for R2 builds
+
 ## [1.0.6] - 2024-03-11
 ### Added
 - RPC COM interface IStore2, IStoreInspector, IStoreLimit

PersistentStore/CMakeLists.txt

@@ -17,13 +17,12 @@
 
 cmake_minimum_required(VERSION 3.14)
 
-project(PersistentStore)
+set(PLUGIN_NAME PersistentStore)
+find_package(WPEFramework)
+set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
 
 set(CMAKE_CXX_STANDARD 11)
 
-find_package(WPEFramework)
-set(MODULE_NAME "${NAMESPACE}${PROJECT_NAME}")
-
 set(PLUGIN_PERSISTENTSTORE_MODE "Off" CACHE STRING "Controls if the plugin should run in its own process, in process or remote")
 set(PLUGIN_PERSISTENTSTORE_URI "ss.eu.prod.developer.comcast.com:443" CACHE STRING "Account scope endpoint")
 set(PLUGIN_PERSISTENTSTORE_PATH "/opt/secure/persistent/rdkservicestore" CACHE STRING "Path")
@@ -67,4 +66,4 @@ endif ()
 install(TARGETS ${MODULE_NAME}
         DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
 
-write_config()
+write_config(${PLUGIN_NAME})

docs/api/AVInputPlugin.md

@@ -2,7 +2,7 @@
 <a name="AVInput_Plugin"></a>
 # AVInput Plugin
 
-**Version: [1.5.0](https://github.com/rdkcentral/rdkservices/blob/main/AVInput/CHANGELOG.md)**
+**Version: [1.5.1](https://github.com/rdkcentral/rdkservices/blob/main/AVInput/CHANGELOG.md)**
 
 A org.rdk.AVInput plugin for Thunder framework.
 
@@ -1088,6 +1088,7 @@ Triggered whenever the status changes for an HDMI/Composite Input.
 | params.id | number | The port identifier for the HDMI/Composite Input |
 | params.locator | string | A URL corresponding to the HDMI/Composite Input port |
 | params.status | string | Status of the HDMI/Composite Input. Valid values are `started` or `stopped` |
+| params?.plane | integer | <sup>*(optional)*</sup> Defines whether the video plane type, 0 - Primary video plane, 1 - Secondary Video Plane, Other values - Invalid  |
 
 ### Example
 
@@ -1098,7 +1099,8 @@ Triggered whenever the status changes for an HDMI/Composite Input.
     "params": {
         "id": 0,
         "locator": "hdmiin://localhost/deviceid/0",
-        "status": "started"
+        "status": "started",
+        "plane": 0
     }
 }
 ```

docs/api/BluetoothPlugin.md

@@ -491,8 +491,6 @@ This method takes no parameters.
 | result.discoveredDevices[#].deviceID | string | ID that is derived from the Bluetooth MAC address. 6 byte MAC value is packed into 8 byte with leading zeros for first 2 bytes |
 | result.discoveredDevices[#].name | string | Name of the Bluetooth Device |
 | result.discoveredDevices[#].deviceType | string | Device class (for example: `headset`, `speakers`, etc.) |
-| result.discoveredDevices[#]rawDeviceType | string | Bluetooth device class as decimal |
-| result.discoveredDevices[#]rawBleDeviceType | string | Bluetooth (LE) device appearance as decimal |
 | result.discoveredDevices[#].connected | boolean | Whether the device is connected |
 | result.discoveredDevices[#].paired | boolean | Whether paired or not |
 | result.success | boolean | Whether the request succeeded |
@@ -1389,8 +1387,8 @@ Triggered during device discovery when a new device is discovered or a discovere
 | params.discoveryType | string | either `DISCOVERED` or `LOST` |
 | params.name | string | Name of the Bluetooth Device |
 | params.deviceType | string | Device class (for example: `headset`, `speakers`, etc.) |
-| params.rawDeviceType | string | Bluetooth device class as decimal |
-| params.rawBleDeviceType | string | Bluetooth (LE) device appearance as decimal |
+| params.rawDeviceType | string | Bluetooth device class |
+| params.rawBleDeviceType | string | Bluetooth device appearance |
 | params.lastConnectedState | boolean | Whether the device was last to connect. Only the last connected device has a value of `true` |
 | params.paired | boolean | Whether the device is paired. 1. `true` if the device is paired when the PAIRING_CHANGE status is sent 2. `false` if the device is unpaired. **Note** The set-top box does not retain/store all paired devices across previous power cycles. In addition, if the device is unpaired as part of a previous operation and the same device gets detected in a new discovery cycle, the device will not be a paired device |
 
@@ -1406,7 +1404,7 @@ Triggered during device discovery when a new device is discovered or a discovere
         "name": "[TV] UE32J5530",
         "deviceType": "TV",
         "rawDeviceType": "2360344",
-        "rawBleDeviceType": "0",
+        "rawBleDeviceType": "180",
         "lastConnectedState": true,
         "paired": true
     }
@@ -1597,8 +1595,8 @@ Triggered when the previous request to pair or connect failed. In absence of a f
 | params.deviceID | string | ID that is derived from the Bluetooth MAC address. 6 byte MAC value is packed into 8 byte with leading zeros for first 2 bytes |
 | params.name | string | Name of the Bluetooth Device |
 | params.deviceType | string | Device class (for example: `headset`, `speakers`, etc.) |
-| params.rawDeviceType | string | Bluetooth device class as decimal |
-| params.rawBleDeviceType | string | Bluetooth (LE) device appearance as decimal |
+| params.rawDeviceType | string | Bluetooth device class |
+| params.rawBleDeviceType | string | Bluetooth device appearance |
 | params.lastConnectedState | boolean | Whether the device was last to connect. Only the last connected device has a value of `true` |
 | params.paired | boolean | Whether paired or not |
 | params.connected | boolean | Whether the device is connected. `true` if the device is connected when the `CONNECTION_CHANGE` status is sent. `false` if the device is disconnected |
@@ -1615,7 +1613,7 @@ Triggered when the previous request to pair or connect failed. In absence of a f
         "name": "[TV] UE32J5530",
         "deviceType": "TV",
         "rawDeviceType": "2360344",
-        "rawBleDeviceType": "0",
+        "rawBleDeviceType": "180",
         "lastConnectedState": true,
         "paired": true,
         "connected": true
@@ -1641,8 +1639,8 @@ Triggered when the Bluetooth functionality status changes. Supported statuses ar
 | params.deviceID | string | ID that is derived from the Bluetooth MAC address. 6 byte MAC value is packed into 8 byte with leading zeros for first 2 bytes |
 | params.name | string | Name of the Bluetooth Device |
 | params.deviceType | string | Device class (for example: `headset`, `speakers`, etc.) |
-| params.rawDeviceType | string | Bluetooth device class as decimal |
-| params.rawBleDeviceType | string | Bluetooth (LE) device appearance as decimal |
+| params.rawDeviceType | string | Bluetooth device class |
+| params.rawBleDeviceType | string | Bluetooth device appearance |
 | params.lastConnectedState | boolean | Whether the device was last to connect. Only the last connected device has a value of `true` |
 | params.paired | boolean | Whether paired or not |
 | params.connected | boolean | Whether device connected or not |
@@ -1659,7 +1657,7 @@ Triggered when the Bluetooth functionality status changes. Supported statuses ar
         "name": "[TV] UE32J5530",
         "deviceType": "TV",
         "rawDeviceType": "2360344",
-        "rawBleDeviceType": "0",
+        "rawBleDeviceType": "180",
         "lastConnectedState": true,
         "paired": true,
         "connected": false
@@ -1680,8 +1678,8 @@ Triggered when the new device got discovered.
 | params.deviceID | string | ID that is derived from the Bluetooth MAC address. 6 byte MAC value is packed into 8 byte with leading zeros for first 2 bytes |
 | params.name | string | Name of the Bluetooth Device |
 | params.deviceType | string | Device class (for example: `headset`, `speakers`, etc.) |
-| params.rawDeviceType | string | Bluetooth device class as decimal |
-| params.rawBleDeviceType | string | Bluetooth (LE) device appearance as decimal |
+| params.rawDeviceType | string | Bluetooth device class |
+| params.rawBleDeviceType | string | Bluetooth device appearance |
 | params.lastConnectedState | boolean | Whether the device was last to connect. Only the last connected device has a value of `true` |
 
 ### Example
@@ -1695,7 +1693,7 @@ Triggered when the new device got discovered.
         "name": "[TV] UE32J5530",
         "deviceType": "TV",
         "rawDeviceType": "2360344",
-        "rawBleDeviceType": "0",
+        "rawBleDeviceType": "180",
         "lastConnectedState": true
     }
 }
@@ -1714,8 +1712,8 @@ Triggered when any discovered device lost or out of range.
 | params.deviceID | string | ID that is derived from the Bluetooth MAC address. 6 byte MAC value is packed into 8 byte with leading zeros for first 2 bytes |
 | params.name | string | Name of the Bluetooth Device |
 | params.deviceType | string | Device class (for example: `headset`, `speakers`, etc.) |
-| params.rawDeviceType | string | Bluetooth device class as decimal |
-| params.rawBleDeviceType | string | Bluetooth (LE) device appearance as decimal |
+| params.rawDeviceType | string | Bluetooth device class |
+| params.rawBleDeviceType | string | Bluetooth device appearance |
 | params.lastConnectedState | boolean | Whether the device was last to connect. Only the last connected device has a value of `true` |
 
 ### Example
@@ -1729,7 +1727,7 @@ Triggered when any discovered device lost or out of range.
         "name": "[TV] UE32J5530",
         "deviceType": "TV",
         "rawDeviceType": "2360344",
-        "rawBleDeviceType": "0",
+        "rawBleDeviceType": "180",
         "lastConnectedState": true
     }
 }

docs/api/ControlServicePlugin.md

@@ -2,7 +2,7 @@
 <a name="ControlService_Plugin"></a>
 # ControlService Plugin
 
-**Version: [1.0.6](https://github.com/rdkcentral/rdkservices/blob/main/ControlService/CHANGELOG.md)**
+**Version: [1.0.7](https://github.com/rdkcentral/rdkservices/blob/main/ControlService/CHANGELOG.md)**
 
 A org.rdk.ControlService plugin for Thunder framework.
 

docs/api/DTVPlugin.md

@@ -2,7 +2,7 @@
 <a name="DTV_Plugin"></a>
 # DTV Plugin
 
-**Version: [1.0.0](https://github.com/rdkcentral/rdkservices/blob/main/DTV/CHANGELOG.md)**
+**Version: [1.0.3](https://github.com/rdkcentral/rdkservices/blob/main/DTV/CHANGELOG.md)**
 
 A DTV plugin for Thunder framework.
 

docs/api/DeviceInfoPlugin.md

@@ -2,7 +2,7 @@
 <a name="DeviceInfo_Plugin"></a>
 # DeviceInfo Plugin
 
-**Version: [1.0.11](https://github.com/rdkcentral/rdkservices/blob/main/DeviceInfo/CHANGELOG.md)**
+**Version: [1.0.12](https://github.com/rdkcentral/rdkservices/blob/main/DeviceInfo/CHANGELOG.md)**
 
 A DeviceInfo plugin for Thunder framework.
 

docs/api/DisplaySettingsPlugin.md

@@ -2,7 +2,7 @@
 <a name="DisplaySettings_Plugin"></a>
 # DisplaySettings Plugin
 
-**Version: [1.3.8](https://github.com/rdkcentral/rdkservices/blob/main/DisplaySettings/CHANGELOG.md)**
+**Version: [1.4.0](https://github.com/rdkcentral/rdkservices/blob/main/DisplaySettings/CHANGELOG.md)**
 
 A org.rdk.DisplaySettings plugin for Thunder framework.
 

docs/api/HdmiCecSinkPlugin.md

@@ -2,7 +2,7 @@
 <a name="HdmiCecSinkPlugin"></a>
 # HdmiCecSinkPlugin
 
-**Version: [1.3.2](https://github.com/rdkcentral/rdkservices/blob/main/HdmiCecSink/CHANGELOG.md)**
+**Version: [1.3.5](https://github.com/rdkcentral/rdkservices/blob/main/HdmiCecSink/CHANGELOG.md)**
 
 A org.rdk.HdmiCecSink plugin for Thunder framework.
 

docs/api/HdmiInputPlugin.md

@@ -2,7 +2,7 @@
 <a name="HdmiInputPlugin"></a>
 # HdmiInputPlugin
 
-**Version: [1.2.0](https://github.com/rdkcentral/rdkservices/blob/main/HdmiInput/CHANGELOG.md)**
+**Version: [1.2.1](https://github.com/rdkcentral/rdkservices/blob/main/HdmiInput/CHANGELOG.md)**
 
 A org.rdk.HdmiInput plugin for Thunder framework.
 
@@ -784,6 +784,7 @@ Triggered whenever the status changes for an HDMI Input.
 | params.id | number | The port identifier for the HDMI Input |
 | params.locator | string | A URL corresponding to the HDMI Input port |
 | params.status | string | Status of the HDMI Input. Valid values are `started` or `stopped` |
+| params?.plane | integer | <sup>*(optional)*</sup> Defines whether the video plane type, 0 - Primary video plane, 1 - Secondary Video Plane, Other values - Invalid  |
 
 ### Example
 
@@ -794,7 +795,8 @@ Triggered whenever the status changes for an HDMI Input.
     "params": {
         "id": 0,
         "locator": "hdmiin://localhost/deviceid/0",
-        "status": "started"
+        "status": "started",
+        "plane": 0
     }
 }
 ```

docs/api/MaintenanceManagerPlugin.md

@@ -2,7 +2,7 @@
 <a name="MaintenanceManagerPlugin"></a>
 # MaintenanceManagerPlugin
 
-**Version: [1.0.25](https://github.com/rdkcentral/rdkservices/blob/main/MaintenanceManager/CHANGELOG.md)**
+**Version: [1.0.27](https://github.com/rdkcentral/rdkservices/blob/main/MaintenanceManager/CHANGELOG.md)**
 
 A org.rdk.MaintenanceManager plugin for Thunder framework.
 

docs/api/MessengerPlugin.md

@@ -2,7 +2,7 @@
 <a name="Messenger_Plugin"></a>
 # Messenger Plugin
 
-**Version: [1.1.2](https://github.com/rdkcentral/rdkservices/blob/main/Messenger/CHANGELOG.md)**
+**Version: [1.1.3](https://github.com/rdkcentral/rdkservices/blob/main/Messenger/CHANGELOG.md)**
 
 A Messenger plugin for Thunder framework.
 

docs/api/MonitorPlugin.md

@@ -2,7 +2,7 @@
 <a name="Monitor_Plugin"></a>
 # Monitor Plugin
 
-**Version: [1.0.4](https://github.com/rdkcentral/rdkservices/blob/main/Monitor/CHANGELOG.md)**
+**Version: [1.0.5](https://github.com/rdkcentral/rdkservices/blob/main/Monitor/CHANGELOG.md)**
 
 A Monitor plugin for Thunder framework.
 

docs/api/NetworkPlugin.md

@@ -2,7 +2,7 @@
 <a name="NetworkPlugin"></a>
 # NetworkPlugin
 
-**Version: [1.3.4](https://github.com/rdkcentral/rdkservices/blob/main/Network/CHANGELOG.md)**
+**Version: [1.3.6](https://github.com/rdkcentral/rdkservices/blob/main/Network/CHANGELOG.md)**
 
 A org.rdk.Network plugin for Thunder framework.
 

docs/api/OpenCDMiPlugin.md

@@ -2,7 +2,7 @@
 <a name="OpenCDMi_Plugin"></a>
 # OpenCDMi Plugin
 
-**Version: [1.0.3](https://github.com/rdkcentral/rdkservices/blob/main/OpenCDMi/CHANGELOG.md)**
+**Version: [1.0.4](https://github.com/rdkcentral/rdkservices/blob/main/OpenCDMi/CHANGELOG.md)**
 
 A OCDM plugin for Thunder framework.