[NXP][k32w1] Rework reference apps

.github/workflows/examples-nxp.yaml

@@ -29,8 +29,8 @@ env:
     CHIP_NO_LOG_TIMESTAMPS: true
 
 jobs:
-    k32w:
-        name: K32W
+    k32w0:
+        name: K32W0
 
         env:
             BUILD_TYPE: gn_k32w
@@ -39,7 +39,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-k32w:66
+            image: ghcr.io/project-chip/chip-build-k32w:71
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
         steps:
@@ -66,8 +66,6 @@ jobs:
                       --target nxp-k32w0-freertos-contact-sensor \
                       --target nxp-k32w0-freertos-contact-sensor-low-power \
                       --target nxp-k32w0-freertos-contact-sensor-low-power-factory \
-                      --target nxp-k32w1-freertos-lighting \
-                      --target nxp-k32w1-freertos-contact-sensor-low-power \
                       build \
                       --copy-artifacts-to out/artifacts \
                   "
@@ -77,16 +75,62 @@ jobs:
                     nxp k32w0+release light \
                     out/artifacts/nxp-k32w0-freertos-lighting/chip-k32w0x-light-example.elf \
                     /tmp/bloat_reports/
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    nxp k32w1+release light \
-                    out/artifacts/nxp-k32w1-freertos-lighting/chip-k32w1-light-example.elf \
-                    /tmp/bloat_reports/
             - name: Get contact sensor size stats
               run: |
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nxp k32w0+release contact \
                     out/artifacts/nxp-k32w0-freertos-contact-sensor-low-power/chip-k32w0x-contact-example.elf \
                     /tmp/bloat_reports/
+            - name: Uploading Size Reports
+              uses: ./.github/actions/upload-size-reports
+              if: ${{ !env.ACT }}
+              with:
+                platform-name: K32W0
+    k32w1:
+        name: K32W1
+
+        env:
+            BUILD_TYPE: gn_k32w
+
+        runs-on: ubuntu-latest
+        if: github.actor != 'restyled-io[bot]'
+
+        container:
+            image: ghcr.io/project-chip/chip-build-nxp:71
+            volumes:
+                - "/tmp/bloat_reports:/tmp/bloat_reports"
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+            - name: Checkout submodules & Bootstrap
+              uses: ./.github/actions/checkout-submodules-and-bootstrap
+              with:
+                platform: nxp
+                extra-submodule-parameters: --recursive
+
+            - name: Set up environment for size reports
+              uses: ./.github/actions/setup-size-reports
+              if: ${{ !env.ACT }}
+              with:
+                gh-context: ${{ toJson(github) }}
+
+            - name: Build examples
+              run: |
+                  scripts/run_in_build_env.sh "\
+                      ./scripts/build/build_examples.py \
+                      --target nxp-k32w1-freertos-lighting \
+                      --target nxp-k32w1-freertos-contact-sensor-low-power \
+                      build \
+                      --copy-artifacts-to out/artifacts \
+                  "
+            - name: Get lighting app size stats
+              run: |
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    nxp k32w1+release light \
+                    out/artifacts/nxp-k32w1-freertos-lighting/chip-k32w1-light-example.elf \
+                    /tmp/bloat_reports/
+            - name: Get contact sensor size stats
+              run: |
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     nxp k32w1+release contact \
                     out/artifacts/nxp-k32w1-freertos-contact-sensor-low-power/chip-k32w1-contact-example.elf \
@@ -95,7 +139,7 @@ jobs:
               uses: ./.github/actions/upload-size-reports
               if: ${{ !env.ACT }}
               with:
-                platform-name: K32W
+                platform-name: K32W1
     rw61x:
         name: RW61X
 

examples/contact-sensor-app/nxp/common/AppTask.cpp

@@ -0,0 +1,53 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include "AppTask.h"
+
+#if CONFIG_LOW_POWER
+#include "PWR_Interface.h"
+#endif
+
+#include <platform/CHIPDeviceLayer.h>
+
+void ContactSensorApp::AppTask::PreInitMatterStack()
+{
+    ChipLogProgress(DeviceLayer, "Welcome to NXP Contact Sensor Demo App");
+}
+
+#if CONFIG_LOW_POWER
+void ContactSensorApp::AppTask::AppMatter_DisallowDeviceToSleep()
+{
+    PWR_DisallowDeviceToSleep();
+}
+
+void ContactSensorApp::AppTask::AppMatter_AllowDeviceToSleep()
+{
+    PWR_AllowDeviceToSleep();
+}
+#endif
+
+ContactSensorApp::AppTask & ContactSensorApp::AppTask::GetDefaultInstance()
+{
+    static ContactSensorApp::AppTask sAppTask;
+    return sAppTask;
+}
+
+chip::NXP::App::AppTaskBase & chip::NXP::App::GetAppTask()
+{
+    return ContactSensorApp::AppTask::GetDefaultInstance();
+}

examples/contact-sensor-app/nxp/common/DeviceCallbacks.cpp

