[nrf noup] Bypassed code generation at build time

Make chip_data_model.cmake correctly determine CHIP_ROOT
constant if that is not defined in the application CMake.

Also, use Python3 selected by CMake.

Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no>

[nrf noup] Bypassed code generation at build time

Allow to bypass codegen at build time.
Re-add removed callback-stub.cpp and plugin callback templates

Signed-off-by: Kamil Kasperczyk <kamil.kasperczyk@nordicsemi.no>
Signed-off-by: Damian Krolik <damian.krolik@nordicsemi.no>

[nrf noup] Fix the external cluster injection mechanism

The necessary change was reverted during the last upmerge.
Without this fix, the external cluster injection does not work.

Signed-off-by: Marcin Kajor <marcin.kajor@nordicsemi.no>

Author: Damian-Nordic

build/chip/chip_codegen.cmake

@@ -52,10 +52,10 @@ function(chip_codegen TARGET_NAME)
 
         # Python is expected to be in the path
         #
-        # find_package(Python3 REQUIRED)
+        find_package(Python3 REQUIRED)
         add_custom_command(
             OUTPUT ${OUT_NAMES}
-            COMMAND "${CHIP_ROOT}/scripts/codegen.py"
+            COMMAND ${Python3_EXECUTABLE} "${CHIP_ROOT}/scripts/codegen.py"
             ARGS "--generator" "${ARG_GENERATOR}"
                  "--output-dir" "${GEN_FOLDER}"
                  "--expected-outputs" "${GEN_FOLDER}/expected.outputs"

src/app/chip_data_model.cmake

@@ -16,6 +16,10 @@
 
 set(CHIP_APP_BASE_DIR ${CMAKE_CURRENT_LIST_DIR})
 
+if (NOT CHIP_ROOT)
+    get_filename_component(CHIP_ROOT ${CHIP_APP_BASE_DIR}/../.. REALPATH)
+endif()
+
 include("${CHIP_ROOT}/build/chip/chip_codegen.cmake")
 
 # Configure ${APP_TARGET} with source files associated with ${CLUSTER} cluster
@@ -57,20 +61,22 @@ endfunction()
 #
 # Configure ${APP_TARGET} based on the selected data model configuration.
 # Available options are:
-# SCOPE             CMake scope keyword that defines the scope of included sources.
-# The default is PRIVATE scope.
-# INCLUDE_SERVER    Include source files from src/app/server directory.
-# ZAP_FILE          Path to the ZAP file, used to determine the list of clusters
-# supported by the application.
-# IDL               .matter IDL file to use for codegen. Inferred from ZAP_FILE
-# if not provided
-# EXTERNAL_CLUSTERS Clusters with external implementations. The default implementations
-# will not be used nor required for these clusters.
-# Format: MY_CUSTOM_CLUSTER'.
+#   SCOPE           Cmake scope keyword that defines the scope of included sources
+#                   The default is PRIVATE scope.
+#   INCLUDE_SERVER  Include source files from src/app/server directory
+#   BYPASS_IDL      Bypass code generation from .matter IDL file.
+#   ZAP_FILE        Path to the ZAP file, used to determine the list of clusters
+#                   supported by the application.
+#   IDL             .matter IDL file to use for codegen. Inferred from ZAP_FILE
+#                   if not provided
+#   EXTERNAL_CLUSTERS Clusters with external implementations. The default implementations
+#                   will not be used nor required for these clusters.
+#                   Format: MY_CUSTOM_CLUSTER'.
 #
+
 function(chip_configure_data_model APP_TARGET)
     set(SCOPE PRIVATE)
-    cmake_parse_arguments(ARG "INCLUDE_SERVER" "SCOPE;ZAP_FILE;IDL" "EXTERNAL_CLUSTERS" ${ARGN})
+    cmake_parse_arguments(ARG "INCLUDE_SERVER;BYPASS_IDL" "SCOPE;ZAP_FILE;GEN_DIR;IDL" "EXTERNAL_CLUSTERS" ${ARGN})
 
     if(ARG_SCOPE)
         set(SCOPE ${ARG_SCOPE})
@@ -100,7 +106,7 @@ function(chip_configure_data_model APP_TARGET)
         endif()
     endif()
 
-    if(ARG_IDL)
+    if (ARG_IDL AND NOT ARG_BYPASS_IDL)
         chip_codegen(${APP_TARGET}-codegen
             INPUT "${ARG_IDL}"
             GENERATOR "cpp-app"
@@ -114,24 +120,30 @@ function(chip_configure_data_model APP_TARGET)
 
         target_include_directories(${APP_TARGET} ${SCOPE} "${APP_GEN_DIR}")
         add_dependencies(${APP_TARGET} ${APP_TARGET}-codegen)
+
+        chip_zapgen(${APP_TARGET}-zapgen
+            INPUT "${ARG_ZAP_FILE}"
+            GENERATOR "app-templates"
+            OUTPUTS
+            "zap-generated/access.h"
+            "zap-generated/CHIPClientCallbacks.h"
+            "zap-generated/endpoint_config.h"
+            "zap-generated/gen_config.h"
+            "zap-generated/IMClusterCommandHandler.cpp"
+            OUTPUT_PATH APP_TEMPLATES_GEN_DIR
+            OUTPUT_FILES APP_TEMPLATES_GEN_FILES
+        )
+        target_include_directories(${APP_TARGET} ${SCOPE} "${APP_TEMPLATES_GEN_DIR}")
+        add_dependencies(${APP_TARGET} ${APP_TARGET}-zapgen)
     else()
-        set(APP_GEN_FILES)
+        target_compile_definitions(${APP_TARGET} PRIVATE CHIP_BYPASS_IDL)
+        target_include_directories(${APP_TARGET} ${SCOPE} ${ARG_GEN_DIR})
+        set(APP_GEN_FILES
+            ${ARG_GEN_DIR}/callback-stub.cpp
+            ${ARG_GEN_DIR}/IMClusterCommandHandler.cpp
+        )
     endif()
 
-    chip_zapgen(${APP_TARGET}-zapgen
-        INPUT "${ARG_ZAP_FILE}"
-        GENERATOR "app-templates"
-        OUTPUTS
-        "zap-generated/access.h"
-        "zap-generated/endpoint_config.h"
-        "zap-generated/gen_config.h"
-        "zap-generated/IMClusterCommandHandler.cpp"
-        OUTPUT_PATH APP_TEMPLATES_GEN_DIR
-        OUTPUT_FILES APP_TEMPLATES_GEN_FILES
-    )
-    target_include_directories(${APP_TARGET} ${SCOPE} "${APP_TEMPLATES_GEN_DIR}")
-    add_dependencies(${APP_TARGET} ${APP_TARGET}-zapgen)
-
     target_sources(${APP_TARGET} ${SCOPE}
         ${CHIP_APP_BASE_DIR}/../../zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp
         ${CHIP_APP_BASE_DIR}/../../zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp

src/app/util/util.cpp

@@ -29,8 +29,11 @@
 #include <lib/core/CHIPEncoding.h>
 #include <protocols/interaction_model/StatusCode.h>
 
-// TODO: figure out a clear path for compile-time codegen
+#ifdef CHIP_BYPASS_IDL
+#include <zap-generated/PluginApplicationCallbacks.h>
+#else
 #include <app/PluginApplicationCallbacks.h>
+#endif
 
 using namespace chip;
 

src/app/zap-templates/app-templates.json

@@ -20,6 +20,16 @@
         }
     ],
     "templates": [
+        {
+            "path": "templates/app/callbacks/PluginApplicationCallbacks.zapt",
+            "name": "Matter Application Callbacks header",
+            "output": "PluginApplicationCallbacks.h"
+        },
+        {
+            "path": "templates/app/callback-stub-src.zapt",
+            "name": "ZCL callback-stub source",
+            "output": "callback-stub.cpp"
+        },
         {
             "path": "templates/app/endpoint_config.zapt",
             "name": "ZCL endpoint configuration",
@@ -41,4 +51,4 @@
             "output": "access.h"
         }
     ]
-}
+}

