diff --git a/build/chip/linux/gdbus_library.gni b/build/chip/linux/gdbus_library.gni index 3c2a734daddb2a..11424b14d341d2 100644 --- a/build/chip/linux/gdbus_library.gni +++ b/build/chip/linux/gdbus_library.gni @@ -29,10 +29,10 @@ template("gdbus_library") { assert(defined(invoker.dbus_out_dir), "Please specify dbus_out_dir") dbus_out_dir = invoker.dbus_out_dir - dbus_gen_dir = "${root_gen_dir}/${dbus_out_dir}" + dbus_gen_dir = "${root_gen_dir}/include/${dbus_out_dir}" config("${library_name}_config") { - include_dirs = [ root_gen_dir ] + include_dirs = [ "${root_gen_dir}/include" ] } dbus_sources = [] diff --git a/config/esp32/components/chip/CMakeLists.txt b/config/esp32/components/chip/CMakeLists.txt index e1d77cc7b08e2f..994a5b73a83e20 100644 --- a/config/esp32/components/chip/CMakeLists.txt +++ b/config/esp32/components/chip/CMakeLists.txt @@ -133,14 +133,13 @@ target_include_directories(${COMPONENT_LIB} PRIVATE target_include_directories(${COMPONENT_LIB} INTERFACE "${CHIP_ROOT}/src/platform/ESP32" - "${CHIP_ROOT}/src/include/" + "${CHIP_ROOT}/src/include" "${CHIP_ROOT}/src/lib" - "${CHIP_ROOT}/src/" - "${CHIP_ROOT}/src/system" + "${CHIP_ROOT}/src" "${CHIP_ROOT}/third_party/nlassert/repo/include" + "${CHIP_ROOT}/third_party/nlio/repo/include" "${CMAKE_CURRENT_BINARY_DIR}/src/include" "${CMAKE_CURRENT_BINARY_DIR}/include" - "${CMAKE_CURRENT_BINARY_DIR}/gen/third_party/connectedhomeip/src/app/include" "${CMAKE_CURRENT_BINARY_DIR}/gen/include" ) diff --git a/config/nrfconnect/chip-module/CMakeLists.txt b/config/nrfconnect/chip-module/CMakeLists.txt index d2a5ab5d956f35..91c5ad83c29bd9 100644 --- a/config/nrfconnect/chip-module/CMakeLists.txt +++ b/config/nrfconnect/chip-module/CMakeLists.txt @@ -259,14 +259,10 @@ zephyr_interface_library_named(chip) target_compile_definitions(chip INTERFACE CHIP_HAVE_CONFIG_H) target_include_directories(chip INTERFACE ${CHIP_ROOT}/src - ${CHIP_ROOT}/src/app/server - ${CHIP_ROOT}/src/app/util ${CHIP_ROOT}/src/include ${CHIP_ROOT}/src/lib - ${CHIP_ROOT}/src/lib/core ${CHIP_ROOT}/third_party/nlassert/repo/include ${CMAKE_CURRENT_BINARY_DIR}/gen/include - ${CMAKE_CURRENT_BINARY_DIR}/gen/third_party/connectedhomeip/src/app/include ) target_link_directories(chip INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/lib) target_link_libraries(chip INTERFACE -Wl,--whole-archive ${CHIP_ZEPHYR_SHELL_LIBRARY} -Wl,--no-whole-archive,--start-group ${CHIP_LIBRARIES} -Wl,--end-group) diff --git a/examples/all-clusters-app/all-clusters-common/gen/IMClusterCommandHandler.cpp b/examples/all-clusters-app/all-clusters-common/gen/IMClusterCommandHandler.cpp index fffa76890b94e8..5e448886555b09 100644 --- a/examples/all-clusters-app/all-clusters-common/gen/IMClusterCommandHandler.cpp +++ b/examples/all-clusters-app/all-clusters-common/gen/IMClusterCommandHandler.cpp @@ -30,7 +30,7 @@ #include // Currently we need some work to keep compatible with ember lib. -#include +#include namespace chip { namespace app { diff --git a/examples/all-clusters-app/all-clusters-common/gen/af-structs.h b/examples/all-clusters-app/all-clusters-common/gen/af-structs.h index 1d625494da0490..b19ca54657a27a 100644 --- a/examples/all-clusters-app/all-clusters-common/gen/af-structs.h +++ b/examples/all-clusters-app/all-clusters-common/gen/af-structs.h @@ -20,8 +20,8 @@ // Prevent multiple inclusion #pragma once -#include "basic-types.h" #include "enums.h" +#include #include // Struct for ApplicationLauncherApp diff --git a/examples/all-clusters-app/all-clusters-common/gen/call-command-handler.h b/examples/all-clusters-app/all-clusters-common/gen/call-command-handler.h index 16314d83b9817f..50a4e86fb253b3 100644 --- a/examples/all-clusters-app/all-clusters-common/gen/call-command-handler.h +++ b/examples/all-clusters-app/all-clusters-common/gen/call-command-handler.h @@ -20,4 +20,4 @@ // Prevent multiple inclusion #pragma once -#include "af-types.h" +#include diff --git a/examples/all-clusters-app/all-clusters-common/gen/callback.h b/examples/all-clusters-app/all-clusters-common/gen/callback.h index 431353fe304e03..c530ab29c6fa6f 100644 --- a/examples/all-clusters-app/all-clusters-common/gen/callback.h +++ b/examples/all-clusters-app/all-clusters-common/gen/callback.h @@ -21,8 +21,8 @@ #pragma once #include "af-structs.h" -#include "af-types.h" -#include "basic-types.h" +#include +#include #include #include diff --git a/examples/all-clusters-app/esp32/main/CMakeLists.txt b/examples/all-clusters-app/esp32/main/CMakeLists.txt index 0fd8b5b4628f41..3931a2d997b03f 100644 --- a/examples/all-clusters-app/esp32/main/CMakeLists.txt +++ b/examples/all-clusters-app/esp32/main/CMakeLists.txt @@ -18,9 +18,6 @@ # (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.) # The list of src and include dirs must be in sync with that in all-clusters-app/esp32/main/component.mk idf_component_register(PRIV_INCLUDE_DIRS - "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/util" - "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app" - "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/server" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/all-clusters-app/all-clusters-common" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/third_party/nlio/repo/include" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src" diff --git a/examples/all-clusters-app/esp32/main/include/CHIPDeviceManager.h b/examples/all-clusters-app/esp32/main/include/CHIPDeviceManager.h index eb5171e70c3a90..8270de21f628fd 100644 --- a/examples/all-clusters-app/esp32/main/include/CHIPDeviceManager.h +++ b/examples/all-clusters-app/esp32/main/include/CHIPDeviceManager.h @@ -35,7 +35,7 @@ #include #include -#include "af-types.h" +#include namespace chip { namespace DeviceManager { diff --git a/examples/all-clusters-app/esp32/main/main.cpp b/examples/all-clusters-app/esp32/main/main.cpp index 45829351eced36..c56357eb05a259 100644 --- a/examples/all-clusters-app/esp32/main/main.cpp +++ b/examples/all-clusters-app/esp32/main/main.cpp @@ -15,7 +15,6 @@ * limitations under the License. */ -#include "AppDelegate.h" #include "BluetoothWidget.h" #include "Button.h" #include "CHIPDeviceManager.h" @@ -24,10 +23,8 @@ #include "Globals.h" #include "LEDWidget.h" #include "ListScreen.h" -#include "OnboardingCodesUtil.h" #include "QRCodeScreen.h" #include "ScreenManager.h" -#include "Server.h" #include "WiFiWidget.h" #include "esp_heap_caps_init.h" #include "esp_log.h" @@ -48,8 +45,11 @@ #include #include +#include +#include +#include +#include #include -#include #include #include #include diff --git a/examples/all-clusters-app/linux/main.cpp b/examples/all-clusters-app/linux/main.cpp index 1db5f5aba6daeb..87772112e20620 100644 --- a/examples/all-clusters-app/linux/main.cpp +++ b/examples/all-clusters-app/linux/main.cpp @@ -19,20 +19,20 @@ #include #include -#include "af.h" #include "gen/attribute-id.h" #include "gen/cluster-id.h" #include #include #include #include +#include #include #include #include #include #include -#include "Server.h" +#include #include #include diff --git a/examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp b/examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp index 9fab92cf21ac63..1a3367df6a222c 100644 --- a/examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp +++ b/examples/bridge-app/bridge-common/gen/IMClusterCommandHandler.cpp @@ -30,7 +30,7 @@ #include // Currently we need some work to keep compatible with ember lib. -#include +#include namespace chip { namespace app { diff --git a/examples/bridge-app/bridge-common/gen/af-structs.h b/examples/bridge-app/bridge-common/gen/af-structs.h index 1d625494da0490..b19ca54657a27a 100644 --- a/examples/bridge-app/bridge-common/gen/af-structs.h +++ b/examples/bridge-app/bridge-common/gen/af-structs.h @@ -20,8 +20,8 @@ // Prevent multiple inclusion #pragma once -#include "basic-types.h" #include "enums.h" +#include #include // Struct for ApplicationLauncherApp diff --git a/examples/bridge-app/bridge-common/gen/call-command-handler.h b/examples/bridge-app/bridge-common/gen/call-command-handler.h index 16314d83b9817f..50a4e86fb253b3 100644 --- a/examples/bridge-app/bridge-common/gen/call-command-handler.h +++ b/examples/bridge-app/bridge-common/gen/call-command-handler.h @@ -20,4 +20,4 @@ // Prevent multiple inclusion #pragma once -#include "af-types.h" +#include diff --git a/examples/bridge-app/bridge-common/gen/callback.h b/examples/bridge-app/bridge-common/gen/callback.h index 20aceab56660c5..2caab42c052fc4 100644 --- a/examples/bridge-app/bridge-common/gen/callback.h +++ b/examples/bridge-app/bridge-common/gen/callback.h @@ -21,8 +21,8 @@ #pragma once #include "af-structs.h" -#include "af-types.h" -#include "basic-types.h" +#include +#include #include #include diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp index bc721b0416ef68..b96b3b1c9cf1fd 100644 --- a/examples/bridge-app/linux/main.cpp +++ b/examples/bridge-app/linux/main.cpp @@ -19,11 +19,11 @@ #include #include -#include "af.h" #include "gen/attribute-id.h" #include "gen/cluster-id.h" #include #include +#include #include #include #include @@ -34,7 +34,7 @@ #include "LightingManager.h" #include "Options.h" -#include "Server.h" +#include #include #include diff --git a/examples/chip-tool/commands/common/Command.h b/examples/chip-tool/commands/common/Command.h index f5fd9be52b1f15..db847b9bd7d991 100644 --- a/examples/chip-tool/commands/common/Command.h +++ b/examples/chip-tool/commands/common/Command.h @@ -18,7 +18,7 @@ #pragma once -#include +#include #include #include #include diff --git a/examples/chip-tool/gen/IMClusterCommandHandler.cpp b/examples/chip-tool/gen/IMClusterCommandHandler.cpp index 0bf873c7940820..943a2f7974f848 100644 --- a/examples/chip-tool/gen/IMClusterCommandHandler.cpp +++ b/examples/chip-tool/gen/IMClusterCommandHandler.cpp @@ -30,7 +30,7 @@ #include // Currently we need some work to keep compatible with ember lib. -#include +#include namespace chip { namespace app { diff --git a/examples/chip-tool/gen/af-structs.h b/examples/chip-tool/gen/af-structs.h index 1d625494da0490..b19ca54657a27a 100644 --- a/examples/chip-tool/gen/af-structs.h +++ b/examples/chip-tool/gen/af-structs.h @@ -20,8 +20,8 @@ // Prevent multiple inclusion #pragma once -#include "basic-types.h" #include "enums.h" +#include #include // Struct for ApplicationLauncherApp diff --git a/examples/chip-tool/gen/call-command-handler.h b/examples/chip-tool/gen/call-command-handler.h index 16314d83b9817f..50a4e86fb253b3 100644 --- a/examples/chip-tool/gen/call-command-handler.h +++ b/examples/chip-tool/gen/call-command-handler.h @@ -20,4 +20,4 @@ // Prevent multiple inclusion #pragma once -#include "af-types.h" +#include diff --git a/examples/chip-tool/gen/callback.h b/examples/chip-tool/gen/callback.h index 5c85b60660941a..52da9c9c09f403 100644 --- a/examples/chip-tool/gen/callback.h +++ b/examples/chip-tool/gen/callback.h @@ -21,8 +21,8 @@ #pragma once #include "af-structs.h" -#include "af-types.h" -#include "basic-types.h" +#include +#include #include #include diff --git a/examples/common/QRCode/CMakeLists.txt b/examples/common/QRCode/CMakeLists.txt index 4f34a23f36cbec..d1fe3c3f61ef30 100644 --- a/examples/common/QRCode/CMakeLists.txt +++ b/examples/common/QRCode/CMakeLists.txt @@ -1,4 +1,4 @@ idf_component_register(SRCS "repo/c/qrcodegen.c" INCLUDE_DIRS "repo/c") -target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-unknown-pragmas") \ No newline at end of file +target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-unknown-pragmas") diff --git a/examples/lighting-app/efr32/src/AppTask.cpp b/examples/lighting-app/efr32/src/AppTask.cpp index f9412c4582c58d..95f552d3325f2a 100644 --- a/examples/lighting-app/efr32/src/AppTask.cpp +++ b/examples/lighting-app/efr32/src/AppTask.cpp @@ -21,17 +21,17 @@ #include "AppConfig.h" #include "AppEvent.h" #include "ButtonHandler.h" -#include "DataModelHandler.h" #include "LEDWidget.h" -#include "OnboardingCodesUtil.h" -#include "Server.h" #include "Service.h" -#include "attribute-storage.h" #include "gen/attribute-id.h" #include "gen/attribute-type.h" #include "gen/cluster-id.h" #include "lcd.h" #include "qrcodegen.h" +#include +#include +#include +#include #include diff --git a/examples/lighting-app/efr32/src/ZclCallbacks.cpp b/examples/lighting-app/efr32/src/ZclCallbacks.cpp index 5201c463445d6b..66bccc19ba497e 100644 --- a/examples/lighting-app/efr32/src/ZclCallbacks.cpp +++ b/examples/lighting-app/efr32/src/ZclCallbacks.cpp @@ -21,8 +21,8 @@ */ #include "AppConfig.h" -#include "DataModelHandler.h" #include "LightingManager.h" +#include #include "gen/attribute-id.h" #include "gen/cluster-id.h" diff --git a/examples/lighting-app/efr32/src/main.cpp b/examples/lighting-app/efr32/src/main.cpp index b9a5164c9567bc..d7fa981ec9f856 100644 --- a/examples/lighting-app/efr32/src/main.cpp +++ b/examples/lighting-app/efr32/src/main.cpp @@ -36,9 +36,9 @@ #include #include "AppConfig.h" -#include "DataModelHandler.h" -#include "Server.h" #include "init_efrPlatform.h" +#include +#include #ifdef HEAP_MONITORING #include "MemMonitoring.h" diff --git a/examples/lighting-app/k32w/BUILD.gn b/examples/lighting-app/k32w/BUILD.gn index 672cbfde6e5703..ef4ad46ccd85a3 100644 --- a/examples/lighting-app/k32w/BUILD.gn +++ b/examples/lighting-app/k32w/BUILD.gn @@ -39,9 +39,6 @@ k32w_sdk("sdk") { "main", "${k32w_platform_dir}/app/project_include", "${k32w_platform_dir}/app/support", - "${chip_root}/examples/lighting-app/lighting-common", - "${chip_root}/src/app/util", - "${chip_root}/src/app/server", "${k32w_platform_dir}/util/include", ] diff --git a/examples/lighting-app/k32w/main/AppTask.cpp b/examples/lighting-app/k32w/main/AppTask.cpp index 57dd35b5806e1d..d1b9fe198b46ff 100644 --- a/examples/lighting-app/k32w/main/AppTask.cpp +++ b/examples/lighting-app/k32w/main/AppTask.cpp @@ -18,18 +18,18 @@ */ #include "AppTask.h" #include "AppEvent.h" -#include "Server.h" #include "support/ErrorStr.h" +#include -#include "OnboardingCodesUtil.h" +#include #include #include #include -#include "attribute-storage.h" #include "gen/attribute-id.h" #include "gen/attribute-type.h" #include "gen/cluster-id.h" +#include #include "Keyboard.h" #include "LED.h" diff --git a/examples/lighting-app/k32w/main/ZclCallbacks.cpp b/examples/lighting-app/k32w/main/ZclCallbacks.cpp index a0896a6a390101..2f8f82a0748f13 100644 --- a/examples/lighting-app/k32w/main/ZclCallbacks.cpp +++ b/examples/lighting-app/k32w/main/ZclCallbacks.cpp @@ -21,10 +21,10 @@ #include "AppTask.h" #include "LightingManager.h" -#include "af.h" #include "gen/attribute-id.h" #include "gen/cluster-id.h" #include +#include using namespace ::chip; diff --git a/examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp b/examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp index 9fab92cf21ac63..1a3367df6a222c 100644 --- a/examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp +++ b/examples/lighting-app/lighting-common/gen/IMClusterCommandHandler.cpp @@ -30,7 +30,7 @@ #include // Currently we need some work to keep compatible with ember lib. -#include +#include namespace chip { namespace app { diff --git a/examples/lighting-app/lighting-common/gen/af-structs.h b/examples/lighting-app/lighting-common/gen/af-structs.h index 1d625494da0490..b19ca54657a27a 100644 --- a/examples/lighting-app/lighting-common/gen/af-structs.h +++ b/examples/lighting-app/lighting-common/gen/af-structs.h @@ -20,8 +20,8 @@ // Prevent multiple inclusion #pragma once -#include "basic-types.h" #include "enums.h" +#include #include // Struct for ApplicationLauncherApp diff --git a/examples/lighting-app/lighting-common/gen/call-command-handler.h b/examples/lighting-app/lighting-common/gen/call-command-handler.h index 16314d83b9817f..50a4e86fb253b3 100644 --- a/examples/lighting-app/lighting-common/gen/call-command-handler.h +++ b/examples/lighting-app/lighting-common/gen/call-command-handler.h @@ -20,4 +20,4 @@ // Prevent multiple inclusion #pragma once -#include "af-types.h" +#include diff --git a/examples/lighting-app/lighting-common/gen/callback.h b/examples/lighting-app/lighting-common/gen/callback.h index 20aceab56660c5..2caab42c052fc4 100644 --- a/examples/lighting-app/lighting-common/gen/callback.h +++ b/examples/lighting-app/lighting-common/gen/callback.h @@ -21,8 +21,8 @@ #pragma once #include "af-structs.h" -#include "af-types.h" -#include "basic-types.h" +#include +#include #include #include diff --git a/examples/lighting-app/linux/main.cpp b/examples/lighting-app/linux/main.cpp index e40b443b3a0458..79c52cfee674d7 100644 --- a/examples/lighting-app/linux/main.cpp +++ b/examples/lighting-app/linux/main.cpp @@ -19,11 +19,11 @@ #include #include -#include "af.h" #include "gen/attribute-id.h" #include "gen/cluster-id.h" #include #include +#include #include #include #include @@ -34,7 +34,7 @@ #include "LightingManager.h" #include "Options.h" -#include "Server.h" +#include #if defined(PW_RPC_ENABLED) #include "Rpc.h" diff --git a/examples/lighting-app/nrfconnect/CMakeLists.txt b/examples/lighting-app/nrfconnect/CMakeLists.txt index e2d89276000573..e959b4a2dbfcc5 100644 --- a/examples/lighting-app/nrfconnect/CMakeLists.txt +++ b/examples/lighting-app/nrfconnect/CMakeLists.txt @@ -37,7 +37,6 @@ target_compile_options(app PRIVATE -Werror) target_include_directories(app PRIVATE main/include - ${CHIP_ROOT}/src/app ${LIGHTING_COMMON} ${NRFCONNECT_COMMON}/util/include ${NRFCONNECT_COMMON}/app/include) diff --git a/examples/lighting-app/nrfconnect/main/AppTask.cpp b/examples/lighting-app/nrfconnect/main/AppTask.cpp index 77e9fed30a2e52..b29a238b4b9a2c 100644 --- a/examples/lighting-app/nrfconnect/main/AppTask.cpp +++ b/examples/lighting-app/nrfconnect/main/AppTask.cpp @@ -22,15 +22,15 @@ #include "AppEvent.h" #include "LEDWidget.h" #include "LightingManager.h" -#include "OnboardingCodesUtil.h" -#include "Server.h" #include "Service.h" #include "ThreadUtil.h" +#include +#include -#include "attribute-storage.h" #include "gen/attribute-id.h" #include "gen/attribute-type.h" #include "gen/cluster-id.h" +#include #include diff --git a/examples/lighting-app/nrfconnect/main/ZclCallbacks.cpp b/examples/lighting-app/nrfconnect/main/ZclCallbacks.cpp index 7ba0c9fd67998a..fe8533991d6781 100644 --- a/examples/lighting-app/nrfconnect/main/ZclCallbacks.cpp +++ b/examples/lighting-app/nrfconnect/main/ZclCallbacks.cpp @@ -18,11 +18,11 @@ #include -#include "af.h" #include "gen/attribute-id.h" #include "gen/cluster-id.h" #include "gen/command-id.h" #include +#include #include "AppTask.h" #include "LightingManager.h" diff --git a/examples/lighting-app/qpg6100/src/AppTask.cpp b/examples/lighting-app/qpg6100/src/AppTask.cpp index 06c64254c8175e..58e0ef504c230b 100644 --- a/examples/lighting-app/qpg6100/src/AppTask.cpp +++ b/examples/lighting-app/qpg6100/src/AppTask.cpp @@ -22,13 +22,13 @@ #include "AppEvent.h" #include "AppTask.h" -#include "OnboardingCodesUtil.h" +#include -#include "Server.h" -#include "attribute-storage.h" #include "gen/attribute-id.h" #include "gen/attribute-type.h" #include "gen/cluster-id.h" +#include +#include #include "Service.h" diff --git a/examples/lock-app/cc13x2x7_26x2x7/main/AppTask.cpp b/examples/lock-app/cc13x2x7_26x2x7/main/AppTask.cpp index 2daf8f933ad6f5..3710792be47466 100644 --- a/examples/lock-app/cc13x2x7_26x2x7/main/AppTask.cpp +++ b/examples/lock-app/cc13x2x7_26x2x7/main/AppTask.cpp @@ -20,7 +20,7 @@ #include "AppTask.h" #include "AppConfig.h" #include "AppEvent.h" -#include "Server.h" +#include #include "FreeRTOS.h" @@ -28,9 +28,9 @@ #include #include -#include "OnboardingCodesUtil.h" +#include -#include "DataModelHandler.h" +#include #include #include diff --git a/examples/lock-app/efr32/src/AppTask.cpp b/examples/lock-app/efr32/src/AppTask.cpp index 0d6e0ae16466b5..0e350b25eb55a9 100644 --- a/examples/lock-app/efr32/src/AppTask.cpp +++ b/examples/lock-app/efr32/src/AppTask.cpp @@ -21,17 +21,17 @@ #include "AppConfig.h" #include "AppEvent.h" #include "ButtonHandler.h" -#include "DataModelHandler.h" #include "LEDWidget.h" -#include "OnboardingCodesUtil.h" -#include "Server.h" #include "Service.h" -#include "attribute-storage.h" #include "gen/attribute-id.h" #include "gen/attribute-type.h" #include "gen/cluster-id.h" #include "lcd.h" #include "qrcodegen.h" +#include +#include +#include +#include #include diff --git a/examples/lock-app/efr32/src/main.cpp b/examples/lock-app/efr32/src/main.cpp index 2e60ca2df26153..785b8de1b5fe58 100644 --- a/examples/lock-app/efr32/src/main.cpp +++ b/examples/lock-app/efr32/src/main.cpp @@ -36,9 +36,9 @@ #include #include "AppConfig.h" -#include "DataModelHandler.h" -#include "Server.h" #include "init_efrPlatform.h" +#include +#include #if DISPLAY_ENABLED #include "lcd.h" diff --git a/examples/lock-app/esp32/main/CMakeLists.txt b/examples/lock-app/esp32/main/CMakeLists.txt index 5e3bddaed31058..9f3bce944ae77d 100644 --- a/examples/lock-app/esp32/main/CMakeLists.txt +++ b/examples/lock-app/esp32/main/CMakeLists.txt @@ -17,10 +17,6 @@ # (Uses default behaviour of compiling all source files in directory, adding 'include' to include path.) idf_component_register(PRIV_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src" - "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app" - "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/util" - "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/server" - "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/reporting" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/examples/lock-app/lock-common" "${CMAKE_CURRENT_LIST_DIR}/include" SRC_DIRS @@ -33,6 +29,7 @@ idf_component_register(PRIV_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/bindings" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/network-commissioning" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/on-off-server" + "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/clusters/general-commissioning-server" PRIV_REQUIRES chip QRCode tft spidriver bt screen-framework) set_property(TARGET ${COMPONENT_LIB} PROPERTY CXX_STANDARD 14) diff --git a/examples/lock-app/esp32/main/include/CHIPDeviceManager.h b/examples/lock-app/esp32/main/include/CHIPDeviceManager.h index 955f9ff75ef554..cfe9ff49944cd3 100644 --- a/examples/lock-app/esp32/main/include/CHIPDeviceManager.h +++ b/examples/lock-app/esp32/main/include/CHIPDeviceManager.h @@ -36,7 +36,7 @@ #include #include -#include "af-types.h" +#include namespace chip { namespace DeviceManager { diff --git a/examples/lock-app/esp32/main/main.cpp b/examples/lock-app/esp32/main/main.cpp index 7952752eab4c31..1ed7224a4d8364 100644 --- a/examples/lock-app/esp32/main/main.cpp +++ b/examples/lock-app/esp32/main/main.cpp @@ -16,9 +16,7 @@ */ #include "CHIPDeviceManager.h" -#include "DataModelHandler.h" #include "DeviceCallbacks.h" -#include "Server.h" #include "esp_heap_caps_init.h" #include "esp_log.h" #include "esp_netif.h" @@ -28,6 +26,8 @@ #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "nvs_flash.h" +#include +#include #include #include diff --git a/examples/lock-app/k32w/main/AppTask.cpp b/examples/lock-app/k32w/main/AppTask.cpp index 8a110fecbd8eea..46effe8cd49441 100644 --- a/examples/lock-app/k32w/main/AppTask.cpp +++ b/examples/lock-app/k32w/main/AppTask.cpp @@ -18,18 +18,18 @@ */ #include "AppTask.h" #include "AppEvent.h" -#include "Server.h" #include "support/ErrorStr.h" +#include -#include "OnboardingCodesUtil.h" +#include #include #include #include -#include "attribute-storage.h" #include "gen/attribute-id.h" #include "gen/attribute-type.h" #include "gen/cluster-id.h" +#include #include "Keyboard.h" #include "LED.h" diff --git a/examples/lock-app/k32w/main/ZclCallbacks.cpp b/examples/lock-app/k32w/main/ZclCallbacks.cpp index 7f8b2aed97d3fe..b47057336f9255 100644 --- a/examples/lock-app/k32w/main/ZclCallbacks.cpp +++ b/examples/lock-app/k32w/main/ZclCallbacks.cpp @@ -21,10 +21,10 @@ #include "AppTask.h" #include "BoltLockManager.h" -#include "af.h" #include "gen/attribute-id.h" #include "gen/cluster-id.h" #include +#include using namespace ::chip; diff --git a/examples/lock-app/lock-common/gen/IMClusterCommandHandler.cpp b/examples/lock-app/lock-common/gen/IMClusterCommandHandler.cpp index a8e42f71f95ef7..3b66b01ea6526b 100644 --- a/examples/lock-app/lock-common/gen/IMClusterCommandHandler.cpp +++ b/examples/lock-app/lock-common/gen/IMClusterCommandHandler.cpp @@ -30,7 +30,7 @@ #include // Currently we need some work to keep compatible with ember lib. -#include +#include namespace chip { namespace app { diff --git a/examples/lock-app/lock-common/gen/af-structs.h b/examples/lock-app/lock-common/gen/af-structs.h index 1d625494da0490..b19ca54657a27a 100644 --- a/examples/lock-app/lock-common/gen/af-structs.h +++ b/examples/lock-app/lock-common/gen/af-structs.h @@ -20,8 +20,8 @@ // Prevent multiple inclusion #pragma once -#include "basic-types.h" #include "enums.h" +#include #include // Struct for ApplicationLauncherApp diff --git a/examples/lock-app/lock-common/gen/call-command-handler.h b/examples/lock-app/lock-common/gen/call-command-handler.h index 16314d83b9817f..50a4e86fb253b3 100644 --- a/examples/lock-app/lock-common/gen/call-command-handler.h +++ b/examples/lock-app/lock-common/gen/call-command-handler.h @@ -20,4 +20,4 @@ // Prevent multiple inclusion #pragma once -#include "af-types.h" +#include diff --git a/examples/lock-app/lock-common/gen/callback.h b/examples/lock-app/lock-common/gen/callback.h index 92e04a0ab52aee..b5f0ef4b12615f 100644 --- a/examples/lock-app/lock-common/gen/callback.h +++ b/examples/lock-app/lock-common/gen/callback.h @@ -21,8 +21,8 @@ #pragma once #include "af-structs.h" -#include "af-types.h" -#include "basic-types.h" +#include +#include #include #include diff --git a/examples/lock-app/nrfconnect/CMakeLists.txt b/examples/lock-app/nrfconnect/CMakeLists.txt index 39bcf5f1d21e13..cc3286bea1795c 100644 --- a/examples/lock-app/nrfconnect/CMakeLists.txt +++ b/examples/lock-app/nrfconnect/CMakeLists.txt @@ -37,9 +37,8 @@ project(chip-nrfconnect-lock-example) target_include_directories(app PRIVATE main/include - ${CHIP_ROOT}/src/app ${LOCK_COMMON} - ${NRFCONNECT_COMMON}/util/include + ${NRFCONNECT_COMMON}/util/include ${NRFCONNECT_COMMON}/app/include) target_sources(app PRIVATE diff --git a/examples/lock-app/nrfconnect/main/AppTask.cpp b/examples/lock-app/nrfconnect/main/AppTask.cpp index de0551c7fc779f..b043e088bf15c2 100644 --- a/examples/lock-app/nrfconnect/main/AppTask.cpp +++ b/examples/lock-app/nrfconnect/main/AppTask.cpp @@ -20,15 +20,15 @@ #include "AppConfig.h" #include "BoltLockManager.h" #include "LEDWidget.h" -#include "OnboardingCodesUtil.h" -#include "Server.h" #include "Service.h" #include "ThreadUtil.h" +#include +#include -#include "attribute-storage.h" #include "gen/attribute-id.h" #include "gen/attribute-type.h" #include "gen/cluster-id.h" +#include #include diff --git a/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp b/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp index 6f373ef8817c96..de40630440a774 100644 --- a/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp +++ b/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp @@ -21,11 +21,11 @@ #include "AppTask.h" #include "BoltLockManager.h" -#include "af.h" #include "gen/attribute-id.h" #include "gen/cluster-id.h" #include "gen/command-id.h" #include +#include using namespace ::chip; diff --git a/examples/lock-app/qpg6100/src/AppTask.cpp b/examples/lock-app/qpg6100/src/AppTask.cpp index f664e71ff291f7..3c562830b6692f 100644 --- a/examples/lock-app/qpg6100/src/AppTask.cpp +++ b/examples/lock-app/qpg6100/src/AppTask.cpp @@ -23,13 +23,13 @@ #include "AppEvent.h" #include "AppTask.h" -#include "OnboardingCodesUtil.h" +#include -#include "Server.h" -#include "attribute-storage.h" #include "gen/attribute-id.h" #include "gen/attribute-type.h" #include "gen/cluster-id.h" +#include +#include #include "Service.h" diff --git a/examples/pigweed-app/esp32/main/CMakeLists.txt b/examples/pigweed-app/esp32/main/CMakeLists.txt index a8e359d82ecf75..e16c02ddacadc5 100644 --- a/examples/pigweed-app/esp32/main/CMakeLists.txt +++ b/examples/pigweed-app/esp32/main/CMakeLists.txt @@ -67,4 +67,4 @@ set_property(TARGET ${chip_lib} APPEND PROPERTY LINK_LIBRARIES ${COMPONENT_LIB}) target_include_directories(${chip_lib} PUBLIC "$/gen/third_party/connectedhomeip/third_party/pigweed/repo/pw_rpc/protos.proto_library/nanopb_rpc" "$/gen/third_party/connectedhomeip/third_party/pigweed/repo/pw_rpc/protos.proto_library/nanopb" - "$/gen/third_party/connectedhomeip/third_party/pigweed/repo/pw_rpc/protos.proto_library/pwpb") \ No newline at end of file + "$/gen/third_party/connectedhomeip/third_party/pigweed/repo/pw_rpc/protos.proto_library/pwpb") diff --git a/examples/temperature-measurement-app/esp32/main/CMakeLists.txt b/examples/temperature-measurement-app/esp32/main/CMakeLists.txt index d3dd12c78987ab..87481b5143990f 100644 --- a/examples/temperature-measurement-app/esp32/main/CMakeLists.txt +++ b/examples/temperature-measurement-app/esp32/main/CMakeLists.txt @@ -19,10 +19,6 @@ # The list of src and include dirs must be in sync with that in temperature-measurement-app/esp32/main/component.mk idf_component_register(PRIV_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}" - "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app" - "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/util" - "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/reporting" - "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src/app/server" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/third_party/nlio/repo/include" "${CMAKE_SOURCE_DIR}/third_party/connectedhomeip/src" "${CMAKE_CURRENT_LIST_DIR}/include" diff --git a/examples/temperature-measurement-app/esp32/main/gen/IMClusterCommandHandler.cpp b/examples/temperature-measurement-app/esp32/main/gen/IMClusterCommandHandler.cpp index 6458755bfe8623..6382ba65a992e5 100644 --- a/examples/temperature-measurement-app/esp32/main/gen/IMClusterCommandHandler.cpp +++ b/examples/temperature-measurement-app/esp32/main/gen/IMClusterCommandHandler.cpp @@ -30,7 +30,7 @@ #include // Currently we need some work to keep compatible with ember lib. -#include +#include namespace chip { namespace app { diff --git a/examples/temperature-measurement-app/esp32/main/gen/af-structs.h b/examples/temperature-measurement-app/esp32/main/gen/af-structs.h index 1d625494da0490..b19ca54657a27a 100644 --- a/examples/temperature-measurement-app/esp32/main/gen/af-structs.h +++ b/examples/temperature-measurement-app/esp32/main/gen/af-structs.h @@ -20,8 +20,8 @@ // Prevent multiple inclusion #pragma once -#include "basic-types.h" #include "enums.h" +#include #include // Struct for ApplicationLauncherApp diff --git a/examples/temperature-measurement-app/esp32/main/gen/call-command-handler.h b/examples/temperature-measurement-app/esp32/main/gen/call-command-handler.h index 16314d83b9817f..50a4e86fb253b3 100644 --- a/examples/temperature-measurement-app/esp32/main/gen/call-command-handler.h +++ b/examples/temperature-measurement-app/esp32/main/gen/call-command-handler.h @@ -20,4 +20,4 @@ // Prevent multiple inclusion #pragma once -#include "af-types.h" +#include diff --git a/examples/temperature-measurement-app/esp32/main/gen/callback.h b/examples/temperature-measurement-app/esp32/main/gen/callback.h index c72013d4b810f6..1b7bac82964d8d 100644 --- a/examples/temperature-measurement-app/esp32/main/gen/callback.h +++ b/examples/temperature-measurement-app/esp32/main/gen/callback.h @@ -21,8 +21,8 @@ #pragma once #include "af-structs.h" -#include "af-types.h" -#include "basic-types.h" +#include +#include #include #include diff --git a/examples/temperature-measurement-app/esp32/main/include/CHIPDeviceManager.h b/examples/temperature-measurement-app/esp32/main/include/CHIPDeviceManager.h index 787ae7600dabbb..6c1e0aa413296d 100644 --- a/examples/temperature-measurement-app/esp32/main/include/CHIPDeviceManager.h +++ b/examples/temperature-measurement-app/esp32/main/include/CHIPDeviceManager.h @@ -36,7 +36,7 @@ #include #include -#include "af-types.h" +#include namespace chip { namespace DeviceManager { diff --git a/examples/temperature-measurement-app/esp32/main/main.cpp b/examples/temperature-measurement-app/esp32/main/main.cpp index 25d946d0b7db3e..36b6601fef3516 100644 --- a/examples/temperature-measurement-app/esp32/main/main.cpp +++ b/examples/temperature-measurement-app/esp32/main/main.cpp @@ -16,9 +16,7 @@ */ #include "CHIPDeviceManager.h" -#include "DataModelHandler.h" #include "DeviceCallbacks.h" -#include "Server.h" #include "esp_heap_caps_init.h" #include "esp_log.h" #include "esp_netif.h" @@ -28,6 +26,8 @@ #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "nvs_flash.h" +#include +#include #include #include diff --git a/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.h b/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.h index b268cf8ff1513d..177cde404928c9 100644 --- a/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.h +++ b/examples/tv-app/linux/include/application-basic/ApplicationBasicManager.h @@ -18,7 +18,7 @@ #pragma once -#include "af-types.h" +#include #include #include "../endpoint-configuration/EndpointConfigurationStorage.h" diff --git a/examples/tv-app/linux/main.cpp b/examples/tv-app/linux/main.cpp index 0ac5d791abfa95..bfe270f9bdf174 100644 --- a/examples/tv-app/linux/main.cpp +++ b/examples/tv-app/linux/main.cpp @@ -21,19 +21,19 @@ #include #include -#include "af.h" #include "gen/attribute-id.h" #include "gen/cluster-id.h" #include #include #include +#include #include #include #include #include #include -#include "Server.h" +#include #include diff --git a/examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp b/examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp index b85bac605c4268..41c0a303b40113 100644 --- a/examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp +++ b/examples/tv-app/tv-common/gen/IMClusterCommandHandler.cpp @@ -30,7 +30,7 @@ #include // Currently we need some work to keep compatible with ember lib. -#include +#include namespace chip { namespace app { diff --git a/examples/tv-app/tv-common/gen/af-structs.h b/examples/tv-app/tv-common/gen/af-structs.h index 1d625494da0490..b19ca54657a27a 100644 --- a/examples/tv-app/tv-common/gen/af-structs.h +++ b/examples/tv-app/tv-common/gen/af-structs.h @@ -20,8 +20,8 @@ // Prevent multiple inclusion #pragma once -#include "basic-types.h" #include "enums.h" +#include #include // Struct for ApplicationLauncherApp diff --git a/examples/tv-app/tv-common/gen/call-command-handler.h b/examples/tv-app/tv-common/gen/call-command-handler.h index 16314d83b9817f..50a4e86fb253b3 100644 --- a/examples/tv-app/tv-common/gen/call-command-handler.h +++ b/examples/tv-app/tv-common/gen/call-command-handler.h @@ -20,4 +20,4 @@ // Prevent multiple inclusion #pragma once -#include "af-types.h" +#include diff --git a/examples/tv-app/tv-common/gen/callback.h b/examples/tv-app/tv-common/gen/callback.h index 678391dd7dc0e0..270ecff88ce5d4 100644 --- a/examples/tv-app/tv-common/gen/callback.h +++ b/examples/tv-app/tv-common/gen/callback.h @@ -21,8 +21,8 @@ #pragma once #include "af-structs.h" -#include "af-types.h" -#include "basic-types.h" +#include +#include #include #include diff --git a/examples/window-app/common/gen/IMClusterCommandHandler.cpp b/examples/window-app/common/gen/IMClusterCommandHandler.cpp index fc023835a863d8..046d83668c93c7 100644 --- a/examples/window-app/common/gen/IMClusterCommandHandler.cpp +++ b/examples/window-app/common/gen/IMClusterCommandHandler.cpp @@ -30,7 +30,7 @@ #include // Currently we need some work to keep compatible with ember lib. -#include +#include namespace chip { namespace app { diff --git a/examples/window-app/common/gen/af-structs.h b/examples/window-app/common/gen/af-structs.h index 1d625494da0490..b19ca54657a27a 100644 --- a/examples/window-app/common/gen/af-structs.h +++ b/examples/window-app/common/gen/af-structs.h @@ -20,8 +20,8 @@ // Prevent multiple inclusion #pragma once -#include "basic-types.h" #include "enums.h" +#include #include // Struct for ApplicationLauncherApp diff --git a/examples/window-app/common/gen/call-command-handler.h b/examples/window-app/common/gen/call-command-handler.h index 16314d83b9817f..50a4e86fb253b3 100644 --- a/examples/window-app/common/gen/call-command-handler.h +++ b/examples/window-app/common/gen/call-command-handler.h @@ -20,4 +20,4 @@ // Prevent multiple inclusion #pragma once -#include "af-types.h" +#include diff --git a/examples/window-app/common/gen/callback.h b/examples/window-app/common/gen/callback.h index 5efda807424cce..e39f4005199135 100644 --- a/examples/window-app/common/gen/callback.h +++ b/examples/window-app/common/gen/callback.h @@ -21,8 +21,8 @@ #pragma once #include "af-structs.h" -#include "af-types.h" -#include "basic-types.h" +#include +#include #include #include diff --git a/examples/window-app/efr32/src/AppTask.cpp b/examples/window-app/efr32/src/AppTask.cpp index cb93cc47a94fea..ff18fa8f68436d 100644 --- a/examples/window-app/efr32/src/AppTask.cpp +++ b/examples/window-app/efr32/src/AppTask.cpp @@ -20,10 +20,10 @@ #include #include #include -#include -#include #include -#include +#include +#include +#include #include #include #include diff --git a/examples/window-app/efr32/src/ZclCallbacks.cpp b/examples/window-app/efr32/src/ZclCallbacks.cpp index 765121df182891..20a28fb1876462 100644 --- a/examples/window-app/efr32/src/ZclCallbacks.cpp +++ b/examples/window-app/efr32/src/ZclCallbacks.cpp @@ -22,8 +22,8 @@ #include #include -#include #include +#include #include #include #include diff --git a/examples/window-app/efr32/src/main.cpp b/examples/window-app/efr32/src/main.cpp index c4f4bff5854301..dbf4b80f227f8c 100644 --- a/examples/window-app/efr32/src/main.cpp +++ b/examples/window-app/efr32/src/main.cpp @@ -35,9 +35,9 @@ #include #include "AppConfig.h" -#include "DataModelHandler.h" -#include "Server.h" #include "init_efrPlatform.h" +#include +#include #if DISPLAY_ENABLED #include "lcd.h" diff --git a/src/android/CHIPTool/app/CMakeLists.txt b/src/android/CHIPTool/app/CMakeLists.txt index 3588f693a80f4d..0c90b81e84bb90 100644 --- a/src/android/CHIPTool/app/CMakeLists.txt +++ b/src/android/CHIPTool/app/CMakeLists.txt @@ -20,5 +20,5 @@ add_library(native-lib SHARED src/main/cpp/native-lib.cpp) find_library(log-lib log) target_link_libraries(native-lib ${log-lib} ${CMAKE_HOME_DIRECTORY}/../../../setup_payload/libSetupPayload.a) -target_include_directories(native-lib PRIVATE ${CMAKE_HOME_DIRECTORY}/../../../setup_payload ${CMAKE_HOME_DIRECTORY}/../../../lib ${CMAKE_HOME_DIRECTORY}/../../..) +target_include_directories(native-lib PRIVATE ${CMAKE_HOME_DIRECTORY}/../../../lib ${CMAKE_HOME_DIRECTORY}/../../..) add_definitions(-DCHIP_SYSTEM_CONFIG_USE_SOCKETS) diff --git a/src/app/BUILD.gn b/src/app/BUILD.gn index e0646ea914c136..6c8d75eabb4c1f 100644 --- a/src/app/BUILD.gn +++ b/src/app/BUILD.gn @@ -23,11 +23,6 @@ declare_args() { } config("app_config") { - include_dirs = [ - "util", - ".", - "${target_gen_dir}/include", - ] if (chip_enable_schema_check) { defines = [ "CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK=1" ] } else { @@ -97,10 +92,10 @@ static_library("app") { "decoder.cpp", "encoder.cpp", "reporting/Engine.cpp", + "reporting/Engine.h", ] public_deps = [ - ":codec_headers", "${chip_root}/src/lib/support", "${chip_root}/src/messaging", "${chip_root}/src/system", @@ -114,9 +109,3 @@ static_library("app") { "${chip_root}/src:includes", ] } - -copy("codec_headers") { - sources = [ "chip-zcl-zpro-codec.h" ] - - outputs = [ "${target_gen_dir}/include/app/{{source_file_part}}" ] -} diff --git a/src/app/MessageDef/AttributeDataElement.h b/src/app/MessageDef/AttributeDataElement.h index 8294fd6090ceae..08dbe8792af95b 100644 --- a/src/app/MessageDef/AttributeDataElement.h +++ b/src/app/MessageDef/AttributeDataElement.h @@ -26,11 +26,11 @@ #include "AttributePath.h" #include "Builder.h" #include "Parser.h" +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/AttributeDataList.h b/src/app/MessageDef/AttributeDataList.h index 793cc30cef4c25..ba2c8cad65df9f 100644 --- a/src/app/MessageDef/AttributeDataList.h +++ b/src/app/MessageDef/AttributeDataList.h @@ -26,11 +26,11 @@ #include "AttributeDataElement.h" #include "ListBuilder.h" #include "ListParser.h" +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/AttributeDataVersionList.h b/src/app/MessageDef/AttributeDataVersionList.h index dcaf76e8ff13d6..f927ab30fd8b1b 100644 --- a/src/app/MessageDef/AttributeDataVersionList.h +++ b/src/app/MessageDef/AttributeDataVersionList.h @@ -27,11 +27,11 @@ #include "ListBuilder.h" #include "ListParser.h" +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/AttributePath.h b/src/app/MessageDef/AttributePath.h index 1aa7011eb69206..8ed3c086e22ebf 100644 --- a/src/app/MessageDef/AttributePath.h +++ b/src/app/MessageDef/AttributePath.h @@ -25,11 +25,11 @@ #include "Builder.h" #include "Parser.h" +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/AttributePathList.h b/src/app/MessageDef/AttributePathList.h index a20769c89c95b6..63c8d3f9bde4ec 100644 --- a/src/app/MessageDef/AttributePathList.h +++ b/src/app/MessageDef/AttributePathList.h @@ -27,11 +27,11 @@ #include "ListBuilder.h" #include "ListParser.h" +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/AttributeStatusElement.h b/src/app/MessageDef/AttributeStatusElement.h index e18b1e8d0fcb20..1d5e1cfa74d7ab 100644 --- a/src/app/MessageDef/AttributeStatusElement.h +++ b/src/app/MessageDef/AttributeStatusElement.h @@ -27,11 +27,11 @@ #include "Builder.h" #include "Parser.h" #include "StatusElement.h" +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/AttributeStatusList.h b/src/app/MessageDef/AttributeStatusList.h index 576562a88407f6..0316557f38adf8 100644 --- a/src/app/MessageDef/AttributeStatusList.h +++ b/src/app/MessageDef/AttributeStatusList.h @@ -27,11 +27,11 @@ #include "ListBuilder.h" #include "ListParser.h" +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/Builder.h b/src/app/MessageDef/Builder.h index 2817a95add6af6..f466ad6682817d 100644 --- a/src/app/MessageDef/Builder.h +++ b/src/app/MessageDef/Builder.h @@ -23,11 +23,11 @@ #pragma once +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/CommandDataElement.h b/src/app/MessageDef/CommandDataElement.h index 2da5007bdee04f..831fa82d375740 100644 --- a/src/app/MessageDef/CommandDataElement.h +++ b/src/app/MessageDef/CommandDataElement.h @@ -28,11 +28,11 @@ #include "Parser.h" #include "StatusElement.h" +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/CommandList.h b/src/app/MessageDef/CommandList.h index bf60a3e731a75a..f678c9217eebb2 100644 --- a/src/app/MessageDef/CommandList.h +++ b/src/app/MessageDef/CommandList.h @@ -27,11 +27,11 @@ #include "ListBuilder.h" #include "ListParser.h" +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/CommandPath.h b/src/app/MessageDef/CommandPath.h index 6e7dac4981a550..1960f4b3624972 100644 --- a/src/app/MessageDef/CommandPath.h +++ b/src/app/MessageDef/CommandPath.h @@ -25,11 +25,11 @@ #include "Builder.h" #include "Parser.h" +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/EventDataElement.h b/src/app/MessageDef/EventDataElement.h index f389c369937655..c718917d6c998d 100644 --- a/src/app/MessageDef/EventDataElement.h +++ b/src/app/MessageDef/EventDataElement.h @@ -27,11 +27,11 @@ #include "EventPath.h" #include "Parser.h" +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/EventList.h b/src/app/MessageDef/EventList.h index 945d2d9202104f..b39d6164561df1 100644 --- a/src/app/MessageDef/EventList.h +++ b/src/app/MessageDef/EventList.h @@ -27,11 +27,11 @@ #include "ListBuilder.h" #include "ListParser.h" +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/EventPath.h b/src/app/MessageDef/EventPath.h index d16313c095d5e2..dcb038ac130fae 100644 --- a/src/app/MessageDef/EventPath.h +++ b/src/app/MessageDef/EventPath.h @@ -25,11 +25,11 @@ #include "Builder.h" #include "Parser.h" +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/EventPathList.h b/src/app/MessageDef/EventPathList.h index bde8a0dc7d595e..7b14c586203ef9 100644 --- a/src/app/MessageDef/EventPathList.h +++ b/src/app/MessageDef/EventPathList.h @@ -28,11 +28,11 @@ #include "ListBuilder.h" #include "ListParser.h" +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/InvokeCommand.h b/src/app/MessageDef/InvokeCommand.h index 48e5832db094a3..e4d5a9783e131a 100644 --- a/src/app/MessageDef/InvokeCommand.h +++ b/src/app/MessageDef/InvokeCommand.h @@ -23,11 +23,11 @@ #pragma once +#include #include #include #include #include -#include #include "Builder.h" #include "CommandDataElement.h" diff --git a/src/app/MessageDef/ListBuilder.h b/src/app/MessageDef/ListBuilder.h index e7d8543e1c6c12..1a1a26c86e1c77 100644 --- a/src/app/MessageDef/ListBuilder.h +++ b/src/app/MessageDef/ListBuilder.h @@ -25,11 +25,11 @@ #include "Builder.h" #include "Parser.h" +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/ListParser.h b/src/app/MessageDef/ListParser.h index e890b3a277a119..a4d9c768e08576 100644 --- a/src/app/MessageDef/ListParser.h +++ b/src/app/MessageDef/ListParser.h @@ -25,11 +25,11 @@ #include "Builder.h" #include "Parser.h" +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/Parser.h b/src/app/MessageDef/Parser.h index 22989fbe665830..f0b0f1be57e49e 100644 --- a/src/app/MessageDef/Parser.h +++ b/src/app/MessageDef/Parser.h @@ -23,11 +23,11 @@ #pragma once +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/ReadRequest.h b/src/app/MessageDef/ReadRequest.h index c1ba347e803d27..7ff1eab3fd3ad6 100644 --- a/src/app/MessageDef/ReadRequest.h +++ b/src/app/MessageDef/ReadRequest.h @@ -29,11 +29,11 @@ #include "EventPathList.h" #include "Parser.h" +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/ReportData.h b/src/app/MessageDef/ReportData.h index 20cc58f961a5d7..30ba8f702e7cb0 100644 --- a/src/app/MessageDef/ReportData.h +++ b/src/app/MessageDef/ReportData.h @@ -23,11 +23,11 @@ #pragma once +#include #include #include #include #include -#include #include "AttributeDataList.h" #include "Builder.h" diff --git a/src/app/MessageDef/StatusElement.h b/src/app/MessageDef/StatusElement.h index b3ccc57f344315..712b382cb99ca7 100644 --- a/src/app/MessageDef/StatusElement.h +++ b/src/app/MessageDef/StatusElement.h @@ -26,12 +26,12 @@ #include "ListBuilder.h" #include "ListParser.h" +#include #include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/WriteRequest.h b/src/app/MessageDef/WriteRequest.h index d6760aabd035b4..f32563a2c6791f 100644 --- a/src/app/MessageDef/WriteRequest.h +++ b/src/app/MessageDef/WriteRequest.h @@ -26,11 +26,11 @@ #include "AttributeDataVersionList.h" #include "Builder.h" #include "Parser.h" +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/MessageDef/WriteResponse.h b/src/app/MessageDef/WriteResponse.h index 32f0c44b778101..4806744f06b166 100644 --- a/src/app/MessageDef/WriteResponse.h +++ b/src/app/MessageDef/WriteResponse.h @@ -26,11 +26,11 @@ #include "Builder.h" #include "Parser.h" +#include #include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/chip_data_model.gni b/src/app/chip_data_model.gni index 0ffe6deb6dd6c1..3f39b3dd58a804 100644 --- a/src/app/chip_data_model.gni +++ b/src/app/chip_data_model.gni @@ -83,7 +83,9 @@ template("chip_data_model") { "${_app_root}/clusters/zll-on-off-server/zll-on-off-server.h", "${_app_root}/clusters/zll-scenes-server/zll-scenes-server.h", "${_app_root}/reporting/reporting-default-configuration.cpp", + "${_app_root}/reporting/reporting-tokens.h", "${_app_root}/reporting/reporting.cpp", + "${_app_root}/reporting/reporting.h", "${_app_root}/util/DataModelHandler.cpp", "${_app_root}/util/af-event.cpp", "${_app_root}/util/af-main-common.cpp", diff --git a/src/app/clusters/bindings/bindings.cpp b/src/app/clusters/bindings/bindings.cpp index 2238198ec15d6e..e4a00f69fb6e3f 100644 --- a/src/app/clusters/bindings/bindings.cpp +++ b/src/app/clusters/bindings/bindings.cpp @@ -20,7 +20,7 @@ * @brief Implementation for the Binding Server Cluster ***************************************************************************/ -#include "af.h" +#include #include #include diff --git a/src/app/clusters/descriptor/descriptor.cpp b/src/app/clusters/descriptor/descriptor.cpp index 1c5d0b43d554b2..687c3a9343c3c3 100644 --- a/src/app/clusters/descriptor/descriptor.cpp +++ b/src/app/clusters/descriptor/descriptor.cpp @@ -20,7 +20,7 @@ * @brief Implementation for the Descriptor Server Cluster ***************************************************************************/ -#include "af.h" +#include #include #include #include diff --git a/src/app/clusters/door-lock-server/door-lock-server-core.cpp b/src/app/clusters/door-lock-server/door-lock-server-core.cpp index a93253732ea661..7c9f76888d235f 100644 --- a/src/app/clusters/door-lock-server/door-lock-server-core.cpp +++ b/src/app/clusters/door-lock-server/door-lock-server-core.cpp @@ -37,8 +37,8 @@ ******************************************************************************* ******************************************************************************/ -#include "af.h" #include "door-lock-server.h" +#include #include "gen/attribute-id.h" #include "gen/attribute-type.h" diff --git a/src/app/clusters/door-lock-server/door-lock-server-logging.cpp b/src/app/clusters/door-lock-server/door-lock-server-logging.cpp index 6d31a5cbb97f44..a0ce8344c1fa6a 100644 --- a/src/app/clusters/door-lock-server/door-lock-server-logging.cpp +++ b/src/app/clusters/door-lock-server/door-lock-server-logging.cpp @@ -38,8 +38,8 @@ ******************************************************************************* ******************************************************************************/ -#include "af.h" #include "door-lock-server.h" +#include #include #include "gen/attribute-id.h" diff --git a/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp b/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp index 99ae92dc2ccf49..f414e0ecc36455 100644 --- a/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp +++ b/src/app/clusters/door-lock-server/door-lock-server-schedule.cpp @@ -37,8 +37,8 @@ ******************************************************************************* ******************************************************************************/ -#include "af.h" #include "door-lock-server.h" +#include #include "gen/attribute-id.h" #include "gen/cluster-id.h" diff --git a/src/app/clusters/door-lock-server/door-lock-server-user.cpp b/src/app/clusters/door-lock-server/door-lock-server-user.cpp index fdd6e25cf0c40c..ad06e989ca0e05 100644 --- a/src/app/clusters/door-lock-server/door-lock-server-user.cpp +++ b/src/app/clusters/door-lock-server/door-lock-server-user.cpp @@ -37,11 +37,11 @@ ******************************************************************************* ******************************************************************************/ -#include "af-event.h" -#include "af.h" #include "app/util/common.h" #include "door-lock-server.h" -#include "time-util.h" +#include +#include +#include #include "gen/attribute-id.h" #include "gen/attribute-type.h" diff --git a/src/app/clusters/ias-zone-client/ias-zone-client.cpp b/src/app/clusters/ias-zone-client/ias-zone-client.cpp index 66e065044f3d5b..fe17ebdb647ced 100644 --- a/src/app/clusters/ias-zone-client/ias-zone-client.cpp +++ b/src/app/clusters/ias-zone-client/ias-zone-client.cpp @@ -79,8 +79,8 @@ ******************************************************************************/ #include "ias-zone-client.h" -#include "af.h" #include +#include //----------------------------------------------------------------------------- // Globals diff --git a/src/app/clusters/network-commissioning/network-commissioning-ember.cpp b/src/app/clusters/network-commissioning/network-commissioning-ember.cpp index ac03d8f3702059..ef7068644c194c 100644 --- a/src/app/clusters/network-commissioning/network-commissioning-ember.cpp +++ b/src/app/clusters/network-commissioning/network-commissioning-ember.cpp @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -28,7 +29,6 @@ #include #include #include -#include using namespace chip; diff --git a/src/app/clusters/network-commissioning/network-commissioning.cpp b/src/app/clusters/network-commissioning/network-commissioning.cpp index e2491506401267..3a8479e31f4d7e 100644 --- a/src/app/clusters/network-commissioning/network-commissioning.cpp +++ b/src/app/clusters/network-commissioning/network-commissioning.cpp @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -28,7 +29,6 @@ #include #include #include -#include #include #include diff --git a/src/app/clusters/on-off-server/on-off-server.cpp b/src/app/clusters/on-off-server/on-off-server.cpp index dfc7ff8ba49b3b..90e59ce6ce6844 100644 --- a/src/app/clusters/on-off-server/on-off-server.cpp +++ b/src/app/clusters/on-off-server/on-off-server.cpp @@ -40,7 +40,7 @@ ******************************************************************************/ #include "on-off-server.h" -#include "af.h" +#include #include "gen/att-storage.h" #include "gen/attribute-id.h" diff --git a/src/app/clusters/operational-credentials/operational-credentials.cpp b/src/app/clusters/operational-credentials/operational-credentials.cpp index afe49140be6804..cff6c577ab72b9 100644 --- a/src/app/clusters/operational-credentials/operational-credentials.cpp +++ b/src/app/clusters/operational-credentials/operational-credentials.cpp @@ -20,8 +20,8 @@ * @brief Implementation for the Operational Credentials Cluster ***************************************************************************/ -#include "af.h" #include +#include #include #include #include diff --git a/src/app/clusters/ota-server/ota-server.cpp b/src/app/clusters/ota-server/ota-server.cpp index c3d39a22569a00..a9f87598668343 100644 --- a/src/app/clusters/ota-server/ota-server.cpp +++ b/src/app/clusters/ota-server/ota-server.cpp @@ -17,6 +17,7 @@ */ #include +#include #include #include #include @@ -24,7 +25,6 @@ #include #include #include -#include #include diff --git a/src/app/clusters/scenes-client/scenes-client.h b/src/app/clusters/scenes-client/scenes-client.h index 784efcd1f04eb8..268c416c286e8b 100644 --- a/src/app/clusters/scenes-client/scenes-client.h +++ b/src/app/clusters/scenes-client/scenes-client.h @@ -42,7 +42,7 @@ #include #include -#include "af-types.h" +#include bool emberAfPluginScenesClientParseAddSceneResponse(const EmberAfClusterCommand * cmd, uint8_t status, chip::GroupId groupId, uint8_t sceneId); diff --git a/src/app/encoder.cpp b/src/app/encoder.cpp index f49b83c4afde83..b9ef25aba658c8 100644 --- a/src/app/encoder.cpp +++ b/src/app/encoder.cpp @@ -17,7 +17,7 @@ // THIS FILE IS GENERATED BY ZAP -#include "chip-zcl-zpro-codec.h" +#include #include #include diff --git a/src/app/reporting/Engine.h b/src/app/reporting/Engine.h index cf47c4b9674408..f0300020140d97 100644 --- a/src/app/reporting/Engine.h +++ b/src/app/reporting/Engine.h @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -34,7 +35,6 @@ #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/reporting/reporting-default-configuration.cpp b/src/app/reporting/reporting-default-configuration.cpp index 9fbfb4d0909134..3e7b3c6a902480 100644 --- a/src/app/reporting/reporting-default-configuration.cpp +++ b/src/app/reporting/reporting-default-configuration.cpp @@ -38,7 +38,7 @@ ******************************************************************************* ******************************************************************************/ -#include "reporting.h" +#include #include #include #include diff --git a/src/app/reporting/reporting.cpp b/src/app/reporting/reporting.cpp index 52406f0eb2ee3b..bfb78bfd206ea1 100644 --- a/src/app/reporting/reporting.cpp +++ b/src/app/reporting/reporting.cpp @@ -39,7 +39,7 @@ ******************************************************************************* ******************************************************************************/ -#include "reporting.h" +#include #include #include #include diff --git a/src/app/server/BUILD.gn b/src/app/server/BUILD.gn index 00922ad935afbf..a7eace451aa171 100644 --- a/src/app/server/BUILD.gn +++ b/src/app/server/BUILD.gn @@ -21,8 +21,6 @@ config("server_config") { if (chip_app_use_echo) { defines += [ "CHIP_APP_USE_ECHO" ] } - - include_dirs = [ "." ] } static_library("server") { diff --git a/src/app/server/Mdns.cpp b/src/app/server/Mdns.cpp index 5324a506cd6d58..91735ad314036a 100644 --- a/src/app/server/Mdns.cpp +++ b/src/app/server/Mdns.cpp @@ -15,7 +15,7 @@ * limitations under the License. */ -#include "Mdns.h" +#include #include @@ -29,7 +29,7 @@ #include #include -#include "Server.h" +#include namespace chip { namespace app { diff --git a/src/app/server/OnboardingCodesUtil.cpp b/src/app/server/OnboardingCodesUtil.cpp index 5be6a6a6e2e0d8..deb55891135321 100644 --- a/src/app/server/OnboardingCodesUtil.cpp +++ b/src/app/server/OnboardingCodesUtil.cpp @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "OnboardingCodesUtil.h" +#include #include #include diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp index 1e76c4460a44b0..4346b7d26d0feb 100644 --- a/src/app/server/Server.cpp +++ b/src/app/server/Server.cpp @@ -20,10 +20,10 @@ #include #include +#include #include #include #include -#include #include #include @@ -43,7 +43,7 @@ #include #if CHIP_DEVICE_CONFIG_ENABLE_MDNS -#include "Mdns.h" +#include #endif using namespace ::chip; diff --git a/src/app/util/CHIPDeviceCallbacksMgr.h b/src/app/util/CHIPDeviceCallbacksMgr.h index af783a3a69f6b0..7783d6fa130877 100644 --- a/src/app/util/CHIPDeviceCallbacksMgr.h +++ b/src/app/util/CHIPDeviceCallbacksMgr.h @@ -26,7 +26,7 @@ #pragma once -#include "basic-types.h" +#include #include #include #include diff --git a/src/app/util/DataModelHandler.cpp b/src/app/util/DataModelHandler.cpp index 1d8dfff8fd389d..b3b60f87f3f358 100644 --- a/src/app/util/DataModelHandler.cpp +++ b/src/app/util/DataModelHandler.cpp @@ -20,7 +20,7 @@ * This file implements the handler for data model messages. */ -#include "DataModelHandler.h" +#include #if __has_include("gen/endpoint_config.h") #define USE_ZAP_CONFIG 1 diff --git a/src/app/util/DataModelHandler.h b/src/app/util/DataModelHandler.h deleted file mode 100644 index b6085e80ab45c5..00000000000000 --- a/src/app/util/DataModelHandler.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * - * Copyright (c) 2020 Project CHIP Authors - * - * 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. - */ - -/** - * @file - * This file defines the API for the handler for data model messages. - */ - -#pragma once - -#include -#include - -/** - * Initialize the data model internal code to be ready to send and receive - * data model messages. - * - */ -void InitDataModelHandler(); - -/** - * Handle a message that should be processed via our data model processing - * codepath. - * - * @param [in] nodeId The source node id of the message - * @param [in] buffer The buffer holding the message. This function guarantees - * that it will free the buffer before returning. - * - */ -void HandleDataModelMessage(chip::NodeId nodeId, chip::System::PacketBufferHandle buffer); diff --git a/src/app/util/af-event.cpp b/src/app/util/af-event.cpp index 31a4f1dc6d3237..5978038d111754 100644 --- a/src/app/util/af-event.cpp +++ b/src/app/util/af-event.cpp @@ -37,10 +37,10 @@ ******************************************************************************* ******************************************************************************/ -#include "af-event.h" +#include -#include "af.h" -#include "attribute-storage.h" +#include +#include #include #include diff --git a/src/app/util/af-event.h b/src/app/util/af-event.h index 42341a72bac746..655184af940da2 100644 --- a/src/app/util/af-event.h +++ b/src/app/util/af-event.h @@ -39,7 +39,7 @@ #pragma once -#include "af.h" +#include #define MAX_TIMER_UNITS_HOST 0x7fff #define MAX_TIMER_MILLISECONDS_HOST (MAX_TIMER_UNITS_HOST * MILLISECOND_TICKS_PER_MINUTE) diff --git a/src/app/util/af-main-common.cpp b/src/app/util/af-main-common.cpp index 02f6691880b8a0..1555dbe5e96433 100644 --- a/src/app/util/af-main-common.cpp +++ b/src/app/util/af-main-common.cpp @@ -90,19 +90,19 @@ // determines the number of in-clusters and out-clusters based on defines // in config.h -#include "af-main.h" +#include //#include "app/framework/security/af-security.h" //#include "app/framework/security/crypto-state.h" #include "app/util/common.h" -#include "attribute-storage.h" -#include "attribute-table.h" -#include "config.h" #include "gen/callback.h" +#include +#include +#include //#include "print.h" -#include "binding-table.h" -#include "chip-message-send.h" -#include "util.h" +#include +#include +#include using namespace chip; diff --git a/src/app/util/af-main.h b/src/app/util/af-main.h index 7d212c31a5e066..010c177a6ff03d 100644 --- a/src/app/util/af-main.h +++ b/src/app/util/af-main.h @@ -40,7 +40,7 @@ #pragma once -#include "af-types.h" +#include //#include CONFIGURATION_HEADER //#include PLATFORM_HEADER // Micro and compiler specific typedefs and macros diff --git a/src/app/util/af-types.h b/src/app/util/af-types.h index 12c562385b8ed0..31ae4f2e74b83a 100644 --- a/src/app/util/af-types.h +++ b/src/app/util/af-types.h @@ -51,9 +51,9 @@ #include // For NULL. #include // For various uint*_t types -#include "af-enums.h" -#include "basic-types.h" -#include "types_stub.h" // For various types. +#include +#include +#include // For various types. #ifdef EZSP_HOST #include "app/util/ezsp/ezsp-enum.h" diff --git a/src/app/util/af.h b/src/app/util/af.h index 51416580d9f5ed..e5e2155b24f536 100644 --- a/src/app/util/af.h +++ b/src/app/util/af.h @@ -51,7 +51,7 @@ #pragma once #ifndef CONFIGURATION_HEADER -#define CONFIGURATION_HEADER "config.h" +#define CONFIGURATION_HEADER #endif #include CONFIGURATION_HEADER @@ -66,11 +66,11 @@ #include "stack/include/error.h" #endif // EZSP_HOST -#include "af-types.h" +#include -#include "client-api.h" -#include "debug-printing.h" -#include "ember-print.h" +#include +#include +#include /** @name Attribute Storage */ // @{ diff --git a/src/app/util/attribute-size.cpp b/src/app/util/attribute-size.cpp index 36ea019a9dda41..a66888b998423b 100644 --- a/src/app/util/attribute-size.cpp +++ b/src/app/util/attribute-size.cpp @@ -39,7 +39,7 @@ ******************************************************************************* ******************************************************************************/ -#include "af.h" +#include #include "gen/attribute-type.h" diff --git a/src/app/util/attribute-storage.cpp b/src/app/util/attribute-storage.cpp index a84faced9d0317..07023bb5b17ff8 100644 --- a/src/app/util/attribute-storage.cpp +++ b/src/app/util/attribute-storage.cpp @@ -39,9 +39,9 @@ ******************************************************************************* ******************************************************************************/ -#include "attribute-storage.h" -#include "af.h" #include "app/util/common.h" +#include +#include #include "gen/attribute-type.h" #include "gen/callback.h" diff --git a/src/app/util/attribute-storage.h b/src/app/util/attribute-storage.h index 5f67c4e9887640..d9ac221e1e29a0 100644 --- a/src/app/util/attribute-storage.h +++ b/src/app/util/attribute-storage.h @@ -42,7 +42,7 @@ #pragma once //#include PLATFORM_HEADER -#include "af.h" +#include #if !defined(EMBER_SCRIPTED_TEST) #include "gen/att-storage.h" diff --git a/src/app/util/attribute-table.cpp b/src/app/util/attribute-table.cpp index e32260ec07fe55..2b19c6d3bf1287 100644 --- a/src/app/util/attribute-table.cpp +++ b/src/app/util/attribute-table.cpp @@ -43,12 +43,12 @@ // this file contains all the common includes for clusters in the zcl-util -#include "attribute-storage.h" +#include // for pulling in defines dealing with EITHER server or client -#include "af-main.h" #include "app/util/common.h" #include "gen/callback.h" +#include #include diff --git a/src/app/util/attribute-table.h b/src/app/util/attribute-table.h index 217d1f43a531e8..37fdbd59fad8f0 100644 --- a/src/app/util/attribute-table.h +++ b/src/app/util/attribute-table.h @@ -41,7 +41,7 @@ #pragma once -#include "af.h" +#include #define ZCL_NULL_ATTRIBUTE_TABLE_INDEX 0xFFFF diff --git a/src/app/util/binding-table.cpp b/src/app/util/binding-table.cpp index a9bca1772a11b0..9098942fb682f0 100644 --- a/src/app/util/binding-table.cpp +++ b/src/app/util/binding-table.cpp @@ -19,8 +19,8 @@ * @file Basic implementation of a binding table. */ -#include "binding-table.h" #include "gen/gen_config.h" +#include static EmberBindingTableEntry bindingTable[EMBER_BINDING_TABLE_SIZE]; diff --git a/src/app/util/chip-message-send.cpp b/src/app/util/chip-message-send.cpp index dd5bed35922de0..07f3e810fcc65e 100644 --- a/src/app/util/chip-message-send.cpp +++ b/src/app/util/chip-message-send.cpp @@ -20,7 +20,7 @@ * This file provides an implementation of functions for sending messages. */ -#include "chip-message-send.h" +#include #include #include diff --git a/src/app/util/chip-message-send.h b/src/app/util/chip-message-send.h index 22d340cc585e7d..cfbc5987264f45 100644 --- a/src/app/util/chip-message-send.h +++ b/src/app/util/chip-message-send.h @@ -24,7 +24,7 @@ #pragma once -#include "types_stub.h" // For EmberApsFrame, EmberStatus, node ids. +#include // For EmberApsFrame, EmberStatus, node ids. /** * @brief diff --git a/src/app/util/client-api.cpp b/src/app/util/client-api.cpp index 817265b8e6c24d..efae02ecec684a 100644 --- a/src/app/util/client-api.cpp +++ b/src/app/util/client-api.cpp @@ -38,9 +38,9 @@ ******************************************************************************* ******************************************************************************/ -#include "client-api.h" #include "app/util/common.h" -#include "util.h" +#include +#include #include using namespace chip; diff --git a/src/app/util/client-api.h b/src/app/util/client-api.h index b929cac1d5615f..648dbb0c93c78f 100644 --- a/src/app/util/client-api.h +++ b/src/app/util/client-api.h @@ -40,7 +40,7 @@ #pragma once -#include "af-types.h" +#include /* @addtogroup command diff --git a/src/app/util/common.h b/src/app/util/common.h index 005a3267b2d726..8299594e460251 100644 --- a/src/app/util/common.h +++ b/src/app/util/common.h @@ -42,11 +42,11 @@ #pragma once // App framework -#include "af.h" -#include "attribute-storage.h" -#include "attribute-table.h" -#include "time-util.h" -#include "util.h" +#include +#include +#include +#include +#include // the variables used to setup and send responses to cluster messages extern EmberApsFrame emberAfResponseApsFrame; diff --git a/src/app/util/ember-compatibility-functions.cpp b/src/app/util/ember-compatibility-functions.cpp index 244aa1f83a883c..e1d103b658a042 100644 --- a/src/app/util/ember-compatibility-functions.cpp +++ b/src/app/util/ember-compatibility-functions.cpp @@ -21,13 +21,13 @@ * when calling ember callbacks. */ -#include "ember-compatibility-functions.h" +#include #include +#include #include #include #include -#include namespace chip { namespace app { diff --git a/src/app/util/ember-compatibility-functions.h b/src/app/util/ember-compatibility-functions.h index 3afbe99d4e18c9..2bb91b481182c1 100644 --- a/src/app/util/ember-compatibility-functions.h +++ b/src/app/util/ember-compatibility-functions.h @@ -24,8 +24,8 @@ #pragma once #include +#include #include -#include namespace chip { namespace app { diff --git a/src/app/util/ember-print.cpp b/src/app/util/ember-print.cpp index c6f94c91ca086b..d270e84fd040ab 100644 --- a/src/app/util/ember-print.cpp +++ b/src/app/util/ember-print.cpp @@ -18,8 +18,8 @@ #include #include -#include "af.h" -#include "debug-printing.h" +#include +#include #include #include diff --git a/src/app/util/ember-print.h b/src/app/util/ember-print.h index 5dd38fb48b142e..8f04d99c6a0e65 100644 --- a/src/app/util/ember-print.h +++ b/src/app/util/ember-print.h @@ -17,7 +17,7 @@ #pragma once -#include "debug-printing.h" +#include #include #include diff --git a/src/app/util/esi-management.cpp b/src/app/util/esi-management.cpp index 01688509c48c7d..cd71df408c0e49 100644 --- a/src/app/util/esi-management.cpp +++ b/src/app/util/esi-management.cpp @@ -39,8 +39,8 @@ ******************************************************************************* ******************************************************************************/ -#include "esi-management.h" -#include "af.h" +#include +#include #include using namespace chip; diff --git a/src/app/util/esi-management.h b/src/app/util/esi-management.h index 1ddc88aa0bb95e..f3e1e1f086484f 100644 --- a/src/app/util/esi-management.h +++ b/src/app/util/esi-management.h @@ -41,7 +41,7 @@ #pragma once -#include "af.h" +#include #ifndef EMBER_AF_PLUGIN_ESI_MANAGEMENT_ESI_TABLE_SIZE #define EMBER_AF_PLUGIN_ESI_MANAGEMENT_ESI_TABLE_SIZE 3 diff --git a/src/app/util/message.cpp b/src/app/util/message.cpp index 290e0a0e4368c6..547376fb52d4ce 100644 --- a/src/app/util/message.cpp +++ b/src/app/util/message.cpp @@ -39,9 +39,9 @@ ******************************************************************************* ******************************************************************************/ -#include "af.h" -#include "config.h" -#include "util.h" +#include +#include +#include using namespace chip; diff --git a/src/app/util/process-cluster-message.cpp b/src/app/util/process-cluster-message.cpp index 9b7a2134a1d951..9e7549a129d81e 100644 --- a/src/app/util/process-cluster-message.cpp +++ b/src/app/util/process-cluster-message.cpp @@ -43,13 +43,13 @@ #include "app/util/common.h" // for pulling in defines dealing with EITHER server or client -#include "af-main.h" +#include #include "gen/cluster-id.h" // the EM260 host needs to include the config file #ifdef EZSP_HOST -#include "config.h" +#include #endif //------------------------------------------------------------------------------ diff --git a/src/app/util/process-global-message.cpp b/src/app/util/process-global-message.cpp index e45f1dec9599c3..72c6488eee08de 100644 --- a/src/app/util/process-global-message.cpp +++ b/src/app/util/process-global-message.cpp @@ -39,7 +39,7 @@ ******************************************************************************* ******************************************************************************/ -#include "af.h" +#include #include #include diff --git a/src/app/util/types_stub.h b/src/app/util/types_stub.h index b174c537f7c1cb..9b8d389003897a 100644 --- a/src/app/util/types_stub.h +++ b/src/app/util/types_stub.h @@ -45,7 +45,7 @@ #include // For EmberApsFrame -#include "basic-types.h" +#include #include static_assert(sizeof(chip::NodeId) == sizeof(uint64_t), "Unexpected node if size"); diff --git a/src/app/util/util.cpp b/src/app/util/util.cpp index 6df97ba600074b..1b59dc186e7858 100644 --- a/src/app/util/util.cpp +++ b/src/app/util/util.cpp @@ -40,11 +40,11 @@ ******************************************************************************* ******************************************************************************/ -#include "af-event.h" -#include "af-main.h" -#include "af.h" #include "app/util/common.h" #include +#include +#include +#include #include "gen/attribute-id.h" #include "gen/attribute-type.h" diff --git a/src/app/util/util.h b/src/app/util/util.h index 2b9367b2f7a9cb..aa0d45139112c1 100644 --- a/src/app/util/util.h +++ b/src/app/util/util.h @@ -47,6 +47,8 @@ #pragma once +#include + // User asserts can override SLAB_ASSERT and should be defined as follows: // void userAssert (int file, int line); // declaration // #define USER_ASSERT(file, line) userAssert(file, line) // definition @@ -80,7 +82,7 @@ extern const EmberAfClusterName zclClusterNames[]; #define ZCL_NULL_CLUSTER_ID 0xFFFF -#include "af.h" +#include // Override APS retry: 0 - don't touch, 1 - always set, 2 - always unset typedef enum diff --git a/src/app/zap-templates/templates/app/af-structs.zapt b/src/app/zap-templates/templates/app/af-structs.zapt index 248cb9a8546442..04216491948374 100644 --- a/src/app/zap-templates/templates/app/af-structs.zapt +++ b/src/app/zap-templates/templates/app/af-structs.zapt @@ -4,7 +4,7 @@ #pragma once #include -#include "basic-types.h" +#include #include "enums.h" {{#zcl_structs}} diff --git a/src/app/zap-templates/templates/app/call-command-handler.zapt b/src/app/zap-templates/templates/app/call-command-handler.zapt index a57e126e3feb47..4204b944303aa7 100644 --- a/src/app/zap-templates/templates/app/call-command-handler.zapt +++ b/src/app/zap-templates/templates/app/call-command-handler.zapt @@ -3,4 +3,4 @@ // Prevent multiple inclusion #pragma once -#include "af-types.h" +#include diff --git a/src/app/zap-templates/templates/app/callback.zapt b/src/app/zap-templates/templates/app/callback.zapt index 4b19c8afc82156..033127264c7d0b 100644 --- a/src/app/zap-templates/templates/app/callback.zapt +++ b/src/app/zap-templates/templates/app/callback.zapt @@ -4,8 +4,8 @@ #pragma once #include "af-structs.h" -#include "af-types.h" -#include "basic-types.h" +#include +#include #include #include diff --git a/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt b/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt index 3f24d72be3a4a3..1f06fe83c3578f 100644 --- a/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt +++ b/src/app/zap-templates/templates/app/im-cluster-command-handler.zapt @@ -13,7 +13,7 @@ #include // Currently we need some work to keep compatible with ember lib. -#include +#include namespace chip { namespace app { diff --git a/src/app/zap-templates/templates/chip/encoder-src.zapt b/src/app/zap-templates/templates/chip/encoder-src.zapt index 269aa65ce02e59..d647ceca14fa3c 100644 --- a/src/app/zap-templates/templates/chip/encoder-src.zapt +++ b/src/app/zap-templates/templates/chip/encoder-src.zapt @@ -1,6 +1,6 @@ {{> header}} -#include "chip-zcl-zpro-codec.h" +#include #include #include diff --git a/src/controller/CHIPDevice.cpp b/src/controller/CHIPDevice.cpp index 3abb6c7e50a2fc..22bae09e725854 100644 --- a/src/controller/CHIPDevice.cpp +++ b/src/controller/CHIPDevice.cpp @@ -36,7 +36,7 @@ #endif // CHIP_SYSTEM_CONFIG_USE_LWIP #include -#include +#include #include #include #include diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp index 15cbc03a2ae089..e239a86a7edad2 100644 --- a/src/controller/CHIPDeviceController.cpp +++ b/src/controller/CHIPDeviceController.cpp @@ -40,7 +40,7 @@ #endif #include -#include +#include #include #include #include diff --git a/src/controller/EmptyDataModelHandler.cpp b/src/controller/EmptyDataModelHandler.cpp index bf90c64267ca1b..325a36640eb1f2 100644 --- a/src/controller/EmptyDataModelHandler.cpp +++ b/src/controller/EmptyDataModelHandler.cpp @@ -22,7 +22,7 @@ // defaults so that the controller library is self-sufficient and a controller // which has not yet implemented ZCL handlers builds without linker errors. -#include +#include __attribute__((weak)) void InitDataModelHandler() {} __attribute__((weak)) void HandleDataModelMessage(chip::NodeId nodeId, chip::System::PacketBufferHandle buffer) {} diff --git a/src/controller/python/gen/IMClusterCommandHandler.cpp b/src/controller/python/gen/IMClusterCommandHandler.cpp index 66e085fa9c4562..a634a043c0444d 100644 --- a/src/controller/python/gen/IMClusterCommandHandler.cpp +++ b/src/controller/python/gen/IMClusterCommandHandler.cpp @@ -30,7 +30,7 @@ #include // Currently we need some work to keep compatible with ember lib. -#include +#include namespace chip { namespace app { diff --git a/src/controller/python/gen/af-structs.h b/src/controller/python/gen/af-structs.h index 1d625494da0490..b19ca54657a27a 100644 --- a/src/controller/python/gen/af-structs.h +++ b/src/controller/python/gen/af-structs.h @@ -20,8 +20,8 @@ // Prevent multiple inclusion #pragma once -#include "basic-types.h" #include "enums.h" +#include #include // Struct for ApplicationLauncherApp diff --git a/src/controller/python/gen/call-command-handler.h b/src/controller/python/gen/call-command-handler.h index 16314d83b9817f..50a4e86fb253b3 100644 --- a/src/controller/python/gen/call-command-handler.h +++ b/src/controller/python/gen/call-command-handler.h @@ -20,4 +20,4 @@ // Prevent multiple inclusion #pragma once -#include "af-types.h" +#include diff --git a/src/controller/python/gen/callback.h b/src/controller/python/gen/callback.h index dcebe691cdc0b2..303f64478110bf 100644 --- a/src/controller/python/gen/callback.h +++ b/src/controller/python/gen/callback.h @@ -21,8 +21,8 @@ #pragma once #include "af-structs.h" -#include "af-types.h" -#include "basic-types.h" +#include +#include #include #include diff --git a/src/darwin/Framework/CHIP/gen/IMClusterCommandHandler.cpp b/src/darwin/Framework/CHIP/gen/IMClusterCommandHandler.cpp index fe39e1dfbb745e..03625546bab415 100644 --- a/src/darwin/Framework/CHIP/gen/IMClusterCommandHandler.cpp +++ b/src/darwin/Framework/CHIP/gen/IMClusterCommandHandler.cpp @@ -30,7 +30,7 @@ #include // Currently we need some work to keep compatible with ember lib. -#include +#include namespace chip { namespace app { diff --git a/src/darwin/Framework/CHIP/gen/af-structs.h b/src/darwin/Framework/CHIP/gen/af-structs.h index 1d625494da0490..b19ca54657a27a 100644 --- a/src/darwin/Framework/CHIP/gen/af-structs.h +++ b/src/darwin/Framework/CHIP/gen/af-structs.h @@ -20,8 +20,8 @@ // Prevent multiple inclusion #pragma once -#include "basic-types.h" #include "enums.h" +#include #include // Struct for ApplicationLauncherApp diff --git a/src/darwin/Framework/CHIP/gen/call-command-handler.h b/src/darwin/Framework/CHIP/gen/call-command-handler.h index 16314d83b9817f..50a4e86fb253b3 100644 --- a/src/darwin/Framework/CHIP/gen/call-command-handler.h +++ b/src/darwin/Framework/CHIP/gen/call-command-handler.h @@ -20,4 +20,4 @@ // Prevent multiple inclusion #pragma once -#include "af-types.h" +#include diff --git a/src/darwin/Framework/CHIP/gen/callback.h b/src/darwin/Framework/CHIP/gen/callback.h index c46b0bf4c11970..1ac38902657f28 100644 --- a/src/darwin/Framework/CHIP/gen/callback.h +++ b/src/darwin/Framework/CHIP/gen/callback.h @@ -21,8 +21,8 @@ #pragma once #include "af-structs.h" -#include "af-types.h" -#include "basic-types.h" +#include +#include #include #include diff --git a/src/setup_payload/BUILD.gn b/src/setup_payload/BUILD.gn index 2fc95a8e775cca..f10bc3c425a8c0 100644 --- a/src/setup_payload/BUILD.gn +++ b/src/setup_payload/BUILD.gn @@ -14,10 +14,6 @@ import("//build_overrides/chip.gni") -config("setup_payload_config") { - include_dirs = [ "." ] -} - static_library("setup_payload") { output_name = "libSetupPayload" @@ -50,6 +46,4 @@ static_library("setup_payload") { "${chip_root}/src/lib/core", "${chip_root}/src/lib/support", ] - - public_configs = [ ":setup_payload_config" ] } diff --git a/src/setup_payload/java/SetupPayloadParser-JNI.cpp b/src/setup_payload/java/SetupPayloadParser-JNI.cpp index 23779f61a1ecd5..456eb7d777e14c 100644 --- a/src/setup_payload/java/SetupPayloadParser-JNI.cpp +++ b/src/setup_payload/java/SetupPayloadParser-JNI.cpp @@ -1,5 +1,5 @@ -#include "ManualSetupPayloadParser.h" -#include "QRCodeSetupPayloadParser.h" +#include +#include #include #include diff --git a/src/setup_payload/tests/TestHelpers.h b/src/setup_payload/tests/TestHelpers.h index 645178a0e1d2bb..83d5721107bfd5 100644 --- a/src/setup_payload/tests/TestHelpers.h +++ b/src/setup_payload/tests/TestHelpers.h @@ -17,10 +17,10 @@ #include -#include "Base41.cpp" -#include "QRCodeSetupPayloadGenerator.cpp" -#include "QRCodeSetupPayloadParser.cpp" -#include "SetupPayload.cpp" +#include +#include +#include +#include namespace chip { diff --git a/src/setup_payload/tests/TestManualCode.cpp b/src/setup_payload/tests/TestManualCode.cpp index b1a4a17d7b44d5..67577b30b2b419 100644 --- a/src/setup_payload/tests/TestManualCode.cpp +++ b/src/setup_payload/tests/TestManualCode.cpp @@ -25,10 +25,10 @@ #include #include -#include "ManualSetupPayloadGenerator.cpp" -#include "ManualSetupPayloadParser.cpp" -#include "SetupPayload.cpp" -#include "SetupPayload.h" +#include +#include +#include +#include #include #include diff --git a/third_party/lwip/lwip.gni b/third_party/lwip/lwip.gni index 76f75dc4b58cbc..53ece77d19808c 100644 --- a/third_party/lwip/lwip.gni +++ b/third_party/lwip/lwip.gni @@ -93,10 +93,7 @@ template("lwip_target") { } config("${lwip_target_name}_base_config") { - include_dirs = [ - "${lwip_root}/repo/lwip/src/include", - "include", - ] + include_dirs = [ "${lwip_root}/repo/lwip/src/include" ] # These options may have overlap with lwipopts.h, however this is harmless # as long the options are the same and if they are not the same it's a