@@ -0,0 +1,69 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <lib/support/logging/CHIPLogging.h>
+
+#include "DeviceCallbacks.h"
+#if CONFIG_ENABLE_FEEDBACK
+#include "UserInterfaceFeedback.h"
+#endif
+
+#include <app-common/zap-generated/ids/Attributes.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <app/EventLogging.h>
+
+using namespace ::chip;
+using namespace ::chip::app::Clusters;
+
+void logBooleanStateEvent(bool state)
+{
+    chip::EventNumber eventNumber;
+    chip::app::Clusters::BooleanState::Events::StateChange::Type event{ state };
+    if (CHIP_NO_ERROR != chip::app::LogEvent(event, 1, eventNumber))
+    {
+        ChipLogProgress(Zcl, "booleanstate: failed to reacord state-change event");
+    }
+}
+
+void ContactSensorApp::DeviceCallbacks::PostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId,
+                                                                    chip::AttributeId attributeId, uint8_t type, uint16_t size,
+                                                                    uint8_t * value)
+{
+    if (clusterId == BooleanState::Id)
+    {
+        if (attributeId != BooleanState::Attributes::StateValue::Id)
+        {
+            ChipLogProgress(Zcl, "Unknown attribute ID: " ChipLogFormatMEI, ChipLogValueMEI(attributeId));
+            return;
+        }
+#if CONFIG_ENABLE_FEEDBACK
+        FeedbackMgr().RestoreState();
+#endif
+        logBooleanStateEvent(static_cast<bool>(*value));
+    }
+    else
+    {
+        ChipLogProgress(Zcl, "Unknown attribute ID: " ChipLogFormatMEI, ChipLogValueMEI(attributeId));
+    }
+}
+
+chip::DeviceManager::CHIPDeviceManagerCallbacks & chip::NXP::App::GetDeviceCallbacks()
+{
+    static ContactSensorApp::DeviceCallbacks sDeviceCallbacks;
+    return sDeviceCallbacks;
+}

examples/contact-sensor-app/nxp/common/ZclCallbacks.cpp

@@ -0,0 +1,38 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#include <app-common/zap-generated/cluster-objects.h>
+#include <lib/support/logging/CHIPLogging.h>
+
+#if CONFIG_ENABLE_FEEDBACK
+#include "UserInterfaceFeedback.h"
+#endif
+
+/** @brief BooleanState Cluster Init
+ *
+ * This function is called when a specific cluster is initialized. It gives the
+ * application an opportunity to take care of cluster initialization procedures.
+ * It is called exactly once for each endpoint where cluster is present.
+ */
+void emberAfBooleanStateClusterInitCallback(chip::EndpointId endpoint)
+{
+    ChipLogProgress(Zcl, "emberAfBooleanStateClusterInitCallback\n");
+#if CONFIG_ENABLE_FEEDBACK
+    FeedbackMgr().RestoreState();
+#endif
+}

src/platform/nxp/k32w/k32w1/DefaultTestEventTriggerDelegate.cpp → examples/contact-sensor-app/nxp/common/include/AppEvent.h

@@ -1,6 +1,6 @@
 /*
  *
- *    Copyright (c) 2022 Project CHIP Authors
+ *    Copyright (c) 2024 Project CHIP Authors
  *    All rights reserved.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,16 +16,12 @@
  *    limitations under the License.
  */
 
-#include "DefaultTestEventTriggerDelegate.h"
+#pragma once
 
-#include <lib/support/CodeUtils.h>
-#include <lib/support/logging/CHIPLogging.h>
+struct AppEvent;
+typedef void (*EventHandler)(const AppEvent &);
 
-namespace chip {
-
-bool DefaultTestEventTriggerDelegate::DoesEnableKeyMatch(const ByteSpan & enableKey) const
+struct AppEvent
 {
-    return !mEnableKey.empty() && mEnableKey.data_equal(enableKey);
-}
-
-} // namespace chip
+    EventHandler Handler;
+};

examples/contact-sensor-app/nxp/common/include/AppTask.h

@@ -0,0 +1,50 @@
+/*
+ *
+ *    Copyright (c) 2024 Project CHIP Authors
+ *    All rights reserved.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+
+#pragma once
+
+#include "AppConfig.h"
+#include "AppTaskFreeRTOS.h"
+
+#include <platform/CHIPDeviceLayer.h>
+
+namespace ContactSensorApp {
+
+class AppTask : public chip::NXP::App::AppTaskFreeRTOS
+{
+public:
+    // AppTaskFreeRTOS virtual methods
+    void PreInitMatterStack() override;
+#if CONFIG_LOW_POWER
+    void AppMatter_DisallowDeviceToSleep() override;
+    void AppMatter_AllowDeviceToSleep() override;
+#endif
+
+    // This returns an instance of this class.
+    static AppTask & GetDefaultInstance();
+};
+
+} // namespace ContactSensorApp
+
+/**
+ * Returns the application-specific implementation of the AppTaskBase object.
+ *
+ * Applications can use this to gain access to features of the AppTaskBase
+ * that are specific to the selected application.
+ */
+chip::NXP::App::AppTaskBase & GetAppTask();