project-chip · andy31415 · Nov 19, 2022 · Nov 3, 2022 · Nov 4, 2022 · Nov 4, 2022
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -103,6 +103,8 @@ jobs:
                      if [ "$idl_file" = "./scripts/idl/tests/inputs/optional_argument.matter" ]; then continue; fi
                      if [ "$idl_file" = "./scripts/idl/tests/inputs/several_clusters.matter" ]; then continue; fi
                      if [ "$idl_file" = "./scripts/idl/tests/inputs/simple_attribute.matter" ]; then continue; fi
+                     if [ "$idl_file" = "./scripts/idl/tests/inputs/large_lighting_app.matter" ]; then continue; fi
+                     if [ "$idl_file" = "./scripts/idl/tests/inputs/large_all_clusters_app.matter" ]; then continue; fi
 
                      ./scripts/run_in_build_env.sh "./scripts/idl_lint.py --log-level warn $idl_file" >/dev/null || exit 1
                  done

diff --git a/build/chip/chip_codegen.cmake b/build/chip/chip_codegen.cmake
@@ -51,7 +51,7 @@ function(chip_codegen TARGET_NAME)
     #
     # find_package(Python3 REQUIRED)
     add_custom_command(
-        OUTPUT "${OUT_NAMES}"
+        OUTPUT ${OUT_NAMES}
         COMMAND "${CHIP_ROOT}/scripts/codegen.py"
         ARGS "--generator" "${ARG_GENERATOR}"
              "--output-dir" "${GEN_FOLDER}"

@@ -34,12 +34,15 @@ macro(chip_app_component_codegen IDL_NAME)
       GENERATOR "cpp-app"
       OUTPUTS
             "app/PluginApplicationCallbacks.h"
+            "app/callback-stub.cpp"
       OUTPUT_PATH   APP_GEN_DIR
       OUTPUT_FILES  APP_GEN_FILES
     )
 
     target_include_directories(${COMPONENT_LIB} PUBLIC "${APP_GEN_DIR}")
 
     add_dependencies(${COMPONENT_LIB} app-codegen)
+
+    target_sources(${COMPONENT_LIB} PRIVATE ${APP_GEN_FILES})
   endif()
 endmacro()
diff --git a/config/mbed/CMakeLists.txt b/config/mbed/CMakeLists.txt
@@ -489,18 +489,11 @@ if (NOT ${APP_TARGET} MATCHES "shell")
         ${CHIP_ROOT}/src/app/clusters/ota-requestor/ota-requestor-server.cpp
     )
 else()
