Update ctrlm_thunder_plugin_powermanager.cpp

src/thunder/ctrlm_thunder_plugin.cpp

@@ -270,20 +270,44 @@ bool ctrlm_thunder_plugin_t::call_plugin_boolean(std::string method, void *param
             Core::JSON::Boolean jsonResponse;
             uint32_t thunderRet = clientObject->Invoke<JsonObject, Core::JSON::Boolean>(CALL_TIMEOUT, _T(method), *jsonParams, jsonResponse);
             if(thunderRet != Core::ERROR_NONE) {
-               XLOGD_ERROR("%s: Thunder call failed <%s> <%u>\n", __FUNCTION__, method.c_str(), thunderRet);
+               XLOGD_ERROR("Thunder call failed <%s> <%u>", method.c_str(), thunderRet);
             } else {
                 *response = jsonResponse.Value();
                 ret = true;
             }
         } else {
-            XLOGD_ERROR("%s: Invalid parameters\n", __FUNCTION__);
+            XLOGD_ERROR("Invalid parameters");
         }
     } else {
-        XLOGD_ERROR("%s: Client is NULL\n", __FUNCTION__);
+        XLOGD_ERROR("Client is NULL");
     }
     return(ret);
 }
 
+bool ctrlm_thunder_plugin_t::call_plugin_string(std::string method, void *params, std::string *response) {
+    bool ret = false;
+    auto clientObject = (JSONRPC::LinkType<Core::JSON::IElement>*)this->plugin_client;
+    JsonObject *jsonParams = (JsonObject *)params;
+    if(clientObject) {
+        if(!method.empty() && jsonParams && response) {
+            Core::JSON::String jsonString;
+            uint32_t thunderRet = clientObject->Invoke<JsonObject, Core::JSON::String>(CALL_TIMEOUT, _T(method), *jsonParams, jsonString);
+            if(thunderRet != Core::ERROR_NONE) {
+               XLOGD_ERROR("Thunder call failed <%s> <%u>", method.c_str(), thunderRet);
+            } else {
+                *response = jsonString.Value();
+                ret = true;
+            }
+        } else {
+            XLOGD_ERROR("Invalid parameters");
+        }
+    } else {
+        XLOGD_ERROR("Client is NULL");
+    }
+    return(ret);
+}
+
+
 bool ctrlm_thunder_plugin_t::call_controller(std::string method, void *params, void *response) {
     bool ret = false;
     if(this->controller) {

src/thunder/ctrlm_thunder_plugin.h

@@ -106,8 +106,7 @@ class ctrlm_thunder_plugin_t {
 
     /**
      * This function is used to get a Thunder Plugin property.
-     * @param method The method in which the user wants to call.
-     * @param params The WPEFramework JsonObject containing the parameters for the call. (We can't include WPEFramework headers in controlMgr .h files as their logging macros clash)
+     * @param property The property the user wants to get
      * @param response The WPEFramework JsonObject containing the response from the call.  (We can't include WPEFramework headers in controlMgr .h files as their logging macros clash)
      * @param retries The number of retries if the call times out.
      * @return True if the call succeeded, otherwise False.
@@ -128,12 +127,20 @@ class ctrlm_thunder_plugin_t {
      * This function is used to call a Thunder Plugin method.
      * @param method The method in which the user wants to call.
      * @param params The WPEFramework JsonObject containing the parameters for the call. (We can't include WPEFramework headers in controlMgr .h files as their logging macros clash)
-     * @param response The WPEFramework JsonObject containing the response from the call.  (We can't include WPEFramework headers in controlMgr .h files as their logging macros clash)
-     * @param retries The number of retries if the call times out.
+     * @param response A pointer to a boolean which will be assigned true or false
      * @return True if the call succeeded, otherwise False.
      */
     bool call_plugin_boolean(std::string method, void *params, bool *response);
 
+    /**
+     * This function is used to call a Thunder Plugin method.
+     * @param method The method in which the user wants to call.
+     * @param params The WPEFramework JsonObject containing the parameters for the call. (We can't include WPEFramework headers in controlMgr .h files as their logging macros clash)
+     * @param response A pointer a string to accept the response
+     * @return True if the call succeeded, otherwise False.
+     */
+    bool call_plugin_string(std::string method, void *params, std::string *response);
+
     /**
      * This function is used to call a Thunder Controller method.
      * @param method The method in which the user wants to call.
@@ -174,4 +181,4 @@ class ctrlm_thunder_plugin_t {
 };
 };
 
-#endif
+#endif

src/thunder/ctrlm_thunder_plugin_powermanager.cpp

@@ -107,19 +107,23 @@ bool ctrlm_thunder_plugin_powermanager_t::get_networked_standby_mode() {
 /* root@pioneer-uhd:~# curl --request POST --url http://127.0.0.1:9998/jsonrpc --header 'Content-Type: application/json' --data '{ "jsonrpc": "2.0", "id": 1234567890, "method": "org.rdk.PowerManager.1.getLastWakeupReason", "params": {} }'
 {"jsonrpc":"2.0","id":1234567890,"result":"COLDBOOT"} */
 bool ctrlm_thunder_plugin_powermanager_t::get_wakeup_reason_voice() {
-   JsonObject params, response;
+   JsonObject params;
+   std::string response;
    params = {};
    bool wakeup_reason_voice = false;
 
    sem_wait(&this->semaphore);   
-   if(this->call_plugin("getLastWakeupReason", (void *)&params, (void *)&response)) {
-      wakeup_reason_voice = (0 == strncmp(response["result"].String().c_str(), "VOICE", 5));
-      XLOGD_DEBUG("voice_wakeup is %s", wakeup_reason_voice?"TRUE":"FALSE");
+   if(this->call_plugin_string("getLastWakeupReason", (void *)&params, &response)) {
+      if(response == "VOICE") {
+         wakeup_reason_voice = true;
+      }
    } else {
       XLOGD_ERROR("getLastWakeupReason call failed");
    }
    sem_post(&this->semaphore);
 
+   XLOGD_DEBUG("voice_wakeup is %s", wakeup_reason_voice?"TRUE":"FALSE");
+
    return wakeup_reason_voice;
 }