Syncup of Metrological plugins from Metrological version

HaseenaSainul · Feb 23, 2024 · 4088040 · 4088040
1 parent 6f27bab
commit 4088040
Show file tree

Hide file tree

Showing 19 changed files with 1,399 additions and 421 deletions.
diff --git a/DeviceIdentification/DeviceIdentification.conf.in b/DeviceIdentification/DeviceIdentification.conf.in
@@ -5,8 +5,7 @@ startuporder = "@PLUGIN_DEVICEIDENTIFICATION_STARTUPORDER@"
 configuration = JSON()
 
 if boolean("@GENERIC_DEVICEIDENTIFIATION@"):
-    if boolean("@PLUGIN_DEVICEIDENTIFICATION_INTERFACE_NAME@"):
-        configuration.add("interface", PLUGIN_DEVICEIDENTIFICATION_INTERFACE_NAME)
+    configuration.add("interface", "@PLUGIN_DEVICEIDENTIFICATION_INTERFACE_NAME@")
 
 rootobject = JSON()
 rootobject.add("mode", "@PLUGIN_DEVICEIDENTIFICATION_MODE@")

diff --git a/LocationSync/CMakeLists.txt b/LocationSync/CMakeLists.txt
@@ -44,6 +44,8 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+target_compile_options (${MODULE_NAME} PRIVATE -Wno-psabi)
+
 target_link_libraries(${MODULE_NAME} 
     PRIVATE
         CompileSettingsDebug::CompileSettingsDebug

diff --git a/LocationSync/LocationSync.cpp b/LocationSync/LocationSync.cpp
@@ -50,10 +50,6 @@ namespace Plugin {
 #pragma warning(default : 4355)
 #endif
 
-    LocationSync::~LocationSync() /* override */
-    {
-    }
-
     const string LocationSync::Initialize(PluginHost::IShell* service) /* override */
     {
         string result;

diff --git a/Monitor/Monitor.config b/Monitor/Monitor.config
@@ -176,6 +176,21 @@ if(PLUGIN_MONITOR_OPENCDMI)
     map_append(${configuration} observables ${OPENCDMI_MONITOR_CONFIG})
 endif()
 
+if(PLUGIN_MONITOR_TEXTTOSPEECH)
+    map()
+        kv(callsign org.rdk.TextToSpeech)
+        kv(operational 1)
+        key(restart)
+        map()
+            kv(window 60)
+            kv(limit 3)
+        end()
+    end()
+    ans(TEXTTOSPEECH_MONITOR_CONFIG)
+    map_append(${configuration} observables ___array___)
+    map_append(${configuration} observables ${TEXTTOSPEECH_MONITOR_CONFIG})
+endif()
+
 if(PLUGIN_MONITOR_SYSTEMAUDIOPLAYER)
     map()
         kv(callsign org.rdk.SystemAudioPlayer)
@@ -208,6 +223,72 @@ if(PLUGIN_MONITOR_WEBKITBROWSER_RESIDENT_APP)
     map_append(${configuration} observables ${RESIDENT_APP_MONITOR_CONFIG})
 endif()
 
+if(PLUGIN_MONITOR_CLONED_APPS)
+    map()
+        kv(callsign "SearchAndDiscovery")
+        kv(operational -1)
+        kv(memory 5)
+        kv(memorylimit ${PLUGIN_MONITOR_SEARCH_AND_DISCOVERY_MEMORYLIMIT})
+    end()
+    ans(SAD_APP_MONITOR_CONFIG)
+    map_append(${configuration} observables ___array___)
+    map_append(${configuration} observables ${SAD_APP_MONITOR_CONFIG})
+
+    foreach(N RANGE 0 3)
+    map()
+        kv(callsign "HtmlApp-${N}")
+        kv(operational -1)
+        kv(memory 5)
+        kv(memorylimit ${PLUGIN_MONITOR_CLONED_APP_MEMORYLIMIT})
+    end()
+    ans(HTML_APP_MONITOR_CONFIG)
+    map_append(${configuration} observables ___array___)
+    map_append(${configuration} observables ${HTML_APP_MONITOR_CONFIG})
+    endforeach()
+
+    foreach(N RANGE 0 3)
+    map()
+        kv(callsign "LightningApp-${N}")
+        kv(operational -1)
+        kv(memory 5)
+        kv(memorylimit ${PLUGIN_MONITOR_CLONED_APP_MEMORYLIMIT})
+    end()
+    ans(LIGHTNING_APP_MONITOR_CONFIG)
+    map_append(${configuration} observables ___array___)
+    map_append(${configuration} observables ${LIGHTNING_APP_MONITOR_CONFIG})
+    endforeach()
+
+    map()
+        kv(callsign "Cobalt-0")
+        kv(operational -1)
+        kv(memory 5)
+        kv(memorylimit ${PLUGIN_MONITOR_CLONED_APP_MEMORYLIMIT})
+    end()
+    ans(COBALT_MONITOR_CONFIG)
+    map_append(${configuration} observables ___array___)
+    map_append(${configuration} observables ${COBALT_MONITOR_CONFIG})
+
+    map()
+        kv(callsign "Netflix-0")
+        kv(operational -1)
+        kv(memory 5)
+        kv(memorylimit ${PLUGIN_MONITOR_NETFLIX_APP_MEMORYLIMIT})
+    end()
+    ans(NETFLIX_APP_MONITOR_CONFIG)
+    map_append(${configuration} observables ___array___)
+    map_append(${configuration} observables ${NETFLIX_APP_MONITOR_CONFIG})
+
+    map()
+        kv(callsign "JSPP")
+        kv(operational -1)
+        kv(memory 5)
+        kv(memorylimit ${PLUGIN_MONITOR_CLONED_APP_MEMORYLIMIT})
+    end()
+    ans(JSPP_MONITOR_CONFIG)
+    map_append(${configuration} observables ___array___)
+    map_append(${configuration} observables ${JSPP_MONITOR_CONFIG})
+endif()
+
 if(PLUGIN_MONITOR_INSTANCES_LIST)
 
     # 'PLUGIN_MONITOR_INSTANCES_LIST' contains a semi-colon (';') separated list of Monitor observable