From 55583c095b2370b8683d90eeb58f1dfa3fd968c2 Mon Sep 17 00:00:00 2001 From: cecille Date: Fri, 12 Jan 2024 17:17:50 -0500 Subject: [PATCH 1/2] Do not use gen_config.h directly. Apparently the right file is config.h, which includes the gen file. --- .../include/static-supported-temperature-levels.h | 2 +- .../src/static-supported-temperature-levels.cpp | 2 +- .../placeholder/linux/static-supported-temperature-levels.cpp | 1 - .../include/static-supported-temperature-levels.h | 2 +- .../src/static-supported-temperature-levels.cpp | 2 +- .../general-diagnostics-server/general-diagnostics-server.cpp | 2 +- src/app/clusters/power-source-server/power-source-server.cpp | 2 +- src/app/clusters/scenes-server/SceneTableImpl.h | 3 ++- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h b/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h index 1ef9f1db0c56ab..50739de0201628 100644 --- a/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h +++ b/examples/all-clusters-app/all-clusters-common/include/static-supported-temperature-levels.h @@ -20,7 +20,7 @@ #include #include -#include +#include namespace chip { namespace app { diff --git a/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp b/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp index d5352eed7b6367..78f909b13143eb 100644 --- a/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp +++ b/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp @@ -17,7 +17,7 @@ */ #include -#include +#include using namespace std; using namespace chip; diff --git a/examples/placeholder/linux/static-supported-temperature-levels.cpp b/examples/placeholder/linux/static-supported-temperature-levels.cpp index 14a1087d230a4d..ed80f5490df821 100644 --- a/examples/placeholder/linux/static-supported-temperature-levels.cpp +++ b/examples/placeholder/linux/static-supported-temperature-levels.cpp @@ -18,7 +18,6 @@ #include #include -#include using namespace std; using namespace chip; diff --git a/examples/refrigerator-app/refrigerator-common/include/static-supported-temperature-levels.h b/examples/refrigerator-app/refrigerator-common/include/static-supported-temperature-levels.h index 1ef9f1db0c56ab..50739de0201628 100644 --- a/examples/refrigerator-app/refrigerator-common/include/static-supported-temperature-levels.h +++ b/examples/refrigerator-app/refrigerator-common/include/static-supported-temperature-levels.h @@ -20,7 +20,7 @@ #include #include -#include +#include namespace chip { namespace app { diff --git a/examples/refrigerator-app/refrigerator-common/src/static-supported-temperature-levels.cpp b/examples/refrigerator-app/refrigerator-common/src/static-supported-temperature-levels.cpp index ae7a7dfa72c9ea..0ae695ec6ab315 100644 --- a/examples/refrigerator-app/refrigerator-common/src/static-supported-temperature-levels.cpp +++ b/examples/refrigerator-app/refrigerator-common/src/static-supported-temperature-levels.cpp @@ -17,7 +17,7 @@ */ #include -#include +#include using namespace std; using namespace chip; diff --git a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp index 0c5cf641268ad9..6f4a5c3e74f5b4 100644 --- a/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp +++ b/src/app/clusters/general-diagnostics-server/general-diagnostics-server.cpp @@ -17,7 +17,7 @@ #include "general-diagnostics-server.h" -#include +#include #ifdef ZCL_USING_TIME_SYNCHRONIZATION_CLUSTER_SERVER // Need the `nogncheck` because it's inter-cluster dependency and this diff --git a/src/app/clusters/power-source-server/power-source-server.cpp b/src/app/clusters/power-source-server/power-source-server.cpp index 3baf2df84949f4..037a182dd7a0d6 100644 --- a/src/app/clusters/power-source-server/power-source-server.cpp +++ b/src/app/clusters/power-source-server/power-source-server.cpp @@ -25,9 +25,9 @@ #include #include #include +#include #include #include -#include using namespace chip; using namespace app; diff --git a/src/app/clusters/scenes-server/SceneTableImpl.h b/src/app/clusters/scenes-server/SceneTableImpl.h index 753799ec70c68e..7bd124c9420865 100644 --- a/src/app/clusters/scenes-server/SceneTableImpl.h +++ b/src/app/clusters/scenes-server/SceneTableImpl.h @@ -20,11 +20,12 @@ #include #include #include +#include #include #include #include #include -#include + namespace chip { namespace scenes { From a1c2108f529fda326591e01c73e7e65fcb2f2f9a Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Fri, 12 Jan 2024 22:19:54 +0000 Subject: [PATCH 2/2] Restyled by clang-format --- .../src/static-supported-temperature-levels.cpp | 2 +- .../src/static-supported-temperature-levels.cpp | 2 +- src/app/clusters/scenes-server/SceneTableImpl.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp b/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp index 78f909b13143eb..0a830480fb188c 100644 --- a/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp +++ b/examples/all-clusters-app/all-clusters-common/src/static-supported-temperature-levels.cpp @@ -16,8 +16,8 @@ * limitations under the License. */ -#include #include +#include using namespace std; using namespace chip; diff --git a/examples/refrigerator-app/refrigerator-common/src/static-supported-temperature-levels.cpp b/examples/refrigerator-app/refrigerator-common/src/static-supported-temperature-levels.cpp index 0ae695ec6ab315..a03a98d89feb1f 100644 --- a/examples/refrigerator-app/refrigerator-common/src/static-supported-temperature-levels.cpp +++ b/examples/refrigerator-app/refrigerator-common/src/static-supported-temperature-levels.cpp @@ -16,8 +16,8 @@ * limitations under the License. */ -#include #include +#include using namespace std; using namespace chip; diff --git a/src/app/clusters/scenes-server/SceneTableImpl.h b/src/app/clusters/scenes-server/SceneTableImpl.h index 7bd124c9420865..01801fd2dd1310 100644 --- a/src/app/clusters/scenes-server/SceneTableImpl.h +++ b/src/app/clusters/scenes-server/SceneTableImpl.h @@ -26,7 +26,6 @@ #include #include - namespace chip { namespace scenes {