Merge commit '78469bb8012524e5921216783937cc7349ac2628' of https://gi…

…thub.com/project-chip/connectedhomeip into feature/device_attestation_complete
project-chip · Sep 10, 2021 · 99b1fa3 · 99b1fa3
2 parents d5e476f + 78469bb
commit 99b1fa3
Show file tree

Hide file tree

Showing 177 changed files with 4,531 additions and 4,852 deletions.
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
@@ -200,6 +200,7 @@ config("strict_warnings") {
     "-Wextra",
     "-Wshadow",
     "-Wunreachable-code",
+    "-Wvla",
   ]
 
   cflags_cc = [ "-Wnon-virtual-dtor" ]

diff --git a/config/android/CHIPProjectConfig.h b/config/android/CHIPProjectConfig.h
@@ -46,8 +46,6 @@
 
 #define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 300
 
-#define CHIP_CONFIG_ENABLE_FUNCT_ERROR_LOGGING 1
-
 #define CHIP_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL 1
 
 #define CHIP_CONFIG_MAX_SOFTWARE_VERSION_LENGTH 128

diff --git a/config/ios/CHIPProjectConfig.h b/config/ios/CHIPProjectConfig.h
@@ -46,8 +46,6 @@
 
 #define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 300
 
-#define CHIP_CONFIG_ENABLE_FUNCT_ERROR_LOGGING 1
-
 #define CHIP_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL 1
 
 #define CHIP_CONFIG_MAX_SOFTWARE_VERSION_LENGTH 128

diff --git a/config/standalone/CHIPProjectConfig.h b/config/standalone/CHIPProjectConfig.h
@@ -67,8 +67,6 @@
 
 #define CHIP_SYSTEM_CONFIG_PACKETBUFFER_POOL_SIZE 0
 
-#define CHIP_CONFIG_ENABLE_FUNCT_ERROR_LOGGING 1
-
 #define CHIP_CONFIG_DATA_MANAGEMENT_CLIENT_EXPERIMENTAL 1
 
 #define CHIP_DEVICE_CONFIG_ENABLE_TEST_DEVICE_IDENTITY 1

diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -1,5 +1,5 @@
 {
-  "featureLevel": 45,
+  "featureLevel": 51,
   "creator": "zap",
   "keyValuePairs": [
     {
@@ -17335,6 +17335,5 @@
       "endpointVersion": null,
       "deviceIdentifier": null
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap
@@ -1,5 +1,5 @@
 {
-  "featureLevel": 45,
+  "featureLevel": 51,
   "creator": "zap",
   "keyValuePairs": [
     {
@@ -3379,6 +3379,5 @@
       "endpointVersion": null,
       "deviceIdentifier": null
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/chip-tool/templates/helper.js b/examples/chip-tool/templates/helper.js
@@ -16,7 +16,7 @@
  */
 
 // Import helpers from zap core
-const zapPath      = '../../../third_party/zap/repo/src-electron/';
+const zapPath      = '../../../third_party/zap/repo/dist/src-electron/';
 const templateUtil = require(zapPath + 'generator/template-util.js')
 const zclHelper    = require(zapPath + 'generator/helper-zcl.js')
 

diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap
@@ -1,5 +1,5 @@
 {
-  "featureLevel": 45,
+  "featureLevel": 51,
   "creator": "zap",
   "keyValuePairs": [
     {
@@ -5522,6 +5522,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": 259
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap
@@ -1,5 +1,5 @@
 {
-  "featureLevel": 45,
+  "featureLevel": 51,
   "creator": "zap",
   "keyValuePairs": [
     {
@@ -4391,6 +4391,5 @@
       "endpointVersion": 0,
       "deviceIdentifier": null
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/ota-provider-app/linux/README.md b/examples/ota-provider-app/linux/README.md
@@ -3,6 +3,11 @@
 This is a reference application that implements an example of an OTA Provider
 Cluster Server.
 
+## Building
+
+Suggest doing the following:
+`scripts/examples/gn_build_example.sh examples/ota-provider-app/linux out/debug chip_config_network_layer_ble=false`
+
 ## Usage
 
 `./ota-provider-app [--filepath \<filepath\>]`

diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
@@ -1,5 +1,5 @@
 {
-  "featureLevel": 45,
+  "featureLevel": 51,
   "creator": "zap",
   "keyValuePairs": [
     {
@@ -3313,6 +3313,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": null
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/platform/nrfconnect/util/test/TestInetCommon.cpp b/examples/platform/nrfconnect/util/test/TestInetCommon.cpp
@@ -55,7 +55,7 @@
 using namespace chip;
 using namespace chip::Inet;
 
-System::Layer gSystemLayer;
+System::LayerImpl gSystemLayer;
 
 Inet::InetLayer gInet;
 

diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap
@@ -1,5 +1,5 @@
 {
-  "featureLevel": 45,
+  "featureLevel": 51,
   "creator": "zap",
   "keyValuePairs": [
     {
@@ -5028,6 +5028,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": null
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap
@@ -1,5 +1,5 @@
 {
-  "featureLevel": 45,
+  "featureLevel": 51,
   "creator": "zap",
   "keyValuePairs": [
     {
@@ -5028,6 +5028,5 @@
       "endpointVersion": 1,
       "deviceIdentifier": null
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap
@@ -1,5 +1,5 @@
 {
-  "featureLevel": 45,
+  "featureLevel": 51,
   "creator": "zap",
   "keyValuePairs": [
     {
@@ -2526,6 +2526,5 @@
       "endpointVersion": null,
       "deviceIdentifier": null
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
@@ -1,5 +1,5 @@
 {
-  "featureLevel": 45,
+  "featureLevel": 51,
   "creator": "zap",
   "keyValuePairs": [
     {
@@ -16375,6 +16375,5 @@
       "endpointVersion": null,
       "deviceIdentifier": null
     }
-  ],
-  "log": []
+  ]
 }
diff --git a/examples/tv-app/linux/include/application-launcher/ApplicationLauncherManager.cpp b/examples/tv-app/linux/include/application-launcher/ApplicationLauncherManager.cpp
@@ -40,7 +40,7 @@ vector<uint16_t> ApplicationLauncherManager::proxyGetApplicationList()
     return applications;
 }
 
-ApplicationLauncherResponse applicationLauncherClusterLaunchApp(EmberAfApplicationLauncherApp application, std::string data)
+ApplicationLauncherResponse applicationLauncherClusterLaunchApp(ApplicationLauncherApp application, std::string data)
 {
     // TODO: Insert your code
     ApplicationLauncherResponse response;

diff --git a/examples/tv-app/linux/include/audio-output/AudioOutputManager.cpp b/examples/tv-app/linux/include/audio-output/AudioOutputManager.cpp
@@ -39,16 +39,16 @@ CHIP_ERROR AudioOutputManager::Init()
     return err;
 }
 
-vector<EmberAfAudioOutputInfo> AudioOutputManager::proxyGetListOfAudioOutputInfo()
+vector<AudioOutputInfo> AudioOutputManager::proxyGetListOfAudioOutputInfo()
 {
     // TODO: Insert code here
-    vector<EmberAfAudioOutputInfo> audioOutputInfos;
+    vector<AudioOutputInfo> audioOutputInfos;
     int maximumVectorSize = 3;
     char name[]           = "exampleName";
 
     for (int i = 0; i < maximumVectorSize; ++i)
     {
-        EmberAfAudioOutputInfo audioOutputInfo;
+        AudioOutputInfo audioOutputInfo;
         audioOutputInfo.outputType = EMBER_ZCL_AUDIO_OUTPUT_TYPE_HDMI;
         audioOutputInfo.name       = chip::ByteSpan(chip::Uint8::from_char(name), sizeof(name));
         audioOutputInfo.index      = static_cast<uint8_t>(1 + i);

diff --git a/examples/tv-app/linux/include/audio-output/AudioOutputManager.h b/examples/tv-app/linux/include/audio-output/AudioOutputManager.h
@@ -26,5 +26,5 @@ class AudioOutputManager
 {
 public:
     CHIP_ERROR Init();
-    std::vector<EmberAfAudioOutputInfo> proxyGetListOfAudioOutputInfo();
+    std::vector<AudioOutputInfo> proxyGetListOfAudioOutputInfo();
 };
diff --git a/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp b/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.cpp
@@ -72,8 +72,8 @@ vector<EmberAfContentLaunchStreamingType> ContentLauncherManager::proxyGetSuppor
     return supportedStreamingTypes;
 }
 
-ContentLaunchResponse ContentLauncherManager::proxyLaunchContentRequest(list<EmberAfContentLaunchParamater> parameterList,
-                                                                        bool autoplay, string data)
+ContentLaunchResponse ContentLauncherManager::proxyLaunchContentRequest(list<ContentLaunchParamater> parameterList, bool autoplay,
+                                                                        string data)
 {
     // TODO: Insert code here
     ContentLaunchResponse response;
@@ -82,7 +82,7 @@ ContentLaunchResponse ContentLauncherManager::proxyLaunchContentRequest(list<Emb
     return response;
 }
 ContentLaunchResponse ContentLauncherManager::proxyLaunchUrlRequest(string contentUrl, string displayString,
-                                                                    EmberAfContentLaunchBrandingInformation brandingInformation)
+                                                                    ContentLaunchBrandingInformation brandingInformation)
 {
     // TODO: Insert code here
     ContentLaunchResponse response;
@@ -108,7 +108,7 @@ bool emberAfContentLauncherClusterLaunchContentCallback(chip::EndpointId endpoin
 {
 
     string dataString(reinterpret_cast<char *>(data));
-    list<EmberAfContentLaunchParamater> parameterList;
+    list<ContentLaunchParamater> parameterList;
     ContentLaunchResponse response = ContentLauncherManager().proxyLaunchContentRequest(parameterList, autoplay, dataString);
     sendResponse("LaunchContent", response, ZCL_LAUNCH_CONTENT_RESPONSE_COMMAND_ID);
     return true;
@@ -119,7 +119,7 @@ bool emberAfContentLauncherClusterLaunchURLCallback(chip::EndpointId endpoint, c
 {
     string contentUrlString(reinterpret_cast<char *>(contentUrl));
     string displayStringString(reinterpret_cast<char *>(displayString));
-    EmberAfContentLaunchBrandingInformation brandingInformation;
+    ContentLaunchBrandingInformation brandingInformation;
     ContentLaunchResponse response =
         ContentLauncherManager().proxyLaunchUrlRequest(contentUrlString, displayStringString, brandingInformation);
     sendResponse("LaunchURL", response, ZCL_LAUNCH_URL_RESPONSE_COMMAND_ID);

diff --git a/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.h b/examples/tv-app/linux/include/content-launcher/ContentLauncherManager.h
@@ -36,8 +36,8 @@ class ContentLauncherManager
     CHIP_ERROR Init();
     std::vector<chip::ByteSpan> proxyGetAcceptsHeader();
     std::vector<EmberAfContentLaunchStreamingType> proxyGetSupportedStreamingTypes();
-    ContentLaunchResponse proxyLaunchContentRequest(std::list<EmberAfContentLaunchParamater> parameterList, bool autoplay,
+    ContentLaunchResponse proxyLaunchContentRequest(std::list<ContentLaunchParamater> parameterList, bool autoplay,
                                                     std::string data);
     ContentLaunchResponse proxyLaunchUrlRequest(std::string contentUrl, std::string displayString,
-                                                EmberAfContentLaunchBrandingInformation brandingInformation);
+                                                ContentLaunchBrandingInformation brandingInformation);
 };
diff --git a/examples/tv-app/linux/include/media-input/MediaInputManager.cpp b/examples/tv-app/linux/include/media-input/MediaInputManager.cpp
@@ -35,17 +35,17 @@ CHIP_ERROR MediaInputManager::Init()
     return err;
 }
 
-std::vector<EmberAfMediaInputInfo> MediaInputManager::proxyGetInputList()
+std::vector<MediaInputInfo> MediaInputManager::proxyGetInputList()
 {
     // TODO: Insert code here
-    std::vector<EmberAfMediaInputInfo> mediaInputList;
+    std::vector<MediaInputInfo> mediaInputList;
     int maximumVectorSize = 2;
     char description[]    = "exampleDescription";
     char name[]           = "exampleName";
 
     for (int i = 0; i < maximumVectorSize; ++i)
     {
-        EmberAfMediaInputInfo mediaInput;
+        MediaInputInfo mediaInput;
         mediaInput.description = chip::ByteSpan(chip::Uint8::from_char(description), sizeof(description));
         mediaInput.name        = chip::ByteSpan(chip::Uint8::from_char(name), sizeof(name));
         mediaInput.inputType   = EMBER_ZCL_MEDIA_INPUT_TYPE_HDMI;

diff --git a/examples/tv-app/linux/include/media-input/MediaInputManager.h b/examples/tv-app/linux/include/media-input/MediaInputManager.h
@@ -28,5 +28,5 @@ class MediaInputManager
 {
 public:
     CHIP_ERROR Init();
-    std::vector<EmberAfMediaInputInfo> proxyGetInputList();
+    std::vector<MediaInputInfo> proxyGetInputList();
 };
diff --git a/examples/tv-app/linux/include/target-navigator/TargetNavigatorManager.cpp b/examples/tv-app/linux/include/target-navigator/TargetNavigatorManager.cpp
@@ -36,16 +36,16 @@ CHIP_ERROR TargetNavigatorManager::Init()
     return err;
 }
 
-std::vector<EmberAfNavigateTargetTargetInfo> TargetNavigatorManager::proxyGetTargetInfoList()
+std::vector<NavigateTargetTargetInfo> TargetNavigatorManager::proxyGetTargetInfoList()
 {
     // TODO: Insert code here
-    std::vector<EmberAfNavigateTargetTargetInfo> targets;
+    std::vector<NavigateTargetTargetInfo> targets;
     int maximumVectorSize = 2;
     char name[]           = "exampleName";
 
     for (int i = 0; i < maximumVectorSize; ++i)
     {
-        EmberAfNavigateTargetTargetInfo targetInfo;
+        NavigateTargetTargetInfo targetInfo;
         targetInfo.name       = chip::ByteSpan(chip::Uint8::from_char(name), sizeof(name));
         targetInfo.identifier = static_cast<uint8_t>(1 + i);
         targets.push_back(targetInfo);

diff --git a/examples/tv-app/linux/include/target-navigator/TargetNavigatorManager.h b/examples/tv-app/linux/include/target-navigator/TargetNavigatorManager.h
@@ -27,5 +27,5 @@ class TargetNavigatorManager
 {
 public:
     CHIP_ERROR Init();
-    std::vector<EmberAfNavigateTargetTargetInfo> proxyGetTargetInfoList();
+    std::vector<NavigateTargetTargetInfo> proxyGetTargetInfoList();
 };
diff --git a/examples/tv-app/linux/include/tv-channel/TvChannelManager.cpp b/examples/tv-app/linux/include/tv-channel/TvChannelManager.cpp
@@ -41,18 +41,18 @@ CHIP_ERROR TvChannelManager::Init()
     return err;
 }
 
-std::vector<EmberAfTvChannelInfo> TvChannelManager::proxyGetTvChannelList()
+std::vector<TvChannelInfo> TvChannelManager::proxyGetTvChannelList()
 {
     // TODO: Insert code here
-    std::vector<EmberAfTvChannelInfo> tvChannels;
+    std::vector<TvChannelInfo> tvChannels;
     int maximumVectorSize    = 2;
     char affiliateCallSign[] = "exampleASign";
     char callSign[]          = "exampleCSign";
     char name[]              = "exampleName";
 
     for (int i = 0; i < maximumVectorSize; ++i)
     {
-        EmberAfTvChannelInfo channelInfo;
+        TvChannelInfo channelInfo;
         channelInfo.affiliateCallSign = ByteSpan(Uint8::from_char(affiliateCallSign), sizeof(affiliateCallSign));
         channelInfo.callSign          = ByteSpan(Uint8::from_char(callSign), sizeof(callSign));
         channelInfo.name              = ByteSpan(Uint8::from_char(name), sizeof(name));
@@ -64,10 +64,10 @@ std::vector<EmberAfTvChannelInfo> TvChannelManager::proxyGetTvChannelList()
     return tvChannels;
 }
 
-EmberAfTvChannelInfo tvChannelClusterChangeChannel(std::string match)
+TvChannelInfo tvChannelClusterChangeChannel(std::string match)
 {
     // TODO: Insert code here
-    EmberAfTvChannelInfo channel = {};
+    TvChannelInfo channel = {};
     return channel;
 }
 bool tvChannelClusterChangeChannelByNumber(uint16_t majorNumber, uint16_t minorNumber)

diff --git a/examples/tv-app/linux/include/tv-channel/TvChannelManager.h b/examples/tv-app/linux/include/tv-channel/TvChannelManager.h
@@ -27,5 +27,5 @@ class TvChannelManager
 {
 public:
     CHIP_ERROR Init();
-    std::vector<EmberAfTvChannelInfo> proxyGetTvChannelList();
+    std::vector<TvChannelInfo> proxyGetTvChannelList();
 };