From 0ce9735781dc91875a8b1be4e28a2059f158a712 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 23 Dec 2022 10:35:47 -0500 Subject: [PATCH] Regenerate generated files. --- .../zap-generated/CHIPInvokeCallbacks.cpp | 50 +++++++++---------- .../devicecontroller/ClusterInfoMapping.java | 30 +++++------ .../CHIP/zap-generated/MTRBaseClusters.h | 5 +- .../app-common/zap-generated/callback.h | 8 +-- .../zap-generated/test/Commands.h | 18 +++---- 5 files changed, 57 insertions(+), 54 deletions(-) diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp index 9d3344adab4134..a77e04584a2a7b 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp @@ -1179,15 +1179,15 @@ void CHIPGeneralCommissioningClusterArmFailSafeResponseCallback::CallbackFn( &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject errorCode; - std::string errorCodeClassName = "java/lang/Integer"; - std::string errorCodeCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(errorCodeClassName.c_str(), errorCodeCtorSignature.c_str(), - static_cast(dataResponse.errorCode), errorCode); - jobject debugText; - debugText = env->NewStringUTF(std::string(dataResponse.debugText.data(), dataResponse.debugText.size()).c_str()); - - env->CallVoidMethod(javaCallbackRef, javaMethod, errorCode, debugText); + jobject ErrorCode; + std::string ErrorCodeClassName = "java/lang/Integer"; + std::string ErrorCodeCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(ErrorCodeClassName.c_str(), ErrorCodeCtorSignature.c_str(), + static_cast(dataResponse.errorCode), ErrorCode); + jobject DebugText; + DebugText = env->NewStringUTF(std::string(dataResponse.debugText.data(), dataResponse.debugText.size()).c_str()); + + env->CallVoidMethod(javaCallbackRef, javaMethod, ErrorCode, DebugText); } CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback:: CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(jobject javaCallback) : @@ -1245,15 +1245,15 @@ void CHIPGeneralCommissioningClusterSetRegulatoryConfigResponseCallback::Callbac &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject errorCode; - std::string errorCodeClassName = "java/lang/Integer"; - std::string errorCodeCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(errorCodeClassName.c_str(), errorCodeCtorSignature.c_str(), - static_cast(dataResponse.errorCode), errorCode); - jobject debugText; - debugText = env->NewStringUTF(std::string(dataResponse.debugText.data(), dataResponse.debugText.size()).c_str()); + jobject ErrorCode; + std::string ErrorCodeClassName = "java/lang/Integer"; + std::string ErrorCodeCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(ErrorCodeClassName.c_str(), ErrorCodeCtorSignature.c_str(), + static_cast(dataResponse.errorCode), ErrorCode); + jobject DebugText; + DebugText = env->NewStringUTF(std::string(dataResponse.debugText.data(), dataResponse.debugText.size()).c_str()); - env->CallVoidMethod(javaCallbackRef, javaMethod, errorCode, debugText); + env->CallVoidMethod(javaCallbackRef, javaMethod, ErrorCode, DebugText); } CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback:: CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback(jobject javaCallback) : @@ -1311,15 +1311,15 @@ void CHIPGeneralCommissioningClusterCommissioningCompleteResponseCallback::Callb &javaMethod); VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - jobject errorCode; - std::string errorCodeClassName = "java/lang/Integer"; - std::string errorCodeCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(errorCodeClassName.c_str(), errorCodeCtorSignature.c_str(), - static_cast(dataResponse.errorCode), errorCode); - jobject debugText; - debugText = env->NewStringUTF(std::string(dataResponse.debugText.data(), dataResponse.debugText.size()).c_str()); + jobject ErrorCode; + std::string ErrorCodeClassName = "java/lang/Integer"; + std::string ErrorCodeCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(ErrorCodeClassName.c_str(), ErrorCodeCtorSignature.c_str(), + static_cast(dataResponse.errorCode), ErrorCode); + jobject DebugText; + DebugText = env->NewStringUTF(std::string(dataResponse.debugText.data(), dataResponse.debugText.size()).c_str()); - env->CallVoidMethod(javaCallbackRef, javaMethod, errorCode, debugText); + env->CallVoidMethod(javaCallbackRef, javaMethod, ErrorCode, DebugText); } CHIPNetworkCommissioningClusterScanNetworksResponseCallback::CHIPNetworkCommissioningClusterScanNetworksResponseCallback( jobject javaCallback) : diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index 6434d4d249f139..c0c8f46f0fd904 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -2177,12 +2177,12 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(Integer errorCode, String debugText) { + public void onSuccess(Integer ErrorCode, String DebugText) { Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo errorCodeResponseValue = new CommandResponseInfo("errorCode", "Integer"); - responseValues.put(errorCodeResponseValue, errorCode); - CommandResponseInfo debugTextResponseValue = new CommandResponseInfo("debugText", "String"); - responseValues.put(debugTextResponseValue, debugText); + CommandResponseInfo ErrorCodeResponseValue = new CommandResponseInfo("ErrorCode", "Integer"); + responseValues.put(ErrorCodeResponseValue, ErrorCode); + CommandResponseInfo DebugTextResponseValue = new CommandResponseInfo("DebugText", "String"); + responseValues.put(DebugTextResponseValue, DebugText); callback.onSuccess(responseValues); } @@ -2203,12 +2203,12 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(Integer errorCode, String debugText) { + public void onSuccess(Integer ErrorCode, String DebugText) { Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo errorCodeResponseValue = new CommandResponseInfo("errorCode", "Integer"); - responseValues.put(errorCodeResponseValue, errorCode); - CommandResponseInfo debugTextResponseValue = new CommandResponseInfo("debugText", "String"); - responseValues.put(debugTextResponseValue, debugText); + CommandResponseInfo ErrorCodeResponseValue = new CommandResponseInfo("ErrorCode", "Integer"); + responseValues.put(ErrorCodeResponseValue, ErrorCode); + CommandResponseInfo DebugTextResponseValue = new CommandResponseInfo("DebugText", "String"); + responseValues.put(DebugTextResponseValue, DebugText); callback.onSuccess(responseValues); } @@ -2229,12 +2229,12 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(Integer errorCode, String debugText) { + public void onSuccess(Integer ErrorCode, String DebugText) { Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo errorCodeResponseValue = new CommandResponseInfo("errorCode", "Integer"); - responseValues.put(errorCodeResponseValue, errorCode); - CommandResponseInfo debugTextResponseValue = new CommandResponseInfo("debugText", "String"); - responseValues.put(debugTextResponseValue, debugText); + CommandResponseInfo ErrorCodeResponseValue = new CommandResponseInfo("ErrorCode", "Integer"); + responseValues.put(ErrorCodeResponseValue, ErrorCode); + CommandResponseInfo DebugTextResponseValue = new CommandResponseInfo("DebugText", "String"); + responseValues.put(DebugTextResponseValue, DebugText); callback.onSuccess(responseValues); } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 9250cc268cbc54..a4ceee7eba016b 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -17437,7 +17437,10 @@ typedef NS_OPTIONS(uint32_t, MTRPowerSourceFeature) { } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); typedef NS_ENUM(uint8_t, MTRGeneralCommissioningCommissioningError) { - MTRGeneralCommissioningCommissioningErrorOk API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, + MTRGeneralCommissioningCommissioningErrorOK MTR_NEWLY_AVAILABLE = 0x00, + MTRGeneralCommissioningCommissioningErrorOk API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTRGeneralCommissioningCommissioningErrorOK") + = 0x00, MTRGeneralCommissioningCommissioningErrorValueOutsideRange API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, MTRGeneralCommissioningCommissioningErrorInvalidAuthentication API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h index 406cb39979d4f7..aebe2184331823 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -7949,7 +7949,7 @@ bool emberAfGeneralCommissioningClusterArmFailSafeCallback( * @brief General Commissioning Cluster ArmFailSafeResponse Command callback (from server) */ bool emberAfGeneralCommissioningClusterArmFailSafeResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t errorCode, chip::CharSpan debugText); + uint8_t ErrorCode, chip::CharSpan DebugText); /** * @brief General Commissioning Cluster SetRegulatoryConfig Command callback (from client) */ @@ -7960,8 +7960,8 @@ bool emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback( * @brief General Commissioning Cluster SetRegulatoryConfigResponse Command callback (from server) */ bool emberAfGeneralCommissioningClusterSetRegulatoryConfigResponseCallback(chip::EndpointId endpoint, - chip::app::CommandSender * commandObj, uint8_t errorCode, - chip::CharSpan debugText); + chip::app::CommandSender * commandObj, uint8_t ErrorCode, + chip::CharSpan DebugText); /** * @brief General Commissioning Cluster CommissioningComplete Command callback (from client) */ @@ -7973,7 +7973,7 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback( */ bool emberAfGeneralCommissioningClusterCommissioningCompleteResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t errorCode, chip::CharSpan debugText); + uint8_t ErrorCode, chip::CharSpan DebugText); /** * @brief Network Commissioning Cluster ScanNetworks Command callback (from client) */ diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 859c8026370121..2e1b2f1006dd6a 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -96574,7 +96574,7 @@ class TestGeneralCommissioning : public TestCommandBridge { { id actualValue = values.errorCode; - VerifyOrReturn(CheckValue("errorCode", actualValue, 3U)); + VerifyOrReturn(CheckValue("ErrorCode", actualValue, 3U)); } NextTest(); @@ -96652,7 +96652,7 @@ class TestGeneralCommissioning : public TestCommandBridge { { id actualValue = values.errorCode; - VerifyOrReturn(CheckValue("errorCode", actualValue, 4U)); + VerifyOrReturn(CheckValue("ErrorCode", actualValue, 4U)); } NextTest(); @@ -96747,7 +96747,7 @@ class TestGeneralCommissioning : public TestCommandBridge { { id actualValue = values.errorCode; - VerifyOrReturn(CheckValue("errorCode", actualValue, 0U)); + VerifyOrReturn(CheckValue("ErrorCode", actualValue, 0U)); } NextTest(); @@ -96802,7 +96802,7 @@ class TestGeneralCommissioning : public TestCommandBridge { { id actualValue = values.errorCode; - VerifyOrReturn(CheckValue("errorCode", actualValue, 4U)); + VerifyOrReturn(CheckValue("ErrorCode", actualValue, 4U)); } NextTest(); @@ -96853,7 +96853,7 @@ class TestGeneralCommissioning : public TestCommandBridge { { id actualValue = values.errorCode; - VerifyOrReturn(CheckValue("errorCode", actualValue, 2U)); + VerifyOrReturn(CheckValue("ErrorCode", actualValue, 2U)); } NextTest(); @@ -96904,7 +96904,7 @@ class TestGeneralCommissioning : public TestCommandBridge { { id actualValue = values.errorCode; - VerifyOrReturn(CheckValue("errorCode", actualValue, 0U)); + VerifyOrReturn(CheckValue("ErrorCode", actualValue, 0U)); } NextTest(); @@ -96959,7 +96959,7 @@ class TestGeneralCommissioning : public TestCommandBridge { { id actualValue = values.errorCode; - VerifyOrReturn(CheckValue("errorCode", actualValue, 0U)); + VerifyOrReturn(CheckValue("ErrorCode", actualValue, 0U)); } NextTest(); @@ -97014,7 +97014,7 @@ class TestGeneralCommissioning : public TestCommandBridge { { id actualValue = values.errorCode; - VerifyOrReturn(CheckValue("errorCode", actualValue, 0U)); + VerifyOrReturn(CheckValue("ErrorCode", actualValue, 0U)); } NextTest(); @@ -100232,7 +100232,7 @@ class TestArmFailSafe : public TestCommandBridge { { id actualValue = values.errorCode; - VerifyOrReturn(CheckValue("errorCode", actualValue, 0U)); + VerifyOrReturn(CheckValue("ErrorCode", actualValue, 0U)); } NextTest();