Skip to content

Commit 5678609

Browse files
janusheidepull[bot]
janusheide
authored and
pull[bot]
committed
Add pump cluster xml (#6530)
* added specification from silabs zcl implementation * pump attributes conform to new spec * added bitmaps and enums from silabs xml * bitmaps and enums conform to new spec * addressing comments * removed previous pump definitions * zap update all * update zap generated files * update zap generated files * prepend OperationMode, ControlMode, and AlarmMask with *Pump*
1 parent 7ead656 commit 5678609

File tree

17 files changed

+342
-277
lines changed

17 files changed

+342
-277
lines changed

‎examples/all-clusters-app/all-clusters-common/gen/enums.h

+20-14
Original file line numberDiff line numberDiff line change
@@ -4227,24 +4227,24 @@ typedef enum
42274227
#define EMBER_AF_PROPOSED_CHANGE_CONTROL_CLEAR_TRANSACTION_LOG_OFFSET (13)
42284228
#define EMBER_AF_PROPOSED_CHANGE_CONTROL_CLEAR_PREPAYMENT_LOG (16384)
42294229
#define EMBER_AF_PROPOSED_CHANGE_CONTROL_CLEAR_PREPAYMENT_LOG_OFFSET (14)
4230-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_LOW (1)
4231-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_LOW_OFFSET (0)
4232-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_HIGH (2)
4233-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_HIGH_OFFSET (1)
4230+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_LOW (1)
4231+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_LOW_OFFSET (0)
4232+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_HIGH (2)
4233+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_HIGH_OFFSET (1)
42344234
#define EMBER_AF_PUMP_ALARM_MASK_POWER_MISSING_PHASE (4)
42354235
#define EMBER_AF_PUMP_ALARM_MASK_POWER_MISSING_PHASE_OFFSET (2)
4236-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_LOW (8)
4237-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_LOW_OFFSET (3)
4238-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_HIGH (16)
4239-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_HIGH_OFFSET (4)
4236+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_LOW (8)
4237+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_LOW_OFFSET (3)
4238+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_HIGH (16)
4239+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_HIGH_OFFSET (4)
42404240
#define EMBER_AF_PUMP_ALARM_MASK_DRY_RUNNING (32)
42414241
#define EMBER_AF_PUMP_ALARM_MASK_DRY_RUNNING_OFFSET (5)
4242-
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_TOO_HIGH (64)
4243-
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_TOO_HIGH_OFFSET (6)
4244-
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_HAS_FATAL_FAILURE (128)
4245-
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_HAS_FATAL_FAILURE_OFFSET (7)
4246-
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_TOO_HIGH (256)
4247-
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_TOO_HIGH_OFFSET (8)
4242+
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_HIGH (64)
4243+
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_HIGH_OFFSET (6)
4244+
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_FATAL_FAILURE (128)
4245+
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_FATAL_FAILURE_OFFSET (7)
4246+
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_HIGH (256)
4247+
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_HIGH_OFFSET (8)
42484248
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_BLOCKED (512)
42494249
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_BLOCKED_OFFSET (9)
42504250
#define EMBER_AF_PUMP_ALARM_MASK_SENSOR_FAILURE (1024)
@@ -4255,6 +4255,12 @@ typedef enum
42554255
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_FATAL_FAILURE_OFFSET (12)
42564256
#define EMBER_AF_PUMP_ALARM_MASK_GENERAL_FAULT (8192)
42574257
#define EMBER_AF_PUMP_ALARM_MASK_GENERAL_FAULT_OFFSET (13)
4258+
#define EMBER_AF_PUMP_ALARM_MASK_LEAKAGE (16384)
4259+
#define EMBER_AF_PUMP_ALARM_MASK_LEAKAGE_OFFSET (14)
4260+
#define EMBER_AF_PUMP_ALARM_MASK_AIR_DETECTION (32768)
4261+
#define EMBER_AF_PUMP_ALARM_MASK_AIR_DETECTION_OFFSET (15)
4262+
#define EMBER_AF_PUMP_ALARM_MASK_TURBINE_OPERATION (65536)
4263+
#define EMBER_AF_PUMP_ALARM_MASK_TURBINE_OPERATION_OFFSET (16)
42584264
#define EMBER_AF_PUMP_STATUS_DEVICE_FAULT (1)
42594265
#define EMBER_AF_PUMP_STATUS_DEVICE_FAULT_OFFSET (0)
42604266
#define EMBER_AF_PUMP_STATUS_SUPPLYFAULT (2)

‎examples/bridge-app/bridge-common/gen/enums.h

+20-14
Original file line numberDiff line numberDiff line change
@@ -4227,24 +4227,24 @@ typedef enum
42274227
#define EMBER_AF_PROPOSED_CHANGE_CONTROL_CLEAR_TRANSACTION_LOG_OFFSET (13)
42284228
#define EMBER_AF_PROPOSED_CHANGE_CONTROL_CLEAR_PREPAYMENT_LOG (16384)
42294229
#define EMBER_AF_PROPOSED_CHANGE_CONTROL_CLEAR_PREPAYMENT_LOG_OFFSET (14)
4230-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_LOW (1)
4231-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_LOW_OFFSET (0)
4232-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_HIGH (2)
4233-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_HIGH_OFFSET (1)
4230+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_LOW (1)
4231+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_LOW_OFFSET (0)
4232+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_HIGH (2)
4233+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_HIGH_OFFSET (1)
42344234
#define EMBER_AF_PUMP_ALARM_MASK_POWER_MISSING_PHASE (4)
42354235
#define EMBER_AF_PUMP_ALARM_MASK_POWER_MISSING_PHASE_OFFSET (2)
4236-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_LOW (8)
4237-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_LOW_OFFSET (3)
4238-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_HIGH (16)
4239-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_HIGH_OFFSET (4)
4236+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_LOW (8)
4237+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_LOW_OFFSET (3)
4238+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_HIGH (16)
4239+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_HIGH_OFFSET (4)
42404240
#define EMBER_AF_PUMP_ALARM_MASK_DRY_RUNNING (32)
42414241
#define EMBER_AF_PUMP_ALARM_MASK_DRY_RUNNING_OFFSET (5)
4242-
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_TOO_HIGH (64)
4243-
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_TOO_HIGH_OFFSET (6)
4244-
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_HAS_FATAL_FAILURE (128)
4245-
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_HAS_FATAL_FAILURE_OFFSET (7)
4246-
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_TOO_HIGH (256)
4247-
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_TOO_HIGH_OFFSET (8)
4242+
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_HIGH (64)
4243+
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_HIGH_OFFSET (6)
4244+
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_FATAL_FAILURE (128)
4245+
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_FATAL_FAILURE_OFFSET (7)
4246+
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_HIGH (256)
4247+
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_HIGH_OFFSET (8)
42484248
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_BLOCKED (512)
42494249
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_BLOCKED_OFFSET (9)
42504250
#define EMBER_AF_PUMP_ALARM_MASK_SENSOR_FAILURE (1024)
@@ -4255,6 +4255,12 @@ typedef enum
42554255
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_FATAL_FAILURE_OFFSET (12)
42564256
#define EMBER_AF_PUMP_ALARM_MASK_GENERAL_FAULT (8192)
42574257
#define EMBER_AF_PUMP_ALARM_MASK_GENERAL_FAULT_OFFSET (13)
4258+
#define EMBER_AF_PUMP_ALARM_MASK_LEAKAGE (16384)
4259+
#define EMBER_AF_PUMP_ALARM_MASK_LEAKAGE_OFFSET (14)
4260+
#define EMBER_AF_PUMP_ALARM_MASK_AIR_DETECTION (32768)
4261+
#define EMBER_AF_PUMP_ALARM_MASK_AIR_DETECTION_OFFSET (15)
4262+
#define EMBER_AF_PUMP_ALARM_MASK_TURBINE_OPERATION (65536)
4263+
#define EMBER_AF_PUMP_ALARM_MASK_TURBINE_OPERATION_OFFSET (16)
42584264
#define EMBER_AF_PUMP_STATUS_DEVICE_FAULT (1)
42594265
#define EMBER_AF_PUMP_STATUS_DEVICE_FAULT_OFFSET (0)
42604266
#define EMBER_AF_PUMP_STATUS_SUPPLYFAULT (2)

‎examples/chip-tool/gen/enums.h

+20-14
Original file line numberDiff line numberDiff line change
@@ -4227,24 +4227,24 @@ typedef enum
42274227
#define EMBER_AF_PROPOSED_CHANGE_CONTROL_CLEAR_TRANSACTION_LOG_OFFSET (13)
42284228
#define EMBER_AF_PROPOSED_CHANGE_CONTROL_CLEAR_PREPAYMENT_LOG (16384)
42294229
#define EMBER_AF_PROPOSED_CHANGE_CONTROL_CLEAR_PREPAYMENT_LOG_OFFSET (14)
4230-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_LOW (1)
4231-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_LOW_OFFSET (0)
4232-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_HIGH (2)
4233-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_HIGH_OFFSET (1)
4230+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_LOW (1)
4231+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_LOW_OFFSET (0)
4232+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_HIGH (2)
4233+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_HIGH_OFFSET (1)
42344234
#define EMBER_AF_PUMP_ALARM_MASK_POWER_MISSING_PHASE (4)
42354235
#define EMBER_AF_PUMP_ALARM_MASK_POWER_MISSING_PHASE_OFFSET (2)
4236-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_LOW (8)
4237-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_LOW_OFFSET (3)
4238-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_HIGH (16)
4239-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_HIGH_OFFSET (4)
4236+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_LOW (8)
4237+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_LOW_OFFSET (3)
4238+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_HIGH (16)
4239+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_HIGH_OFFSET (4)
42404240
#define EMBER_AF_PUMP_ALARM_MASK_DRY_RUNNING (32)
42414241
#define EMBER_AF_PUMP_ALARM_MASK_DRY_RUNNING_OFFSET (5)
4242-
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_TOO_HIGH (64)
4243-
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_TOO_HIGH_OFFSET (6)
4244-
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_HAS_FATAL_FAILURE (128)
4245-
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_HAS_FATAL_FAILURE_OFFSET (7)
4246-
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_TOO_HIGH (256)
4247-
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_TOO_HIGH_OFFSET (8)
4242+
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_HIGH (64)
4243+
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_HIGH_OFFSET (6)
4244+
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_FATAL_FAILURE (128)
4245+
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_FATAL_FAILURE_OFFSET (7)
4246+
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_HIGH (256)
4247+
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_HIGH_OFFSET (8)
42484248
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_BLOCKED (512)
42494249
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_BLOCKED_OFFSET (9)
42504250
#define EMBER_AF_PUMP_ALARM_MASK_SENSOR_FAILURE (1024)
@@ -4255,6 +4255,12 @@ typedef enum
42554255
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_FATAL_FAILURE_OFFSET (12)
42564256
#define EMBER_AF_PUMP_ALARM_MASK_GENERAL_FAULT (8192)
42574257
#define EMBER_AF_PUMP_ALARM_MASK_GENERAL_FAULT_OFFSET (13)
4258+
#define EMBER_AF_PUMP_ALARM_MASK_LEAKAGE (16384)
4259+
#define EMBER_AF_PUMP_ALARM_MASK_LEAKAGE_OFFSET (14)
4260+
#define EMBER_AF_PUMP_ALARM_MASK_AIR_DETECTION (32768)
4261+
#define EMBER_AF_PUMP_ALARM_MASK_AIR_DETECTION_OFFSET (15)
4262+
#define EMBER_AF_PUMP_ALARM_MASK_TURBINE_OPERATION (65536)
4263+
#define EMBER_AF_PUMP_ALARM_MASK_TURBINE_OPERATION_OFFSET (16)
42584264
#define EMBER_AF_PUMP_STATUS_DEVICE_FAULT (1)
42594265
#define EMBER_AF_PUMP_STATUS_DEVICE_FAULT_OFFSET (0)
42604266
#define EMBER_AF_PUMP_STATUS_SUPPLYFAULT (2)

‎examples/lighting-app/lighting-common/gen/enums.h

+20-14
Original file line numberDiff line numberDiff line change
@@ -4227,24 +4227,24 @@ typedef enum
42274227
#define EMBER_AF_PROPOSED_CHANGE_CONTROL_CLEAR_TRANSACTION_LOG_OFFSET (13)
42284228
#define EMBER_AF_PROPOSED_CHANGE_CONTROL_CLEAR_PREPAYMENT_LOG (16384)
42294229
#define EMBER_AF_PROPOSED_CHANGE_CONTROL_CLEAR_PREPAYMENT_LOG_OFFSET (14)
4230-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_LOW (1)
4231-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_LOW_OFFSET (0)
4232-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_HIGH (2)
4233-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_HIGH_OFFSET (1)
4230+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_LOW (1)
4231+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_LOW_OFFSET (0)
4232+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_HIGH (2)
4233+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_HIGH_OFFSET (1)
42344234
#define EMBER_AF_PUMP_ALARM_MASK_POWER_MISSING_PHASE (4)
42354235
#define EMBER_AF_PUMP_ALARM_MASK_POWER_MISSING_PHASE_OFFSET (2)
4236-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_LOW (8)
4237-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_LOW_OFFSET (3)
4238-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_HIGH (16)
4239-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_HIGH_OFFSET (4)
4236+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_LOW (8)
4237+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_LOW_OFFSET (3)
4238+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_HIGH (16)
4239+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_HIGH_OFFSET (4)
42404240
#define EMBER_AF_PUMP_ALARM_MASK_DRY_RUNNING (32)
42414241
#define EMBER_AF_PUMP_ALARM_MASK_DRY_RUNNING_OFFSET (5)
4242-
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_TOO_HIGH (64)
4243-
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_TOO_HIGH_OFFSET (6)
4244-
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_HAS_FATAL_FAILURE (128)
4245-
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_HAS_FATAL_FAILURE_OFFSET (7)
4246-
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_TOO_HIGH (256)
4247-
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_TOO_HIGH_OFFSET (8)
4242+
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_HIGH (64)
4243+
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_HIGH_OFFSET (6)
4244+
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_FATAL_FAILURE (128)
4245+
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_FATAL_FAILURE_OFFSET (7)
4246+
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_HIGH (256)
4247+
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_HIGH_OFFSET (8)
42484248
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_BLOCKED (512)
42494249
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_BLOCKED_OFFSET (9)
42504250
#define EMBER_AF_PUMP_ALARM_MASK_SENSOR_FAILURE (1024)
@@ -4255,6 +4255,12 @@ typedef enum
42554255
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_FATAL_FAILURE_OFFSET (12)
42564256
#define EMBER_AF_PUMP_ALARM_MASK_GENERAL_FAULT (8192)
42574257
#define EMBER_AF_PUMP_ALARM_MASK_GENERAL_FAULT_OFFSET (13)
4258+
#define EMBER_AF_PUMP_ALARM_MASK_LEAKAGE (16384)
4259+
#define EMBER_AF_PUMP_ALARM_MASK_LEAKAGE_OFFSET (14)
4260+
#define EMBER_AF_PUMP_ALARM_MASK_AIR_DETECTION (32768)
4261+
#define EMBER_AF_PUMP_ALARM_MASK_AIR_DETECTION_OFFSET (15)
4262+
#define EMBER_AF_PUMP_ALARM_MASK_TURBINE_OPERATION (65536)
4263+
#define EMBER_AF_PUMP_ALARM_MASK_TURBINE_OPERATION_OFFSET (16)
42584264
#define EMBER_AF_PUMP_STATUS_DEVICE_FAULT (1)
42594265
#define EMBER_AF_PUMP_STATUS_DEVICE_FAULT_OFFSET (0)
42604266
#define EMBER_AF_PUMP_STATUS_SUPPLYFAULT (2)

‎examples/lock-app/lock-common/gen/enums.h

+20-14
Original file line numberDiff line numberDiff line change
@@ -4227,24 +4227,24 @@ typedef enum
42274227
#define EMBER_AF_PROPOSED_CHANGE_CONTROL_CLEAR_TRANSACTION_LOG_OFFSET (13)
42284228
#define EMBER_AF_PROPOSED_CHANGE_CONTROL_CLEAR_PREPAYMENT_LOG (16384)
42294229
#define EMBER_AF_PROPOSED_CHANGE_CONTROL_CLEAR_PREPAYMENT_LOG_OFFSET (14)
4230-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_LOW (1)
4231-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_LOW_OFFSET (0)
4232-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_HIGH (2)
4233-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_HIGH_OFFSET (1)
4230+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_LOW (1)
4231+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_LOW_OFFSET (0)
4232+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_HIGH (2)
4233+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_HIGH_OFFSET (1)
42344234
#define EMBER_AF_PUMP_ALARM_MASK_POWER_MISSING_PHASE (4)
42354235
#define EMBER_AF_PUMP_ALARM_MASK_POWER_MISSING_PHASE_OFFSET (2)
4236-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_LOW (8)
4237-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_LOW_OFFSET (3)
4238-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_HIGH (16)
4239-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_HIGH_OFFSET (4)
4236+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_LOW (8)
4237+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_LOW_OFFSET (3)
4238+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_HIGH (16)
4239+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_HIGH_OFFSET (4)
42404240
#define EMBER_AF_PUMP_ALARM_MASK_DRY_RUNNING (32)
42414241
#define EMBER_AF_PUMP_ALARM_MASK_DRY_RUNNING_OFFSET (5)
4242-
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_TOO_HIGH (64)
4243-
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_TOO_HIGH_OFFSET (6)
4244-
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_HAS_FATAL_FAILURE (128)
4245-
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_HAS_FATAL_FAILURE_OFFSET (7)
4246-
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_TOO_HIGH (256)
4247-
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_TOO_HIGH_OFFSET (8)
4242+
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_HIGH (64)
4243+
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_HIGH_OFFSET (6)
4244+
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_FATAL_FAILURE (128)
4245+
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_FATAL_FAILURE_OFFSET (7)
4246+
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_HIGH (256)
4247+
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_HIGH_OFFSET (8)
42484248
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_BLOCKED (512)
42494249
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_BLOCKED_OFFSET (9)
42504250
#define EMBER_AF_PUMP_ALARM_MASK_SENSOR_FAILURE (1024)
@@ -4255,6 +4255,12 @@ typedef enum
42554255
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_FATAL_FAILURE_OFFSET (12)
42564256
#define EMBER_AF_PUMP_ALARM_MASK_GENERAL_FAULT (8192)
42574257
#define EMBER_AF_PUMP_ALARM_MASK_GENERAL_FAULT_OFFSET (13)
4258+
#define EMBER_AF_PUMP_ALARM_MASK_LEAKAGE (16384)
4259+
#define EMBER_AF_PUMP_ALARM_MASK_LEAKAGE_OFFSET (14)
4260+
#define EMBER_AF_PUMP_ALARM_MASK_AIR_DETECTION (32768)
4261+
#define EMBER_AF_PUMP_ALARM_MASK_AIR_DETECTION_OFFSET (15)
4262+
#define EMBER_AF_PUMP_ALARM_MASK_TURBINE_OPERATION (65536)
4263+
#define EMBER_AF_PUMP_ALARM_MASK_TURBINE_OPERATION_OFFSET (16)
42584264
#define EMBER_AF_PUMP_STATUS_DEVICE_FAULT (1)
42594265
#define EMBER_AF_PUMP_STATUS_DEVICE_FAULT_OFFSET (0)
42604266
#define EMBER_AF_PUMP_STATUS_SUPPLYFAULT (2)

‎examples/pump-app/pump-common/gen/enums.h

+20-14
Original file line numberDiff line numberDiff line change
@@ -4227,24 +4227,24 @@ typedef enum
42274227
#define EMBER_AF_PROPOSED_CHANGE_CONTROL_CLEAR_TRANSACTION_LOG_OFFSET (13)
42284228
#define EMBER_AF_PROPOSED_CHANGE_CONTROL_CLEAR_PREPAYMENT_LOG (16384)
42294229
#define EMBER_AF_PROPOSED_CHANGE_CONTROL_CLEAR_PREPAYMENT_LOG_OFFSET (14)
4230-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_LOW (1)
4231-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_LOW_OFFSET (0)
4232-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_HIGH (2)
4233-
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_TOO_HIGH_OFFSET (1)
4230+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_LOW (1)
4231+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_LOW_OFFSET (0)
4232+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_HIGH (2)
4233+
#define EMBER_AF_PUMP_ALARM_MASK_SUPPLY_VOLTAGE_HIGH_OFFSET (1)
42344234
#define EMBER_AF_PUMP_ALARM_MASK_POWER_MISSING_PHASE (4)
42354235
#define EMBER_AF_PUMP_ALARM_MASK_POWER_MISSING_PHASE_OFFSET (2)
4236-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_LOW (8)
4237-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_LOW_OFFSET (3)
4238-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_HIGH (16)
4239-
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_TOO_HIGH_OFFSET (4)
4236+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_LOW (8)
4237+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_LOW_OFFSET (3)
4238+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_HIGH (16)
4239+
#define EMBER_AF_PUMP_ALARM_MASK_SYSTEM_PRESSURE_HIGH_OFFSET (4)
42404240
#define EMBER_AF_PUMP_ALARM_MASK_DRY_RUNNING (32)
42414241
#define EMBER_AF_PUMP_ALARM_MASK_DRY_RUNNING_OFFSET (5)
4242-
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_TOO_HIGH (64)
4243-
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_TOO_HIGH_OFFSET (6)
4244-
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_HAS_FATAL_FAILURE (128)
4245-
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_HAS_FATAL_FAILURE_OFFSET (7)
4246-
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_TOO_HIGH (256)
4247-
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_TOO_HIGH_OFFSET (8)
4242+
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_HIGH (64)
4243+
#define EMBER_AF_PUMP_ALARM_MASK_MOTOR_TEMPERATURE_HIGH_OFFSET (6)
4244+
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_FATAL_FAILURE (128)
4245+
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_MOTOR_FATAL_FAILURE_OFFSET (7)
4246+
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_HIGH (256)
4247+
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_TEMPERATURE_HIGH_OFFSET (8)
42484248
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_BLOCKED (512)
42494249
#define EMBER_AF_PUMP_ALARM_MASK_PUMP_BLOCKED_OFFSET (9)
42504250
#define EMBER_AF_PUMP_ALARM_MASK_SENSOR_FAILURE (1024)
@@ -4255,6 +4255,12 @@ typedef enum
42554255
#define EMBER_AF_PUMP_ALARM_MASK_ELECTRONIC_FATAL_FAILURE_OFFSET (12)
42564256
#define EMBER_AF_PUMP_ALARM_MASK_GENERAL_FAULT (8192)
42574257
#define EMBER_AF_PUMP_ALARM_MASK_GENERAL_FAULT_OFFSET (13)
4258+
#define EMBER_AF_PUMP_ALARM_MASK_LEAKAGE (16384)
4259+
#define EMBER_AF_PUMP_ALARM_MASK_LEAKAGE_OFFSET (14)
4260+
#define EMBER_AF_PUMP_ALARM_MASK_AIR_DETECTION (32768)
4261+
#define EMBER_AF_PUMP_ALARM_MASK_AIR_DETECTION_OFFSET (15)
4262+
#define EMBER_AF_PUMP_ALARM_MASK_TURBINE_OPERATION (65536)
4263+
#define EMBER_AF_PUMP_ALARM_MASK_TURBINE_OPERATION_OFFSET (16)
42584264
#define EMBER_AF_PUMP_STATUS_DEVICE_FAULT (1)
42594265
#define EMBER_AF_PUMP_STATUS_DEVICE_FAULT_OFFSET (0)
42604266
#define EMBER_AF_PUMP_STATUS_SUPPLYFAULT (2)

0 commit comments

Comments
 (0)