Skip to content

Commit

Permalink
DEMM, EVSEM, WHM, EEVSE, DEM, EWATERHTR zap XML out of date with 1.4 …
Browse files Browse the repository at this point in the history 
…specs (#36155)

* Fixes #36059

* regen_all after change to mode cluster ZCL XML

* Checking on EEVSE the cluster revision was wrong (looks like the rev 4 was backed out after it was felt to still be a draft). Taken in the DEM and WHM latest descriptions based on Alchemy autogen.

* revert description in DEM which was truncated by Alchemy

* regen_all

* Removed src/app/tests/suites/certification/Test_TC_EEVSEM_3_1.yaml, Test_TC_EEVSEM_3_2.yaml, Test_TC_EEVSEM_3_3.yaml which were removed in test plan PR: CHIP-Specifications/chip-test-plans#4553

* Reverted change to domain since ZAP does not show the clusters if the <domain> element text is empty
  • Loading branch information
@jamesharrow
jamesharrow authored Oct 21, 2024
1 parent 6f0a70c commit 9ee0499
Show file tree
Hide file tree
Showing 43 changed files with 179 additions and 4,801 deletions.
30 changes: 11 additions & 19 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4709,13 +4709,13 @@ provisional cluster DeviceEnergyManagement = 152 {
command ModifyForecastRequest(ModifyForecastRequestRequest): DefaultSuccess = 5;
/** Allows a client to ask the ESA to recompute its Forecast based on power and time constraints. */
command RequestConstraintBasedForecast(RequestConstraintBasedForecastRequest): DefaultSuccess = 6;
/** Allows a client to request cancellation of a previous adjustment request in a StartTimeAdjustRequest, ModifyForecastRequest or RequestConstraintBasedForecast command */
/** Allows a client to request cancellation of a previous adjustment request in a StartTimeAdjustRequest, ModifyForecastRequest or RequestConstraintBasedForecast command. */
command CancelRequest(): DefaultSuccess = 7;
}

/** Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an interface to the functionality of Electric Vehicle Supply Equipment (EVSE) management. */
cluster EnergyEvse = 153 {
revision 4;
revision 3;

enum EnergyTransferStoppedReasonEnum : enum8 {
kEVStopped = 0;
Expand Down Expand Up @@ -4880,9 +4880,9 @@ cluster EnergyEvse = 153 {

/** Allows a client to disable the EVSE from charging and discharging. */
timed command Disable(): DefaultSuccess = 1;
/** This command allows a client to enable the EVSE to charge an EV, */
/** This command allows a client to enable the EVSE to charge an EV, and to provide or update the maximum and minimum charge current. */
timed command EnableCharging(EnableChargingRequest): DefaultSuccess = 2;
/** Upon receipt, this SHALL allow a client to enable the discharge of an EV, */
/** Upon receipt, this SHALL allow a client to enable the discharge of an EV, and to provide or update the maximum discharge current. */
timed command EnableDischarging(EnableDischargingRequest): DefaultSuccess = 3;
/** Allows a client to put the EVSE into a self-diagnostics mode. */
timed command StartDiagnostics(): DefaultSuccess = 4;
Expand Down Expand Up @@ -4951,7 +4951,7 @@ cluster PowerTopology = 156 {

/** Attributes and commands for selecting a mode from a list of supported options. */
cluster EnergyEvseMode = 157 {
revision 1;
revision 2;

enum ModeTag : enum16 {
kAuto = 0;
Expand All @@ -4967,6 +4967,7 @@ cluster EnergyEvseMode = 157 {
kManual = 16384;
kTimeOfUse = 16385;
kSolarCharging = 16386;
kV2X = 16387;
}

bitmap Feature : bitmap32 {
Expand All @@ -4986,8 +4987,6 @@ cluster EnergyEvseMode = 157 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
attribute optional nullable int8u startUpMode = 2;
attribute optional nullable int8u onMode = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -5004,8 +5003,7 @@ cluster EnergyEvseMode = 157 {
optional char_string<64> statusText = 1;
}

/** This command is used to change device modes.
On receipt of this command the device SHALL respond with a ChangeToModeResponse command. */
/** This command is used to change device modes. */
command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0;
}

Expand Down Expand Up @@ -5046,8 +5044,6 @@ cluster WaterHeaterMode = 158 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
attribute optional nullable int8u startUpMode = 2;
attribute optional nullable int8u onMode = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -5061,17 +5057,16 @@ cluster WaterHeaterMode = 158 {

response struct ChangeToModeResponse = 1 {
enum8 status = 0;
optional char_string statusText = 1;
optional char_string<64> statusText = 1;
}

/** This command is used to change device modes.
On receipt of this command the device SHALL respond with a ChangeToModeResponse command. */
/** This command is used to change device modes. */
command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0;
}

/** Attributes and commands for selecting a mode from a list of supported options. */
provisional cluster DeviceEnergyManagementMode = 159 {
revision 1;
revision 2;

enum ModeTag : enum16 {
kAuto = 0;
Expand Down Expand Up @@ -5107,8 +5102,6 @@ provisional cluster DeviceEnergyManagementMode = 159 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
attribute optional nullable int8u startUpMode = 2;
attribute optional nullable int8u onMode = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -5125,8 +5118,7 @@ provisional cluster DeviceEnergyManagementMode = 159 {
optional char_string<64> statusText = 1;
}

/** This command is used to change device modes.
On receipt of this command the device SHALL respond with a ChangeToModeResponse command. */
/** This command is used to change device modes. */
command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0;
}

Expand Down
11 changes: 3 additions & 8 deletions examples/dishwasher-app/silabs/data_model/dishwasher-thread-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2227,7 +2227,7 @@ provisional cluster DeviceEnergyManagement = 152 {
command ModifyForecastRequest(ModifyForecastRequestRequest): DefaultSuccess = 5;
/** Allows a client to ask the ESA to recompute its Forecast based on power and time constraints. */
command RequestConstraintBasedForecast(RequestConstraintBasedForecastRequest): DefaultSuccess = 6;
/** Allows a client to request cancellation of a previous adjustment request in a StartTimeAdjustRequest, ModifyForecastRequest or RequestConstraintBasedForecast command */
/** Allows a client to request cancellation of a previous adjustment request in a StartTimeAdjustRequest, ModifyForecastRequest or RequestConstraintBasedForecast command. */
command CancelRequest(): DefaultSuccess = 7;
}

Expand All @@ -2254,7 +2254,7 @@ cluster PowerTopology = 156 {

/** Attributes and commands for selecting a mode from a list of supported options. */
provisional cluster DeviceEnergyManagementMode = 159 {
revision 1;
revision 2;

enum ModeTag : enum16 {
kAuto = 0;
Expand Down Expand Up @@ -2290,8 +2290,6 @@ provisional cluster DeviceEnergyManagementMode = 159 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
attribute optional nullable int8u startUpMode = 2;
attribute optional nullable int8u onMode = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -2308,8 +2306,7 @@ provisional cluster DeviceEnergyManagementMode = 159 {
optional char_string<64> statusText = 1;
}

/** This command is used to change device modes.
On receipt of this command the device SHALL respond with a ChangeToModeResponse command. */
/** This command is used to change device modes. */
command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0;
}

Expand Down Expand Up @@ -2792,8 +2789,6 @@ endpoint 3 {
server cluster DeviceEnergyManagementMode {
callback attribute supportedModes;
callback attribute currentMode;
ram attribute startUpMode;
ram attribute onMode;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
Expand Down
11 changes: 3 additions & 8 deletions examples/dishwasher-app/silabs/data_model/dishwasher-wifi-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2138,7 +2138,7 @@ provisional cluster DeviceEnergyManagement = 152 {
command ModifyForecastRequest(ModifyForecastRequestRequest): DefaultSuccess = 5;
/** Allows a client to ask the ESA to recompute its Forecast based on power and time constraints. */
command RequestConstraintBasedForecast(RequestConstraintBasedForecastRequest): DefaultSuccess = 6;
/** Allows a client to request cancellation of a previous adjustment request in a StartTimeAdjustRequest, ModifyForecastRequest or RequestConstraintBasedForecast command */
/** Allows a client to request cancellation of a previous adjustment request in a StartTimeAdjustRequest, ModifyForecastRequest or RequestConstraintBasedForecast command. */
command CancelRequest(): DefaultSuccess = 7;
}

Expand All @@ -2165,7 +2165,7 @@ cluster PowerTopology = 156 {

/** Attributes and commands for selecting a mode from a list of supported options. */
provisional cluster DeviceEnergyManagementMode = 159 {
revision 1;
revision 2;

enum ModeTag : enum16 {
kAuto = 0;
Expand Down Expand Up @@ -2201,8 +2201,6 @@ provisional cluster DeviceEnergyManagementMode = 159 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
attribute optional nullable int8u startUpMode = 2;
attribute optional nullable int8u onMode = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -2219,8 +2217,7 @@ provisional cluster DeviceEnergyManagementMode = 159 {
optional char_string<64> statusText = 1;
}

/** This command is used to change device modes.
On receipt of this command the device SHALL respond with a ChangeToModeResponse command. */
/** This command is used to change device modes. */
command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0;
}

Expand Down Expand Up @@ -2652,8 +2649,6 @@ endpoint 3 {
server cluster DeviceEnergyManagementMode {
callback attribute supportedModes;
callback attribute currentMode;
ram attribute startUpMode;
ram attribute onMode;
callback attribute generatedCommandList;
callback attribute acceptedCommandList;
callback attribute eventList;
Expand Down
30 changes: 11 additions & 19 deletions examples/energy-management-app/energy-management-common/energy-management-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2019,13 +2019,13 @@ provisional cluster DeviceEnergyManagement = 152 {
command ModifyForecastRequest(ModifyForecastRequestRequest): DefaultSuccess = 5;
/** Allows a client to ask the ESA to recompute its Forecast based on power and time constraints. */
command RequestConstraintBasedForecast(RequestConstraintBasedForecastRequest): DefaultSuccess = 6;
/** Allows a client to request cancellation of a previous adjustment request in a StartTimeAdjustRequest, ModifyForecastRequest or RequestConstraintBasedForecast command */
/** Allows a client to request cancellation of a previous adjustment request in a StartTimeAdjustRequest, ModifyForecastRequest or RequestConstraintBasedForecast command. */
command CancelRequest(): DefaultSuccess = 7;
}

/** Electric Vehicle Supply Equipment (EVSE) is equipment used to charge an Electric Vehicle (EV) or Plug-In Hybrid Electric Vehicle. This cluster provides an interface to the functionality of Electric Vehicle Supply Equipment (EVSE) management. */
cluster EnergyEvse = 153 {
revision 4;
revision 3;

enum EnergyTransferStoppedReasonEnum : enum8 {
kEVStopped = 0;
Expand Down Expand Up @@ -2190,9 +2190,9 @@ cluster EnergyEvse = 153 {

/** Allows a client to disable the EVSE from charging and discharging. */
timed command Disable(): DefaultSuccess = 1;
/** This command allows a client to enable the EVSE to charge an EV, */
/** This command allows a client to enable the EVSE to charge an EV, and to provide or update the maximum and minimum charge current. */
timed command EnableCharging(EnableChargingRequest): DefaultSuccess = 2;
/** Upon receipt, this SHALL allow a client to enable the discharge of an EV, */
/** Upon receipt, this SHALL allow a client to enable the discharge of an EV, and to provide or update the maximum discharge current. */
timed command EnableDischarging(EnableDischargingRequest): DefaultSuccess = 3;
/** Allows a client to put the EVSE into a self-diagnostics mode. */
timed command StartDiagnostics(): DefaultSuccess = 4;
Expand Down Expand Up @@ -2227,7 +2227,7 @@ cluster PowerTopology = 156 {

/** Attributes and commands for selecting a mode from a list of supported options. */
cluster EnergyEvseMode = 157 {
revision 1;
revision 2;

enum ModeTag : enum16 {
kAuto = 0;
Expand All @@ -2243,6 +2243,7 @@ cluster EnergyEvseMode = 157 {
kManual = 16384;
kTimeOfUse = 16385;
kSolarCharging = 16386;
kV2X = 16387;
}

bitmap Feature : bitmap32 {
Expand All @@ -2262,8 +2263,6 @@ cluster EnergyEvseMode = 157 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
attribute optional nullable int8u startUpMode = 2;
attribute optional nullable int8u onMode = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -2280,8 +2279,7 @@ cluster EnergyEvseMode = 157 {
optional char_string<64> statusText = 1;
}

/** This command is used to change device modes.
On receipt of this command the device SHALL respond with a ChangeToModeResponse command. */
/** This command is used to change device modes. */
command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0;
}

Expand Down Expand Up @@ -2322,8 +2320,6 @@ cluster WaterHeaterMode = 158 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
attribute optional nullable int8u startUpMode = 2;
attribute optional nullable int8u onMode = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -2337,17 +2333,16 @@ cluster WaterHeaterMode = 158 {

response struct ChangeToModeResponse = 1 {
enum8 status = 0;
optional char_string statusText = 1;
optional char_string<64> statusText = 1;
}

/** This command is used to change device modes.
On receipt of this command the device SHALL respond with a ChangeToModeResponse command. */
/** This command is used to change device modes. */
command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0;
}

/** Attributes and commands for selecting a mode from a list of supported options. */
provisional cluster DeviceEnergyManagementMode = 159 {
revision 1;
revision 2;

enum ModeTag : enum16 {
kAuto = 0;
Expand Down Expand Up @@ -2383,8 +2378,6 @@ provisional cluster DeviceEnergyManagementMode = 159 {

readonly attribute ModeOptionStruct supportedModes[] = 0;
readonly attribute int8u currentMode = 1;
attribute optional nullable int8u startUpMode = 2;
attribute optional nullable int8u onMode = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
readonly attribute event_id eventList[] = 65530;
Expand All @@ -2401,8 +2394,7 @@ provisional cluster DeviceEnergyManagementMode = 159 {
optional char_string<64> statusText = 1;
}

/** This command is used to change device modes.
On receipt of this command the device SHALL respond with a ChangeToModeResponse command. */
/** This command is used to change device modes. */
command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0;
}

Expand Down
Loading

0 comments on commit 9ee0499

Please sign in to comment.