Add back structs, bitmaps and enums of the Messaging cluster into ami… (

project-chip#8061) * Add back structs, bitmaps and enums of the Messaging cluster into ami.xml * Update gen/ folders
nikita-s-wrk · Sep 23, 2021 · 3121284 · 3121284
1 parent 601000b
commit 3121284
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 0 deletions.
diff --git a/src/app/common/gen/enums.h b/src/app/common/gen/enums.h
@@ -954,6 +954,38 @@ enum EmberAfMediaPlaybackStatus : uint8_t
     EMBER_ZCL_MEDIA_PLAYBACK_STATUS_SEEK_OUT_OF_RANGE         = 5,
 };
 
+// Enum for MessagingControlConfirmation
+enum EmberAfMessagingControlConfirmation : uint8_t
+{
+    EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_NOT_REQUIRED = 0,
+    EMBER_ZCL_MESSAGING_CONTROL_CONFIRMATION_REQUIRED     = 128,
+};
+
+// Enum for MessagingControlEnhancedConfirmation
+enum EmberAfMessagingControlEnhancedConfirmation : uint8_t
+{
+    EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_NOT_REQUIRED = 0,
+    EMBER_ZCL_MESSAGING_CONTROL_ENHANCED_CONFIRMATION_REQUIRED     = 32,
+};
+
+// Enum for MessagingControlImportance
+enum EmberAfMessagingControlImportance : uint8_t
+{
+    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_LOW      = 0,
+    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_MEDIUM   = 4,
+    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_HIGH     = 8,
+    EMBER_ZCL_MESSAGING_CONTROL_IMPORTANCE_CRITICAL = 12,
+};
+
+// Enum for MessagingControlTransmission
+enum EmberAfMessagingControlTransmission : uint8_t
+{
+    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL               = 0,
+    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_NORMAL_AND_ANONYMOUS = 1,
+    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_ANONYMOUS            = 2,
+    EMBER_ZCL_MESSAGING_CONTROL_TRANSMISSION_RESERVED             = 3,
+};
+
 // Enum for MeterTypeId
 enum EmberAfMeterTypeId : uint16_t
 {
@@ -1620,6 +1652,20 @@ enum EmberAfWiFiVersionType : uint8_t
 #define EMBER_AF_MAINS_ALARM_MASK_VOLTAGE_TOO_HIGH_OFFSET (1)
 #define EMBER_AF_MAINS_ALARM_MASK_MAINS_POWER_SUPPLY_LOST (4)
 #define EMBER_AF_MAINS_ALARM_MASK_MAINS_POWER_SUPPLY_LOST_OFFSET (2)
+#define EMBER_AF_MESSAGING_CONFIRMATION_CONTROL_NO_RETURNED (1)
+#define EMBER_AF_MESSAGING_CONFIRMATION_CONTROL_NO_RETURNED_OFFSET (0)
+#define EMBER_AF_MESSAGING_CONFIRMATION_CONTROL_YES_RETURNED (2)
+#define EMBER_AF_MESSAGING_CONFIRMATION_CONTROL_YES_RETURNED_OFFSET (1)
+#define EMBER_AF_MESSAGING_CONTROL_MASK_TRANS_MECHANISM (3)
+#define EMBER_AF_MESSAGING_CONTROL_MASK_TRANS_MECHANISM_OFFSET (0)
+#define EMBER_AF_MESSAGING_CONTROL_MASK_MESSAGE_URGENCY (12)
+#define EMBER_AF_MESSAGING_CONTROL_MASK_MESSAGE_URGENCY_OFFSET (2)
+#define EMBER_AF_MESSAGING_CONTROL_MASK_ENHANCED_CONFIRMATION_REQUEST (32)
+#define EMBER_AF_MESSAGING_CONTROL_MASK_ENHANCED_CONFIRMATION_REQUEST_OFFSET (5)
+#define EMBER_AF_MESSAGING_CONTROL_MASK_MESSAGE_CONFIRMATION (128)
+#define EMBER_AF_MESSAGING_CONTROL_MASK_MESSAGE_CONFIRMATION_OFFSET (7)
+#define EMBER_AF_MESSAGING_EXTENDED_CONTROL_MASK_MESSAGE_CONFIRMATION_STATUS (1)
+#define EMBER_AF_MESSAGING_EXTENDED_CONTROL_MASK_MESSAGE_CONFIRMATION_STATUS_OFFSET (0)
 #define EMBER_AF_MODE_FOR_SEQUENCE_HEAT_SETPOINT_FIELD_PRESENT (1)
 #define EMBER_AF_MODE_FOR_SEQUENCE_HEAT_SETPOINT_FIELD_PRESENT_OFFSET (0)
 #define EMBER_AF_MODE_FOR_SEQUENCE_COOL_SETPOINT_FIELD_PRESENT (2)

diff --git a/src/app/zap-templates/zcl/data-model/silabs/ami.xml b/src/app/zap-templates/zcl/data-model/silabs/ami.xml
@@ -24,6 +24,40 @@ limitations under the License.
     <older spec="se-1.1-07-5356-16" dependsOn="zcl-1.0-07-5123-03" certifiable="true"/>
     <older spec="se-1.0-07-5356-15" dependsOn="zcl-1.0-07-5123-03" certifiable="true"/>
   </domain>
+ <!-- Messaging Cluster - Structs, BITMAPs & ENUMs -->
+   <bitmap name="MessagingControlMask" type="BITMAP8">
+     <field name="transMechanism" mask="0x03"/>
+     <field name="messageUrgency" mask="0x0C"/>
+     <field name="enhancedConfirmationRequest" mask="0x20"/>
+     <field name="messageConfirmation" mask="0x80"/>
+   </bitmap>
+   <enum name="MessagingControlTransmission" type="ENUM8">
+     <item name="normal" value="0x00"/>
+     <item name="normalAndAnonymous" value="0x01"/>
+     <item name="anonymous" value="0x02"/>
+     <item name="reserved" value="0x03"/>
+   </enum>
+   <enum name="MessagingControlImportance" type="ENUM8">
+     <item name="low" value="0x00"/>
+     <item name="medium" value="0x04"/>
+     <item name="high" value="0x08"/>
+     <item name="critical" value="0x0C"/>
+   </enum>
+   <enum name="MessagingControlEnhancedConfirmation" type="ENUM8">
+     <item name="notRequired" value="0x00"/>
+     <item name="required" value="0x20"/>
+   </enum>
+   <enum name="MessagingControlConfirmation" type="ENUM8">
+     <item name="notRequired" value="0x00"/>
+     <item name="required" value="0x80"/>
+   </enum>
+   <bitmap name="MessagingExtendedControlMask" type="BITMAP8">
+     <field name="messageConfirmationStatus" mask="0x01"/>
+   </bitmap>
+   <bitmap name="MessagingConfirmationControl" type="BITMAP8">
+     <field name="NoReturned" mask="0x01"/>
+     <field name="YesReturned" mask="0x02"/>
+   </bitmap>
   <!-- Messaging Cluster -->
   <cluster>
     <name>Messaging</name>