From 11785609fff0dcc355ef11d136d2854a2edd033b Mon Sep 17 00:00:00 2001 From: fesseha-eve <88329315+fessehaeve@users.noreply.github.com> Date: Mon, 13 Dec 2021 17:13:24 +0100 Subject: [PATCH] Add featuremap for thermostat and power source clusters (#12903) * Add featuremap definitions in Thermostat and Power Source cluster + moved thermostat cluster to a separate file * Regenerate all * Removed attributelist + add cluster element to feature bitmaps * Regenerate all * More discoballing of thermostat cluster definition * Regenerate all --- .../all-clusters-common/all-clusters-app.zap | 4 +- examples/lock-app/lock-common/lock-app.zap | 5 +- .../thermostat-common/thermostat.zap | 34 +-- .../tv-casting-common/tv-casting-app.zap | 4 +- src/app/zap-templates/zcl/data-model/all.xml | 1 + .../data-model/chip/power-source-cluster.xml | 8 + .../data-model/chip/thermostat-cluster.xml | 138 +++++++++++++ .../zcl/data-model/silabs/ha.xml | 108 ---------- src/app/zap-templates/zcl/zcl.json | 1 + .../data_model/controller-clusters.zap | 8 +- .../java/zap-generated/CHIPCallbackTypes.h | 4 + .../java/zap-generated/CHIPClusters-JNI.cpp | 18 +- .../zap-generated/CHIPInvokeCallbacks.cpp | 178 ++++++++++++++++ .../java/zap-generated/CHIPInvokeCallbacks.h | 30 +++ .../chip/devicecontroller/ChipClusters.java | 33 ++- .../devicecontroller/ClusterInfoMapping.java | 92 ++++++++- .../python/chip/clusters/Objects.py | 10 +- .../CHIP/zap-generated/CHIPCallbackBridge.mm | 59 ++++++ .../CHIPCallbackBridge_internal.h | 30 +++ .../CHIP/zap-generated/CHIPClustersObjc.h | 6 +- .../CHIP/zap-generated/CHIPClustersObjc.mm | 26 +-- .../zap-generated/CHIPCommandPayloadsObjc.h | 4 +- .../zap-generated/CHIPCommandPayloadsObjc.mm | 4 +- .../zap-generated/attributes/Accessors.cpp | 4 +- .../zap-generated/attributes/Accessors.h | 4 +- .../app-common/zap-generated/callback.h | 19 +- .../zap-generated/cluster-objects.cpp | 8 +- .../zap-generated/cluster-objects.h | 54 +++-- .../app-common/zap-generated/command-id.h | 4 +- .../app-common/zap-generated/enums.h | 20 ++ .../app-common/zap-generated/ids/Attributes.h | 4 +- .../app-common/zap-generated/ids/Commands.h | 8 +- .../zap-generated/cluster/Commands.h | 68 +++++- .../zap-generated/CHIPClientCallbacks.cpp | 40 ++++ .../zap-generated/CHIPClientCallbacks.h | 6 + .../zap-generated/IMClusterCommandHandler.cpp | 194 ++++++++++++++++++ .../lock-app/zap-generated/endpoint_config.h | 4 +- 37 files changed, 1011 insertions(+), 231 deletions(-) create mode 100644 src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml 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 index 22b6ce52d74847..01ab1953daf560 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -11124,7 +11124,7 @@ "enabled": 1, "commands": [ { - "name": "CurrentWeeklySchedule", + "name": "GetWeeklyScheduleResponse", "code": 0, "mfgCode": null, "source": "server", @@ -11132,7 +11132,7 @@ "outgoing": 0 }, { - "name": "RelayStatusLog", + "name": "GetRelayStatusLogResponse", "code": 1, "mfgCode": null, "source": "server", diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index ccc73eb30b5c14..1770fad717b070 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -1298,7 +1298,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "1", "reportable": 0, "minInterval": 1, "maxInterval": 65534, @@ -5588,5 +5588,6 @@ "endpointVersion": 1, "deviceIdentifier": 10 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index bc4deeef9ddb5a..65b81725bc91e2 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -10414,7 +10414,7 @@ "enabled": 1, "commands": [ { - "name": "CurrentWeeklySchedule", + "name": "GetWeeklyScheduleResponse", "code": 0, "mfgCode": null, "source": "server", @@ -10422,7 +10422,7 @@ "outgoing": 1 }, { - "name": "RelayStatusLog", + "name": "GetRelayStatusLogResponse", "code": 1, "mfgCode": null, "source": "server", @@ -12416,7 +12416,7 @@ ], "attributes": [ { - "name": "tv channel list", + "name": "channel list", "code": 0, "mfgCode": null, "side": "server", @@ -12431,7 +12431,7 @@ "reportableChange": 0 }, { - "name": "tv channel lineup", + "name": "channel lineup", "code": 1, "mfgCode": null, "side": "server", @@ -12446,7 +12446,7 @@ "reportableChange": 0 }, { - "name": "current tv channel", + "name": "current channel", "code": 2, "mfgCode": null, "side": "server", @@ -13100,7 +13100,7 @@ "reportableChange": 0 }, { - "name": "supported streaming types", + "name": "supported streaming protocols", "code": 1, "mfgCode": null, "side": "server", @@ -13396,7 +13396,7 @@ "reportableChange": 0 }, { - "name": "application id", + "name": "application status", "code": 5, "mfgCode": null, "side": "server", @@ -13411,7 +13411,7 @@ "reportableChange": 0 }, { - "name": "catalog vendor id", + "name": "application version", "code": 6, "mfgCode": null, "side": "server", @@ -13425,21 +13425,6 @@ "maxInterval": 65344, "reportableChange": 0 }, - { - "name": "application status", - "code": 7, - "mfgCode": null, - "side": "server", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0x01", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, { "name": "ClusterRevision", "code": 65533, @@ -13935,5 +13920,6 @@ "endpointVersion": 1, "deviceIdentifier": 769 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index 737de10220f581..b1ae7546bc821f 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -10016,7 +10016,7 @@ "enabled": 1, "commands": [ { - "name": "CurrentWeeklySchedule", + "name": "GetWeeklyScheduleResponse", "code": 0, "mfgCode": null, "source": "server", @@ -10024,7 +10024,7 @@ "outgoing": 1 }, { - "name": "RelayStatusLog", + "name": "GetRelayStatusLogResponse", "code": 1, "mfgCode": null, "source": "server", diff --git a/src/app/zap-templates/zcl/data-model/all.xml b/src/app/zap-templates/zcl/data-model/all.xml index 1bbbde543e01d1..feb167213830c0 100644 --- a/src/app/zap-templates/zcl/data-model/all.xml +++ b/src/app/zap-templates/zcl/data-model/all.xml @@ -52,6 +52,7 @@ + diff --git a/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml index 664efc1b23f07b..cc31b480ad0ee8 100644 --- a/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/power-source-cluster.xml @@ -82,6 +82,14 @@ limitations under the License. + + + + + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml new file mode 100644 index 00000000000000..59c42899dd556d --- /dev/null +++ b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml @@ -0,0 +1,138 @@ + + + + + + Thermostat + HVAC + An interface for configuring and controlling the functionality of a thermostat. + 0x0201 + THERMOSTAT_CLUSTER + true + true + + local temperature + outdoor temperature + occupancy + + abs min heat setpoint limit + abs max heat setpoint limit + abs min cool setpoint limit + abs max cool setpoint limit + pi cooling demand + pi heating demand + HVAC system type configuration + local temperature calibration + occupied cooling setpoint + occupied heating setpoint + unoccupied cooling setpoint + unoccupied heating setpoint + min heat setpoint limit + max heat setpoint limit + min cool setpoint limit + max cool setpoint limit + min setpoint dead band + remote sensing + control sequence of operation + system mode + alarm mask + + thermostat running mode + start of week + number of weekly transitions + number of daily transitions + temperature setpoint hold + temperature setpoint hold duration + thermostat programming operation mode + thermostat running state + setpoint change source + setpoint change amount + setpoint change source timestamp + ac type + ac capacity + ac refrigerant type + ac compressor + ac error code + ac louver position + ac coil temperature + ac capacity format + + + Command description for SetpointRaiseLower + + + + + + + Command description for SetWeeklySchedule + + + + + + + + + Command description for GetWeeklySchedule + + + + + + + The Clear Weekly Schedule command is used to clear the weekly schedule. + + + + + The Get Relay Status Log command is used to query the thermostat internal relay status log. + + + + + The Current Weekly Schedule Command is sent from the server in response to the Get Weekly Schedule Command. + + + + + + + + + This command is sent from the thermostat cluster server in response to the Get Relay Status Log. + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/zap-templates/zcl/data-model/silabs/ha.xml b/src/app/zap-templates/zcl/data-model/silabs/ha.xml index 3a47091f9d00e8..9c79336545174e 100644 --- a/src/app/zap-templates/zcl/data-model/silabs/ha.xml +++ b/src/app/zap-templates/zcl/data-model/silabs/ha.xml @@ -45,114 +45,6 @@ limitations under the License. mode - - Thermostat - HVAC - An interface for configuring and controlling the functionality of a thermostat. - 0x0201 - THERMOSTAT_CLUSTER - true - true - - local temperature - outdoor temperature - occupancy - - abs min heat setpoint limit - abs max heat setpoint limit - abs min cool setpoint limit - abs max cool setpoint limit - pi cooling demand - pi heating demand - HVAC system type configuration - local temperature calibration - occupied cooling setpoint - occupied heating setpoint - unoccupied cooling setpoint - unoccupied heating setpoint - min heat setpoint limit - max heat setpoint limit - min cool setpoint limit - max cool setpoint limit - min setpoint dead band - remote sensing - control sequence of operation - system mode - alarm mask - - thermostat running mode - start of week - number of weekly transitions - number of daily transitions - temperature setpoint hold - temperature setpoint hold duration - thermostat programming operation mode - hvac relay state - setpoint change source - setpoint change amount - setpoint change source timestamp - ac type - ac capacity - ac refrigerant type - ac compressor - ac error code - ac louver position - ac coil temperature - ac capacity format - - - Command description for SetpointRaiseLower - - - - - - - Command description for SetWeeklySchedule - - - - - - - - - Command description for GetWeeklySchedule - - - - - - - The Clear Weekly Schedule command is used to clear the weekly schedule. - - - - - The Get Relay Status Log command is used to query the thermostat internal relay status log. - - - - - The Current Weekly Schedule Command is sent from the server in response to the Get Weekly Schedule Command. - - - - - - - - - This command is sent from the thermostat cluster server in response to the Get Relay Status Log. - - - - - - - - - Fan Control HVAC diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index 0513b0ea5fff9d..6ef03a94167223 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -54,6 +54,7 @@ "target-navigator-cluster.xml", "temperature-measurement-cluster.xml", "test-cluster.xml", + "thermostat-cluster.xml", "thread-network-diagnostics-cluster.xml", "time-synchronization-cluster.xml", "tv-channel-cluster.xml", diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index a7df038b4381ec..cc574c91de978b 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -8030,19 +8030,19 @@ "enabled": 0, "commands": [ { - "name": "CurrentWeeklySchedule", + "name": "GetWeeklyScheduleResponse", "code": 0, "mfgCode": null, "source": "server", - "incoming": 0, + "incoming": 1, "outgoing": 0 }, { - "name": "RelayStatusLog", + "name": "GetRelayStatusLogResponse", "code": 1, "mfgCode": null, "source": "server", - "incoming": 0, + "incoming": 1, "outgoing": 0 } ], diff --git a/src/controller/java/zap-generated/CHIPCallbackTypes.h b/src/controller/java/zap-generated/CHIPCallbackTypes.h index 3247fa7bb89ccf..88f567f9050298 100644 --- a/src/controller/java/zap-generated/CHIPCallbackTypes.h +++ b/src/controller/java/zap-generated/CHIPCallbackTypes.h @@ -1113,6 +1113,10 @@ typedef void (*CHIPTestClusterClusterAttributeListAttributeCallbackType)( void *, const chip::app::Clusters::TestCluster::Attributes::AttributeList::TypeInfo::DecodableType &); typedef void (*CHIPTestClusterClusterClusterRevisionAttributeCallbackType)( void *, chip::app::Clusters::TestCluster::Attributes::ClusterRevision::TypeInfo::DecodableArgType); +typedef void (*CHIPThermostatClusterGetRelayStatusLogResponseCallbackType)( + void *, const chip::app::Clusters::Thermostat::Commands::GetRelayStatusLogResponse::DecodableType &); +typedef void (*CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType)( + void *, const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType &); typedef void (*CHIPThermostatClusterLocalTemperatureAttributeCallbackType)( void *, chip::app::Clusters::Thermostat::Attributes::LocalTemperature::TypeInfo::DecodableArgType); diff --git a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp index d9d2eedbaee64b..60726bea37aa1b 100644 --- a/src/controller/java/zap-generated/CHIPClusters-JNI.cpp +++ b/src/controller/java/zap-generated/CHIPClusters-JNI.cpp @@ -30756,8 +30756,10 @@ JNI_METHOD(void, ThermostatCluster, getRelayStatusLog)(JNIEnv * env, jobject sel chip::app::Clusters::Thermostat::Commands::GetRelayStatusLog::Type request; - std::unique_ptr onSuccess( - Platform::New(callback), Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -30772,7 +30774,8 @@ JNI_METHOD(void, ThermostatCluster, getRelayStatusLog)(JNIEnv * env, jobject sel AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); @@ -30797,8 +30800,10 @@ JNI_METHOD(void, ThermostatCluster, getWeeklySchedule) request.modeToReturn = static_cast(chip::JniReferences::GetInstance().IntegerToPrimitive(modeToReturn)); - std::unique_ptr onSuccess( - Platform::New(callback), Platform::Delete); + std::unique_ptr + onSuccess(Platform::New(callback), + Platform::Delete); std::unique_ptr onFailure( Platform::New(callback), Platform::Delete); VerifyOrReturn(onSuccess.get() != nullptr, @@ -30813,7 +30818,8 @@ JNI_METHOD(void, ThermostatCluster, getWeeklySchedule) AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error getting native cluster", CHIP_ERROR_INCORRECT_STATE)); - auto successFn = chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); + auto successFn = + chip::Callback::Callback::FromCancelable(onSuccess->Cancel()); auto failureFn = chip::Callback::Callback::FromCancelable(onFailure->Cancel()); err = cppCluster->InvokeCommand(request, onSuccess->mContext, successFn->mCall, failureFn->mCall); diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp index 4cdcd9770a2b8c..ab9deedbeb5c5d 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp @@ -4156,4 +4156,182 @@ void CHIPTestClusterClusterTestSpecificResponseCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, returnValue); } +CHIPThermostatClusterGetRelayStatusLogResponseCallback::CHIPThermostatClusterGetRelayStatusLogResponseCallback( + jobject javaCallback) : + Callback::Callback(CallbackFn, this) +{ + JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); + if (env == nullptr) + { + ChipLogError(Zcl, "Could not create global reference for Java callback"); + return; + } + + javaCallbackRef = env->NewGlobalRef(javaCallback); + if (javaCallbackRef == nullptr) + { + ChipLogError(Zcl, "Could not create global reference for Java callback"); + } +} + +CHIPThermostatClusterGetRelayStatusLogResponseCallback::~CHIPThermostatClusterGetRelayStatusLogResponseCallback() +{ + JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); + if (env == nullptr) + { + ChipLogError(Zcl, "Could not delete global reference for Java callback"); + return; + } + env->DeleteGlobalRef(javaCallbackRef); +}; + +void CHIPThermostatClusterGetRelayStatusLogResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::Thermostat::Commands::GetRelayStatusLogResponse::DecodableType & dataResponse) +{ + chip::DeviceLayer::StackUnlock unlock; + CHIP_ERROR err = CHIP_NO_ERROR; + JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); + jobject javaCallbackRef; + jmethodID javaMethod; + + VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); + + std::unique_ptr + cppCallback(reinterpret_cast(context), + chip::Platform::Delete); + VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); + + javaCallbackRef = cppCallback->javaCallbackRef; + // Java callback is allowed to be null, exit early if this is the case. + VerifyOrReturn(javaCallbackRef != nullptr); + + err = JniReferences::GetInstance().FindMethod( + env, javaCallbackRef, "onSuccess", + "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V", + &javaMethod); + VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); + + jobject timeOfDay; + + std::string timeOfDayClassName = "java/lang/Integer"; + std::string timeOfDayCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(timeOfDayClassName.c_str(), timeOfDayCtorSignature.c_str(), + dataResponse.timeOfDay, timeOfDay); + jobject relayStatus; + + std::string relayStatusClassName = "java/lang/Integer"; + std::string relayStatusCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(relayStatusClassName.c_str(), relayStatusCtorSignature.c_str(), + dataResponse.relayStatus, relayStatus); + jobject localTemperature; + + std::string localTemperatureClassName = "java/lang/Integer"; + std::string localTemperatureCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + localTemperatureClassName.c_str(), localTemperatureCtorSignature.c_str(), dataResponse.localTemperature, localTemperature); + jobject humidityInPercentage; + + std::string humidityInPercentageClassName = "java/lang/Integer"; + std::string humidityInPercentageCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(humidityInPercentageClassName.c_str(), + humidityInPercentageCtorSignature.c_str(), + dataResponse.humidityInPercentage, humidityInPercentage); + jobject setpoint; + + std::string setpointClassName = "java/lang/Integer"; + std::string setpointCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(setpointClassName.c_str(), setpointCtorSignature.c_str(), + dataResponse.setpoint, setpoint); + jobject unreadEntries; + + std::string unreadEntriesClassName = "java/lang/Integer"; + std::string unreadEntriesCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + unreadEntriesClassName.c_str(), unreadEntriesCtorSignature.c_str(), dataResponse.unreadEntries, unreadEntries); + + env->CallVoidMethod(javaCallbackRef, javaMethod, timeOfDay, relayStatus, localTemperature, humidityInPercentage, setpoint, + unreadEntries); +} +CHIPThermostatClusterGetWeeklyScheduleResponseCallback::CHIPThermostatClusterGetWeeklyScheduleResponseCallback( + jobject javaCallback) : + Callback::Callback(CallbackFn, this) +{ + JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); + if (env == nullptr) + { + ChipLogError(Zcl, "Could not create global reference for Java callback"); + return; + } + + javaCallbackRef = env->NewGlobalRef(javaCallback); + if (javaCallbackRef == nullptr) + { + ChipLogError(Zcl, "Could not create global reference for Java callback"); + } +} + +CHIPThermostatClusterGetWeeklyScheduleResponseCallback::~CHIPThermostatClusterGetWeeklyScheduleResponseCallback() +{ + JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); + if (env == nullptr) + { + ChipLogError(Zcl, "Could not delete global reference for Java callback"); + return; + } + env->DeleteGlobalRef(javaCallbackRef); +}; + +void CHIPThermostatClusterGetWeeklyScheduleResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & dataResponse) +{ + chip::DeviceLayer::StackUnlock unlock; + CHIP_ERROR err = CHIP_NO_ERROR; + JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); + jobject javaCallbackRef; + jmethodID javaMethod; + + VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); + + std::unique_ptr + cppCallback(reinterpret_cast(context), + chip::Platform::Delete); + VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); + + javaCallbackRef = cppCallback->javaCallbackRef; + // Java callback is allowed to be null, exit early if this is the case. + VerifyOrReturn(javaCallbackRef != nullptr); + + err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", + "(Ljava/lang/Integer;Ljava/lang/Integer;Ljava/lang/Integer;)V", &javaMethod); + VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); + + jobject numberOfTransitionsForSequence; + + std::string numberOfTransitionsForSequenceClassName = "java/lang/Integer"; + std::string numberOfTransitionsForSequenceCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + numberOfTransitionsForSequenceClassName.c_str(), numberOfTransitionsForSequenceCtorSignature.c_str(), + dataResponse.numberOfTransitionsForSequence, numberOfTransitionsForSequence); + jobject dayOfWeekForSequence; + + std::string dayOfWeekForSequenceClassName = "java/lang/Integer"; + std::string dayOfWeekForSequenceCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject>( + dayOfWeekForSequenceClassName.c_str(), dayOfWeekForSequenceCtorSignature.c_str(), dataResponse.dayOfWeekForSequence, + dayOfWeekForSequence); + jobject modeForSequence; + + std::string modeForSequenceClassName = "java/lang/Integer"; + std::string modeForSequenceCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject>( + modeForSequenceClassName.c_str(), modeForSequenceCtorSignature.c_str(), dataResponse.modeForSequence, modeForSequence); + jobject payload; + + payload = nullptr; /* Array - Conversion from this type to Java is not properly implemented yet */ + + env->CallVoidMethod(javaCallbackRef, javaMethod, numberOfTransitionsForSequence, dayOfWeekForSequence, modeForSequence, + payload); +} } // namespace chip diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h index 1d7f32b55d25a2..16a83b5ae49d97 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h @@ -897,4 +897,34 @@ class CHIPTestClusterClusterTestSpecificResponseCallback jobject javaCallbackRef; }; +class CHIPThermostatClusterGetRelayStatusLogResponseCallback + : public Callback::Callback +{ +public: + CHIPThermostatClusterGetRelayStatusLogResponseCallback(jobject javaCallback); + + ~CHIPThermostatClusterGetRelayStatusLogResponseCallback(); + + static void CallbackFn(void * context, + const chip::app::Clusters::Thermostat::Commands::GetRelayStatusLogResponse::DecodableType & data); + +private: + jobject javaCallbackRef; +}; + +class CHIPThermostatClusterGetWeeklyScheduleResponseCallback + : public Callback::Callback +{ +public: + CHIPThermostatClusterGetWeeklyScheduleResponseCallback(jobject javaCallback); + + ~CHIPThermostatClusterGetWeeklyScheduleResponseCallback(); + + static void CallbackFn(void * context, + const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & data); + +private: + jobject javaCallbackRef; +}; + } // namespace chip diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index 8db05defdccf0b..4a0d23f28e2d1b 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -13848,12 +13848,12 @@ public void clearWeeklySchedule(DefaultClusterCallback callback) { clearWeeklySchedule(chipClusterPtr, callback); } - public void getRelayStatusLog(DefaultClusterCallback callback) { + public void getRelayStatusLog(GetRelayStatusLogResponseCallback callback) { getRelayStatusLog(chipClusterPtr, callback); } public void getWeeklySchedule( - DefaultClusterCallback callback, Integer daysToReturn, Integer modeToReturn) { + GetWeeklyScheduleResponseCallback callback, Integer daysToReturn, Integer modeToReturn) { getWeeklySchedule(chipClusterPtr, callback, daysToReturn, modeToReturn); } @@ -13878,11 +13878,12 @@ public void setpointRaiseLower(DefaultClusterCallback callback, Integer mode, In private native void clearWeeklySchedule(long chipClusterPtr, DefaultClusterCallback Callback); - private native void getRelayStatusLog(long chipClusterPtr, DefaultClusterCallback Callback); + private native void getRelayStatusLog( + long chipClusterPtr, GetRelayStatusLogResponseCallback Callback); private native void getWeeklySchedule( long chipClusterPtr, - DefaultClusterCallback Callback, + GetWeeklyScheduleResponseCallback Callback, Integer daysToReturn, Integer modeToReturn); @@ -13897,6 +13898,30 @@ private native void setWeeklySchedule( private native void setpointRaiseLower( long chipClusterPtr, DefaultClusterCallback Callback, Integer mode, Integer amount); + public interface GetRelayStatusLogResponseCallback { + void onSuccess( + Integer timeOfDay, + Integer relayStatus, + Integer localTemperature, + Integer humidityInPercentage, + Integer setpoint, + Integer unreadEntries); + + void onError(Exception error); + } + + public interface GetWeeklyScheduleResponseCallback { + void onSuccess( + Integer numberOfTransitionsForSequence, + Integer dayOfWeekForSequence, + Integer modeForSequence + // payload: /* TYPE WARNING: array array defaults to */ uint8_t * + // Conversion from this type to Java is not properly implemented yet + ); + + void onError(Exception error); + } + public interface AttributeListAttributeCallback { void onSuccess(List valueList); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index 4ec43fc15a6404..3f79527e0babce 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -4074,6 +4074,89 @@ public void onError(Exception ex) { } } + public static class DelegatedGetRelayStatusLogResponseCallback + implements ChipClusters.ThermostatCluster.GetRelayStatusLogResponseCallback, + DelegatedClusterCallback { + private ClusterCommandCallback callback; + + @Override + public void setCallbackDelegate(ClusterCommandCallback callback) { + this.callback = callback; + } + + @Override + public void onSuccess( + Integer timeOfDay, + Integer relayStatus, + Integer localTemperature, + Integer humidityInPercentage, + Integer setpoint, + Integer unreadEntries) { + Map responseValues = new LinkedHashMap<>(); + CommandResponseInfo timeOfDayResponseValue = new CommandResponseInfo("timeOfDay", "int"); + responseValues.put(timeOfDayResponseValue, timeOfDay); + CommandResponseInfo relayStatusResponseValue = new CommandResponseInfo("relayStatus", "int"); + responseValues.put(relayStatusResponseValue, relayStatus); + CommandResponseInfo localTemperatureResponseValue = + new CommandResponseInfo("localTemperature", "int"); + responseValues.put(localTemperatureResponseValue, localTemperature); + CommandResponseInfo humidityInPercentageResponseValue = + new CommandResponseInfo("humidityInPercentage", "int"); + responseValues.put(humidityInPercentageResponseValue, humidityInPercentage); + CommandResponseInfo setpointResponseValue = new CommandResponseInfo("setpoint", "int"); + responseValues.put(setpointResponseValue, setpoint); + CommandResponseInfo unreadEntriesResponseValue = + new CommandResponseInfo("unreadEntries", "int"); + responseValues.put(unreadEntriesResponseValue, unreadEntries); + callback.onSuccess(responseValues); + } + + @Override + public void onError(Exception error) { + callback.onFailure(error); + } + } + + public static class DelegatedGetWeeklyScheduleResponseCallback + implements ChipClusters.ThermostatCluster.GetWeeklyScheduleResponseCallback, + DelegatedClusterCallback { + private ClusterCommandCallback callback; + + @Override + public void setCallbackDelegate(ClusterCommandCallback callback) { + this.callback = callback; + } + + @Override + public void onSuccess( + Integer numberOfTransitionsForSequence, + Integer dayOfWeekForSequence, + Integer modeForSequence + // payload: /* TYPE WARNING: array array defaults to */ uint8_t * + // Conversion from this type to Java is not properly implemented yet + ) { + Map responseValues = new LinkedHashMap<>(); + CommandResponseInfo numberOfTransitionsForSequenceResponseValue = + new CommandResponseInfo("numberOfTransitionsForSequence", "int"); + responseValues.put( + numberOfTransitionsForSequenceResponseValue, numberOfTransitionsForSequence); + CommandResponseInfo dayOfWeekForSequenceResponseValue = + new CommandResponseInfo("dayOfWeekForSequence", "int"); + responseValues.put(dayOfWeekForSequenceResponseValue, dayOfWeekForSequence); + CommandResponseInfo modeForSequenceResponseValue = + new CommandResponseInfo("modeForSequence", "int"); + responseValues.put(modeForSequenceResponseValue, modeForSequence); + // payload: /* TYPE WARNING: array array defaults to */ uint8_t * + // Conversion from this type to Java is not properly implemented yet + callback.onSuccess(responseValues); + } + + @Override + public void onError(Exception error) { + callback.onFailure(error); + } + } + public static class DelegatedThermostatClusterAttributeListAttributeCallback implements ChipClusters.ThermostatCluster.AttributeListAttributeCallback, DelegatedClusterCallback { @@ -9184,9 +9267,10 @@ public Map> getCommandMap() { new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.ThermostatCluster) cluster) - .getRelayStatusLog((DefaultClusterCallback) callback); + .getRelayStatusLog( + (ChipClusters.ThermostatCluster.GetRelayStatusLogResponseCallback) callback); }, - () -> new DelegatedDefaultClusterCallback(), + () -> new DelegatedGetRelayStatusLogResponseCallback(), thermostatgetRelayStatusLogCommandParams); thermostatClusterInteractionInfoMap.put( "getRelayStatusLog", thermostatgetRelayStatusLogInteractionInfo); @@ -9208,11 +9292,11 @@ public Map> getCommandMap() { (cluster, callback, commandArguments) -> { ((ChipClusters.ThermostatCluster) cluster) .getWeeklySchedule( - (DefaultClusterCallback) callback, + (ChipClusters.ThermostatCluster.GetWeeklyScheduleResponseCallback) callback, (Integer) commandArguments.get("daysToReturn"), (Integer) commandArguments.get("modeToReturn")); }, - () -> new DelegatedDefaultClusterCallback(), + () -> new DelegatedGetWeeklyScheduleResponseCallback(), thermostatgetWeeklyScheduleCommandParams); thermostatClusterInteractionInfoMap.put( "getWeeklySchedule", thermostatgetWeeklyScheduleInteractionInfo); diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index dae3beae401d44..4fb8ef4102ca3b 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -17510,7 +17510,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="temperatureSetpointHold", Tag=0x00000023, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="temperatureSetpointHoldDuration", Tag=0x00000024, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="thermostatProgrammingOperationMode", Tag=0x00000025, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="hvacRelayState", Tag=0x00000029, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="thermostatRunningState", Tag=0x00000029, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="setpointChangeSource", Tag=0x00000030, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="setpointChangeAmount", Tag=0x00000031, Type=typing.Optional[int]), ClusterObjectFieldDescriptor(Label="setpointChangeSourceTimestamp", Tag=0x00000032, Type=typing.Optional[uint]), @@ -17558,7 +17558,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: temperatureSetpointHold: 'typing.Optional[uint]' = None temperatureSetpointHoldDuration: 'typing.Optional[uint]' = None thermostatProgrammingOperationMode: 'typing.Optional[uint]' = None - hvacRelayState: 'typing.Optional[uint]' = None + thermostatRunningState: 'typing.Optional[uint]' = None setpointChangeSource: 'typing.Optional[uint]' = None setpointChangeAmount: 'typing.Optional[int]' = None setpointChangeSourceTimestamp: 'typing.Optional[uint]' = None @@ -17601,7 +17601,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: amount: 'int' = 0 @dataclass - class CurrentWeeklySchedule(ClusterCommand): + class GetWeeklyScheduleResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0201 command_id: typing.ClassVar[int] = 0x0000 is_client: typing.ClassVar[bool] = False @@ -17643,7 +17643,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: payload: 'typing.List[uint]' = field(default_factory=lambda: []) @dataclass - class RelayStatusLog(ClusterCommand): + class GetRelayStatusLogResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0201 command_id: typing.ClassVar[int] = 0x0001 is_client: typing.ClassVar[bool] = False @@ -18209,7 +18209,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[uint]' = None @dataclass - class HvacRelayState(ClusterAttributeDescriptor): + class ThermostatRunningState(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0201 diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm index 46bdaabebd4f18..f4717aa83f90eb 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm @@ -5992,6 +5992,65 @@ DispatchSuccess(context, response); }; +void CHIPThermostatClusterGetRelayStatusLogResponseCallbackBridge::OnSuccessFn( + void * context, const chip::app::Clusters::Thermostat::Commands::GetRelayStatusLogResponse::DecodableType & data) +{ + auto * response = [CHIPThermostatClusterGetRelayStatusLogResponseParams new]; + { + response.timeOfDay = [NSNumber numberWithUnsignedShort:data.timeOfDay]; + } + { + response.relayStatus = [NSNumber numberWithUnsignedShort:data.relayStatus]; + } + { + response.localTemperature = [NSNumber numberWithShort:data.localTemperature]; + } + { + response.humidityInPercentage = [NSNumber numberWithUnsignedChar:data.humidityInPercentage]; + } + { + response.setpoint = [NSNumber numberWithShort:data.setpoint]; + } + { + response.unreadEntries = [NSNumber numberWithUnsignedShort:data.unreadEntries]; + } + DispatchSuccess(context, response); +}; + +void CHIPThermostatClusterGetWeeklyScheduleResponseCallbackBridge::OnSuccessFn( + void * context, const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & data) +{ + auto * response = [CHIPThermostatClusterGetWeeklyScheduleResponseParams new]; + { + response.numberOfTransitionsForSequence = [NSNumber numberWithUnsignedChar:data.numberOfTransitionsForSequence]; + } + { + response.dayOfWeekForSequence = [NSNumber numberWithUnsignedChar:data.dayOfWeekForSequence.Raw()]; + } + { + response.modeForSequence = [NSNumber numberWithUnsignedChar:data.modeForSequence.Raw()]; + } + { + auto * array_0 = [NSMutableArray new]; + auto iter_0 = data.payload.begin(); + while (iter_0.Next()) { + auto & entry_0 = iter_0.GetValue(); + NSNumber * newElement_0; + newElement_0 = [NSNumber numberWithUnsignedChar:entry_0]; + [array_0 addObject:newElement_0]; + } + { // Scope for the error so we will know what it's named + CHIP_ERROR err = iter_0.GetStatus(); + if (err != CHIP_NO_ERROR) { + OnFailureFn(context, EMBER_ZCL_STATUS_INVALID_VALUE); + return; + } + } + response.payload = array_0; + } + DispatchSuccess(context, response); +}; + void CHIPIdentifyClusterIdentifyEffectIdentifierAttributeCallbackBridge::OnSuccessFn( void * context, chip::app::Clusters::Identify::IdentifyEffectIdentifier value) { diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h index 144587c74eeceb..b1a4391e7f1029 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h @@ -149,6 +149,10 @@ typedef void (*CHIPTestClusterClusterTestNullableOptionalResponseCallbackType)( void *, const chip::app::Clusters::TestCluster::Commands::TestNullableOptionalResponse::DecodableType &); typedef void (*CHIPTestClusterClusterTestSpecificResponseCallbackType)( void *, const chip::app::Clusters::TestCluster::Commands::TestSpecificResponse::DecodableType &); +typedef void (*CHIPThermostatClusterGetRelayStatusLogResponseCallbackType)( + void *, const chip::app::Clusters::Thermostat::Commands::GetRelayStatusLogResponse::DecodableType &); +typedef void (*CHIPThermostatClusterGetWeeklyScheduleResponseCallbackType)( + void *, const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType &); typedef void (*IdentifyClusterIdentifyEffectIdentifierAttributeCallback)(void *, chip::app::Clusters::Identify::IdentifyEffectIdentifier); @@ -4777,6 +4781,32 @@ class CHIPTestClusterClusterTestSpecificResponseCallbackBridge const chip::app::Clusters::TestCluster::Commands::TestSpecificResponse::DecodableType & data); }; +class CHIPThermostatClusterGetRelayStatusLogResponseCallbackBridge + : public CHIPCallbackBridge +{ +public: + CHIPThermostatClusterGetRelayStatusLogResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + keepAlive){}; + + static void OnSuccessFn(void * context, + const chip::app::Clusters::Thermostat::Commands::GetRelayStatusLogResponse::DecodableType & data); +}; + +class CHIPThermostatClusterGetWeeklyScheduleResponseCallbackBridge + : public CHIPCallbackBridge +{ +public: + CHIPThermostatClusterGetWeeklyScheduleResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, + keepAlive){}; + + static void OnSuccessFn(void * context, + const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & data); +}; + class CHIPIdentifyClusterIdentifyEffectIdentifierAttributeCallbackBridge : public CHIPCallbackBridge { diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h index b012e426c44dd3..260070f8d2abbe 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h @@ -4148,9 +4148,11 @@ NS_ASSUME_NONNULL_BEGIN @interface CHIPThermostat : CHIPCluster - (void)clearWeeklyScheduleWithCompletionHandler:(StatusCompletion)completionHandler; -- (void)getRelayStatusLogWithCompletionHandler:(StatusCompletion)completionHandler; +- (void)getRelayStatusLogWithCompletionHandler:(void (^)(CHIPThermostatClusterGetRelayStatusLogResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; - (void)getWeeklyScheduleWithParams:(CHIPThermostatClusterGetWeeklyScheduleParams *)params - completionHandler:(StatusCompletion)completionHandler; + completionHandler:(void (^)(CHIPThermostatClusterGetWeeklyScheduleResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler; - (void)setWeeklyScheduleWithParams:(CHIPThermostatClusterSetWeeklyScheduleParams *)params completionHandler:(StatusCompletion)completionHandler; - (void)setpointRaiseLowerWithParams:(CHIPThermostatClusterSetpointRaiseLowerParams *)params diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm index 9166e882a02ab9..6c23ea5ff66896 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm @@ -18530,25 +18530,23 @@ new CHIPCommandSuccessCallbackBridge( }); } -- (void)getRelayStatusLogWithCompletionHandler:(StatusCompletion)completionHandler +- (void)getRelayStatusLogWithCompletionHandler:(void (^)(CHIPThermostatClusterGetRelayStatusLogResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; Thermostat::Commands::GetRelayStatusLog::Type request; - new CHIPCommandSuccessCallbackBridge( - self.callbackQueue, - ^(id _Nullable value, NSError * _Nullable error) { - completionHandler(error); - }, - ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + new CHIPThermostatClusterGetRelayStatusLogResponseCallbackBridge( + self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); } - (void)getWeeklyScheduleWithParams:(CHIPThermostatClusterGetWeeklyScheduleParams *)params - completionHandler:(StatusCompletion)completionHandler + completionHandler:(void (^)(CHIPThermostatClusterGetWeeklyScheduleResponseParams * _Nullable data, + NSError * _Nullable error))completionHandler { ListFreer listFreer; Thermostat::Commands::GetWeeklySchedule::Type request; @@ -18557,13 +18555,9 @@ - (void)getWeeklyScheduleWithParams:(CHIPThermostatClusterGetWeeklyScheduleParam request.modeToReturn = static_cast>(params.modeToReturn.unsignedCharValue); - new CHIPCommandSuccessCallbackBridge( - self.callbackQueue, - ^(id _Nullable value, NSError * _Nullable error) { - completionHandler(error); - }, - ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); + new CHIPThermostatClusterGetWeeklyScheduleResponseCallbackBridge( + self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.InvokeCommand(request, successFn->mContext, successFn->mCall, failureFn->mCall); }); diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h index 8165255c8b9f56..233f94efaeb63e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h @@ -1211,7 +1211,7 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPThermostatClusterCurrentWeeklyScheduleParams : NSObject +@interface CHIPThermostatClusterGetWeeklyScheduleResponseParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull numberOfTransitionsForSequence; @property (strong, nonatomic) NSNumber * _Nonnull dayOfWeekForSequence; @property (strong, nonatomic) NSNumber * _Nonnull modeForSequence; @@ -1227,7 +1227,7 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)init; @end -@interface CHIPThermostatClusterRelayStatusLogParams : NSObject +@interface CHIPThermostatClusterGetRelayStatusLogResponseParams : NSObject @property (strong, nonatomic) NSNumber * _Nonnull timeOfDay; @property (strong, nonatomic) NSNumber * _Nonnull relayStatus; @property (strong, nonatomic) NSNumber * _Nonnull localTemperature; diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm index bc919c37cdf4b8..2272f2f76cdbbd 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm @@ -2570,7 +2570,7 @@ - (instancetype)init } @end -@implementation CHIPThermostatClusterCurrentWeeklyScheduleParams +@implementation CHIPThermostatClusterGetWeeklyScheduleResponseParams - (instancetype)init { if (self = [super init]) { @@ -2604,7 +2604,7 @@ - (instancetype)init } @end -@implementation CHIPThermostatClusterRelayStatusLogParams +@implementation CHIPThermostatClusterGetRelayStatusLogResponseParams - (instancetype)init { if (self = [super init]) { diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index 0a8332d14e4090..9f8966f7082a3f 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -16574,7 +16574,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) } // namespace ThermostatProgrammingOperationMode -namespace HvacRelayState { +namespace ThermostatRunningState { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { @@ -16601,7 +16601,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_BITMAP16_ATTRIBUTE_TYPE); } -} // namespace HvacRelayState +} // namespace ThermostatRunningState namespace SetpointChangeSource { diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index d0ec6997bea67a..91b2b32d121208 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -3109,10 +3109,10 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // bitmap8 EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); } // namespace ThermostatProgrammingOperationMode -namespace HvacRelayState { +namespace ThermostatRunningState { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // bitmap16 EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace HvacRelayState +} // namespace ThermostatRunningState namespace SetpointChangeSource { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8 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 8497ba36e404cf..399bc428c1d3cb 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -14498,12 +14498,12 @@ bool emberAfThermostatClusterSetpointRaiseLowerCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::Thermostat::Commands::SetpointRaiseLower::DecodableType & commandData); /** - * @brief Thermostat Cluster CurrentWeeklySchedule Command callback (from server) + * @brief Thermostat Cluster GetWeeklyScheduleResponse Command callback (from server) */ -bool emberAfThermostatClusterCurrentWeeklyScheduleCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t numberOfTransitionsForSequence, uint8_t dayOfWeekForSequence, - uint8_t modeForSequence, - /* TYPE WARNING: array array defaults to */ uint8_t * payload); +bool emberAfThermostatClusterGetWeeklyScheduleResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, + uint8_t numberOfTransitionsForSequence, uint8_t dayOfWeekForSequence, + uint8_t modeForSequence, + /* TYPE WARNING: array array defaults to */ uint8_t * payload); /** * @brief Thermostat Cluster SetWeeklySchedule Command callback (from client) */ @@ -14511,11 +14511,12 @@ bool emberAfThermostatClusterSetWeeklyScheduleCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::Thermostat::Commands::SetWeeklySchedule::DecodableType & commandData); /** - * @brief Thermostat Cluster RelayStatusLog Command callback (from server) + * @brief Thermostat Cluster GetRelayStatusLogResponse Command callback (from server) */ -bool emberAfThermostatClusterRelayStatusLogCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint16_t timeOfDay, uint16_t relayStatus, int16_t localTemperature, - uint8_t humidityInPercentage, int16_t setpoint, uint16_t unreadEntries); +bool emberAfThermostatClusterGetRelayStatusLogResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, + uint16_t timeOfDay, uint16_t relayStatus, int16_t localTemperature, + uint8_t humidityInPercentage, int16_t setpoint, + uint16_t unreadEntries); /** * @brief Thermostat Cluster GetWeeklySchedule Command callback (from client) */ diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index d0a42c9de65d0d..88117616eedef0 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -11957,7 +11957,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } } // namespace SetpointRaiseLower. -namespace CurrentWeeklySchedule { +namespace GetWeeklyScheduleResponse { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -12004,7 +12004,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace CurrentWeeklySchedule. +} // namespace GetWeeklyScheduleResponse. namespace SetWeeklySchedule { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { @@ -12053,7 +12053,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } } // namespace SetWeeklySchedule. -namespace RelayStatusLog { +namespace GetRelayStatusLogResponse { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; @@ -12107,7 +12107,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace RelayStatusLog. +} // namespace GetRelayStatusLogResponse. namespace GetWeeklySchedule { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 8cefe4c9e4d7c4..8d35224f65383b 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -8454,6 +8454,15 @@ struct TypeInfo } // namespace PowerSourceConfiguration namespace PowerSource { +// Bitmap for PowerSourceFeature +enum class PowerSourceFeature : uint32_t +{ + kWired = 0x1, + kBattery = 0x2, + kRechargeable = 0x4, + kReplaceable = 0x8, +}; + namespace Attributes { namespace Status { struct TypeInfo @@ -19771,6 +19780,17 @@ enum class ModeForSequence : uint8_t kCoolSetpointFieldPresent = 0x2, }; +// Bitmap for ThermostatFeature +enum class ThermostatFeature : uint32_t +{ + kHeating = 0x1, + kCooling = 0x2, + kOccupancy = 0x4, + kSchedule = 0x8, + kSetback = 0x10, + kAutomode = 0x20, +}; + namespace Commands { // Forward-declarations so we can reference these later. @@ -19779,20 +19799,20 @@ struct Type; struct DecodableType; } // namespace SetpointRaiseLower -namespace CurrentWeeklySchedule { +namespace GetWeeklyScheduleResponse { struct Type; struct DecodableType; -} // namespace CurrentWeeklySchedule +} // namespace GetWeeklyScheduleResponse namespace SetWeeklySchedule { struct Type; struct DecodableType; } // namespace SetWeeklySchedule -namespace RelayStatusLog { +namespace GetRelayStatusLogResponse { struct Type; struct DecodableType; -} // namespace RelayStatusLog +} // namespace GetRelayStatusLogResponse namespace GetWeeklySchedule { struct Type; @@ -19847,7 +19867,7 @@ struct DecodableType CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace SetpointRaiseLower -namespace CurrentWeeklySchedule { +namespace GetWeeklyScheduleResponse { enum class Fields { kNumberOfTransitionsForSequence = 0, @@ -19860,7 +19880,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::CurrentWeeklySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetWeeklyScheduleResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } uint8_t numberOfTransitionsForSequence; @@ -19878,7 +19898,7 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::CurrentWeeklySchedule::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetWeeklyScheduleResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } uint8_t numberOfTransitionsForSequence; @@ -19887,7 +19907,7 @@ struct DecodableType DataModel::DecodableList payload; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace CurrentWeeklySchedule +}; // namespace GetWeeklyScheduleResponse namespace SetWeeklySchedule { enum class Fields { @@ -19929,7 +19949,7 @@ struct DecodableType CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace SetWeeklySchedule -namespace RelayStatusLog { +namespace GetRelayStatusLogResponse { enum class Fields { kTimeOfDay = 0, @@ -19944,7 +19964,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::RelayStatusLog::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetRelayStatusLogResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } uint16_t timeOfDay; @@ -19964,7 +19984,7 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::RelayStatusLog::Id; } + static constexpr CommandId GetCommandId() { return Commands::GetRelayStatusLogResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } uint16_t timeOfDay; @@ -19975,7 +19995,7 @@ struct DecodableType uint16_t unreadEntries; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace RelayStatusLog +}; // namespace GetRelayStatusLogResponse namespace GetWeeklySchedule { enum class Fields { @@ -19995,7 +20015,7 @@ struct Type CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = DataModel::NullObjectType; + using ResponseType = Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -20053,7 +20073,7 @@ struct Type CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = DataModel::NullObjectType; + using ResponseType = Clusters::Thermostat::Commands::GetRelayStatusLogResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -20442,7 +20462,7 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace ThermostatProgrammingOperationMode -namespace HvacRelayState { +namespace ThermostatRunningState { struct TypeInfo { using Type = uint16_t; @@ -20450,10 +20470,10 @@ struct TypeInfo using DecodableArgType = uint16_t; static constexpr ClusterId GetClusterId() { return Clusters::Thermostat::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::HvacRelayState::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ThermostatRunningState::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace HvacRelayState +} // namespace ThermostatRunningState namespace SetpointChangeSource { struct TypeInfo { diff --git a/zzz_generated/app-common/app-common/zap-generated/command-id.h b/zzz_generated/app-common/app-common/zap-generated/command-id.h index ddc5cdfeddddf4..d69869337e9192 100644 --- a/zzz_generated/app-common/app-common/zap-generated/command-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/command-id.h @@ -300,9 +300,9 @@ // Commands for cluster: Thermostat #define ZCL_SETPOINT_RAISE_LOWER_COMMAND_ID (0x00) -#define ZCL_CURRENT_WEEKLY_SCHEDULE_COMMAND_ID (0x00) +#define ZCL_GET_WEEKLY_SCHEDULE_RESPONSE_COMMAND_ID (0x00) #define ZCL_SET_WEEKLY_SCHEDULE_COMMAND_ID (0x01) -#define ZCL_RELAY_STATUS_LOG_COMMAND_ID (0x01) +#define ZCL_GET_RELAY_STATUS_LOG_RESPONSE_COMMAND_ID (0x01) #define ZCL_GET_WEEKLY_SCHEDULE_COMMAND_ID (0x02) #define ZCL_CLEAR_WEEKLY_SCHEDULE_COMMAND_ID (0x03) #define ZCL_GET_RELAY_STATUS_LOG_COMMAND_ID (0x04) diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h index 7ec02298590c5d..f010e077f5bc1a 100644 --- a/zzz_generated/app-common/app-common/zap-generated/enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/enums.h @@ -1169,6 +1169,14 @@ enum EmberAfWiFiVersionType : uint8_t #define EMBER_AF_OCCUPANCY_SENSOR_TYPE_BITMAP_PHYSICAL_CONTACT_OFFSET (2) #define EMBER_AF_ON_OFF_CONTROL_ACCEPT_ONLY_WHEN_ON (1) #define EMBER_AF_ON_OFF_CONTROL_ACCEPT_ONLY_WHEN_ON_OFFSET (0) +#define EMBER_AF_POWER_SOURCE_FEATURE_WIRED (1) +#define EMBER_AF_POWER_SOURCE_FEATURE_WIRED_OFFSET (0) +#define EMBER_AF_POWER_SOURCE_FEATURE_BATTERY (2) +#define EMBER_AF_POWER_SOURCE_FEATURE_BATTERY_OFFSET (1) +#define EMBER_AF_POWER_SOURCE_FEATURE_RECHARGEABLE (4) +#define EMBER_AF_POWER_SOURCE_FEATURE_RECHARGEABLE_OFFSET (2) +#define EMBER_AF_POWER_SOURCE_FEATURE_REPLACEABLE (8) +#define EMBER_AF_POWER_SOURCE_FEATURE_REPLACEABLE_OFFSET (3) #define EMBER_AF_PUMP_STATUS_DEVICE_FAULT (1) #define EMBER_AF_PUMP_STATUS_DEVICE_FAULT_OFFSET (0) #define EMBER_AF_PUMP_STATUS_SUPPLYFAULT (2) @@ -1247,6 +1255,18 @@ enum EmberAfWiFiVersionType : uint8_t #define EMBER_AF_THERMOSTAT_ALARM_MASK_HARDWARE_FAILURE_OFFSET (1) #define EMBER_AF_THERMOSTAT_ALARM_MASK_SELFCALIBRATION_FAILURE (4) #define EMBER_AF_THERMOSTAT_ALARM_MASK_SELFCALIBRATION_FAILURE_OFFSET (2) +#define EMBER_AF_THERMOSTAT_FEATURE_HEATING (1) +#define EMBER_AF_THERMOSTAT_FEATURE_HEATING_OFFSET (0) +#define EMBER_AF_THERMOSTAT_FEATURE_COOLING (2) +#define EMBER_AF_THERMOSTAT_FEATURE_COOLING_OFFSET (1) +#define EMBER_AF_THERMOSTAT_FEATURE_OCCUPANCY (4) +#define EMBER_AF_THERMOSTAT_FEATURE_OCCUPANCY_OFFSET (2) +#define EMBER_AF_THERMOSTAT_FEATURE_SCHEDULE (8) +#define EMBER_AF_THERMOSTAT_FEATURE_SCHEDULE_OFFSET (3) +#define EMBER_AF_THERMOSTAT_FEATURE_SETBACK (16) +#define EMBER_AF_THERMOSTAT_FEATURE_SETBACK_OFFSET (4) +#define EMBER_AF_THERMOSTAT_FEATURE_AUTOMODE (32) +#define EMBER_AF_THERMOSTAT_FEATURE_AUTOMODE_OFFSET (5) #define EMBER_AF_THERMOSTAT_OCCUPANCY_OCCUPIED (1) #define EMBER_AF_THERMOSTAT_OCCUPANCY_OCCUPIED_OFFSET (0) #define EMBER_AF_THERMOSTAT_RUNNING_STATE_HEAT_STATE_ON (1) diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h index 62ea80977f6ad0..de11c99fc9a9a7 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h @@ -2888,9 +2888,9 @@ namespace ThermostatProgrammingOperationMode { static constexpr AttributeId Id = 0x00000025; } // namespace ThermostatProgrammingOperationMode -namespace HvacRelayState { +namespace ThermostatRunningState { static constexpr AttributeId Id = 0x00000029; -} // namespace HvacRelayState +} // namespace ThermostatRunningState namespace SetpointChangeSource { static constexpr AttributeId Id = 0x00000030; diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h index d74ce0eebdb937..0617f7b3e8d5d1 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h @@ -1042,17 +1042,17 @@ namespace SetpointRaiseLower { static constexpr CommandId Id = 0x00000000; } // namespace SetpointRaiseLower -namespace CurrentWeeklySchedule { +namespace GetWeeklyScheduleResponse { static constexpr CommandId Id = 0x00000000; -} // namespace CurrentWeeklySchedule +} // namespace GetWeeklyScheduleResponse namespace SetWeeklySchedule { static constexpr CommandId Id = 0x00000001; } // namespace SetWeeklySchedule -namespace RelayStatusLog { +namespace GetRelayStatusLogResponse { static constexpr CommandId Id = 0x00000001; -} // namespace RelayStatusLog +} // namespace GetRelayStatusLogResponse namespace GetWeeklySchedule { static constexpr CommandId Id = 0x00000002; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 92dd9848e9d263..a885e2bd229bdd 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -3441,6 +3441,66 @@ static void OnTestClusterTestSpecificResponseSuccess( command->SetCommandExitStatus(err); }; +static void OnThermostatGetRelayStatusLogResponseSuccess( + void * context, const chip::app::Clusters::Thermostat::Commands::GetRelayStatusLogResponse::DecodableType & data) +{ + ChipLogProgress(Zcl, "Received GetRelayStatusLogResponse:"); + CHIP_ERROR err = CHIP_NO_ERROR; + if (err == CHIP_NO_ERROR) + { + err = LogValue("timeOfDay", 1, data.timeOfDay); + } + if (err == CHIP_NO_ERROR) + { + err = LogValue("relayStatus", 1, data.relayStatus); + } + if (err == CHIP_NO_ERROR) + { + err = LogValue("localTemperature", 1, data.localTemperature); + } + if (err == CHIP_NO_ERROR) + { + err = LogValue("humidityInPercentage", 1, data.humidityInPercentage); + } + if (err == CHIP_NO_ERROR) + { + err = LogValue("setpoint", 1, data.setpoint); + } + if (err == CHIP_NO_ERROR) + { + err = LogValue("unreadEntries", 1, data.unreadEntries); + } + + ModelCommand * command = static_cast(context); + command->SetCommandExitStatus(err); +}; + +static void OnThermostatGetWeeklyScheduleResponseSuccess( + void * context, const chip::app::Clusters::Thermostat::Commands::GetWeeklyScheduleResponse::DecodableType & data) +{ + ChipLogProgress(Zcl, "Received GetWeeklyScheduleResponse:"); + CHIP_ERROR err = CHIP_NO_ERROR; + if (err == CHIP_NO_ERROR) + { + err = LogValue("numberOfTransitionsForSequence", 1, data.numberOfTransitionsForSequence); + } + if (err == CHIP_NO_ERROR) + { + err = LogValue("dayOfWeekForSequence", 1, data.dayOfWeekForSequence); + } + if (err == CHIP_NO_ERROR) + { + err = LogValue("modeForSequence", 1, data.modeForSequence); + } + if (err == CHIP_NO_ERROR) + { + err = LogValue("payload", 1, data.payload); + } + + ModelCommand * command = static_cast(context); + command->SetCommandExitStatus(err); +}; + /*----------------------------------------------------------------------------*\ | Cluster Name | ID | |---------------------------------------------------------------------+--------| @@ -40645,8 +40705,8 @@ class ThermostatGetRelayStatusLog : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000201) command (0x00000004) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, - mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnThermostatGetRelayStatusLogResponseSuccess, OnDefaultFailure, + endpointId, mRequest, mTimedInteractionTimeoutMs); } private: @@ -40673,8 +40733,8 @@ class ThermostatGetWeeklySchedule : public ModelCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000201) command (0x00000002) on endpoint %" PRIu8, endpointId); - return chip::Controller::InvokeCommand(device, this, OnDefaultSuccess, OnDefaultFailure, endpointId, mRequest, - mTimedInteractionTimeoutMs); + return chip::Controller::InvokeCommand(device, this, OnThermostatGetWeeklyScheduleResponseSuccess, OnDefaultFailure, + endpointId, mRequest, mTimedInteractionTimeoutMs); } private: diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp index 6f30ab4df16f5a..0bb35c05f889f8 100644 --- a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp +++ b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.cpp @@ -3119,3 +3119,43 @@ bool emberAfTestClusterClusterTestSpecificResponseCallback(EndpointId endpoint, cb->mCall(cb->mContext, returnValue); return true; } + +bool emberAfThermostatClusterGetRelayStatusLogResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, + uint16_t timeOfDay, uint16_t relayStatus, int16_t localTemperature, + uint8_t humidityInPercentage, int16_t setpoint, + uint16_t unreadEntries) +{ + ChipLogProgress(Zcl, "GetRelayStatusLogResponse:"); + ChipLogProgress(Zcl, " timeOfDay: %" PRIu16 "", timeOfDay); + ChipLogProgress(Zcl, " relayStatus: %" PRIu16 "", relayStatus); + ChipLogProgress(Zcl, " localTemperature: %" PRId16 "", localTemperature); + ChipLogProgress(Zcl, " humidityInPercentage: %" PRIu8 "", humidityInPercentage); + ChipLogProgress(Zcl, " setpoint: %" PRId16 "", setpoint); + ChipLogProgress(Zcl, " unreadEntries: %" PRIu16 "", unreadEntries); + + GET_CLUSTER_RESPONSE_CALLBACKS("ThermostatClusterGetRelayStatusLogResponseCallback"); + + Callback::Callback * cb = + Callback::Callback::FromCancelable(onSuccessCallback); + cb->mCall(cb->mContext, timeOfDay, relayStatus, localTemperature, humidityInPercentage, setpoint, unreadEntries); + return true; +} + +bool emberAfThermostatClusterGetWeeklyScheduleResponseCallback(EndpointId endpoint, app::CommandSender * commandObj, + uint8_t numberOfTransitionsForSequence, uint8_t dayOfWeekForSequence, + uint8_t modeForSequence, + /* TYPE WARNING: array array defaults to */ uint8_t * payload) +{ + ChipLogProgress(Zcl, "GetWeeklyScheduleResponse:"); + ChipLogProgress(Zcl, " numberOfTransitionsForSequence: %" PRIu8 "", numberOfTransitionsForSequence); + ChipLogProgress(Zcl, " dayOfWeekForSequence: %" PRIu8 "", dayOfWeekForSequence); + ChipLogProgress(Zcl, " modeForSequence: %" PRIu8 "", modeForSequence); + ChipLogProgress(Zcl, " payload: %p", payload); + + GET_CLUSTER_RESPONSE_CALLBACKS("ThermostatClusterGetWeeklyScheduleResponseCallback"); + + Callback::Callback * cb = + Callback::Callback::FromCancelable(onSuccessCallback); + cb->mCall(cb->mContext, numberOfTransitionsForSequence, dayOfWeekForSequence, modeForSequence, payload); + return true; +} diff --git a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h index 0fdab6c129bf45..5383519579665f 100644 --- a/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h +++ b/zzz_generated/controller-clusters/zap-generated/CHIPClientCallbacks.h @@ -128,6 +128,12 @@ typedef void (*TestClusterClusterTestListInt8UReverseResponseCallback)(void * co typedef void (*TestClusterClusterTestNullableOptionalResponseCallback)(void * context, bool wasPresent, bool wasNull, uint8_t value, uint8_t originalValue); typedef void (*TestClusterClusterTestSpecificResponseCallback)(void * context, uint8_t returnValue); +typedef void (*ThermostatClusterGetRelayStatusLogResponseCallback)(void * context, uint16_t timeOfDay, uint16_t relayStatus, + int16_t localTemperature, uint8_t humidityInPercentage, + int16_t setpoint, uint16_t unreadEntries); +typedef void (*ThermostatClusterGetWeeklyScheduleResponseCallback)(void * context, uint8_t numberOfTransitionsForSequence, + uint8_t dayOfWeekForSequence, uint8_t modeForSequence, + /* TYPE WARNING: array array defaults to */ uint8_t * payload); // List specific responses void AccessControlClusterAclListAttributeFilter(chip::TLV::TLVReader * data, chip::Callback::Cancelable * onSuccessCallback, diff --git a/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp index 70a86fbd3a066a..9c97d3bb88917a 100644 --- a/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/controller-clusters/zap-generated/IMClusterCommandHandler.cpp @@ -4465,6 +4465,197 @@ void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPa } // namespace TestCluster +namespace Thermostat { + +void DispatchClientCommand(CommandSender * apCommandObj, const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aDataTlv) +{ + // We are using TLVUnpackError and TLVError here since both of them can be CHIP_END_OF_TLV + // When TLVError is CHIP_END_OF_TLV, it means we have iterated all of the items, which is not a real error. + // Any error value TLVUnpackError means we have received an illegal value. + // The following variables are used for all commands to save code size. + CHIP_ERROR TLVError = CHIP_NO_ERROR; + CHIP_ERROR TLVUnpackError = CHIP_NO_ERROR; + uint32_t validArgumentCount = 0; + uint32_t expectArgumentCount = 0; + uint32_t currentDecodeTagId = 0; + bool wasHandled = false; + { + switch (aCommandPath.mCommandId) + { + case Commands::GetRelayStatusLogResponse::Id: { + expectArgumentCount = 6; + uint16_t timeOfDay; + uint16_t relayStatus; + int16_t localTemperature; + uint8_t humidityInPercentage; + int16_t setpoint; + uint16_t unreadEntries; + bool argExists[6]; + + memset(argExists, 0, sizeof argExists); + + while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) + { + // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. + // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. + if (!TLV::IsContextTag(aDataTlv.GetTag())) + { + continue; + } + currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); + if (currentDecodeTagId < 6) + { + if (argExists[currentDecodeTagId]) + { + ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); + TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; + break; + } + else + { + argExists[currentDecodeTagId] = true; + validArgumentCount++; + } + } + switch (currentDecodeTagId) + { + case 0: + TLVUnpackError = aDataTlv.Get(timeOfDay); + break; + case 1: + TLVUnpackError = aDataTlv.Get(relayStatus); + break; + case 2: + TLVUnpackError = aDataTlv.Get(localTemperature); + break; + case 3: + TLVUnpackError = aDataTlv.Get(humidityInPercentage); + break; + case 4: + TLVUnpackError = aDataTlv.Get(setpoint); + break; + case 5: + TLVUnpackError = aDataTlv.Get(unreadEntries); + break; + default: + // Unsupported tag, ignore it. + ChipLogProgress(Zcl, "Unknown TLV tag during processing."); + break; + } + if (CHIP_NO_ERROR != TLVUnpackError) + { + break; + } + } + + if (CHIP_END_OF_TLV == TLVError) + { + // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. + TLVError = CHIP_NO_ERROR; + } + + if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 6 == validArgumentCount) + { + wasHandled = emberAfThermostatClusterGetRelayStatusLogResponseCallback( + aCommandPath.mEndpointId, apCommandObj, timeOfDay, relayStatus, localTemperature, humidityInPercentage, + setpoint, unreadEntries); + } + break; + } + case Commands::GetWeeklyScheduleResponse::Id: { + expectArgumentCount = 4; + uint8_t numberOfTransitionsForSequence; + uint8_t dayOfWeekForSequence; + uint8_t modeForSequence; + /* TYPE WARNING: array array defaults to */ uint8_t * payload; + bool argExists[4]; + + memset(argExists, 0, sizeof argExists); + + while ((TLVError = aDataTlv.Next()) == CHIP_NO_ERROR) + { + // Since call to aDataTlv.Next() is CHIP_NO_ERROR, the read head always points to an element. + // Skip this element if it is not a ContextTag, not consider it as an error if other values are valid. + if (!TLV::IsContextTag(aDataTlv.GetTag())) + { + continue; + } + currentDecodeTagId = TLV::TagNumFromTag(aDataTlv.GetTag()); + if (currentDecodeTagId < 4) + { + if (argExists[currentDecodeTagId]) + { + ChipLogProgress(Zcl, "Duplicate TLV tag %" PRIx32, TLV::TagNumFromTag(aDataTlv.GetTag())); + TLVUnpackError = CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_ELEMENT; + break; + } + else + { + argExists[currentDecodeTagId] = true; + validArgumentCount++; + } + } + switch (currentDecodeTagId) + { + case 0: + TLVUnpackError = aDataTlv.Get(numberOfTransitionsForSequence); + break; + case 1: + TLVUnpackError = aDataTlv.Get(dayOfWeekForSequence); + break; + case 2: + TLVUnpackError = aDataTlv.Get(modeForSequence); + break; + case 3: + // Just for compatibility, we will add array type support in IM later. + TLVUnpackError = aDataTlv.GetDataPtr(const_cast(payload)); + break; + default: + // Unsupported tag, ignore it. + ChipLogProgress(Zcl, "Unknown TLV tag during processing."); + break; + } + if (CHIP_NO_ERROR != TLVUnpackError) + { + break; + } + } + + if (CHIP_END_OF_TLV == TLVError) + { + // CHIP_END_OF_TLV means we have iterated all items in the structure, which is not a real error. + TLVError = CHIP_NO_ERROR; + } + + if (CHIP_NO_ERROR == TLVError && CHIP_NO_ERROR == TLVUnpackError && 4 == validArgumentCount) + { + wasHandled = emberAfThermostatClusterGetWeeklyScheduleResponseCallback( + aCommandPath.mEndpointId, apCommandObj, numberOfTransitionsForSequence, dayOfWeekForSequence, modeForSequence, + payload); + } + break; + } + default: { + return; + } + } + } + + if (CHIP_NO_ERROR != TLVError || CHIP_NO_ERROR != TLVUnpackError || expectArgumentCount != validArgumentCount || !wasHandled) + { + ChipLogProgress(Zcl, + "Failed to dispatch command, %" PRIu32 "/%" PRIu32 " arguments parsed, TLVError=%" CHIP_ERROR_FORMAT + ", UnpackError=%" CHIP_ERROR_FORMAT " (last decoded tag = %" PRIu32, + validArgumentCount, expectArgumentCount, TLVError.Format(), TLVUnpackError.Format(), currentDecodeTagId); + // A command with no arguments would never write currentDecodeTagId. If + // progress logging is also disabled, it would look unused. Silence that + // warning. + UNUSED_VAR(currentDecodeTagId); + } +} + +} // namespace Thermostat + } // namespace Clusters void DispatchSingleClusterCommand(const ConcreteCommandPath & aCommandPath, TLV::TLVReader & aReader, CommandHandler * apCommandObj) @@ -4542,6 +4733,9 @@ void DispatchSingleClusterResponseCommand(const ConcreteCommandPath & aCommandPa case Clusters::TestCluster::Id: Clusters::TestCluster::DispatchClientCommand(apCommandObj, aCommandPath, aReader); break; + case Clusters::Thermostat::Id: + Clusters::Thermostat::DispatchClientCommand(apCommandObj, aCommandPath, aReader); + break; default: ChipLogError(Zcl, "Unknown cluster " ChipLogFormatMEI, ChipLogValueMEI(aCommandPath.mClusterId)); break; diff --git a/zzz_generated/lock-app/zap-generated/endpoint_config.h b/zzz_generated/lock-app/zap-generated/endpoint_config.h index ce07128278b217..215484feca3e1c 100644 --- a/zzz_generated/lock-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lock-app/zap-generated/endpoint_config.h @@ -41,7 +41,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 12 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x00, \ + 0x00, 0x00, 0x00, 0x01, \ \ /* Endpoint: 0, Cluster: General Commissioning (server), big-endian */ \ \ @@ -309,7 +309,7 @@ 0x00, 0x00, 0x00, 0x00, \ \ /* 12 - FeatureMap, */ \ - 0x00, 0x00, 0x00, 0x00, \ + 0x01, 0x00, 0x00, 0x00, \ \ /* Endpoint: 0, Cluster: General Commissioning (server), little-endian */ \ \