-    include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
-    chip_configure_data_model(${APP_TARGET}
-        ZAP_FILE ${CHIP_ROOT}/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
-        GEN_DIR ${CHIP_ROOT}/zzz_generated/ota-requestor-app/zap-generated
-    )
-    target_include_directories(${APP_TARGET} PRIVATE
-                           ${GEN_DIR}/ota-requestor-app
-    )
-    target_sources(${APP_TARGET} PRIVATE
-               ${GEN_DIR}//ota-requestor-app/zap-generated/callback-stub.cpp
-               ${GEN_DIR}/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp
-    )
+    target_include_directories(${APP_TARGET} 
+        PRIVATE ${GEN_DIR}/ota-requestor-app)
+
+    target_sources(${APP_TARGET} 
+        PRIVATE ${GEN_DIR}/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp)
 endif()
 
     list(APPEND CHIP_DEFINES

diff --git a/examples/all-clusters-app/ameba/chip_main.cmake b/examples/all-clusters-app/ameba/chip_main.cmake
@@ -149,7 +149,6 @@ endif (matter_enable_ota_requestor)
 list(
     APPEND ${list_chip_main_sources}
 
-    ${chip_dir}/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp
     ${chip_dir}/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp
 
     ${chip_dir}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp

diff --git a/examples/all-clusters-app/mbed/CMakeLists.txt b/examples/all-clusters-app/mbed/CMakeLists.txt
@@ -57,7 +57,6 @@ target_include_directories(${APP_TARGET} PRIVATE
 target_sources(${APP_TARGET} PRIVATE
                main/main.cpp
                main/AppTask.cpp
-               ${GEN_DIR}/all-clusters-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp
                ${MBED_COMMON}/util/LEDWidget.cpp
                ${MBED_COMMON}/util/DFUManager.cpp

@@ -59,7 +59,6 @@ target_sources(app PRIVATE
                ${ALL_CLUSTERS_COMMON_DIR}/src/static-supported-modes-manager.cpp
                ${ALL_CLUSTERS_COMMON_DIR}/src/bridged-actions-stub.cpp
                ${ALL_CLUSTERS_COMMON_DIR}/src/binding-handler.cpp
-               ${GEN_DIR}/all-clusters-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp
                ${NRFCONNECT_COMMON}/util/LEDWidget.cpp)
 

@@ -1617,7 +1617,7 @@ EmberAfStatus emberAfExternalAttributeReadCallback(EndpointId endpoint, ClusterI
                                                    uint16_t maxReadLength)
 {
     // Added for the pairing of TE9 to report the commission_info
-    // default function (in zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp)
+    // default function (in callback-stub.cpp)
     //
     PRINTF("-> %s()\n\r", __FUNCTION__);
     return EMBER_ZCL_STATUS_SUCCESS;

diff --git a/examples/all-clusters-app/telink/CMakeLists.txt b/examples/all-clusters-app/telink/CMakeLists.txt
@@ -55,7 +55,6 @@ target_sources(app PRIVATE
                ${ALL_CLUSTERS_COMMON_DIR}/src/static-supported-modes-manager.cpp
                ${ALL_CLUSTERS_COMMON_DIR}/src/bridged-actions-stub.cpp
                ${ALL_CLUSTERS_COMMON_DIR}/src/binding-handler.cpp
-               ${GEN_DIR}/all-clusters-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp
                ${TELINK_COMMON}/util/src/LEDWidget.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp

diff --git a/examples/all-clusters-minimal-app/ameba/chip_main.cmake b/examples/all-clusters-minimal-app/ameba/chip_main.cmake
@@ -128,7 +128,6 @@ endif (matter_enable_ota_requestor)
 list(
     APPEND ${list_chip_main_sources}
 
-    ${chip_dir}/zzz_generated/all-clusters-minimal-app/zap-generated/callback-stub.cpp
     ${chip_dir}/zzz_generated/all-clusters-minimal-app/zap-generated/IMClusterCommandHandler.cpp
 
     ${chip_dir}/examples/all-clusters-minimal-app/all-clusters-common/src/bridged-actions-stub.cpp

diff --git a/examples/all-clusters-minimal-app/mbed/CMakeLists.txt b/examples/all-clusters-minimal-app/mbed/CMakeLists.txt
@@ -57,7 +57,6 @@ target_include_directories(${APP_TARGET} PRIVATE
 target_sources(${APP_TARGET} PRIVATE
                main/main.cpp
                main/AppTask.cpp
-               ${GEN_DIR}/all-clusters-minimal-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/all-clusters-minimal-app/zap-generated/IMClusterCommandHandler.cpp
                ${MBED_COMMON}/util/LEDWidget.cpp
                ${MBED_COMMON}/util/DFUManager.cpp

@@ -58,7 +58,6 @@ target_sources(app PRIVATE
                ${ALL_CLUSTERS_COMMON_DIR}/src/static-supported-modes-manager.cpp
                ${ALL_CLUSTERS_COMMON_DIR}/src/bridged-actions-stub.cpp
                ${ALL_CLUSTERS_COMMON_DIR}/src/binding-handler.cpp
-               ${GEN_DIR}/all-clusters-minimal-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/all-clusters-minimal-app/zap-generated/IMClusterCommandHandler.cpp
                ${NRFCONNECT_COMMON}/util/LEDWidget.cpp)
 

diff --git a/examples/all-clusters-minimal-app/telink/CMakeLists.txt b/examples/all-clusters-minimal-app/telink/CMakeLists.txt
@@ -54,7 +54,6 @@ target_sources(app PRIVATE
                ${ALL_CLUSTERS_COMMON_DIR}/src/static-supported-modes-manager.cpp
                ${ALL_CLUSTERS_COMMON_DIR}/src/bridged-actions-stub.cpp
                ${ALL_CLUSTERS_COMMON_DIR}/src/binding-handler.cpp
-               ${GEN_DIR}/all-clusters-minimal-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/all-clusters-minimal-app/zap-generated/IMClusterCommandHandler.cpp
                ${TELINK_COMMON}/util/src/LEDWidget.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp

diff --git a/examples/chef/ameba/chip_main.cmake b/examples/chef/ameba/chip_main.cmake
@@ -35,7 +35,6 @@ endif (matter_enable_ota_requestor)
 list(
     APPEND ${list_chip_main_sources}
 
-    ${chip_dir}/examples/chef/out/${SAMPLE_NAME}/zap-generated/callback-stub.cpp
     ${chip_dir}/examples/chef/out/${SAMPLE_NAME}/zap-generated/IMClusterCommandHandler.cpp
 
     ${matter_example_path}//main/chipinterface.cpp

@@ -86,7 +86,6 @@ endif (CONFIG_ENABLE_CHIP_SHELL)
 target_sources(app PRIVATE
     ${CHEF}/nrfconnect/main.cpp
     ${CHEF}/common/stubs.cpp
-    ${GEN_DIR}/callback-stub.cpp
     ${GEN_DIR}/IMClusterCommandHandler.cpp
 )
 

diff --git a/examples/light-switch-app/ameba/chip_main.cmake b/examples/light-switch-app/ameba/chip_main.cmake
@@ -149,7 +149,6 @@ endif (matter_enable_ota_requestor)
 list(
     APPEND ${list_chip_main_sources}
 
-    ${chip_dir}/zzz_generated/light-switch-app/zap-generated/callback-stub.cpp
     ${chip_dir}/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp
 
     ${chip_dir}/examples/light-switch-app/ameba/main/chipinterface.cpp

@@ -58,7 +58,6 @@ target_sources(app PRIVATE
                main/LightSwitch.cpp
                main/ShellCommands.cpp
                main/BindingHandler.cpp
-               ${GEN_DIR}/light-switch-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/light-switch-app/zap-generated/IMClusterCommandHandler.cpp
                ${NRFCONNECT_COMMON}/util/LEDWidget.cpp)
 

diff --git a/examples/light-switch-app/telink/CMakeLists.txt b/examples/light-switch-app/telink/CMakeLists.txt
@@ -52,7 +52,6 @@ target_sources(app PRIVATE
                src/main.cpp
                src/ZclCallbacks.cpp
                src/binding-handler.cpp
-               ${GEN_DIR}/light-switch-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/light-switch-app/zap-generated/IMClusterCommandHandler.cpp
                ${TELINK_COMMON}/util/src/LEDWidget.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp

diff --git a/examples/lighting-app/ameba/chip_main.cmake b/examples/lighting-app/ameba/chip_main.cmake
@@ -141,7 +141,6 @@ endif (matter_enable_ota_requestor)
 list(
     APPEND ${list_chip_main_sources}
 
-    ${chip_dir}/zzz_generated/lighting-app/zap-generated/callback-stub.cpp
     ${chip_dir}/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp
 
     ${chip_dir}/examples/lighting-app/lighting-common/src/ColorFormat.cpp

diff --git a/examples/lighting-app/mbed/CMakeLists.txt b/examples/lighting-app/mbed/CMakeLists.txt
@@ -57,7 +57,6 @@ target_sources(${APP_TARGET} PRIVATE
                main/LightingManager.cpp
                main/main.cpp
                main/ZclCallbacks.cpp
-               ${GEN_DIR}/lighting-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/lighting-app/zap-generated/IMClusterCommandHandler.cpp
                ${MBED_COMMON}/util/LEDWidget.cpp
                ${MBED_COMMON}/util/DFUManager.cpp

@@ -58,7 +58,6 @@ target_sources(app PRIVATE
                main/AppTask.cpp
                main/main.cpp
                main/ZclCallbacks.cpp
-               ${GEN_DIR}/lighting-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/lighting-app/zap-generated/IMClusterCommandHandler.cpp
                ${NRFCONNECT_COMMON}/util/LEDWidget.cpp
                ${NRFCONNECT_COMMON}/util/PWMDevice.cpp)

diff --git a/examples/lighting-app/telink/CMakeLists.txt b/examples/lighting-app/telink/CMakeLists.txt
@@ -52,7 +52,6 @@ target_sources(app PRIVATE
                src/LightingManager.cpp
                src/main.cpp
                src/ZclCallbacks.cpp
-               ${GEN_DIR}/lighting-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/lighting-app/zap-generated/IMClusterCommandHandler.cpp
                ${TELINK_COMMON}/util/src/LEDWidget.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp

diff --git a/examples/lock-app/mbed/CMakeLists.txt b/examples/lock-app/mbed/CMakeLists.txt
@@ -57,7 +57,6 @@ target_sources(${APP_TARGET} PRIVATE
                main/BoltLockManager.cpp
                main/main.cpp
                main/ZclCallbacks.cpp
-               ${GEN_DIR}/lock-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/lock-app/zap-generated/IMClusterCommandHandler.cpp
                ${MBED_COMMON}/util/LEDWidget.cpp
                ${MBED_COMMON}/util/DFUManager.cpp

@@ -56,7 +56,6 @@ target_sources(app PRIVATE
                main/BoltLockManager.cpp
                main/main.cpp
                main/ZclCallbacks.cpp
-               ${GEN_DIR}/lock-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/lock-app/zap-generated/IMClusterCommandHandler.cpp
                ${NRFCONNECT_COMMON}/util/LEDWidget.cpp)
 

diff --git a/examples/ota-requestor-app/ameba/chip_main.cmake b/examples/ota-requestor-app/ameba/chip_main.cmake
@@ -13,7 +13,6 @@ include(${prj_root}/GCC-RELEASE/project_hp/asdk/includepath.cmake)
 list(
     APPEND ${list_chip_main_sources}
 
-    ${chip_dir}/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp
     ${chip_dir}/zzz_generated/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp
 
     ${chip_dir}/examples/ota-requestor-app/ameba/main/chipinterface.cpp

diff --git a/examples/ota-requestor-app/mbed/CMakeLists.txt b/examples/ota-requestor-app/mbed/CMakeLists.txt
@@ -55,7 +55,6 @@ target_include_directories(${APP_TARGET} PRIVATE
 target_sources(${APP_TARGET} PRIVATE
                main/main.cpp
                main/AppTask.cpp
-               ${GEN_DIR}//ota-requestor-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp
                ${MBED_COMMON}/util/LEDWidget.cpp
                ${MBED_COMMON}/util/DFUManager.cpp

diff --git a/examples/ota-requestor-app/telink/CMakeLists.txt b/examples/ota-requestor-app/telink/CMakeLists.txt
@@ -51,7 +51,6 @@ target_sources(app PRIVATE
                src/AppTask.cpp
                src/main.cpp
                src/ZclCallbacks.cpp
-               ${GEN_DIR}/ota-requestor-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/ota-requestor-app/zap-generated/IMClusterCommandHandler.cpp
                ${TELINK_COMMON}/util/src/LEDWidget.cpp
                ${TELINK_COMMON}/util/src/ButtonManager.cpp

@@ -56,7 +56,6 @@ target_sources(app PRIVATE
                main/PumpManager.cpp
                main/main.cpp
                main/ZclCallbacks.cpp
-               ${GEN_DIR}/pump-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/pump-app/zap-generated/IMClusterCommandHandler.cpp
                ${NRFCONNECT_COMMON}/util/LEDWidget.cpp)
 

@@ -56,7 +56,6 @@ target_sources(app PRIVATE
                main/PumpManager.cpp
                main/main.cpp
                main/ZclCallbacks.cpp
-               ${GEN_DIR}/pump-controller-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp
                ${NRFCONNECT_COMMON}/util/LEDWidget.cpp)
 

diff --git a/examples/shell/mbed/CMakeLists.txt b/examples/shell/mbed/CMakeLists.txt
@@ -32,6 +32,7 @@ if(MBED_TARGET STREQUAL "CY8CPROTO_062_4343W" AND BOOT_ENABLED)
     list(REMOVE_ITEM MBED_TARGET_LABELS CM0P_SLEEP)
     list(REMOVE_ITEM MBED_TARGET_DEFINITIONS COMPONENT_CM0P_SLEEP=1)
 endif()
+include(${CHIP_ROOT}/src/app/chip_data_model.cmake)
 
 project(${APP_TARGET})
 
@@ -62,6 +63,11 @@ target_sources(${APP_TARGET} PRIVATE
                ${MBED_COMMON}/util/DFUManager.cpp
 )
 
+chip_configure_data_model(${APP_TARGET}
+    ZAP_FILE ${CHIP_ROOT}/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
+    GEN_DIR ${CHIP_ROOT}/zzz_generated/ota-requestor-app/zap-generated
+)
+
 target_link_libraries(${APP_TARGET} mbed-os-posix-socket mbed-os mbed-ble mbed-events mbed-netsocket mbed-storage mbed-storage-kv-global-api mbed-mbedtls mbed-emac chip)
 
 if(MBED_TARGET STREQUAL "CY8CPROTO_062_4343W")

@@ -58,7 +58,6 @@ target_sources(app PRIVATE
                main/main.cpp
                main/ZclCallbacks.cpp
                main/WindowCovering.cpp
-               ${GEN_DIR}/window-app/zap-generated/callback-stub.cpp
                ${GEN_DIR}/window-app/zap-generated/IMClusterCommandHandler.cpp
                ${NRFCONNECT_COMMON}/util/LEDWidget.cpp
                ${NRFCONNECT_COMMON}/util/PWMDevice.cpp)

diff --git a/...ates/templates/app/callback-stub-src.zapt → .../cpp/application/CallbackStubSource.jinja b/...ates/templates/app/callback-stub-src.zapt → .../cpp/application/CallbackStubSource.jinja
@@ -1,5 +1,3 @@
-{{> header}}
-
 #include <app-common/zap-generated/callback.h>
 #include <app-common/zap-generated/cluster-id.h>
 #include <lib/support/Span.h>
@@ -12,21 +10,21 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
 {
     switch (clusterId)
     {
-    {{#all_user_clusters_names}}
-     case ZCL_{{asDelimitedMacro define}}_ID :
-        emberAf{{asUpperCamelCase name}}ClusterInitCallback(endpoint);
+  {%- for name in clusters | sort(attribute='name') | map(attribute='name') | unique %}
+    case ZCL_{{name | normalize_acronyms | constcase}}_CLUSTER_ID:
+        emberAf{{name}}ClusterInitCallback(endpoint);
         break;
-    {{/all_user_clusters_names}}
+  {%- endfor %}
     default:
         // Unrecognized cluster ID
         break;
     }
 }
 
-{{#all_user_clusters_names}}
-void __attribute__((weak)) emberAf{{asUpperCamelCase name}}ClusterInitCallback(EndpointId endpoint)
+{%- for name in clusters | sort(attribute='name') | map(attribute='name') | unique %}
+void __attribute__((weak)) emberAf{{name}}ClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
     (void) endpoint;
 }
-{{/all_user_clusters_names}}
+{%- endfor %}
diff --git a/scripts/idl/generators/cpp/application/__init__.py b/scripts/idl/generators/cpp/application/__init__.py
@@ -54,3 +54,13 @@ def internal_render_all(self):
                 'clusters': self.idl.clusters,
             }
         )
+
+        # Source for __attribute__(weak) implementations of all cluster
+        # initialization methods
+        self.internal_render_one_output(
+            template_path="cpp/application/CallbackStubSource.jinja",
+            output_file_name="app/callback-stub.cpp",
+            vars={
+                'clusters': self.idl.clusters,
+            }
+        )
diff --git a/scripts/idl/generators/filters.py b/scripts/idl/generators/filters.py
@@ -12,10 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import logging
 import stringcase
 
 
+def normalize_acronyms(s: str) -> str:
+    """Replaces variations of acronyms when converting various words.
+
+       Specifically when considering how to generate a CONST_CASE constant,
+       strings such as WiFi should not be WI_FI but rather WIFI
+    """
+    return s.replace('WiFi', 'Wifi').replace('WI_FI', 'WIFI')
+
+
 def RegisterCommonFilters(filtermap):
     """
     Register filters that are NOT considered platform-generator specific.
@@ -32,3 +40,5 @@ def RegisterCommonFilters(filtermap):
     filtermap['pascalcase'] = stringcase.pascalcase
     filtermap['snakecase'] = stringcase.snakecase
     filtermap['spinalcase'] = stringcase.spinalcase
+
+    filtermap['normalize_acronyms'] = normalize_acronyms
diff --git a/scripts/idl/tests/available_tests.yaml b/scripts/idl/tests/available_tests.yaml
@@ -62,3 +62,12 @@ bridge:
 cpp-app:
     inputs/several_clusters.matter:
         app/PluginApplicationCallbacks.h: outputs/several_clusters/cpp-app/PluginApplicationCallbacks.h
+        app/callback-stub.cpp: outputs/several_clusters/cpp-app/callback-stub.cpp
+
+    inputs/large_all_clusters_app.matter:
+        app/PluginApplicationCallbacks.h: outputs/large_all_clusters_app/cpp-app/PluginApplicationCallbacks.h
+        app/callback-stub.cpp: outputs/large_all_clusters_app/cpp-app/callback-stub.cpp
+
+    inputs/large_lighting_app.matter:
+        app/PluginApplicationCallbacks.h: outputs/large_lighting_app/cpp-app/PluginApplicationCallbacks.h
+        app/callback-stub.cpp: outputs/large_lighting_app/cpp-app/callback-stub.cpp