src/app/zap-templates/templates/app/callback-stub-src.zapt

@@ -0,0 +1,32 @@
+{{> header}}
+
+#include <app-common/zap-generated/callback.h>
+#include <app-common/zap-generated/ids/Clusters.h>
+#include <lib/support/Span.h>
+#include <protocols/interaction_model/Constants.h>
+
+using namespace chip;
+
+// Cluster Init Functions
+void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
+{
+    switch (clusterId)
+    {
+    {{#all_user_clusters_names}}
+    case app::Clusters::{{asUpperCamelCase name}}::Id:
+        emberAf{{asUpperCamelCase name}}ClusterInitCallback(endpoint);
+        break;
+    {{/all_user_clusters_names}}
+    default:
+        // Unrecognized cluster ID
+        break;
+    }
+}
+
+{{#all_user_clusters_names}}
+void __attribute__((weak)) emberAf{{asUpperCamelCase name}}ClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+{{/all_user_clusters_names}}

src/app/zap-templates/templates/app/callbacks/PluginApplicationCallbacks.zapt

@@ -0,0 +1,9 @@
+{{> header}}
+
+#pragma once
+
+{{#chip_server_clusters}}
+void Matter{{asUpperCamelCase name}}Plugin{{asUpperCamelCase side}}InitCallback();
+{{/chip_server_clusters}}
+
+#define MATTER_PLUGINS_INIT {{#chip_server_clusters}}Matter{{asUpperCamelCase name}}Plugin{{asUpperCamelCase side}}InitCallback(); {{/chip_server_clusters}}