Merge branch 'master' into EVSE_Add_PersistedAttributes_and_Events

project-chip · Jan 15, 2024 · 44c85a5 · 44c85a5
2 parents a1b379e + 5f1eb5b
commit 44c85a5
Show file tree

Hide file tree

Showing 86 changed files with 1,803 additions and 654 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -3716,6 +3716,72 @@ cluster ActivatedCarbonFilterMonitoring = 114 {
   command ResetCondition(): DefaultSuccess = 0;
 }
 
+/** This cluster is used to configure a valve. */
+provisional cluster ValveConfigurationAndControl = 129 {
+  revision 1;
+
+  enum StatusCodeEnum : enum8 {
+    kFailureDueToFault = 2;
+  }
+
+  enum ValveStateEnum : enum8 {
+    kClosed = 0;
+    kOpen = 1;
+    kTransitioning = 2;
+  }
+
+  bitmap Feature : bitmap32 {
+    kTimeSync = 0x1;
+    kLevel = 0x2;
+  }
+
+  bitmap ValveFaultBitmap : bitmap16 {
+    kGeneralFault = 0x1;
+    kBlocked = 0x2;
+    kLeaking = 0x4;
+    kNotConnected = 0x8;
+    kShortCircuit = 0x10;
+    kCurrentExceeded = 0x20;
+  }
+
+  info event ValveStateChanged = 0 {
+    ValveStateEnum valveState = 0;
+    optional percent valveLevel = 1;
+  }
+
+  info event ValveFault = 1 {
+    ValveFaultBitmap valveFault = 0;
+  }
+
+  readonly attribute nullable elapsed_s openDuration = 0;
+  attribute nullable elapsed_s defaultOpenDuration = 1;
+  readonly attribute optional nullable epoch_us autoCloseTime = 2;
+  readonly attribute nullable elapsed_s remainingDuration = 3;
+  readonly attribute nullable ValveStateEnum currentState = 4;
+  readonly attribute nullable ValveStateEnum targetState = 5;
+  readonly attribute optional nullable percent currentLevel = 6;
+  readonly attribute optional nullable percent targetLevel = 7;
+  attribute optional percent defaultOpenLevel = 8;
+  readonly attribute optional ValveFaultBitmap valveFault = 9;
+  readonly attribute optional int8u levelStep = 10;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct OpenRequest {
+    optional nullable elapsed_s openDuration = 0;
+    optional percent targetLevel = 1;
+  }
+
+  /** This command is used to set the valve to its open position. */
+  command Open(OpenRequest): DefaultSuccess = 0;
+  /** This command is used to set the valve to its closed position. */
+  command Close(): DefaultSuccess = 1;
+}
+
 /** This cluster provides a mechanism for querying data about the electrical energy imported or provided by the server. */
 provisional cluster ElectricalEnergyMeasurement = 145 {
   revision 1;
@@ -7426,6 +7492,31 @@ endpoint 1 {
     handle command ResetCondition;
   }
 
+  server cluster ValveConfigurationAndControl {
+    emits event ValveStateChanged;
+    emits event ValveFault;
+    ram      attribute openDuration;
+    persist  attribute defaultOpenDuration;
+    ram      attribute autoCloseTime;
+    callback attribute remainingDuration;
+    ram      attribute currentState;
+    ram      attribute targetState;
+    ram      attribute currentLevel;
+    ram      attribute targetLevel;
+    persist  attribute defaultOpenLevel default = 100;
+    ram      attribute valveFault default = 0;
+    ram      attribute levelStep default = 1;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 3;
+    ram      attribute clusterRevision default = 1;
+
+    handle command Open;
+    handle command Close;
+  }
+
   server cluster ElectricalEnergyMeasurement {
     emits event CumulativeEnergyMeasured;
     emits event PeriodicEnergyMeasured;