Moved IO dependency from Qorvo's glue code to Qorvo's SW stack library (

#12356)
project-chip · May 14, 2022 · b4b937b · b4b937b
1 parent 1cc8168
commit b4b937b
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 27 deletions.
diff --git a/examples/lighting-app/qpg/src/AppTask.cpp b/examples/lighting-app/qpg/src/AppTask.cpp
@@ -16,7 +16,7 @@
  *    limitations under the License.
  */
 
-#include "qvCHIP.h"
+#include "qvIO.h"
 
 #include "AppConfig.h"
 #include "AppEvent.h"
@@ -107,7 +107,7 @@ CHIP_ERROR AppTask::Init()
     LightingMgr().SetCallbacks(ActionInitiated, ActionCompleted);
 
     // Subscribe with our button callback to the qvCHIP button handler.
-    qvCHIP_SetBtnCallback(ButtonEventHandler);
+    qvIO_SetBtnCallback(ButtonEventHandler);
 
     // Init ZCL Data Model
     chip::Server::GetInstance().Init();
@@ -178,15 +178,15 @@ void AppTask::AppTaskMain(void * pvParameter)
         {
             if (sIsThreadProvisioned && sIsThreadEnabled)
             {
-                qvCHIP_LedBlink(SYSTEM_STATE_LED, 950, 50);
+                qvIO_LedBlink(SYSTEM_STATE_LED, 950, 50);
             }
             else if (sHaveBLEConnections)
             {
-                qvCHIP_LedBlink(SYSTEM_STATE_LED, 100, 100);
+                qvIO_LedBlink(SYSTEM_STATE_LED, 100, 100);
             }
             else
             {
-                qvCHIP_LedBlink(SYSTEM_STATE_LED, 50, 950);
+                qvIO_LedBlink(SYSTEM_STATE_LED, 50, 950);
             }
         }
     }
@@ -301,9 +301,9 @@ void AppTask::FunctionTimerEventHandler(AppEvent * aEvent)
 
         // Turn off all LEDs before starting blink to make sure blink is
         // co-ordinated.
-        qvCHIP_LedSet(SYSTEM_STATE_LED, false);
+        qvIO_LedSet(SYSTEM_STATE_LED, false);
 
-        qvCHIP_LedBlink(SYSTEM_STATE_LED, 500, 500);
+        qvIO_LedBlink(SYSTEM_STATE_LED, 500, 500);
     }
     else if (sAppTask.mFunctionTimerActive && sAppTask.mFunction == kFunction_FactoryReset)
     {

diff --git a/examples/lighting-app/qpg/src/LightingManager.cpp b/examples/lighting-app/qpg/src/LightingManager.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "LightingManager.h"
-#include "qvCHIP.h"
+#include "qvIO.h"
 #include <lib/support/logging/CHIPLogging.h>
 
 // initialization values for Blue in XY color space
@@ -211,6 +211,6 @@ void LightingManager::Set(bool aOn)
 void LightingManager::UpdateLight()
 {
     ChipLogProgress(NotSpecified, "UpdateLight: %d L:%d R:%d G:%d B:%d", mState, mLevel, mRGB.r, mRGB.g, mRGB.b);
-    qvCHIP_PWMSetColor(mRGB.r, mRGB.g, mRGB.b);
-    qvCHIP_PWMColorOnOff(mState == kState_On);
+    qvIO_PWMSetColor(mRGB.r, mRGB.g, mRGB.b);
+    qvIO_PWMColorOnOff(mState == kState_On);
 }
diff --git a/examples/lock-app/qpg/include/AppConfig.h b/examples/lock-app/qpg/include/AppConfig.h
@@ -25,7 +25,7 @@
 #define APP_FUNCTION_BUTTON BTN_SW5
 
 #define SYSTEM_STATE_LED LED_GREEN
-#define LOCK_STATE_LED LED_RED
+#define LOCK_STATE_LED LED_WHITE
 
 // Time it takes in ms for the simulated actuator to move from one
 // state to another.

diff --git a/examples/lock-app/qpg/src/AppTask.cpp b/examples/lock-app/qpg/src/AppTask.cpp
@@ -16,7 +16,7 @@
  *    limitations under the License.
  */
 
-#include "qvCHIP.h"
+#include "qvIO.h"
 
 #include "AppConfig.h"
 #include "AppEvent.h"
@@ -106,9 +106,9 @@ CHIP_ERROR AppTask::Init()
     BoltLockMgr().SetCallbacks(ActionInitiated, ActionCompleted);
 
     // Subscribe with our button callback to the qvCHIP button handler.
-    qvCHIP_SetBtnCallback(ButtonEventHandler);
+    qvIO_SetBtnCallback(ButtonEventHandler);
 
-    qvCHIP_LedSet(LOCK_STATE_LED, !BoltLockMgr().IsUnlocked());
+    qvIO_LedSet(LOCK_STATE_LED, !BoltLockMgr().IsUnlocked());
 
     // Init ZCL Data Model
     chip::Server::GetInstance().Init();
@@ -175,15 +175,15 @@ void AppTask::AppTaskMain(void * pvParameter)
         {
             if (sIsThreadProvisioned && sIsThreadEnabled)
             {
-                qvCHIP_LedBlink(SYSTEM_STATE_LED, 950, 50);
+                qvIO_LedBlink(SYSTEM_STATE_LED, 950, 50);
             }
             else if (sHaveBLEConnections)
             {
-                qvCHIP_LedBlink(SYSTEM_STATE_LED, 100, 100);
+                qvIO_LedBlink(SYSTEM_STATE_LED, 100, 100);
             }
             else
             {
-                qvCHIP_LedBlink(SYSTEM_STATE_LED, 50, 950);
+                qvIO_LedBlink(SYSTEM_STATE_LED, 50, 950);
             }
         }
     }
@@ -293,11 +293,11 @@ void AppTask::FunctionTimerEventHandler(AppEvent * aEvent)
 
         // Turn off all LEDs before starting blink to make sure blink is
         // co-ordinated.
-        qvCHIP_LedSet(SYSTEM_STATE_LED, false);
-        qvCHIP_LedSet(LOCK_STATE_LED, false);
+        qvIO_LedSet(SYSTEM_STATE_LED, false);
+        qvIO_LedSet(LOCK_STATE_LED, false);
 
-        qvCHIP_LedBlink(SYSTEM_STATE_LED, 500, 500);
-        qvCHIP_LedBlink(LOCK_STATE_LED, 500, 500);
+        qvIO_LedBlink(SYSTEM_STATE_LED, 500, 500);
+        qvIO_LedBlink(LOCK_STATE_LED, 500, 500);
     }
     else if (sAppTask.mFunctionTimerActive && sAppTask.mFunction == kFunction_FactoryReset)
     {
@@ -375,7 +375,7 @@ void AppTask::FunctionHandler(AppEvent * aEvent)
         else if (sAppTask.mFunctionTimerActive && sAppTask.mFunction == kFunction_FactoryReset)
         {
             // Set lock status LED back to show state of lock.
-            qvCHIP_LedSet(LOCK_STATE_LED, !BoltLockMgr().IsUnlocked());
+            qvIO_LedSet(LOCK_STATE_LED, !BoltLockMgr().IsUnlocked());
 
             sAppTask.CancelTimer();
 
@@ -428,7 +428,7 @@ void AppTask::ActionInitiated(BoltLockManager::Action_t aAction, int32_t aActor)
         sAppTask.mSyncClusterToButtonAction = true;
     }
 
-    qvCHIP_LedBlink(LOCK_STATE_LED, 50, 50);
+    qvIO_LedBlink(LOCK_STATE_LED, 50, 50);
 }
 
 void AppTask::ActionCompleted(BoltLockManager::Action_t aAction)
@@ -440,13 +440,13 @@ void AppTask::ActionCompleted(BoltLockManager::Action_t aAction)
     {
         ChipLogProgress(NotSpecified, "Lock Action has been completed");
 
-        qvCHIP_LedSet(LOCK_STATE_LED, true);
+        qvIO_LedSet(LOCK_STATE_LED, true);
     }
     else if (aAction == BoltLockManager::UNLOCK_ACTION)
     {
         ChipLogProgress(NotSpecified, "Unlock Action has been completed");
 
-        qvCHIP_LedSet(LOCK_STATE_LED, false);
+        qvIO_LedSet(LOCK_STATE_LED, false);
     }
 
     if (sAppTask.mSyncClusterToButtonAction)

diff --git a/third_party/qpg_sdk/BUILD.gn b/third_party/qpg_sdk/BUILD.gn
@@ -33,7 +33,7 @@ group("qpg_sdk") {
 
 config("qpg_freertos_config") {
   include_dirs = [
-    "${chip_root}/third_party/qpg_sdk/repo/qpg6100/comps/gpFreeRTOS/config",
+    "${qpg_sdk_root}/${qpg_target_ic}/comps/gpFreeRTOS/config",
     "${chip_root}/third_party/qpg_sdk/repo/qpg6100/comps/lwip",
     "${freertos_root}/repo/portable/GCC/ARM_CM3",
   ]

diff --git a/third_party/qpg_sdk/qpg_sdk.gni b/third_party/qpg_sdk/qpg_sdk.gni
@@ -58,6 +58,7 @@ template("qpg_sdk") {
 
     include_dirs += [
       "${qpg_sdk_root}/${qpg_target_ic}/comps/qvCHIP/inc",
+      "${qpg_sdk_root}/${qpg_target_ic}/comps/qvIO/inc",
       "${qpg_sdk_root}/${qpg_target_ic}/comps/gpFreeRTOS/config",
       "${qpg_sdk_root}/${qpg_target_ic}/comps/libmbedtls",
       "${mbedtls_root}/repo/include",

diff --git a/third_party/qpg_sdk/repo b/third_party/qpg_sdk/repo