From 1147023ca2be1c23c8df96bd9d8b92ad8bef2873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20M=C3=A9gevand?= <77852424+jmeg-sfy@users.noreply.github.com> Date: Tue, 5 Apr 2022 16:33:32 +0200 Subject: [PATCH] WindowCovering: Cleanup enum xml (#16992) * DEV: Update XML enum declaration and ZAP * DEV: Update attribute access for Window-covering-server * DEV: Update CycleType in WindowApp * DEV: Update LCD painter to new enun + use uint16_t instead of uint8_t * DEV: LCD Painter move namespace * Test config disable test on WNCV 2.1 invalid operands to binary expression ('chip::app::Clusters::WindowCovering::EndProductType' and 'int') CheckConstraintNotValue("endProductType", endProductType, 250) * DEV: Fix missing update * FIX: UpdateLCD must not be called outside the app Task + Update LCDPainter * Restyled by clang-format * DEV: remove comment useless * fix: Includes: keep order in the right position from clang-format * FIX: Remove leftover enum declaration from helper.js Co-authored-by: Restyled.io --- .../all-clusters-app.matter | 48 +- .../placeholder/linux/apps/app1/config.matter | 48 +- .../placeholder/linux/apps/app2/config.matter | 48 +- .../window-app/common/include/WindowApp.h | 2 +- examples/window-app/common/src/WindowApp.cpp | 28 +- examples/window-app/common/window-app.matter | 48 +- .../window-app/efr32/include/LcdPainter.h | 22 +- examples/window-app/efr32/src/LcdPainter.cpp | 41 +- .../window-app/efr32/src/WindowAppImpl.cpp | 7 +- .../window-covering-server.cpp | 21 +- .../window-covering-server.h | 8 +- .../certification/Test_TC_WNCV_2_1.yaml | 2 + src/app/zap-templates/templates/app/helper.js | 2 - .../zcl/data-model/chip/window-covering.xml | 20 +- .../data_model/controller-clusters.matter | 48 +- .../CHIPAttributeTLVValueDecoder.cpp | 4 +- .../python/chip/clusters/Objects.py | 57 +- .../CHIPAttributeTLVValueDecoder.mm | 4 +- .../CHIP/zap-generated/CHIPCallbackBridge.mm | 104 ++ .../CHIPCallbackBridge_internal.h | 119 +++ .../CHIP/zap-generated/CHIPClustersObjc.h | 44 +- .../CHIP/zap-generated/CHIPClustersObjc.mm | 104 +- .../zap-generated/CHIPTestClustersObjc.mm | 4 +- .../Framework/CHIPTests/CHIPClustersTests.m | 151 +-- .../zap-generated/attributes/Accessors.cpp | 16 +- .../zap-generated/attributes/Accessors.h | 8 +- .../app-common/zap-generated/cluster-enums.h | 48 +- .../zap-generated/cluster-objects.h | 17 +- .../app-common/zap-generated/enums.h | 46 - .../cluster/CHIPTestClustersObjc.mm | 4 +- .../zap-generated/test/Commands.h | 388 ++++---- .../cluster/logging/DataModelLogger.cpp | 4 +- .../chip-tool/zap-generated/test/Commands.h | 936 ++++++++---------- 33 files changed, 1397 insertions(+), 1054 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 index d55b68df092709..0528b4013199fb 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -3509,6 +3509,48 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster WindowCovering = 258 { + enum EndProductType : ENUM8 { + kRollerShade = 0; + kRomanShade = 1; + kBalloonShade = 2; + kWovenWood = 3; + kPleatedShade = 4; + kCellularShade = 5; + kLayeredShade = 6; + kLayeredShade2D = 7; + kSheerShade = 8; + kTiltOnlyInteriorBlind = 9; + kInteriorBlind = 10; + kVerticalBlindStripCurtain = 11; + kInteriorVenetianBlind = 12; + kExteriorVenetianBlind = 13; + kLateralLeftCurtain = 14; + kLateralRightCurtain = 15; + kCentralCurtain = 16; + kRollerShutter = 17; + kExteriorVerticalScreen = 18; + kAwningTerracePatio = 19; + kAwningVerticalScreen = 20; + kTiltOnlyPergola = 21; + kSwingingShutter = 22; + kSlidingShutter = 23; + kUnknown = 255; + } + + enum Type : ENUM8 { + kRollerShade = 0; + kRollerShade2Motor = 1; + kRollerShadeExterior = 2; + kRollerShadeExterior2Motor = 3; + kDrapery = 4; + kAwning = 5; + kShutter = 6; + kTiltBlindTiltOnly = 7; + kTiltBlindLiftAndTilt = 8; + kProjectorScreen = 9; + kUnknown = 255; + } + bitmap WcConfigStatus : BITMAP8 { kOperational = 0x1; kOnline = 0x2; @@ -3531,7 +3573,7 @@ server cluster WindowCovering = 258 { kMotorDirectionReversed = 0x1; kCalibrationMode = 0x2; kMaintenanceMode = 0x4; - kLEDFeedback = 0x8; + kLedFeedback = 0x8; } bitmap WcOperationalStatus : BITMAP8 { @@ -3555,7 +3597,7 @@ server cluster WindowCovering = 258 { kProtection = 0x800; } - readonly attribute enum8 type = 0; + readonly attribute Type type = 0; readonly attribute nullable int16u currentPositionLift = 3; readonly attribute nullable int16u currentPositionTilt = 4; readonly attribute bitmap8 configStatus = 7; @@ -3564,7 +3606,7 @@ server cluster WindowCovering = 258 { readonly attribute bitmap8 operationalStatus = 10; readonly attribute nullable Percent100ths targetPositionLiftPercent100ths = 11; readonly attribute nullable Percent100ths targetPositionTiltPercent100ths = 12; - readonly attribute enum8 endProductType = 13; + readonly attribute EndProductType endProductType = 13; readonly attribute nullable Percent100ths currentPositionLiftPercent100ths = 14; readonly attribute nullable Percent100ths currentPositionTiltPercent100ths = 15; readonly attribute int16u installedOpenLimitLift = 16; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index e04b0901bd34b6..925cbd6506cf9f 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1991,6 +1991,48 @@ server cluster ThermostatUserInterfaceConfiguration = 516 { } server cluster WindowCovering = 258 { + enum EndProductType : ENUM8 { + kRollerShade = 0; + kRomanShade = 1; + kBalloonShade = 2; + kWovenWood = 3; + kPleatedShade = 4; + kCellularShade = 5; + kLayeredShade = 6; + kLayeredShade2D = 7; + kSheerShade = 8; + kTiltOnlyInteriorBlind = 9; + kInteriorBlind = 10; + kVerticalBlindStripCurtain = 11; + kInteriorVenetianBlind = 12; + kExteriorVenetianBlind = 13; + kLateralLeftCurtain = 14; + kLateralRightCurtain = 15; + kCentralCurtain = 16; + kRollerShutter = 17; + kExteriorVerticalScreen = 18; + kAwningTerracePatio = 19; + kAwningVerticalScreen = 20; + kTiltOnlyPergola = 21; + kSwingingShutter = 22; + kSlidingShutter = 23; + kUnknown = 255; + } + + enum Type : ENUM8 { + kRollerShade = 0; + kRollerShade2Motor = 1; + kRollerShadeExterior = 2; + kRollerShadeExterior2Motor = 3; + kDrapery = 4; + kAwning = 5; + kShutter = 6; + kTiltBlindTiltOnly = 7; + kTiltBlindLiftAndTilt = 8; + kProjectorScreen = 9; + kUnknown = 255; + } + bitmap WcConfigStatus : BITMAP8 { kOperational = 0x1; kOnline = 0x2; @@ -2013,7 +2055,7 @@ server cluster WindowCovering = 258 { kMotorDirectionReversed = 0x1; kCalibrationMode = 0x2; kMaintenanceMode = 0x4; - kLEDFeedback = 0x8; + kLedFeedback = 0x8; } bitmap WcOperationalStatus : BITMAP8 { @@ -2037,7 +2079,7 @@ server cluster WindowCovering = 258 { kProtection = 0x800; } - readonly attribute enum8 type = 0; + readonly attribute Type type = 0; readonly attribute nullable int16u currentPositionLift = 3; readonly attribute nullable int16u currentPositionTilt = 4; readonly attribute bitmap8 configStatus = 7; @@ -2046,7 +2088,7 @@ server cluster WindowCovering = 258 { readonly attribute bitmap8 operationalStatus = 10; readonly attribute nullable Percent100ths targetPositionLiftPercent100ths = 11; readonly attribute nullable Percent100ths targetPositionTiltPercent100ths = 12; - readonly attribute enum8 endProductType = 13; + readonly attribute EndProductType endProductType = 13; readonly attribute nullable Percent100ths currentPositionLiftPercent100ths = 14; readonly attribute nullable Percent100ths currentPositionTiltPercent100ths = 15; readonly attribute int16u installedOpenLimitLift = 16; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index e04b0901bd34b6..925cbd6506cf9f 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1991,6 +1991,48 @@ server cluster ThermostatUserInterfaceConfiguration = 516 { } server cluster WindowCovering = 258 { + enum EndProductType : ENUM8 { + kRollerShade = 0; + kRomanShade = 1; + kBalloonShade = 2; + kWovenWood = 3; + kPleatedShade = 4; + kCellularShade = 5; + kLayeredShade = 6; + kLayeredShade2D = 7; + kSheerShade = 8; + kTiltOnlyInteriorBlind = 9; + kInteriorBlind = 10; + kVerticalBlindStripCurtain = 11; + kInteriorVenetianBlind = 12; + kExteriorVenetianBlind = 13; + kLateralLeftCurtain = 14; + kLateralRightCurtain = 15; + kCentralCurtain = 16; + kRollerShutter = 17; + kExteriorVerticalScreen = 18; + kAwningTerracePatio = 19; + kAwningVerticalScreen = 20; + kTiltOnlyPergola = 21; + kSwingingShutter = 22; + kSlidingShutter = 23; + kUnknown = 255; + } + + enum Type : ENUM8 { + kRollerShade = 0; + kRollerShade2Motor = 1; + kRollerShadeExterior = 2; + kRollerShadeExterior2Motor = 3; + kDrapery = 4; + kAwning = 5; + kShutter = 6; + kTiltBlindTiltOnly = 7; + kTiltBlindLiftAndTilt = 8; + kProjectorScreen = 9; + kUnknown = 255; + } + bitmap WcConfigStatus : BITMAP8 { kOperational = 0x1; kOnline = 0x2; @@ -2013,7 +2055,7 @@ server cluster WindowCovering = 258 { kMotorDirectionReversed = 0x1; kCalibrationMode = 0x2; kMaintenanceMode = 0x4; - kLEDFeedback = 0x8; + kLedFeedback = 0x8; } bitmap WcOperationalStatus : BITMAP8 { @@ -2037,7 +2079,7 @@ server cluster WindowCovering = 258 { kProtection = 0x800; } - readonly attribute enum8 type = 0; + readonly attribute Type type = 0; readonly attribute nullable int16u currentPositionLift = 3; readonly attribute nullable int16u currentPositionTilt = 4; readonly attribute bitmap8 configStatus = 7; @@ -2046,7 +2088,7 @@ server cluster WindowCovering = 258 { readonly attribute bitmap8 operationalStatus = 10; readonly attribute nullable Percent100ths targetPositionLiftPercent100ths = 11; readonly attribute nullable Percent100ths targetPositionTiltPercent100ths = 12; - readonly attribute enum8 endProductType = 13; + readonly attribute EndProductType endProductType = 13; readonly attribute nullable Percent100ths currentPositionLiftPercent100ths = 14; readonly attribute nullable Percent100ths currentPositionTiltPercent100ths = 15; readonly attribute int16u installedOpenLimitLift = 16; diff --git a/examples/window-app/common/include/WindowApp.h b/examples/window-app/common/include/WindowApp.h index c21ab925acc323..22a7c66ad924e1 100644 --- a/examples/window-app/common/include/WindowApp.h +++ b/examples/window-app/common/include/WindowApp.h @@ -121,7 +121,7 @@ class WindowApp void StepToward(OperationalState direction, bool isTilt); - EmberAfWcType CycleType(); + Type CycleType(); static void OnLiftTimeout(Timer & timer); static void OnTiltTimeout(Timer & timer); diff --git a/examples/window-app/common/src/WindowApp.cpp b/examples/window-app/common/src/WindowApp.cpp index 70f36943c89c16..03d3c90fee718c 100644 --- a/examples/window-app/common/src/WindowApp.cpp +++ b/examples/window-app/common/src/WindowApp.cpp @@ -380,9 +380,9 @@ void WindowApp::HandleLongPress() else if (mDownPressed) { // Long press button down: Cycle between covering types - mDownSuppressed = true; - EmberAfWcType cover_type = GetCover().CycleType(); - mTiltMode = mTiltMode && (EMBER_ZCL_WC_TYPE_TILT_BLIND_LIFT_AND_TILT == cover_type); + mDownSuppressed = true; + Type type = GetCover().CycleType(); + mTiltMode = mTiltMode && (Type::kTiltBlindLiftAndTilt == type); } } @@ -412,7 +412,7 @@ void WindowApp::Cover::Init(chip::EndpointId endpoint) // Note: All Current Positions are preset via Zap config and kept accross reboot via NVM: no need to init them // Attribute: Id 0 Type - TypeSet(endpoint, EMBER_ZCL_WC_TYPE_TILT_BLIND_LIFT_AND_TILT); + TypeSet(endpoint, Type::kTiltBlindLiftAndTilt); // Attribute: Id 7 ConfigStatus ConfigStatus configStatus = { .operational = 1, @@ -427,7 +427,7 @@ void WindowApp::Cover::Init(chip::EndpointId endpoint) OperationalStatusSetWithGlobalUpdated(endpoint, mOperationalStatus); // Attribute: Id 13 EndProductType - EndProductTypeSet(endpoint, EMBER_ZCL_WC_END_PRODUCT_TYPE_INTERIOR_BLIND); + EndProductTypeSet(endpoint, EndProductType::kInteriorBlind); // Attribute: Id 24 Mode Mode mode = { .motorDirReversed = 0, .calibrationMode = 1, .maintenanceMode = 1, .ledDisplay = 1 }; @@ -588,27 +588,27 @@ void WindowApp::Cover::StepToward(OperationalState direction, bool isTilt) } } -EmberAfWcType WindowApp::Cover::CycleType() +Type WindowApp::Cover::CycleType() { chip::DeviceLayer::PlatformMgr().LockChipStack(); - EmberAfWcType type = TypeGet(mEndpoint); + Type type = TypeGet(mEndpoint); chip::DeviceLayer::PlatformMgr().UnlockChipStack(); switch (type) { - case EMBER_ZCL_WC_TYPE_ROLLERSHADE: - type = EMBER_ZCL_WC_TYPE_DRAPERY; + case Type::kRollerShade: + type = Type::kDrapery; // tilt = false; break; - case EMBER_ZCL_WC_TYPE_DRAPERY: - type = EMBER_ZCL_WC_TYPE_TILT_BLIND_LIFT_AND_TILT; + case Type::kDrapery: + type = Type::kTiltBlindLiftAndTilt; break; - case EMBER_ZCL_WC_TYPE_TILT_BLIND_LIFT_AND_TILT: - type = EMBER_ZCL_WC_TYPE_ROLLERSHADE; + case Type::kTiltBlindLiftAndTilt: + type = Type::kRollerShade; // tilt = false; break; default: - type = EMBER_ZCL_WC_TYPE_TILT_BLIND_LIFT_AND_TILT; + type = Type::kTiltBlindLiftAndTilt; } chip::DeviceLayer::PlatformMgr().LockChipStack(); diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 829787c8b939a4..2e41c3d8173467 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -1092,6 +1092,48 @@ server cluster WiFiNetworkDiagnostics = 54 { } server cluster WindowCovering = 258 { + enum EndProductType : ENUM8 { + kRollerShade = 0; + kRomanShade = 1; + kBalloonShade = 2; + kWovenWood = 3; + kPleatedShade = 4; + kCellularShade = 5; + kLayeredShade = 6; + kLayeredShade2D = 7; + kSheerShade = 8; + kTiltOnlyInteriorBlind = 9; + kInteriorBlind = 10; + kVerticalBlindStripCurtain = 11; + kInteriorVenetianBlind = 12; + kExteriorVenetianBlind = 13; + kLateralLeftCurtain = 14; + kLateralRightCurtain = 15; + kCentralCurtain = 16; + kRollerShutter = 17; + kExteriorVerticalScreen = 18; + kAwningTerracePatio = 19; + kAwningVerticalScreen = 20; + kTiltOnlyPergola = 21; + kSwingingShutter = 22; + kSlidingShutter = 23; + kUnknown = 255; + } + + enum Type : ENUM8 { + kRollerShade = 0; + kRollerShade2Motor = 1; + kRollerShadeExterior = 2; + kRollerShadeExterior2Motor = 3; + kDrapery = 4; + kAwning = 5; + kShutter = 6; + kTiltBlindTiltOnly = 7; + kTiltBlindLiftAndTilt = 8; + kProjectorScreen = 9; + kUnknown = 255; + } + bitmap WcConfigStatus : BITMAP8 { kOperational = 0x1; kOnline = 0x2; @@ -1114,7 +1156,7 @@ server cluster WindowCovering = 258 { kMotorDirectionReversed = 0x1; kCalibrationMode = 0x2; kMaintenanceMode = 0x4; - kLEDFeedback = 0x8; + kLedFeedback = 0x8; } bitmap WcOperationalStatus : BITMAP8 { @@ -1138,7 +1180,7 @@ server cluster WindowCovering = 258 { kProtection = 0x800; } - readonly attribute enum8 type = 0; + readonly attribute Type type = 0; readonly attribute nullable int16u currentPositionLift = 3; readonly attribute nullable int16u currentPositionTilt = 4; readonly attribute bitmap8 configStatus = 7; @@ -1147,7 +1189,7 @@ server cluster WindowCovering = 258 { readonly attribute bitmap8 operationalStatus = 10; readonly attribute nullable Percent100ths targetPositionLiftPercent100ths = 11; readonly attribute nullable Percent100ths targetPositionTiltPercent100ths = 12; - readonly attribute enum8 endProductType = 13; + readonly attribute EndProductType endProductType = 13; readonly attribute nullable Percent100ths currentPositionLiftPercent100ths = 14; readonly attribute nullable Percent100ths currentPositionTiltPercent100ths = 15; readonly attribute int16u installedOpenLimitLift = 16; diff --git a/examples/window-app/efr32/include/LcdPainter.h b/examples/window-app/efr32/include/LcdPainter.h index 42cdb107ecd749..448c750e166613 100644 --- a/examples/window-app/efr32/include/LcdPainter.h +++ b/examples/window-app/efr32/include/LcdPainter.h @@ -18,7 +18,11 @@ #pragma once -#include +// clang-format off +#include "app-common/app-common/zap-generated/enums.h" +#include "app-common/app-common/zap-generated/cluster-enums.h" +// clang-format on + #include enum class LcdIcon @@ -33,19 +37,19 @@ enum class LcdIcon class PixelPainter { public: - PixelPainter(uint8_t lift, uint8_t tilt); + PixelPainter(uint16_t lift, uint16_t tilt); virtual ~PixelPainter() = default; virtual uint8_t Color(uint32_t x, uint32_t y) = 0; protected: - uint8_t mLift; - uint8_t mTilt; + uint16_t mLift; + uint16_t mTilt; }; class CompositePainter : public PixelPainter { public: - CompositePainter(uint8_t lift, uint8_t tilt, PixelPainter * painter1, PixelPainter * painter2, PixelPainter * painter3); + CompositePainter(uint16_t lift, uint16_t tilt, PixelPainter * painter1, PixelPainter * painter2, PixelPainter * painter3); uint8_t Color(uint32_t x, uint32_t y); private: @@ -63,7 +67,7 @@ class FramePainter : public PixelPainter class IconPainter : public PixelPainter { public: - IconPainter(uint8_t lift, uint8_t tilt, LcdIcon icon); + IconPainter(uint16_t lift, uint16_t tilt, LcdIcon icon); uint8_t Color(uint32_t x, uint32_t y); private: @@ -89,7 +93,7 @@ class HorizontalShadePainter : public PixelPainter class VerticalBlindPainter : public PixelPainter { public: - VerticalBlindPainter(uint8_t lift, uint8_t tilt); + VerticalBlindPainter(uint16_t lift, uint16_t tilt); uint8_t Color(uint32_t x, uint32_t y); private: @@ -100,8 +104,8 @@ class VerticalBlindPainter : public PixelPainter class LcdPainter { public: - static void Paint(EmberAfWcType type, uint8_t lift, uint8_t tilt, LcdIcon icon); + static void Paint(chip::app::Clusters::WindowCovering::Type type, uint16_t lift, uint16_t tilt, LcdIcon icon); private: - static PixelPainter * GetCoverPainter(EmberAfWcType type, uint8_t lift, uint8_t tilt); + static PixelPainter * GetCoverPainter(chip::app::Clusters::WindowCovering::Type type, uint16_t lift, uint16_t tilt); }; diff --git a/examples/window-app/efr32/src/LcdPainter.cpp b/examples/window-app/efr32/src/LcdPainter.cpp index 4b23268d20f279..6ff452cf197eee 100644 --- a/examples/window-app/efr32/src/LcdPainter.cpp +++ b/examples/window-app/efr32/src/LcdPainter.cpp @@ -20,6 +20,8 @@ #include #include +using namespace chip::app::Clusters::WindowCovering; + constexpr uint32_t sTiltIcon[] = { 0xffffffff, 0xffffffff, 0xc0000003, 0xc0000003, 0xc0000003, 0xc0000003, 0xc1ffffc3, 0xc1ffffc3, 0xc1ffffc3, 0xc003c003, 0xc003c003, 0xc003c003, 0xc003c003, 0xc003c003, 0xc003c003, 0xc003c003, @@ -48,9 +50,9 @@ constexpr uint32_t sTwoIcon[] = { 0xc3ffffc3, 0xc3ffffc3, 0xc3ffffc3, 0xc0000003, 0xc0000003, 0xc0000003, 0xffffffff, 0xffffffff, }; -PixelPainter::PixelPainter(uint8_t lift, uint8_t tilt) : mLift(lift), mTilt(tilt) {} +PixelPainter::PixelPainter(uint16_t lift, uint16_t tilt) : mLift(lift), mTilt(tilt) {} -CompositePainter::CompositePainter(uint8_t lift, uint8_t tilt, PixelPainter * painter1, PixelPainter * painter2, +CompositePainter::CompositePainter(uint16_t lift, uint16_t tilt, PixelPainter * painter1, PixelPainter * painter2, PixelPainter * painter3) : PixelPainter(lift, tilt), mPainter1(painter1), mPainter2(painter2), mPainter3(painter3) @@ -103,7 +105,7 @@ uint8_t FramePainter::Color(uint32_t x, uint32_t y) return -1; } -IconPainter::IconPainter(uint8_t lift, uint8_t tilt, LcdIcon icon) : PixelPainter(lift, tilt), mIcon(icon) +IconPainter::IconPainter(uint16_t lift, uint16_t tilt, LcdIcon icon) : PixelPainter(lift, tilt), mIcon(icon) { mIconSize = sizeof(sTiltIcon) / sizeof(uint32_t); mIconOffset = (LCD_SIZE - mIconSize) / 2; @@ -148,7 +150,7 @@ uint8_t HorizontalShadePainter::Color(uint32_t x, uint32_t y) return (x % 2) && x < (uint32_t)(LCD_FRAME_SIZE + mLift); } -VerticalBlindPainter::VerticalBlindPainter(uint8_t lift, uint8_t tilt) : PixelPainter(lift, tilt) +VerticalBlindPainter::VerticalBlindPainter(uint16_t lift, uint16_t tilt) : PixelPainter(lift, tilt) { mBandSize = (LCD_COVER_SIZE / sBandCount); } @@ -175,33 +177,32 @@ uint8_t VerticalBlindPainter::Color(uint32_t x, uint32_t y) } } -PixelPainter * LcdPainter::GetCoverPainter(EmberAfWcType type, uint8_t lift, uint8_t tilt) +PixelPainter * LcdPainter::GetCoverPainter(Type type, uint16_t lift, uint16_t tilt) { switch (type) { - case EMBER_ZCL_WC_TYPE_ROLLERSHADE: - case EMBER_ZCL_WC_TYPE_ROLLERSHADE2_MOTOR: - case EMBER_ZCL_WC_TYPE_ROLLERSHADE_EXTERIOR: - case EMBER_ZCL_WC_TYPE_ROLLERSHADE_EXTERIOR2_MOTOR: + case Type::kRollerShade: + case Type::kRollerShade2Motor: + case Type::kRollerShadeExterior: + case Type::kRollerShadeExterior2Motor: return new VerticalShadePainter(lift, tilt); - - case EMBER_ZCL_WC_TYPE_DRAPERY: - case EMBER_ZCL_WC_TYPE_AWNING: + case Type::kDrapery: + case Type::kAwning: return new HorizontalShadePainter(lift, tilt); - - case EMBER_ZCL_WC_TYPE_SHUTTER: - case EMBER_ZCL_WC_TYPE_TILT_BLIND_TILT_ONLY: - case EMBER_ZCL_WC_TYPE_TILT_BLIND_LIFT_AND_TILT: + case Type::kShutter: + case Type::kTiltBlindTiltOnly: + case Type::kTiltBlindLiftAndTilt: return new VerticalBlindPainter(lift, tilt); - - case EMBER_ZCL_WC_TYPE_PROJECTOR_SCREEN: - case EMBER_ZCL_WC_TYPE_UNKNOWN: + case Type::kProjectorScreen: + case Type::kUnknown: default: return new VerticalShadePainter(lift, tilt); } + + return nullptr; } -void LcdPainter::Paint(EmberAfWcType type, uint8_t lift, uint8_t tilt, LcdIcon icon) +void LcdPainter::Paint(Type type, uint16_t lift, uint16_t tilt, LcdIcon icon) { FramePainter framePaint = FramePainter(lift, tilt); IconPainter iconPaint = IconPainter(lift, tilt, icon); diff --git a/examples/window-app/efr32/src/WindowAppImpl.cpp b/examples/window-app/efr32/src/WindowAppImpl.cpp index 0e754efb9cae3f..5cfc4b6206c760 100644 --- a/examples/window-app/efr32/src/WindowAppImpl.cpp +++ b/examples/window-app/efr32/src/WindowAppImpl.cpp @@ -184,9 +184,6 @@ CHIP_ERROR WindowAppImpl::Init() mStatusLED.Init(APP_STATE_LED); mActionLED.Init(APP_ACTION_LED); - // Print setup info on LCD if available - UpdateLCD(); - return CHIP_NO_ERROR; } @@ -422,7 +419,7 @@ void WindowAppImpl::UpdateLCD() chip::app::DataModel::Nullable tilt; chip::DeviceLayer::PlatformMgr().LockChipStack(); - EmberAfWcType type = TypeGet(cover.mEndpoint); + Type type = TypeGet(cover.mEndpoint); Attributes::CurrentPositionLift::Get(cover.mEndpoint, lift); Attributes::CurrentPositionTilt::Get(cover.mEndpoint, tilt); @@ -430,7 +427,7 @@ void WindowAppImpl::UpdateLCD() if (!tilt.IsNull() && !lift.IsNull()) { - LcdPainter::Paint(type, static_cast(lift.Value()), static_cast(tilt.Value()), mIcon); + LcdPainter::Paint(type, lift.Value(), tilt.Value(), mIcon); } } #ifdef QR_CODE_ENABLED diff --git a/src/app/clusters/window-covering-server/window-covering-server.cpp b/src/app/clusters/window-covering-server/window-covering-server.cpp index 1dca33f1605560..fefa288ca28c48 100644 --- a/src/app/clusters/window-covering-server/window-covering-server.cpp +++ b/src/app/clusters/window-covering-server/window-covering-server.cpp @@ -158,16 +158,16 @@ bool HasFeaturePaTilt(chip::EndpointId endpoint) return (HasFeature(endpoint, WcFeature::kTilt) && HasFeature(endpoint, WcFeature::kPositionAwareTilt)); } -void TypeSet(chip::EndpointId endpoint, EmberAfWcType type) +void TypeSet(chip::EndpointId endpoint, Type type) { - Attributes::Type::Set(endpoint, chip::to_underlying(type)); + Attributes::Type::Set(endpoint, type); } -EmberAfWcType TypeGet(chip::EndpointId endpoint) +Type TypeGet(chip::EndpointId endpoint) { - std::underlying_type::type value; + Type value; Attributes::Type::Get(endpoint, &value); - return static_cast(value); + return value; } void ConfigStatusSet(chip::EndpointId endpoint, const ConfigStatus & status) @@ -236,16 +236,17 @@ const OperationalStatus OperationalStatusGet(chip::EndpointId endpoint) return status; } -void EndProductTypeSet(chip::EndpointId endpoint, EmberAfWcEndProductType type) +void EndProductTypeSet(chip::EndpointId endpoint, EndProductType type) { - Attributes::EndProductType::Set(endpoint, chip::to_underlying(type)); + Attributes::EndProductType::Set(endpoint, type); } -EmberAfWcEndProductType EndProductTypeGet(chip::EndpointId endpoint) +EndProductType EndProductTypeGet(chip::EndpointId endpoint) { - std::underlying_type::type value; + EndProductType value; Attributes::EndProductType::Get(endpoint, &value); - return static_cast(value); + + return value; } void ModeSet(chip::EndpointId endpoint, const Mode & mode) diff --git a/src/app/clusters/window-covering-server/window-covering-server.h b/src/app/clusters/window-covering-server/window-covering-server.h index cbdd29205a7e93..65e6ebaf9b9948 100644 --- a/src/app/clusters/window-covering-server/window-covering-server.h +++ b/src/app/clusters/window-covering-server/window-covering-server.h @@ -114,8 +114,8 @@ bool HasFeature(chip::EndpointId endpoint, WcFeature feature); bool HasFeaturePaLift(chip::EndpointId endpoint); bool HasFeaturePaTilt(chip::EndpointId endpoint); -void TypeSet(chip::EndpointId endpoint, EmberAfWcType type); -EmberAfWcType TypeGet(chip::EndpointId endpoint); +void TypeSet(chip::EndpointId endpoint, Type type); +Type TypeGet(chip::EndpointId endpoint); void ConfigStatusSet(chip::EndpointId endpoint, const ConfigStatus & status); const ConfigStatus ConfigStatusGet(chip::EndpointId endpoint); @@ -128,8 +128,8 @@ OperationalState ComputeOperationalState(uint16_t target, uint16_t current); OperationalState ComputeOperationalState(NPercent100ths target, NPercent100ths current); Percent100ths ComputePercent100thsStep(OperationalState direction, Percent100ths previous, Percent100ths delta); -void EndProductTypeSet(chip::EndpointId endpoint, EmberAfWcEndProductType type); -EmberAfWcEndProductType EndProductTypeGet(chip::EndpointId endpoint); +void EndProductTypeSet(chip::EndpointId endpoint, EndProductType type); +EndProductType EndProductTypeGet(chip::EndpointId endpoint); void ModeSet(chip::EndpointId endpoint, const Mode & mode); const Mode ModeGet(chip::EndpointId endpoint); diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml index 79c536df640f74..f87e4d43c334ae 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml @@ -50,6 +50,7 @@ tests: error: UNSUPPORTED_WRITE - label: "3b: reads back the RO mandatory attribute: Type" + disabled: true command: "readAttribute" attribute: "Type" response: @@ -129,6 +130,7 @@ tests: error: UNSUPPORTED_WRITE - label: "3b: reads back the RO mandatory attribute: EndProductType" + disabled: true command: "readAttribute" attribute: "EndProductType" response: diff --git a/src/app/zap-templates/templates/app/helper.js b/src/app/zap-templates/templates/app/helper.js index 326960bc6e1f01..9700bcfb0e0eaf 100644 --- a/src/app/zap-templates/templates/app/helper.js +++ b/src/app/zap-templates/templates/app/helper.js @@ -790,8 +790,6 @@ function isWeaklyTypedEnum(label) "StatusCode", "StepMode", "TemperatureDisplayMode", - "WcEndProductType", - "WcType", "WiFiVersionType", ].includes(label); } diff --git a/src/app/zap-templates/zcl/data-model/chip/window-covering.xml b/src/app/zap-templates/zcl/data-model/chip/window-covering.xml index da40584f80ab81..33b76d926bc687 100644 --- a/src/app/zap-templates/zcl/data-model/chip/window-covering.xml +++ b/src/app/zap-templates/zcl/data-model/chip/window-covering.xml @@ -35,7 +35,7 @@ limitations under the License. - Type + Type PhysicalClosedLimitLift @@ -61,7 +61,7 @@ limitations under the License. TargetPositionTiltPercent100ths - EndProductType + EndProductType CurrentPositionLiftPercent100ths @@ -126,11 +126,12 @@ limitations under the License. - - - - - + + + + + + @@ -140,7 +141,8 @@ limitations under the License. - + + @@ -174,7 +176,7 @@ limitations under the License. - + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 4dc88a122886fe..6467bdb9b00023 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -4019,6 +4019,48 @@ client cluster WiFiNetworkDiagnostics = 54 { } client cluster WindowCovering = 258 { + enum EndProductType : ENUM8 { + kRollerShade = 0; + kRomanShade = 1; + kBalloonShade = 2; + kWovenWood = 3; + kPleatedShade = 4; + kCellularShade = 5; + kLayeredShade = 6; + kLayeredShade2D = 7; + kSheerShade = 8; + kTiltOnlyInteriorBlind = 9; + kInteriorBlind = 10; + kVerticalBlindStripCurtain = 11; + kInteriorVenetianBlind = 12; + kExteriorVenetianBlind = 13; + kLateralLeftCurtain = 14; + kLateralRightCurtain = 15; + kCentralCurtain = 16; + kRollerShutter = 17; + kExteriorVerticalScreen = 18; + kAwningTerracePatio = 19; + kAwningVerticalScreen = 20; + kTiltOnlyPergola = 21; + kSwingingShutter = 22; + kSlidingShutter = 23; + kUnknown = 255; + } + + enum Type : ENUM8 { + kRollerShade = 0; + kRollerShade2Motor = 1; + kRollerShadeExterior = 2; + kRollerShadeExterior2Motor = 3; + kDrapery = 4; + kAwning = 5; + kShutter = 6; + kTiltBlindTiltOnly = 7; + kTiltBlindLiftAndTilt = 8; + kProjectorScreen = 9; + kUnknown = 255; + } + bitmap WcConfigStatus : BITMAP8 { kOperational = 0x1; kOnline = 0x2; @@ -4041,7 +4083,7 @@ client cluster WindowCovering = 258 { kMotorDirectionReversed = 0x1; kCalibrationMode = 0x2; kMaintenanceMode = 0x4; - kLEDFeedback = 0x8; + kLedFeedback = 0x8; } bitmap WcOperationalStatus : BITMAP8 { @@ -4065,7 +4107,7 @@ client cluster WindowCovering = 258 { kProtection = 0x800; } - readonly attribute enum8 type = 0; + readonly attribute Type type = 0; readonly attribute nullable int16u currentPositionLift = 3; readonly attribute nullable int16u currentPositionTilt = 4; readonly attribute bitmap8 configStatus = 7; @@ -4074,7 +4116,7 @@ client cluster WindowCovering = 258 { readonly attribute bitmap8 operationalStatus = 10; readonly attribute nullable Percent100ths targetPositionLiftPercent100ths = 11; readonly attribute nullable Percent100ths targetPositionTiltPercent100ths = 12; - readonly attribute enum8 endProductType = 13; + readonly attribute EndProductType endProductType = 13; readonly attribute nullable Percent100ths currentPositionLiftPercent100ths = 14; readonly attribute nullable Percent100ths currentPositionTiltPercent100ths = 15; readonly attribute int16u installedOpenLimitLift = 16; diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index 4cfd65521f4840..ddd59a4188e39a 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -16608,7 +16608,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR std::string valueClassName = "java/lang/Integer"; std::string valueCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(), - cppValue, value); + static_cast(cppValue), value); return value; } case Attributes::CurrentPositionLift::Id: { @@ -16785,7 +16785,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR std::string valueClassName = "java/lang/Integer"; std::string valueCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(), - cppValue, value); + static_cast(cppValue), value); return value; } case Attributes::CurrentPositionLiftPercent100ths::Id: { diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 56ca9d2f2fbd76..c2898861379cfb 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -18200,7 +18200,7 @@ class WindowCovering(Cluster): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="type", Tag=0x00000000, Type=uint), + ClusterObjectFieldDescriptor(Label="type", Tag=0x00000000, Type=WindowCovering.Enums.Type), ClusterObjectFieldDescriptor(Label="physicalClosedLimitLift", Tag=0x00000001, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="physicalClosedLimitTilt", Tag=0x00000002, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="currentPositionLift", Tag=0x00000003, Type=typing.Union[None, Nullable, uint]), @@ -18213,7 +18213,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="operationalStatus", Tag=0x0000000A, Type=uint), ClusterObjectFieldDescriptor(Label="targetPositionLiftPercent100ths", Tag=0x0000000B, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="targetPositionTiltPercent100ths", Tag=0x0000000C, Type=typing.Union[None, Nullable, uint]), - ClusterObjectFieldDescriptor(Label="endProductType", Tag=0x0000000D, Type=uint), + ClusterObjectFieldDescriptor(Label="endProductType", Tag=0x0000000D, Type=WindowCovering.Enums.EndProductType), ClusterObjectFieldDescriptor(Label="currentPositionLiftPercent100ths", Tag=0x0000000E, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="currentPositionTiltPercent100ths", Tag=0x0000000F, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="installedOpenLimitLift", Tag=0x00000010, Type=typing.Optional[uint]), @@ -18229,7 +18229,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - type: 'uint' = None + type: 'WindowCovering.Enums.Type' = None physicalClosedLimitLift: 'typing.Optional[uint]' = None physicalClosedLimitTilt: 'typing.Optional[uint]' = None currentPositionLift: 'typing.Union[None, Nullable, uint]' = None @@ -18242,7 +18242,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: operationalStatus: 'uint' = None targetPositionLiftPercent100ths: 'typing.Union[None, Nullable, uint]' = None targetPositionTiltPercent100ths: 'typing.Union[None, Nullable, uint]' = None - endProductType: 'uint' = None + endProductType: 'WindowCovering.Enums.EndProductType' = None currentPositionLiftPercent100ths: 'typing.Union[None, Nullable, uint]' = None currentPositionTiltPercent100ths: 'typing.Union[None, Nullable, uint]' = None installedOpenLimitLift: 'typing.Optional[uint]' = None @@ -18257,6 +18257,47 @@ def descriptor(cls) -> ClusterObjectDescriptor: featureMap: 'typing.Optional[uint]' = None clusterRevision: 'uint' = None + class Enums: + class EndProductType(IntEnum): + kRollerShade = 0x00 + kRomanShade = 0x01 + kBalloonShade = 0x02 + kWovenWood = 0x03 + kPleatedShade = 0x04 + kCellularShade = 0x05 + kLayeredShade = 0x06 + kLayeredShade2D = 0x07 + kSheerShade = 0x08 + kTiltOnlyInteriorBlind = 0x09 + kInteriorBlind = 0x0A + kVerticalBlindStripCurtain = 0x0B + kInteriorVenetianBlind = 0x0C + kExteriorVenetianBlind = 0x0D + kLateralLeftCurtain = 0x0E + kLateralRightCurtain = 0x0F + kCentralCurtain = 0x10 + kRollerShutter = 0x11 + kExteriorVerticalScreen = 0x12 + kAwningTerracePatio = 0x13 + kAwningVerticalScreen = 0x14 + kTiltOnlyPergola = 0x15 + kSwingingShutter = 0x16 + kSlidingShutter = 0x17 + kUnknown = 0xFF + + class Type(IntEnum): + kRollerShade = 0x00 + kRollerShade2Motor = 0x01 + kRollerShadeExterior = 0x02 + kRollerShadeExterior2Motor = 0x03 + kDrapery = 0x04 + kAwning = 0x05 + kShutter = 0x06 + kTiltBlindTiltOnly = 0x07 + kTiltBlindLiftAndTilt = 0x08 + kProjectorScreen = 0x09 + kUnknown = 0xFF + class Commands: @@ -18377,9 +18418,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=uint) + return ClusterObjectFieldDescriptor(Type=WindowCovering.Enums.Type) - value: 'uint' = 0 + value: 'WindowCovering.Enums.Type' = 0 @dataclass class PhysicalClosedLimitLift(ClusterAttributeDescriptor): @@ -18585,9 +18626,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=uint) + return ClusterObjectFieldDescriptor(Type=WindowCovering.Enums.EndProductType) - value: 'uint' = 0 + value: 'WindowCovering.Enums.EndProductType' = 0 @dataclass class CurrentPositionLiftPercent100ths(ClusterAttributeDescriptor): diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm index 0a60997acaca52..aba8a79a03ef34 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm @@ -13062,7 +13062,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return nil; } NSNumber * _Nonnull value; - value = [NSNumber numberWithUnsignedChar:cppValue]; + value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)]; return value; } case Attributes::CurrentPositionLift::Id: { @@ -13185,7 +13185,7 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader return nil; } NSNumber * _Nonnull value; - value = [NSNumber numberWithUnsignedChar:cppValue]; + value = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue)]; return value; } case Attributes::CurrentPositionLiftPercent100ths::Id: { diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm index 0c8a88e8f1fb7f..ca70319fd0d690 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm @@ -15923,6 +15923,110 @@ } } +void CHIPWindowCoveringClusterEndProductTypeAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::WindowCovering::EndProductType value) +{ + NSNumber * _Nonnull objCValue; + objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; + DispatchSuccess(context, objCValue); +}; + +void CHIPWindowCoveringClusterEndProductTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +{ + auto * self = static_cast(context); + if (!self->mQueue) { + return; + } + + if (self->mEstablishedHandler != nil) { + dispatch_async(self->mQueue, self->mEstablishedHandler); + // On failure, mEstablishedHandler will be cleaned up by our destructor, + // but we can clean it up earlier on successful subscription + // establishment. + self->mEstablishedHandler = nil; + } +} + +void CHIPNullableWindowCoveringClusterEndProductTypeAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) +{ + NSNumber * _Nullable objCValue; + if (value.IsNull()) { + objCValue = nil; + } else { + objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())]; + } + DispatchSuccess(context, objCValue); +}; + +void CHIPNullableWindowCoveringClusterEndProductTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +{ + auto * self = static_cast(context); + if (!self->mQueue) { + return; + } + + if (self->mEstablishedHandler != nil) { + dispatch_async(self->mQueue, self->mEstablishedHandler); + // On failure, mEstablishedHandler will be cleaned up by our destructor, + // but we can clean it up earlier on successful subscription + // establishment. + self->mEstablishedHandler = nil; + } +} + +void CHIPWindowCoveringClusterTypeAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::WindowCovering::Type value) +{ + NSNumber * _Nonnull objCValue; + objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; + DispatchSuccess(context, objCValue); +}; + +void CHIPWindowCoveringClusterTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +{ + auto * self = static_cast(context); + if (!self->mQueue) { + return; + } + + if (self->mEstablishedHandler != nil) { + dispatch_async(self->mQueue, self->mEstablishedHandler); + // On failure, mEstablishedHandler will be cleaned up by our destructor, + // but we can clean it up earlier on successful subscription + // establishment. + self->mEstablishedHandler = nil; + } +} + +void CHIPNullableWindowCoveringClusterTypeAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) +{ + NSNumber * _Nullable objCValue; + if (value.IsNull()) { + objCValue = nil; + } else { + objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())]; + } + DispatchSuccess(context, objCValue); +}; + +void CHIPNullableWindowCoveringClusterTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished(void * context) +{ + auto * self = static_cast(context); + if (!self->mQueue) { + return; + } + + if (self->mEstablishedHandler != nil) { + dispatch_async(self->mQueue, self->mEstablishedHandler); + // On failure, mEstablishedHandler will be cleaned up by our destructor, + // but we can clean it up earlier on successful subscription + // establishment. + self->mEstablishedHandler = nil; + } +} + void CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge::OnSuccessFn( void * context, chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value) { diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h index 725081af49cc2d..e1fddc22e9d279 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h @@ -405,6 +405,12 @@ typedef void (*NullableDoorLockClusterDoorLockUserStatusAttributeCallback)( typedef void (*DoorLockClusterDoorLockUserTypeAttributeCallback)(void *, chip::app::Clusters::DoorLock::DoorLockUserType); typedef void (*NullableDoorLockClusterDoorLockUserTypeAttributeCallback)( void *, const chip::app::DataModel::Nullable &); +typedef void (*WindowCoveringClusterEndProductTypeAttributeCallback)(void *, chip::app::Clusters::WindowCovering::EndProductType); +typedef void (*NullableWindowCoveringClusterEndProductTypeAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*WindowCoveringClusterTypeAttributeCallback)(void *, chip::app::Clusters::WindowCovering::Type); +typedef void (*NullableWindowCoveringClusterTypeAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); typedef void (*PumpConfigurationAndControlClusterPumpControlModeAttributeCallback)( void *, chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode); typedef void (*NullablePumpConfigurationAndControlClusterPumpControlModeAttributeCallback)( @@ -13478,6 +13484,119 @@ class CHIPNullableDoorLockClusterDoorLockUserTypeAttributeCallbackSubscriptionBr SubscriptionEstablishedHandler mEstablishedHandler; }; +class CHIPWindowCoveringClusterEndProductTypeAttributeCallbackBridge + : public CHIPCallbackBridge +{ +public: + CHIPWindowCoveringClusterEndProductTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; + + static void OnSuccessFn(void * context, chip::app::Clusters::WindowCovering::EndProductType value); +}; + +class CHIPWindowCoveringClusterEndProductTypeAttributeCallbackSubscriptionBridge + : public CHIPWindowCoveringClusterEndProductTypeAttributeCallbackBridge +{ +public: + CHIPWindowCoveringClusterEndProductTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPWindowCoveringClusterEndProductTypeAttributeCallbackBridge(queue, handler, action, true), + mEstablishedHandler(establishedHandler) + {} + + static void OnSubscriptionEstablished(void * context); + +private: + SubscriptionEstablishedHandler mEstablishedHandler; +}; + +class CHIPNullableWindowCoveringClusterEndProductTypeAttributeCallbackBridge + : public CHIPCallbackBridge +{ +public: + CHIPNullableWindowCoveringClusterEndProductTypeAttributeCallbackBridge(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::DataModel::Nullable & value); +}; + +class CHIPNullableWindowCoveringClusterEndProductTypeAttributeCallbackSubscriptionBridge + : public CHIPNullableWindowCoveringClusterEndProductTypeAttributeCallbackBridge +{ +public: + CHIPNullableWindowCoveringClusterEndProductTypeAttributeCallbackSubscriptionBridge( + dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPNullableWindowCoveringClusterEndProductTypeAttributeCallbackBridge(queue, handler, action, true), + mEstablishedHandler(establishedHandler) + {} + + static void OnSubscriptionEstablished(void * context); + +private: + SubscriptionEstablishedHandler mEstablishedHandler; +}; + +class CHIPWindowCoveringClusterTypeAttributeCallbackBridge : public CHIPCallbackBridge +{ +public: + CHIPWindowCoveringClusterTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, + bool keepAlive = false) : + CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; + + static void OnSuccessFn(void * context, chip::app::Clusters::WindowCovering::Type value); +}; + +class CHIPWindowCoveringClusterTypeAttributeCallbackSubscriptionBridge : public CHIPWindowCoveringClusterTypeAttributeCallbackBridge +{ +public: + CHIPWindowCoveringClusterTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPWindowCoveringClusterTypeAttributeCallbackBridge(queue, handler, action, true), + mEstablishedHandler(establishedHandler) + {} + + static void OnSubscriptionEstablished(void * context); + +private: + SubscriptionEstablishedHandler mEstablishedHandler; +}; + +class CHIPNullableWindowCoveringClusterTypeAttributeCallbackBridge + : public CHIPCallbackBridge +{ +public: + CHIPNullableWindowCoveringClusterTypeAttributeCallbackBridge(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::DataModel::Nullable & value); +}; + +class CHIPNullableWindowCoveringClusterTypeAttributeCallbackSubscriptionBridge + : public CHIPNullableWindowCoveringClusterTypeAttributeCallbackBridge +{ +public: + CHIPNullableWindowCoveringClusterTypeAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + CHIPActionBlock action, + SubscriptionEstablishedHandler establishedHandler) : + CHIPNullableWindowCoveringClusterTypeAttributeCallbackBridge(queue, handler, action, true), + mEstablishedHandler(establishedHandler) + {} + + static void OnSubscriptionEstablished(void * context); + +private: + SubscriptionEstablishedHandler mEstablishedHandler; +}; + class CHIPPumpConfigurationAndControlClusterPumpControlModeAttributeCallbackBridge : public CHIPCallbackBridge { diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h index f4956798b2a470..8c4abb8d8432fa 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h @@ -15786,6 +15786,48 @@ typedef NS_OPTIONS(uint32_t, CHIPDoorLockFeature) { CHIPDoorLockFeatureNotifications = 0x200, }; +typedef NS_ENUM(uint8_t, CHIPWindowCoveringEndProductType) { + CHIPWindowCoveringEndProductTypeRollerShade = 0x00, + CHIPWindowCoveringEndProductTypeRomanShade = 0x01, + CHIPWindowCoveringEndProductTypeBalloonShade = 0x02, + CHIPWindowCoveringEndProductTypeWovenWood = 0x03, + CHIPWindowCoveringEndProductTypePleatedShade = 0x04, + CHIPWindowCoveringEndProductTypeCellularShade = 0x05, + CHIPWindowCoveringEndProductTypeLayeredShade = 0x06, + CHIPWindowCoveringEndProductTypeLayeredShade2D = 0x07, + CHIPWindowCoveringEndProductTypeSheerShade = 0x08, + CHIPWindowCoveringEndProductTypeTiltOnlyInteriorBlind = 0x09, + CHIPWindowCoveringEndProductTypeInteriorBlind = 0x0A, + CHIPWindowCoveringEndProductTypeVerticalBlindStripCurtain = 0x0B, + CHIPWindowCoveringEndProductTypeInteriorVenetianBlind = 0x0C, + CHIPWindowCoveringEndProductTypeExteriorVenetianBlind = 0x0D, + CHIPWindowCoveringEndProductTypeLateralLeftCurtain = 0x0E, + CHIPWindowCoveringEndProductTypeLateralRightCurtain = 0x0F, + CHIPWindowCoveringEndProductTypeCentralCurtain = 0x10, + CHIPWindowCoveringEndProductTypeRollerShutter = 0x11, + CHIPWindowCoveringEndProductTypeExteriorVerticalScreen = 0x12, + CHIPWindowCoveringEndProductTypeAwningTerracePatio = 0x13, + CHIPWindowCoveringEndProductTypeAwningVerticalScreen = 0x14, + CHIPWindowCoveringEndProductTypeTiltOnlyPergola = 0x15, + CHIPWindowCoveringEndProductTypeSwingingShutter = 0x16, + CHIPWindowCoveringEndProductTypeSlidingShutter = 0x17, + CHIPWindowCoveringEndProductTypeUnknown = 0xFF, +}; + +typedef NS_ENUM(uint8_t, CHIPWindowCoveringType) { + CHIPWindowCoveringTypeRollerShade = 0x00, + CHIPWindowCoveringTypeRollerShade2Motor = 0x01, + CHIPWindowCoveringTypeRollerShadeExterior = 0x02, + CHIPWindowCoveringTypeRollerShadeExterior2Motor = 0x03, + CHIPWindowCoveringTypeDrapery = 0x04, + CHIPWindowCoveringTypeAwning = 0x05, + CHIPWindowCoveringTypeShutter = 0x06, + CHIPWindowCoveringTypeTiltBlindTiltOnly = 0x07, + CHIPWindowCoveringTypeTiltBlindLiftAndTilt = 0x08, + CHIPWindowCoveringTypeProjectorScreen = 0x09, + CHIPWindowCoveringTypeUnknown = 0xFF, +}; + typedef NS_OPTIONS(uint8_t, CHIPWindowCoveringWcConfigStatus) { CHIPWindowCoveringWcConfigStatusOperational = 0x1, CHIPWindowCoveringWcConfigStatusOnline = 0x2, @@ -15808,7 +15850,7 @@ typedef NS_OPTIONS(uint8_t, CHIPWindowCoveringWcMode) { CHIPWindowCoveringWcModeMotorDirectionReversed = 0x1, CHIPWindowCoveringWcModeCalibrationMode = 0x2, CHIPWindowCoveringWcModeMaintenanceMode = 0x4, - CHIPWindowCoveringWcModeLEDFeedback = 0x8, + CHIPWindowCoveringWcModeLedFeedback = 0x8, }; typedef NS_OPTIONS(uint8_t, CHIPWindowCoveringWcOperationalStatus) { diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm index da315870956269..664c3305994e58 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm @@ -54929,12 +54929,13 @@ new CHIPCommandSuccessCallbackBridge( - (void)readAttributeTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = WindowCovering::Attributes::Type::TypeInfo; - auto successFn = Callback::FromCancelable(success); - auto failureFn = Callback::FromCancelable(failure); - return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); - }); + new CHIPWindowCoveringClusterTypeAttributeCallbackBridge( + self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = WindowCovering::Attributes::Type::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); + }); } - (void)subscribeAttributeTypeWithMinInterval:(NSNumber * _Nonnull)minInterval @@ -54943,7 +54944,7 @@ - (void)subscribeAttributeTypeWithMinInterval:(NSNumber * _Nonnull)minInterval subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - new CHIPInt8uAttributeCallbackSubscriptionBridge( + new CHIPWindowCoveringClusterTypeAttributeCallbackSubscriptionBridge( self.callbackQueue, reportHandler, ^(Cancelable * success, Cancelable * failure) { if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { @@ -54951,11 +54952,11 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge( return CHIP_ERROR_INVALID_ARGUMENT; } using TypeInfo = WindowCovering::Attributes::Type::TypeInfo; - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, [minInterval unsignedShortValue], [maxInterval unsignedShortValue], - CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, + CHIPWindowCoveringClusterTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); }, @@ -54967,23 +54968,24 @@ + (void)readAttributeTypeWithAttributeCache:(CHIPAttributeCacheContainer *)attri queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - if (attributeCacheContainer.cppAttributeCache) { - chip::app::ConcreteAttributePath path; - using TypeInfo = WindowCovering::Attributes::Type::TypeInfo; - path.mEndpointId = static_cast([endpoint unsignedShortValue]); - path.mClusterId = TypeInfo::GetClusterId(); - path.mAttributeId = TypeInfo::GetAttributeId(); - TypeInfo::DecodableType value; - CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); - auto successFn = Callback::FromCancelable(success); - if (err == CHIP_NO_ERROR) { - successFn->mCall(successFn->mContext, value); + new CHIPWindowCoveringClusterTypeAttributeCallbackBridge( + queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + if (attributeCacheContainer.cppAttributeCache) { + chip::app::ConcreteAttributePath path; + using TypeInfo = WindowCovering::Attributes::Type::TypeInfo; + path.mEndpointId = static_cast([endpoint unsignedShortValue]); + path.mClusterId = TypeInfo::GetClusterId(); + path.mAttributeId = TypeInfo::GetAttributeId(); + TypeInfo::DecodableType value; + CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); + auto successFn = Callback::FromCancelable(success); + if (err == CHIP_NO_ERROR) { + successFn->mCall(successFn->mContext, value); + } + return err; } - return err; - } - return CHIP_ERROR_NOT_FOUND; - }); + return CHIP_ERROR_NOT_FOUND; + }); } - (void)readAttributeCurrentPositionLiftWithCompletionHandler:(void (^)(NSNumber * _Nullable value, @@ -55496,12 +55498,13 @@ new CHIPNullableInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancel - (void)readAttributeEndProductTypeWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - using TypeInfo = WindowCovering::Attributes::EndProductType::TypeInfo; - auto successFn = Callback::FromCancelable(success); - auto failureFn = Callback::FromCancelable(failure); - return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); - }); + new CHIPWindowCoveringClusterEndProductTypeAttributeCallbackBridge( + self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + using TypeInfo = WindowCovering::Attributes::EndProductType::TypeInfo; + auto successFn = Callback::FromCancelable(success); + auto failureFn = Callback::FromCancelable(failure); + return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); + }); } - (void)subscribeAttributeEndProductTypeWithMinInterval:(NSNumber * _Nonnull)minInterval @@ -55511,7 +55514,7 @@ - (void)subscribeAttributeEndProductTypeWithMinInterval:(NSNumber * _Nonnull)min reportHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - new CHIPInt8uAttributeCallbackSubscriptionBridge( + new CHIPWindowCoveringClusterEndProductTypeAttributeCallbackSubscriptionBridge( self.callbackQueue, reportHandler, ^(Cancelable * success, Cancelable * failure) { if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { @@ -55519,11 +55522,11 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge( return CHIP_ERROR_INVALID_ARGUMENT; } using TypeInfo = WindowCovering::Attributes::EndProductType::TypeInfo; - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, [minInterval unsignedShortValue], [maxInterval unsignedShortValue], - CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, + CHIPWindowCoveringClusterEndProductTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); }, @@ -55536,23 +55539,24 @@ + (void)readAttributeEndProductTypeWithAttributeCache:(CHIPAttributeCacheContain completionHandler: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - if (attributeCacheContainer.cppAttributeCache) { - chip::app::ConcreteAttributePath path; - using TypeInfo = WindowCovering::Attributes::EndProductType::TypeInfo; - path.mEndpointId = static_cast([endpoint unsignedShortValue]); - path.mClusterId = TypeInfo::GetClusterId(); - path.mAttributeId = TypeInfo::GetAttributeId(); - TypeInfo::DecodableType value; - CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); - auto successFn = Callback::FromCancelable(success); - if (err == CHIP_NO_ERROR) { - successFn->mCall(successFn->mContext, value); + new CHIPWindowCoveringClusterEndProductTypeAttributeCallbackBridge( + queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + if (attributeCacheContainer.cppAttributeCache) { + chip::app::ConcreteAttributePath path; + using TypeInfo = WindowCovering::Attributes::EndProductType::TypeInfo; + path.mEndpointId = static_cast([endpoint unsignedShortValue]); + path.mClusterId = TypeInfo::GetClusterId(); + path.mAttributeId = TypeInfo::GetAttributeId(); + TypeInfo::DecodableType value; + CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); + auto successFn = Callback::FromCancelable(success); + if (err == CHIP_NO_ERROR) { + successFn->mCall(successFn->mContext, value); + } + return err; } - return err; - } - return CHIP_ERROR_NOT_FOUND; - }); + return CHIP_ERROR_NOT_FOUND; + }); } - (void)readAttributeCurrentPositionLiftPercent100thsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm index f5445f85cff794..52cbde53b9c0dd 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPTestClustersObjc.mm @@ -16375,7 +16375,7 @@ new CHIPDefaultSuccessCallbackBridge( ListFreer listFreer; using TypeInfo = WindowCovering::Attributes::Type::TypeInfo; TypeInfo::Type cppValue; - cppValue = value.unsignedCharValue; + cppValue = static_cast>(value.unsignedCharValue); auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.WriteAttribute(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall); @@ -16571,7 +16571,7 @@ new CHIPDefaultSuccessCallbackBridge( ListFreer listFreer; using TypeInfo = WindowCovering::Attributes::EndProductType::TypeInfo; TypeInfo::Type cppValue; - cppValue = value.unsignedCharValue; + cppValue = static_cast>(value.unsignedCharValue); auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.WriteAttribute(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall); diff --git a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m index b1c3c40387393c..286d4384855d4d 100644 --- a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m +++ b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m @@ -29235,32 +29235,6 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000002_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } - (void)testSendClusterTest_TC_WNCV_2_1_000003_ReadAttribute -{ - XCTestExpectation * expectation = [self expectationWithDescription:@"3b: reads back the RO mandatory attribute: Type"]; - - CHIPDevice * device = GetConnectedDevice(); - dispatch_queue_t queue = dispatch_get_main_queue(); - CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:queue]; - XCTAssertNotNil(cluster); - - [cluster readAttributeTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { - NSLog(@"3b: reads back the RO mandatory attribute: Type Error: %@", err); - - XCTAssertEqual([CHIPErrorTestUtils errorToZCLErrorCode:err], 0); - - { - id actualValue = value; - if (actualValue != nil) { - XCTAssertNotEqual([actualValue unsignedCharValue], 250); - } - } - - [expectation fulfill]; - }]; - - [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; -} -- (void)testSendClusterTest_TC_WNCV_2_1_000004_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"2: read the RO mandatory attribute default: ConfigStatus"]; @@ -29292,7 +29266,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000004_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000005_WriteAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000004_WriteAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3a: write a value into the RO mandatory attribute: ConfigStatus"]; @@ -29314,7 +29288,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000005_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000006_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000005_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3b: reads back the RO mandatory attribute: ConfigStatus"]; @@ -29340,7 +29314,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000006_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000007_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000006_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"2: read the RO mandatory attribute default: OperationalStatus"]; @@ -29373,7 +29347,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000007_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000008_WriteAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000007_WriteAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3a: write a value into the RO mandatory attribute: OperationalStatus"]; @@ -29396,7 +29370,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000008_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000009_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000008_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3b: reads back the RO mandatory attribute: OperationalStatus"]; @@ -29423,7 +29397,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000009_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000010_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000009_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"2: read the RO mandatory attribute default: EndProductType"]; @@ -29456,7 +29430,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000010_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000011_WriteAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000010_WriteAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3a: write a value into the RO mandatory attribute: EndProductType"]; @@ -29479,34 +29453,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000011_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000012_ReadAttribute -{ - XCTestExpectation * expectation = - [self expectationWithDescription:@"3b: reads back the RO mandatory attribute: EndProductType"]; - - CHIPDevice * device = GetConnectedDevice(); - dispatch_queue_t queue = dispatch_get_main_queue(); - CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:queue]; - XCTAssertNotNil(cluster); - - [cluster readAttributeEndProductTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { - NSLog(@"3b: reads back the RO mandatory attribute: EndProductType Error: %@", err); - - XCTAssertEqual([CHIPErrorTestUtils errorToZCLErrorCode:err], 0); - - { - id actualValue = value; - if (actualValue != nil) { - XCTAssertNotEqual([actualValue unsignedCharValue], 250); - } - } - - [expectation fulfill]; - }]; - - [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; -} -- (void)testSendClusterTest_TC_WNCV_2_1_000013_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000011_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"2: read the RW mandatory attribute default: Mode"]; @@ -29538,7 +29485,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000013_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000014_WriteAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000012_WriteAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3a: write a value into the RW mandatory attribute:: Mode"]; @@ -29560,7 +29507,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000014_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000015_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000013_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3b: reads back the RW mandatory attribute: Mode"]; @@ -29584,7 +29531,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000015_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000016_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000014_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"2: read the RO optional attribute default: TargetPositionLiftPercent100ths"]; @@ -29618,7 +29565,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000016_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000017_WriteAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000015_WriteAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3a: write a value into the RO optional attribute: TargetPositionLiftPercent100ths"]; @@ -29643,7 +29590,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000017_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000018_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000016_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3b: reads back the RO optional attribute: TargetPositionLiftPercent100ths"]; @@ -29671,7 +29618,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000018_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000019_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000017_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"2: read the RO optional attribute default: TargetPositionTiltPercent100ths"]; @@ -29705,7 +29652,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000019_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000020_WriteAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000018_WriteAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3a: write a value into the RO optional attribute: TargetPositionTiltPercent100ths"]; @@ -29730,7 +29677,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000020_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000021_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000019_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3b: reads back the RO optional attribute: TargetPositionTiltPercent100ths"]; @@ -29758,7 +29705,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000021_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000022_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000020_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"2: read the RO optional attribute default: CurrentPositionLiftPercent100ths"]; @@ -29792,7 +29739,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000022_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000023_WriteAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000021_WriteAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3a: write a value into the RO optional attribute: CurrentPositionLiftPercent100ths"]; @@ -29817,7 +29764,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000023_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000024_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000022_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3b: reads back the RO optional attribute: CurrentPositionLiftPercent100ths"]; @@ -29845,7 +29792,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000024_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000025_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000023_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"2: read the RO optional attribute default: CurrentPositionTiltPercent100ths"]; @@ -29879,7 +29826,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000025_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000026_WriteAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000024_WriteAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3a: write a value into the RO optional attribute: CurrentPositionTiltPercent100ths"]; @@ -29904,7 +29851,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000026_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000027_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000025_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3b: reads back the RO optional attribute: CurrentPositionTiltPercent100ths"]; @@ -29932,7 +29879,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000027_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000028_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000026_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"2: read the RO optional attribute default: InstalledOpenLimitLift"]; @@ -29965,7 +29912,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000028_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000029_WriteAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000027_WriteAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3a: write a value into the RO optional attribute: InstalledOpenLimitLift"]; @@ -29990,7 +29937,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000029_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000030_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000028_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3b: reads back the RO optional attribute: InstalledOpenLimitLift"]; @@ -30023,7 +29970,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000030_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000031_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000029_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"2: read the RO optional attribute default: InstalledClosedLimitLift"]; @@ -30056,7 +30003,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000031_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000032_WriteAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000030_WriteAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3a: write a value into the RO optional attribute: InstalledClosedLimitLift"]; @@ -30081,7 +30028,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000032_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000033_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000031_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3b: reads back the RO optional attribute: InstalledClosedLimitLift"]; @@ -30114,7 +30061,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000033_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000034_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000032_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"2: read the RO optional attribute default: InstalledOpenLimitTilt"]; @@ -30147,7 +30094,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000034_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000035_WriteAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000033_WriteAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3a: write a value into the RO optional attribute: InstalledOpenLimitTilt"]; @@ -30172,7 +30119,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000035_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000036_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000034_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3b: reads back the RO optional attribute: InstalledOpenLimitTilt"]; @@ -30205,7 +30152,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000036_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000037_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000035_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"2: read the RO optional attribute default: InstalledClosedLimitTilt"]; @@ -30238,7 +30185,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000037_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000038_WriteAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000036_WriteAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3a: write a value into the RO optional attribute: InstalledClosedLimitTilt"]; @@ -30263,7 +30210,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000038_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000039_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000037_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"3b: reads back the RO optional attribute: InstalledClosedLimitTilt"]; @@ -30296,7 +30243,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000039_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000040_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000038_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"4: read the RO mandatory attribute default: SafetyStatus"]; @@ -30328,7 +30275,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000040_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000041_WriteAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000039_WriteAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"5a: write a value into the RO mandatory attribute: SafetyStatus"]; @@ -30350,7 +30297,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000041_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000042_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000040_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"5b: reads back the RO mandatory attribute: SafetyStatus"]; @@ -30376,7 +30323,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000042_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000043_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000041_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"4: read the RO optional attribute default: CurrentPositionLift"]; @@ -30409,7 +30356,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000043_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000044_WriteAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000042_WriteAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"5a: write a value into the RO optional attribute: CurrentPositionLift"]; @@ -30433,7 +30380,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000044_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000045_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000043_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"5b: reads back the RO optional attribute: CurrentPositionLift"]; @@ -30466,7 +30413,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000045_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000046_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000044_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"4: read the RO optional attribute default: CurrentPositionTilt"]; @@ -30499,7 +30446,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000046_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000047_WriteAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000045_WriteAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"5a: write a value into the RO optional attribute: CurrentPositionTilt"]; @@ -30523,7 +30470,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000047_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000048_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000046_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"5b: reads back the RO optional attribute: CurrentPositionTilt"]; @@ -30556,7 +30503,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000048_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000049_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000047_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"4: read the RO optional attribute default: CurrentPositionLiftPercentage"]; @@ -30590,7 +30537,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000049_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000050_WriteAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000048_WriteAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"5a: write a value into the RO optional attribute: CurrentPositionLiftPercentage"]; @@ -30615,7 +30562,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000050_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000051_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000049_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"5b: reads back the RO optional attribute: CurrentPositionLiftPercentage"]; @@ -30643,7 +30590,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000051_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000052_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000050_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"4: read the RO optional attribute default: CurrentPositionTiltPercentage"]; @@ -30677,7 +30624,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000052_ReadAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000053_WriteAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000051_WriteAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"5a: write a value into the RO optional attribute: CurrentPositionTiltPercentage"]; @@ -30702,7 +30649,7 @@ - (void)testSendClusterTest_TC_WNCV_2_1_000053_WriteAttribute [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil]; } -- (void)testSendClusterTest_TC_WNCV_2_1_000054_ReadAttribute +- (void)testSendClusterTest_TC_WNCV_2_1_000052_ReadAttribute { XCTestExpectation * expectation = [self expectationWithDescription:@"5b: reads back the RO optional attribute: CurrentPositionTiltPercentage"]; 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 fcff316390f8eb..72f9995eaea14e 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 @@ -15326,9 +15326,9 @@ namespace Attributes { namespace Type { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) +EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::Type * value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, readable, sizeof(temp)); @@ -15340,9 +15340,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) *value = Traits::StorageToWorking(temp); return status; } -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::Type value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; @@ -15861,9 +15861,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullabl namespace EndProductType { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) +EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::EndProductType * value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::WindowCovering::Id, Id, readable, sizeof(temp)); @@ -15875,9 +15875,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) *value = Traits::StorageToWorking(temp); return status; } -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::EndProductType value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; 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 c586f581ed4815..14e9480779b245 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 @@ -2745,8 +2745,8 @@ namespace WindowCovering { namespace Attributes { namespace Type { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8 -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); +EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::Type * value); // Type +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::Type value); } // namespace Type namespace PhysicalClosedLimitLift { @@ -2822,8 +2822,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullabl } // namespace TargetPositionTiltPercent100ths namespace EndProductType { -EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8 -EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); +EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::EndProductType * value); // EndProductType +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::WindowCovering::EndProductType value); } // namespace EndProductType namespace CurrentPositionLiftPercent100ths { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index 0e2f5027438f21..3c0d17df697a69 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -1377,6 +1377,52 @@ enum class DoorLockFeature : uint32_t namespace WindowCovering { +// Enum for EndProductType +enum class EndProductType : uint8_t +{ + kRollerShade = 0x00, + kRomanShade = 0x01, + kBalloonShade = 0x02, + kWovenWood = 0x03, + kPleatedShade = 0x04, + kCellularShade = 0x05, + kLayeredShade = 0x06, + kLayeredShade2D = 0x07, + kSheerShade = 0x08, + kTiltOnlyInteriorBlind = 0x09, + kInteriorBlind = 0x0A, + kVerticalBlindStripCurtain = 0x0B, + kInteriorVenetianBlind = 0x0C, + kExteriorVenetianBlind = 0x0D, + kLateralLeftCurtain = 0x0E, + kLateralRightCurtain = 0x0F, + kCentralCurtain = 0x10, + kRollerShutter = 0x11, + kExteriorVerticalScreen = 0x12, + kAwningTerracePatio = 0x13, + kAwningVerticalScreen = 0x14, + kTiltOnlyPergola = 0x15, + kSwingingShutter = 0x16, + kSlidingShutter = 0x17, + kUnknown = 0xFF, +}; + +// Enum for Type +enum class Type : uint8_t +{ + kRollerShade = 0x00, + kRollerShade2Motor = 0x01, + kRollerShadeExterior = 0x02, + kRollerShadeExterior2Motor = 0x03, + kDrapery = 0x04, + kAwning = 0x05, + kShutter = 0x06, + kTiltBlindTiltOnly = 0x07, + kTiltBlindLiftAndTilt = 0x08, + kProjectorScreen = 0x09, + kUnknown = 0xFF, +}; + // Bitmap for WcConfigStatus enum class WcConfigStatus : uint8_t { @@ -1405,7 +1451,7 @@ enum class WcMode : uint8_t kMotorDirectionReversed = 0x1, kCalibrationMode = 0x2, kMaintenanceMode = 0x4, - kLEDFeedback = 0x8, + kLedFeedback = 0x8, }; // Bitmap for WcOperationalStatus 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 30e7150c004ab6..f2d381f7022328 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 @@ -20367,9 +20367,9 @@ namespace Attributes { namespace Type { struct TypeInfo { - using Type = uint8_t; - using DecodableType = uint8_t; - using DecodableArgType = uint8_t; + using Type = chip::app::Clusters::WindowCovering::Type; + using DecodableType = chip::app::Clusters::WindowCovering::Type; + using DecodableArgType = chip::app::Clusters::WindowCovering::Type; static constexpr ClusterId GetClusterId() { return Clusters::WindowCovering::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::Type::Id; } @@ -20523,9 +20523,9 @@ struct TypeInfo namespace EndProductType { struct TypeInfo { - using Type = uint8_t; - using DecodableType = uint8_t; - using DecodableArgType = uint8_t; + using Type = chip::app::Clusters::WindowCovering::EndProductType; + using DecodableType = chip::app::Clusters::WindowCovering::EndProductType; + using DecodableArgType = chip::app::Clusters::WindowCovering::EndProductType; static constexpr ClusterId GetClusterId() { return Clusters::WindowCovering::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::EndProductType::Id; } @@ -20697,7 +20697,7 @@ struct TypeInfo CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); - Attributes::Type::TypeInfo::DecodableType type = static_cast(0); + Attributes::Type::TypeInfo::DecodableType type = static_cast(0); Attributes::PhysicalClosedLimitLift::TypeInfo::DecodableType physicalClosedLimitLift = static_cast(0); Attributes::PhysicalClosedLimitTilt::TypeInfo::DecodableType physicalClosedLimitTilt = static_cast(0); Attributes::CurrentPositionLift::TypeInfo::DecodableType currentPositionLift; @@ -20710,7 +20710,8 @@ struct TypeInfo Attributes::OperationalStatus::TypeInfo::DecodableType operationalStatus = static_cast(0); Attributes::TargetPositionLiftPercent100ths::TypeInfo::DecodableType targetPositionLiftPercent100ths; Attributes::TargetPositionTiltPercent100ths::TypeInfo::DecodableType targetPositionTiltPercent100ths; - Attributes::EndProductType::TypeInfo::DecodableType endProductType = static_cast(0); + Attributes::EndProductType::TypeInfo::DecodableType endProductType = + static_cast(0); Attributes::CurrentPositionLiftPercent100ths::TypeInfo::DecodableType currentPositionLiftPercent100ths; Attributes::CurrentPositionTiltPercent100ths::TypeInfo::DecodableType currentPositionTiltPercent100ths; Attributes::InstalledOpenLimitLift::TypeInfo::DecodableType installedOpenLimitLift = static_cast(0); 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 50476dab0b551b..e45816105d7804 100644 --- a/zzz_generated/app-common/app-common/zap-generated/enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/enums.h @@ -363,52 +363,6 @@ enum EmberAfTemperatureDisplayMode : uint8_t EMBER_ZCL_TEMPERATURE_DISPLAY_MODE_FAHRENHEIT = 1, }; -// Enum for WcEndProductType -enum EmberAfWcEndProductType : uint8_t -{ - EMBER_ZCL_WC_END_PRODUCT_TYPE_ROLLER_SHADE = 0, - EMBER_ZCL_WC_END_PRODUCT_TYPE_ROMAN_SHADE = 1, - EMBER_ZCL_WC_END_PRODUCT_TYPE_BALLOON_SHADE = 2, - EMBER_ZCL_WC_END_PRODUCT_TYPE_WOVEN_WOOD = 3, - EMBER_ZCL_WC_END_PRODUCT_TYPE_PLEATED_SHADE = 4, - EMBER_ZCL_WC_END_PRODUCT_TYPE_CELLULAR_SHADE = 5, - EMBER_ZCL_WC_END_PRODUCT_TYPE_LAYERED_SHADE = 6, - EMBER_ZCL_WC_END_PRODUCT_TYPE_LAYERED_SHADE2_D = 7, - EMBER_ZCL_WC_END_PRODUCT_TYPE_SHEER_SHADE = 8, - EMBER_ZCL_WC_END_PRODUCT_TYPE_TILT_ONLY_INTERIOR_BLIND = 9, - EMBER_ZCL_WC_END_PRODUCT_TYPE_INTERIOR_BLIND = 10, - EMBER_ZCL_WC_END_PRODUCT_TYPE_VERTICAL_BLIND_STRIP_CURTAIN = 11, - EMBER_ZCL_WC_END_PRODUCT_TYPE_INTERIOR_VENETIAN_BLIND = 12, - EMBER_ZCL_WC_END_PRODUCT_TYPE_EXTERIOR_VENETIAN_BLIND = 13, - EMBER_ZCL_WC_END_PRODUCT_TYPE_LATERAL_LEFT_CURTAIN = 14, - EMBER_ZCL_WC_END_PRODUCT_TYPE_LATERAL_RIGHT_CURTAIN = 15, - EMBER_ZCL_WC_END_PRODUCT_TYPE_CENTRAL_CURTAIN = 16, - EMBER_ZCL_WC_END_PRODUCT_TYPE_ROLLER_SHUTTER = 17, - EMBER_ZCL_WC_END_PRODUCT_TYPE_EXTERIOR_VERTICAL_SCREEN = 18, - EMBER_ZCL_WC_END_PRODUCT_TYPE_AWNING_TERRACE_PATIO = 19, - EMBER_ZCL_WC_END_PRODUCT_TYPE_AWNING_VERTICAL_SCREEN = 20, - EMBER_ZCL_WC_END_PRODUCT_TYPE_TILT_ONLY_PERGOLA = 21, - EMBER_ZCL_WC_END_PRODUCT_TYPE_SWINGING_SHUTTER = 22, - EMBER_ZCL_WC_END_PRODUCT_TYPE_SLIDING_SHUTTER = 23, - EMBER_ZCL_WC_END_PRODUCT_TYPE_UNKNOWN = 255, -}; - -// Enum for WcType -enum EmberAfWcType : uint8_t -{ - EMBER_ZCL_WC_TYPE_ROLLERSHADE = 0, - EMBER_ZCL_WC_TYPE_ROLLERSHADE2_MOTOR = 1, - EMBER_ZCL_WC_TYPE_ROLLERSHADE_EXTERIOR = 2, - EMBER_ZCL_WC_TYPE_ROLLERSHADE_EXTERIOR2_MOTOR = 3, - EMBER_ZCL_WC_TYPE_DRAPERY = 4, - EMBER_ZCL_WC_TYPE_AWNING = 5, - EMBER_ZCL_WC_TYPE_SHUTTER = 6, - EMBER_ZCL_WC_TYPE_TILT_BLIND_TILT_ONLY = 7, - EMBER_ZCL_WC_TYPE_TILT_BLIND_LIFT_AND_TILT = 8, - EMBER_ZCL_WC_TYPE_PROJECTOR_SCREEN = 9, - EMBER_ZCL_WC_TYPE_UNKNOWN = 255, -}; - // Enum for WiFiVersionType enum EmberAfWiFiVersionType : uint8_t { diff --git a/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm b/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm index f5445f85cff794..52cbde53b9c0dd 100644 --- a/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm +++ b/zzz_generated/chip-tool-darwin/zap-generated/cluster/CHIPTestClustersObjc.mm @@ -16375,7 +16375,7 @@ new CHIPDefaultSuccessCallbackBridge( ListFreer listFreer; using TypeInfo = WindowCovering::Attributes::Type::TypeInfo; TypeInfo::Type cppValue; - cppValue = value.unsignedCharValue; + cppValue = static_cast>(value.unsignedCharValue); auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.WriteAttribute(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall); @@ -16571,7 +16571,7 @@ new CHIPDefaultSuccessCallbackBridge( ListFreer listFreer; using TypeInfo = WindowCovering::Attributes::EndProductType::TypeInfo; TypeInfo::Type cppValue; - cppValue = value.unsignedCharValue; + cppValue = static_cast>(value.unsignedCharValue); auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster.WriteAttribute(cppValue, successFn->mContext, successFn->mCall, failureFn->mCall); diff --git a/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h b/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h index cb96942c66e3db..37996395f2823c 100644 --- a/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h @@ -39957,239 +39957,231 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { err = Test3aWriteAValueIntoTheRoMandatoryAttributeType_2(); break; case 3: - ChipLogProgress(chipTool, " ***** Test Step 3 : 3b: reads back the RO mandatory attribute: Type\n"); - err = Test3bReadsBackTheRoMandatoryAttributeType_3(); + ChipLogProgress(chipTool, " ***** Test Step 3 : 2: read the RO mandatory attribute default: ConfigStatus\n"); + err = Test2ReadTheRoMandatoryAttributeDefaultConfigStatus_3(); break; case 4: - ChipLogProgress(chipTool, " ***** Test Step 4 : 2: read the RO mandatory attribute default: ConfigStatus\n"); - err = Test2ReadTheRoMandatoryAttributeDefaultConfigStatus_4(); + ChipLogProgress(chipTool, " ***** Test Step 4 : 3a: write a value into the RO mandatory attribute: ConfigStatus\n"); + err = Test3aWriteAValueIntoTheRoMandatoryAttributeConfigStatus_4(); break; case 5: - ChipLogProgress(chipTool, " ***** Test Step 5 : 3a: write a value into the RO mandatory attribute: ConfigStatus\n"); - err = Test3aWriteAValueIntoTheRoMandatoryAttributeConfigStatus_5(); + ChipLogProgress(chipTool, " ***** Test Step 5 : 3b: reads back the RO mandatory attribute: ConfigStatus\n"); + err = Test3bReadsBackTheRoMandatoryAttributeConfigStatus_5(); break; case 6: - ChipLogProgress(chipTool, " ***** Test Step 6 : 3b: reads back the RO mandatory attribute: ConfigStatus\n"); - err = Test3bReadsBackTheRoMandatoryAttributeConfigStatus_6(); + ChipLogProgress(chipTool, " ***** Test Step 6 : 2: read the RO mandatory attribute default: OperationalStatus\n"); + err = Test2ReadTheRoMandatoryAttributeDefaultOperationalStatus_6(); break; case 7: - ChipLogProgress(chipTool, " ***** Test Step 7 : 2: read the RO mandatory attribute default: OperationalStatus\n"); - err = Test2ReadTheRoMandatoryAttributeDefaultOperationalStatus_7(); + ChipLogProgress( + chipTool, " ***** Test Step 7 : 3a: write a value into the RO mandatory attribute: OperationalStatus\n"); + err = Test3aWriteAValueIntoTheRoMandatoryAttributeOperationalStatus_7(); break; case 8: - ChipLogProgress( - chipTool, " ***** Test Step 8 : 3a: write a value into the RO mandatory attribute: OperationalStatus\n"); - err = Test3aWriteAValueIntoTheRoMandatoryAttributeOperationalStatus_8(); + ChipLogProgress(chipTool, " ***** Test Step 8 : 3b: reads back the RO mandatory attribute: OperationalStatus\n"); + err = Test3bReadsBackTheRoMandatoryAttributeOperationalStatus_8(); break; case 9: - ChipLogProgress(chipTool, " ***** Test Step 9 : 3b: reads back the RO mandatory attribute: OperationalStatus\n"); - err = Test3bReadsBackTheRoMandatoryAttributeOperationalStatus_9(); + ChipLogProgress(chipTool, " ***** Test Step 9 : 2: read the RO mandatory attribute default: EndProductType\n"); + err = Test2ReadTheRoMandatoryAttributeDefaultEndProductType_9(); break; case 10: - ChipLogProgress(chipTool, " ***** Test Step 10 : 2: read the RO mandatory attribute default: EndProductType\n"); - err = Test2ReadTheRoMandatoryAttributeDefaultEndProductType_10(); + ChipLogProgress(chipTool, " ***** Test Step 10 : 3a: write a value into the RO mandatory attribute: EndProductType\n"); + err = Test3aWriteAValueIntoTheRoMandatoryAttributeEndProductType_10(); break; case 11: - ChipLogProgress(chipTool, " ***** Test Step 11 : 3a: write a value into the RO mandatory attribute: EndProductType\n"); - err = Test3aWriteAValueIntoTheRoMandatoryAttributeEndProductType_11(); + ChipLogProgress(chipTool, " ***** Test Step 11 : 2: read the RW mandatory attribute default: Mode\n"); + err = Test2ReadTheRwMandatoryAttributeDefaultMode_11(); break; case 12: - ChipLogProgress(chipTool, " ***** Test Step 12 : 3b: reads back the RO mandatory attribute: EndProductType\n"); - err = Test3bReadsBackTheRoMandatoryAttributeEndProductType_12(); + ChipLogProgress(chipTool, " ***** Test Step 12 : 3a: write a value into the RW mandatory attribute:: Mode\n"); + err = Test3aWriteAValueIntoTheRwMandatoryAttributeMode_12(); break; case 13: - ChipLogProgress(chipTool, " ***** Test Step 13 : 2: read the RW mandatory attribute default: Mode\n"); - err = Test2ReadTheRwMandatoryAttributeDefaultMode_13(); + ChipLogProgress(chipTool, " ***** Test Step 13 : 3b: reads back the RW mandatory attribute: Mode\n"); + err = Test3bReadsBackTheRwMandatoryAttributeMode_13(); break; case 14: - ChipLogProgress(chipTool, " ***** Test Step 14 : 3a: write a value into the RW mandatory attribute:: Mode\n"); - err = Test3aWriteAValueIntoTheRwMandatoryAttributeMode_14(); + ChipLogProgress( + chipTool, " ***** Test Step 14 : 2: read the RO optional attribute default: TargetPositionLiftPercent100ths\n"); + err = Test2ReadTheRoOptionalAttributeDefaultTargetPositionLiftPercent100ths_14(); break; case 15: - ChipLogProgress(chipTool, " ***** Test Step 15 : 3b: reads back the RW mandatory attribute: Mode\n"); - err = Test3bReadsBackTheRwMandatoryAttributeMode_15(); + ChipLogProgress(chipTool, + " ***** Test Step 15 : 3a: write a value into the RO optional attribute: TargetPositionLiftPercent100ths\n"); + err = Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionLiftPercent100ths_15(); break; case 16: ChipLogProgress( - chipTool, " ***** Test Step 16 : 2: read the RO optional attribute default: TargetPositionLiftPercent100ths\n"); - err = Test2ReadTheRoOptionalAttributeDefaultTargetPositionLiftPercent100ths_16(); + chipTool, " ***** Test Step 16 : 3b: reads back the RO optional attribute: TargetPositionLiftPercent100ths\n"); + err = Test3bReadsBackTheRoOptionalAttributeTargetPositionLiftPercent100ths_16(); break; case 17: - ChipLogProgress(chipTool, - " ***** Test Step 17 : 3a: write a value into the RO optional attribute: TargetPositionLiftPercent100ths\n"); - err = Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionLiftPercent100ths_17(); + ChipLogProgress( + chipTool, " ***** Test Step 17 : 2: read the RO optional attribute default: TargetPositionTiltPercent100ths\n"); + err = Test2ReadTheRoOptionalAttributeDefaultTargetPositionTiltPercent100ths_17(); break; case 18: - ChipLogProgress( - chipTool, " ***** Test Step 18 : 3b: reads back the RO optional attribute: TargetPositionLiftPercent100ths\n"); - err = Test3bReadsBackTheRoOptionalAttributeTargetPositionLiftPercent100ths_18(); + ChipLogProgress(chipTool, + " ***** Test Step 18 : 3a: write a value into the RO optional attribute: TargetPositionTiltPercent100ths\n"); + err = Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionTiltPercent100ths_18(); break; case 19: ChipLogProgress( - chipTool, " ***** Test Step 19 : 2: read the RO optional attribute default: TargetPositionTiltPercent100ths\n"); - err = Test2ReadTheRoOptionalAttributeDefaultTargetPositionTiltPercent100ths_19(); + chipTool, " ***** Test Step 19 : 3b: reads back the RO optional attribute: TargetPositionTiltPercent100ths\n"); + err = Test3bReadsBackTheRoOptionalAttributeTargetPositionTiltPercent100ths_19(); break; case 20: - ChipLogProgress(chipTool, - " ***** Test Step 20 : 3a: write a value into the RO optional attribute: TargetPositionTiltPercent100ths\n"); - err = Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionTiltPercent100ths_20(); + ChipLogProgress( + chipTool, " ***** Test Step 20 : 2: read the RO optional attribute default: CurrentPositionLiftPercent100ths\n"); + err = Test2ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercent100ths_20(); break; case 21: - ChipLogProgress( - chipTool, " ***** Test Step 21 : 3b: reads back the RO optional attribute: TargetPositionTiltPercent100ths\n"); - err = Test3bReadsBackTheRoOptionalAttributeTargetPositionTiltPercent100ths_21(); + ChipLogProgress(chipTool, + " ***** Test Step 21 : 3a: write a value into the RO optional attribute: CurrentPositionLiftPercent100ths\n"); + err = Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercent100ths_21(); break; case 22: ChipLogProgress( - chipTool, " ***** Test Step 22 : 2: read the RO optional attribute default: CurrentPositionLiftPercent100ths\n"); - err = Test2ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercent100ths_22(); + chipTool, " ***** Test Step 22 : 3b: reads back the RO optional attribute: CurrentPositionLiftPercent100ths\n"); + err = Test3bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercent100ths_22(); break; case 23: - ChipLogProgress(chipTool, - " ***** Test Step 23 : 3a: write a value into the RO optional attribute: CurrentPositionLiftPercent100ths\n"); - err = Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercent100ths_23(); + ChipLogProgress( + chipTool, " ***** Test Step 23 : 2: read the RO optional attribute default: CurrentPositionTiltPercent100ths\n"); + err = Test2ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercent100ths_23(); break; case 24: - ChipLogProgress( - chipTool, " ***** Test Step 24 : 3b: reads back the RO optional attribute: CurrentPositionLiftPercent100ths\n"); - err = Test3bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercent100ths_24(); + ChipLogProgress(chipTool, + " ***** Test Step 24 : 3a: write a value into the RO optional attribute: CurrentPositionTiltPercent100ths\n"); + err = Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercent100ths_24(); break; case 25: ChipLogProgress( - chipTool, " ***** Test Step 25 : 2: read the RO optional attribute default: CurrentPositionTiltPercent100ths\n"); - err = Test2ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercent100ths_25(); + chipTool, " ***** Test Step 25 : 3b: reads back the RO optional attribute: CurrentPositionTiltPercent100ths\n"); + err = Test3bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercent100ths_25(); break; case 26: - ChipLogProgress(chipTool, - " ***** Test Step 26 : 3a: write a value into the RO optional attribute: CurrentPositionTiltPercent100ths\n"); - err = Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercent100ths_26(); + ChipLogProgress(chipTool, " ***** Test Step 26 : 2: read the RO optional attribute default: InstalledOpenLimitLift\n"); + err = Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitLift_26(); break; case 27: ChipLogProgress( - chipTool, " ***** Test Step 27 : 3b: reads back the RO optional attribute: CurrentPositionTiltPercent100ths\n"); - err = Test3bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercent100ths_27(); + chipTool, " ***** Test Step 27 : 3a: write a value into the RO optional attribute: InstalledOpenLimitLift\n"); + err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitLift_27(); break; case 28: - ChipLogProgress(chipTool, " ***** Test Step 28 : 2: read the RO optional attribute default: InstalledOpenLimitLift\n"); - err = Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitLift_28(); + ChipLogProgress(chipTool, " ***** Test Step 28 : 3b: reads back the RO optional attribute: InstalledOpenLimitLift\n"); + err = Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitLift_28(); break; case 29: ChipLogProgress( - chipTool, " ***** Test Step 29 : 3a: write a value into the RO optional attribute: InstalledOpenLimitLift\n"); - err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitLift_29(); + chipTool, " ***** Test Step 29 : 2: read the RO optional attribute default: InstalledClosedLimitLift\n"); + err = Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitLift_29(); break; case 30: - ChipLogProgress(chipTool, " ***** Test Step 30 : 3b: reads back the RO optional attribute: InstalledOpenLimitLift\n"); - err = Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitLift_30(); + ChipLogProgress( + chipTool, " ***** Test Step 30 : 3a: write a value into the RO optional attribute: InstalledClosedLimitLift\n"); + err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitLift_30(); break; case 31: - ChipLogProgress( - chipTool, " ***** Test Step 31 : 2: read the RO optional attribute default: InstalledClosedLimitLift\n"); - err = Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitLift_31(); + ChipLogProgress(chipTool, " ***** Test Step 31 : 3b: reads back the RO optional attribute: InstalledClosedLimitLift\n"); + err = Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitLift_31(); break; case 32: - ChipLogProgress( - chipTool, " ***** Test Step 32 : 3a: write a value into the RO optional attribute: InstalledClosedLimitLift\n"); - err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitLift_32(); + ChipLogProgress(chipTool, " ***** Test Step 32 : 2: read the RO optional attribute default: InstalledOpenLimitTilt\n"); + err = Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitTilt_32(); break; case 33: - ChipLogProgress(chipTool, " ***** Test Step 33 : 3b: reads back the RO optional attribute: InstalledClosedLimitLift\n"); - err = Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitLift_33(); + ChipLogProgress( + chipTool, " ***** Test Step 33 : 3a: write a value into the RO optional attribute: InstalledOpenLimitTilt\n"); + err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitTilt_33(); break; case 34: - ChipLogProgress(chipTool, " ***** Test Step 34 : 2: read the RO optional attribute default: InstalledOpenLimitTilt\n"); - err = Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitTilt_34(); + ChipLogProgress(chipTool, " ***** Test Step 34 : 3b: reads back the RO optional attribute: InstalledOpenLimitTilt\n"); + err = Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitTilt_34(); break; case 35: ChipLogProgress( - chipTool, " ***** Test Step 35 : 3a: write a value into the RO optional attribute: InstalledOpenLimitTilt\n"); - err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitTilt_35(); + chipTool, " ***** Test Step 35 : 2: read the RO optional attribute default: InstalledClosedLimitTilt\n"); + err = Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitTilt_35(); break; case 36: - ChipLogProgress(chipTool, " ***** Test Step 36 : 3b: reads back the RO optional attribute: InstalledOpenLimitTilt\n"); - err = Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitTilt_36(); + ChipLogProgress( + chipTool, " ***** Test Step 36 : 3a: write a value into the RO optional attribute: InstalledClosedLimitTilt\n"); + err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitTilt_36(); break; case 37: - ChipLogProgress( - chipTool, " ***** Test Step 37 : 2: read the RO optional attribute default: InstalledClosedLimitTilt\n"); - err = Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitTilt_37(); + ChipLogProgress(chipTool, " ***** Test Step 37 : 3b: reads back the RO optional attribute: InstalledClosedLimitTilt\n"); + err = Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitTilt_37(); break; case 38: - ChipLogProgress( - chipTool, " ***** Test Step 38 : 3a: write a value into the RO optional attribute: InstalledClosedLimitTilt\n"); - err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitTilt_38(); + ChipLogProgress(chipTool, " ***** Test Step 38 : 4: read the RO mandatory attribute default: SafetyStatus\n"); + err = Test4ReadTheRoMandatoryAttributeDefaultSafetyStatus_38(); break; case 39: - ChipLogProgress(chipTool, " ***** Test Step 39 : 3b: reads back the RO optional attribute: InstalledClosedLimitTilt\n"); - err = Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitTilt_39(); + ChipLogProgress(chipTool, " ***** Test Step 39 : 5a: write a value into the RO mandatory attribute: SafetyStatus\n"); + err = Test5aWriteAValueIntoTheRoMandatoryAttributeSafetyStatus_39(); break; case 40: - ChipLogProgress(chipTool, " ***** Test Step 40 : 4: read the RO mandatory attribute default: SafetyStatus\n"); - err = Test4ReadTheRoMandatoryAttributeDefaultSafetyStatus_40(); + ChipLogProgress(chipTool, " ***** Test Step 40 : 5b: reads back the RO mandatory attribute: SafetyStatus\n"); + err = Test5bReadsBackTheRoMandatoryAttributeSafetyStatus_40(); break; case 41: - ChipLogProgress(chipTool, " ***** Test Step 41 : 5a: write a value into the RO mandatory attribute: SafetyStatus\n"); - err = Test5aWriteAValueIntoTheRoMandatoryAttributeSafetyStatus_41(); + ChipLogProgress(chipTool, " ***** Test Step 41 : 4: read the RO optional attribute default: CurrentPositionLift\n"); + err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLift_41(); break; case 42: - ChipLogProgress(chipTool, " ***** Test Step 42 : 5b: reads back the RO mandatory attribute: SafetyStatus\n"); - err = Test5bReadsBackTheRoMandatoryAttributeSafetyStatus_42(); + ChipLogProgress( + chipTool, " ***** Test Step 42 : 5a: write a value into the RO optional attribute: CurrentPositionLift\n"); + err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLift_42(); break; case 43: - ChipLogProgress(chipTool, " ***** Test Step 43 : 4: read the RO optional attribute default: CurrentPositionLift\n"); - err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLift_43(); + ChipLogProgress(chipTool, " ***** Test Step 43 : 5b: reads back the RO optional attribute: CurrentPositionLift\n"); + err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionLift_43(); break; case 44: - ChipLogProgress( - chipTool, " ***** Test Step 44 : 5a: write a value into the RO optional attribute: CurrentPositionLift\n"); - err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLift_44(); + ChipLogProgress(chipTool, " ***** Test Step 44 : 4: read the RO optional attribute default: CurrentPositionTilt\n"); + err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTilt_44(); break; case 45: - ChipLogProgress(chipTool, " ***** Test Step 45 : 5b: reads back the RO optional attribute: CurrentPositionLift\n"); - err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionLift_45(); + ChipLogProgress( + chipTool, " ***** Test Step 45 : 5a: write a value into the RO optional attribute: CurrentPositionTilt\n"); + err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTilt_45(); break; case 46: - ChipLogProgress(chipTool, " ***** Test Step 46 : 4: read the RO optional attribute default: CurrentPositionTilt\n"); - err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTilt_46(); + ChipLogProgress(chipTool, " ***** Test Step 46 : 5b: reads back the RO optional attribute: CurrentPositionTilt\n"); + err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionTilt_46(); break; case 47: ChipLogProgress( - chipTool, " ***** Test Step 47 : 5a: write a value into the RO optional attribute: CurrentPositionTilt\n"); - err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTilt_47(); + chipTool, " ***** Test Step 47 : 4: read the RO optional attribute default: CurrentPositionLiftPercentage\n"); + err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercentage_47(); break; case 48: - ChipLogProgress(chipTool, " ***** Test Step 48 : 5b: reads back the RO optional attribute: CurrentPositionTilt\n"); - err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionTilt_48(); + ChipLogProgress(chipTool, + " ***** Test Step 48 : 5a: write a value into the RO optional attribute: CurrentPositionLiftPercentage\n"); + err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercentage_48(); break; case 49: ChipLogProgress( - chipTool, " ***** Test Step 49 : 4: read the RO optional attribute default: CurrentPositionLiftPercentage\n"); - err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercentage_49(); + chipTool, " ***** Test Step 49 : 5b: reads back the RO optional attribute: CurrentPositionLiftPercentage\n"); + err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercentage_49(); break; case 50: - ChipLogProgress(chipTool, - " ***** Test Step 50 : 5a: write a value into the RO optional attribute: CurrentPositionLiftPercentage\n"); - err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercentage_50(); - break; - case 51: - ChipLogProgress( - chipTool, " ***** Test Step 51 : 5b: reads back the RO optional attribute: CurrentPositionLiftPercentage\n"); - err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercentage_51(); - break; - case 52: ChipLogProgress( - chipTool, " ***** Test Step 52 : 4: read the RO optional attribute default: CurrentPositionTiltPercentage\n"); - err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercentage_52(); + chipTool, " ***** Test Step 50 : 4: read the RO optional attribute default: CurrentPositionTiltPercentage\n"); + err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercentage_50(); break; - case 53: + case 51: ChipLogProgress(chipTool, - " ***** Test Step 53 : 5a: write a value into the RO optional attribute: CurrentPositionTiltPercentage\n"); - err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercentage_53(); + " ***** Test Step 51 : 5a: write a value into the RO optional attribute: CurrentPositionTiltPercentage\n"); + err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercentage_51(); break; - case 54: + case 52: ChipLogProgress( - chipTool, " ***** Test Step 54 : 5b: reads back the RO optional attribute: CurrentPositionTiltPercentage\n"); - err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercentage_54(); + chipTool, " ***** Test Step 52 : 5b: reads back the RO optional attribute: CurrentPositionTiltPercentage\n"); + err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercentage_52(); break; } @@ -40206,7 +40198,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 55; + const uint16_t mTestCount = 53; chip::Optional mNodeId; chip::Optional mCluster; @@ -40263,29 +40255,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3bReadsBackTheRoMandatoryAttributeType_3() - { - CHIPDevice * device = GetConnectedDevice(); - CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; - VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - - [cluster readAttributeTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { - NSLog(@"3b: reads back the RO mandatory attribute: Type Error: %@", err); - - VerifyOrReturn(CheckValue("status", err, 0)); - - VerifyOrReturn(CheckConstraintType("type", "", "enum8")); - if (value != nil) { - VerifyOrReturn(CheckConstraintNotValue("type", value, 250)); - } - - NextTest(); - }]; - - return CHIP_NO_ERROR; - } - - CHIP_ERROR Test2ReadTheRoMandatoryAttributeDefaultConfigStatus_4() + CHIP_ERROR Test2ReadTheRoMandatoryAttributeDefaultConfigStatus_3() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40310,7 +40280,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3aWriteAValueIntoTheRoMandatoryAttributeConfigStatus_5() + CHIP_ERROR Test3aWriteAValueIntoTheRoMandatoryAttributeConfigStatus_4() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40329,7 +40299,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3bReadsBackTheRoMandatoryAttributeConfigStatus_6() + CHIP_ERROR Test3bReadsBackTheRoMandatoryAttributeConfigStatus_5() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40351,7 +40321,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test2ReadTheRoMandatoryAttributeDefaultOperationalStatus_7() + CHIP_ERROR Test2ReadTheRoMandatoryAttributeDefaultOperationalStatus_6() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40376,7 +40346,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3aWriteAValueIntoTheRoMandatoryAttributeOperationalStatus_8() + CHIP_ERROR Test3aWriteAValueIntoTheRoMandatoryAttributeOperationalStatus_7() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40396,7 +40366,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3bReadsBackTheRoMandatoryAttributeOperationalStatus_9() + CHIP_ERROR Test3bReadsBackTheRoMandatoryAttributeOperationalStatus_8() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40418,7 +40388,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test2ReadTheRoMandatoryAttributeDefaultEndProductType_10() + CHIP_ERROR Test2ReadTheRoMandatoryAttributeDefaultEndProductType_9() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40443,7 +40413,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3aWriteAValueIntoTheRoMandatoryAttributeEndProductType_11() + CHIP_ERROR Test3aWriteAValueIntoTheRoMandatoryAttributeEndProductType_10() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40462,29 +40432,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3bReadsBackTheRoMandatoryAttributeEndProductType_12() - { - CHIPDevice * device = GetConnectedDevice(); - CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; - VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - - [cluster readAttributeEndProductTypeWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { - NSLog(@"3b: reads back the RO mandatory attribute: EndProductType Error: %@", err); - - VerifyOrReturn(CheckValue("status", err, 0)); - - VerifyOrReturn(CheckConstraintType("endProductType", "", "enum8")); - if (value != nil) { - VerifyOrReturn(CheckConstraintNotValue("endProductType", value, 250)); - } - - NextTest(); - }]; - - return CHIP_NO_ERROR; - } - - CHIP_ERROR Test2ReadTheRwMandatoryAttributeDefaultMode_13() + CHIP_ERROR Test2ReadTheRwMandatoryAttributeDefaultMode_11() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40509,7 +40457,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3aWriteAValueIntoTheRwMandatoryAttributeMode_14() + CHIP_ERROR Test3aWriteAValueIntoTheRwMandatoryAttributeMode_12() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40529,7 +40477,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3bReadsBackTheRwMandatoryAttributeMode_15() + CHIP_ERROR Test3bReadsBackTheRwMandatoryAttributeMode_13() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40551,7 +40499,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultTargetPositionLiftPercent100ths_16() + CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultTargetPositionLiftPercent100ths_14() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40579,7 +40527,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionLiftPercent100ths_17() + CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionLiftPercent100ths_15() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40601,7 +40549,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeTargetPositionLiftPercent100ths_18() + CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeTargetPositionLiftPercent100ths_16() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40624,7 +40572,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultTargetPositionTiltPercent100ths_19() + CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultTargetPositionTiltPercent100ths_17() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40652,7 +40600,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionTiltPercent100ths_20() + CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionTiltPercent100ths_18() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40674,7 +40622,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeTargetPositionTiltPercent100ths_21() + CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeTargetPositionTiltPercent100ths_19() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40697,7 +40645,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercent100ths_22() + CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercent100ths_20() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40725,7 +40673,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercent100ths_23() + CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercent100ths_21() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40747,7 +40695,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercent100ths_24() + CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercent100ths_22() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40770,7 +40718,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercent100ths_25() + CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercent100ths_23() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40798,7 +40746,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercent100ths_26() + CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercent100ths_24() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40820,7 +40768,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercent100ths_27() + CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercent100ths_25() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40843,7 +40791,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitLift_28() + CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitLift_26() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40868,7 +40816,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitLift_29() + CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitLift_27() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40889,7 +40837,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitLift_30() + CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitLift_28() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40914,7 +40862,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitLift_31() + CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitLift_29() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40939,7 +40887,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitLift_32() + CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitLift_30() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40960,7 +40908,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitLift_33() + CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitLift_31() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -40985,7 +40933,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitTilt_34() + CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitTilt_32() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41010,7 +40958,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitTilt_35() + CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitTilt_33() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41031,7 +40979,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitTilt_36() + CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitTilt_34() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41056,7 +41004,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitTilt_37() + CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitTilt_35() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41081,7 +41029,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitTilt_38() + CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitTilt_36() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41102,7 +41050,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitTilt_39() + CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitTilt_37() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41127,7 +41075,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test4ReadTheRoMandatoryAttributeDefaultSafetyStatus_40() + CHIP_ERROR Test4ReadTheRoMandatoryAttributeDefaultSafetyStatus_38() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41152,7 +41100,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test5aWriteAValueIntoTheRoMandatoryAttributeSafetyStatus_41() + CHIP_ERROR Test5aWriteAValueIntoTheRoMandatoryAttributeSafetyStatus_39() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41171,7 +41119,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test5bReadsBackTheRoMandatoryAttributeSafetyStatus_42() + CHIP_ERROR Test5bReadsBackTheRoMandatoryAttributeSafetyStatus_40() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41193,7 +41141,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLift_43() + CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLift_41() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41218,7 +41166,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLift_44() + CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLift_42() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41239,7 +41187,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionLift_45() + CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionLift_43() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41264,7 +41212,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTilt_46() + CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTilt_44() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41289,7 +41237,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTilt_47() + CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTilt_45() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41310,7 +41258,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionTilt_48() + CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionTilt_46() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41335,7 +41283,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercentage_49() + CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercentage_47() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41363,7 +41311,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercentage_50() + CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercentage_48() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41385,7 +41333,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercentage_51() + CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercentage_49() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41408,7 +41356,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercentage_52() + CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercentage_50() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41436,7 +41384,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercentage_53() + CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercentage_51() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -41458,7 +41406,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercentage_54() + CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercentage_52() { CHIPDevice * device = GetConnectedDevice(); CHIPTestWindowCovering * cluster = [[CHIPTestWindowCovering alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index d543a82d85cedf..19f55bc1d77bb2 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -9804,7 +9804,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP switch (path.mAttributeId) { case WindowCovering::Attributes::Type::Id: { - uint8_t value; + chip::app::Clusters::WindowCovering::Type value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("Type", 1, value); } @@ -9869,7 +9869,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("TargetPositionTiltPercent100ths", 1, value); } case WindowCovering::Attributes::EndProductType::Id: { - uint8_t value; + chip::app::Clusters::WindowCovering::EndProductType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("EndProductType", 1, value); } diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index c8aee4745c9b97..6d911a0b0f87ec 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -56997,245 +56997,237 @@ class Test_TC_WNCV_2_1Suite : public TestCommand err = Test3aWriteAValueIntoTheRoMandatoryAttributeType_2(); break; case 3: - ChipLogProgress(chipTool, " ***** Test Step 3 : 3b: reads back the RO mandatory attribute: Type\n"); - err = Test3bReadsBackTheRoMandatoryAttributeType_3(); + ChipLogProgress(chipTool, " ***** Test Step 3 : 2: read the RO mandatory attribute default: ConfigStatus\n"); + err = Test2ReadTheRoMandatoryAttributeDefaultConfigStatus_3(); break; case 4: - ChipLogProgress(chipTool, " ***** Test Step 4 : 2: read the RO mandatory attribute default: ConfigStatus\n"); - err = Test2ReadTheRoMandatoryAttributeDefaultConfigStatus_4(); + ChipLogProgress(chipTool, " ***** Test Step 4 : 3a: write a value into the RO mandatory attribute: ConfigStatus\n"); + err = Test3aWriteAValueIntoTheRoMandatoryAttributeConfigStatus_4(); break; case 5: - ChipLogProgress(chipTool, " ***** Test Step 5 : 3a: write a value into the RO mandatory attribute: ConfigStatus\n"); - err = Test3aWriteAValueIntoTheRoMandatoryAttributeConfigStatus_5(); + ChipLogProgress(chipTool, " ***** Test Step 5 : 3b: reads back the RO mandatory attribute: ConfigStatus\n"); + err = Test3bReadsBackTheRoMandatoryAttributeConfigStatus_5(); break; case 6: - ChipLogProgress(chipTool, " ***** Test Step 6 : 3b: reads back the RO mandatory attribute: ConfigStatus\n"); - err = Test3bReadsBackTheRoMandatoryAttributeConfigStatus_6(); + ChipLogProgress(chipTool, " ***** Test Step 6 : 2: read the RO mandatory attribute default: OperationalStatus\n"); + err = Test2ReadTheRoMandatoryAttributeDefaultOperationalStatus_6(); break; case 7: - ChipLogProgress(chipTool, " ***** Test Step 7 : 2: read the RO mandatory attribute default: OperationalStatus\n"); - err = Test2ReadTheRoMandatoryAttributeDefaultOperationalStatus_7(); + ChipLogProgress(chipTool, + " ***** Test Step 7 : 3a: write a value into the RO mandatory attribute: OperationalStatus\n"); + err = Test3aWriteAValueIntoTheRoMandatoryAttributeOperationalStatus_7(); break; case 8: - ChipLogProgress(chipTool, - " ***** Test Step 8 : 3a: write a value into the RO mandatory attribute: OperationalStatus\n"); - err = Test3aWriteAValueIntoTheRoMandatoryAttributeOperationalStatus_8(); + ChipLogProgress(chipTool, " ***** Test Step 8 : 3b: reads back the RO mandatory attribute: OperationalStatus\n"); + err = Test3bReadsBackTheRoMandatoryAttributeOperationalStatus_8(); break; case 9: - ChipLogProgress(chipTool, " ***** Test Step 9 : 3b: reads back the RO mandatory attribute: OperationalStatus\n"); - err = Test3bReadsBackTheRoMandatoryAttributeOperationalStatus_9(); + ChipLogProgress(chipTool, " ***** Test Step 9 : 2: read the RO mandatory attribute default: EndProductType\n"); + err = Test2ReadTheRoMandatoryAttributeDefaultEndProductType_9(); break; case 10: - ChipLogProgress(chipTool, " ***** Test Step 10 : 2: read the RO mandatory attribute default: EndProductType\n"); - err = Test2ReadTheRoMandatoryAttributeDefaultEndProductType_10(); + ChipLogProgress(chipTool, " ***** Test Step 10 : 3a: write a value into the RO mandatory attribute: EndProductType\n"); + err = Test3aWriteAValueIntoTheRoMandatoryAttributeEndProductType_10(); break; case 11: - ChipLogProgress(chipTool, " ***** Test Step 11 : 3a: write a value into the RO mandatory attribute: EndProductType\n"); - err = Test3aWriteAValueIntoTheRoMandatoryAttributeEndProductType_11(); + ChipLogProgress(chipTool, " ***** Test Step 11 : 2: read the RW mandatory attribute default: Mode\n"); + err = Test2ReadTheRwMandatoryAttributeDefaultMode_11(); break; case 12: - ChipLogProgress(chipTool, " ***** Test Step 12 : 3b: reads back the RO mandatory attribute: EndProductType\n"); - err = Test3bReadsBackTheRoMandatoryAttributeEndProductType_12(); + ChipLogProgress(chipTool, " ***** Test Step 12 : 3a: write a value into the RW mandatory attribute:: Mode\n"); + err = Test3aWriteAValueIntoTheRwMandatoryAttributeMode_12(); break; case 13: - ChipLogProgress(chipTool, " ***** Test Step 13 : 2: read the RW mandatory attribute default: Mode\n"); - err = Test2ReadTheRwMandatoryAttributeDefaultMode_13(); + ChipLogProgress(chipTool, " ***** Test Step 13 : 3b: reads back the RW mandatory attribute: Mode\n"); + err = Test3bReadsBackTheRwMandatoryAttributeMode_13(); break; case 14: - ChipLogProgress(chipTool, " ***** Test Step 14 : 3a: write a value into the RW mandatory attribute:: Mode\n"); - err = Test3aWriteAValueIntoTheRwMandatoryAttributeMode_14(); + ChipLogProgress(chipTool, + " ***** Test Step 14 : 2: read the RO optional attribute default: TargetPositionLiftPercent100ths\n"); + err = Test2ReadTheRoOptionalAttributeDefaultTargetPositionLiftPercent100ths_14(); break; case 15: - ChipLogProgress(chipTool, " ***** Test Step 15 : 3b: reads back the RW mandatory attribute: Mode\n"); - err = Test3bReadsBackTheRwMandatoryAttributeMode_15(); + ChipLogProgress( + chipTool, + " ***** Test Step 15 : 3a: write a value into the RO optional attribute: TargetPositionLiftPercent100ths\n"); + err = Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionLiftPercent100ths_15(); break; case 16: ChipLogProgress(chipTool, - " ***** Test Step 16 : 2: read the RO optional attribute default: TargetPositionLiftPercent100ths\n"); - err = Test2ReadTheRoOptionalAttributeDefaultTargetPositionLiftPercent100ths_16(); + " ***** Test Step 16 : 3b: reads back the RO optional attribute: TargetPositionLiftPercent100ths\n"); + err = Test3bReadsBackTheRoOptionalAttributeTargetPositionLiftPercent100ths_16(); break; case 17: - ChipLogProgress( - chipTool, - " ***** Test Step 17 : 3a: write a value into the RO optional attribute: TargetPositionLiftPercent100ths\n"); - err = Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionLiftPercent100ths_17(); + ChipLogProgress(chipTool, + " ***** Test Step 17 : 2: read the RO optional attribute default: TargetPositionTiltPercent100ths\n"); + err = Test2ReadTheRoOptionalAttributeDefaultTargetPositionTiltPercent100ths_17(); break; case 18: - ChipLogProgress(chipTool, - " ***** Test Step 18 : 3b: reads back the RO optional attribute: TargetPositionLiftPercent100ths\n"); - err = Test3bReadsBackTheRoOptionalAttributeTargetPositionLiftPercent100ths_18(); + ChipLogProgress( + chipTool, + " ***** Test Step 18 : 3a: write a value into the RO optional attribute: TargetPositionTiltPercent100ths\n"); + err = Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionTiltPercent100ths_18(); break; case 19: ChipLogProgress(chipTool, - " ***** Test Step 19 : 2: read the RO optional attribute default: TargetPositionTiltPercent100ths\n"); - err = Test2ReadTheRoOptionalAttributeDefaultTargetPositionTiltPercent100ths_19(); + " ***** Test Step 19 : 3b: reads back the RO optional attribute: TargetPositionTiltPercent100ths\n"); + err = Test3bReadsBackTheRoOptionalAttributeTargetPositionTiltPercent100ths_19(); break; case 20: - ChipLogProgress( - chipTool, - " ***** Test Step 20 : 3a: write a value into the RO optional attribute: TargetPositionTiltPercent100ths\n"); - err = Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionTiltPercent100ths_20(); + ChipLogProgress(chipTool, + " ***** Test Step 20 : 2: read the RO optional attribute default: CurrentPositionLiftPercent100ths\n"); + err = Test2ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercent100ths_20(); break; case 21: - ChipLogProgress(chipTool, - " ***** Test Step 21 : 3b: reads back the RO optional attribute: TargetPositionTiltPercent100ths\n"); - err = Test3bReadsBackTheRoOptionalAttributeTargetPositionTiltPercent100ths_21(); + ChipLogProgress( + chipTool, + " ***** Test Step 21 : 3a: write a value into the RO optional attribute: CurrentPositionLiftPercent100ths\n"); + err = Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercent100ths_21(); break; case 22: ChipLogProgress(chipTool, - " ***** Test Step 22 : 2: read the RO optional attribute default: CurrentPositionLiftPercent100ths\n"); - err = Test2ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercent100ths_22(); + " ***** Test Step 22 : 3b: reads back the RO optional attribute: CurrentPositionLiftPercent100ths\n"); + err = Test3bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercent100ths_22(); break; case 23: - ChipLogProgress( - chipTool, - " ***** Test Step 23 : 3a: write a value into the RO optional attribute: CurrentPositionLiftPercent100ths\n"); - err = Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercent100ths_23(); + ChipLogProgress(chipTool, + " ***** Test Step 23 : 2: read the RO optional attribute default: CurrentPositionTiltPercent100ths\n"); + err = Test2ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercent100ths_23(); break; case 24: - ChipLogProgress(chipTool, - " ***** Test Step 24 : 3b: reads back the RO optional attribute: CurrentPositionLiftPercent100ths\n"); - err = Test3bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercent100ths_24(); + ChipLogProgress( + chipTool, + " ***** Test Step 24 : 3a: write a value into the RO optional attribute: CurrentPositionTiltPercent100ths\n"); + err = Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercent100ths_24(); break; case 25: ChipLogProgress(chipTool, - " ***** Test Step 25 : 2: read the RO optional attribute default: CurrentPositionTiltPercent100ths\n"); - err = Test2ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercent100ths_25(); + " ***** Test Step 25 : 3b: reads back the RO optional attribute: CurrentPositionTiltPercent100ths\n"); + err = Test3bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercent100ths_25(); break; case 26: - ChipLogProgress( - chipTool, - " ***** Test Step 26 : 3a: write a value into the RO optional attribute: CurrentPositionTiltPercent100ths\n"); - err = Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercent100ths_26(); + ChipLogProgress(chipTool, " ***** Test Step 26 : 2: read the RO optional attribute default: InstalledOpenLimitLift\n"); + err = Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitLift_26(); break; case 27: ChipLogProgress(chipTool, - " ***** Test Step 27 : 3b: reads back the RO optional attribute: CurrentPositionTiltPercent100ths\n"); - err = Test3bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercent100ths_27(); + " ***** Test Step 27 : 3a: write a value into the RO optional attribute: InstalledOpenLimitLift\n"); + err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitLift_27(); break; case 28: - ChipLogProgress(chipTool, " ***** Test Step 28 : 2: read the RO optional attribute default: InstalledOpenLimitLift\n"); - err = Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitLift_28(); + ChipLogProgress(chipTool, " ***** Test Step 28 : 3b: reads back the RO optional attribute: InstalledOpenLimitLift\n"); + err = Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitLift_28(); break; case 29: ChipLogProgress(chipTool, - " ***** Test Step 29 : 3a: write a value into the RO optional attribute: InstalledOpenLimitLift\n"); - err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitLift_29(); + " ***** Test Step 29 : 2: read the RO optional attribute default: InstalledClosedLimitLift\n"); + err = Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitLift_29(); break; case 30: - ChipLogProgress(chipTool, " ***** Test Step 30 : 3b: reads back the RO optional attribute: InstalledOpenLimitLift\n"); - err = Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitLift_30(); + ChipLogProgress(chipTool, + " ***** Test Step 30 : 3a: write a value into the RO optional attribute: InstalledClosedLimitLift\n"); + err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitLift_30(); break; case 31: - ChipLogProgress(chipTool, - " ***** Test Step 31 : 2: read the RO optional attribute default: InstalledClosedLimitLift\n"); - err = Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitLift_31(); + ChipLogProgress(chipTool, " ***** Test Step 31 : 3b: reads back the RO optional attribute: InstalledClosedLimitLift\n"); + err = Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitLift_31(); break; case 32: - ChipLogProgress(chipTool, - " ***** Test Step 32 : 3a: write a value into the RO optional attribute: InstalledClosedLimitLift\n"); - err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitLift_32(); + ChipLogProgress(chipTool, " ***** Test Step 32 : 2: read the RO optional attribute default: InstalledOpenLimitTilt\n"); + err = Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitTilt_32(); break; case 33: - ChipLogProgress(chipTool, " ***** Test Step 33 : 3b: reads back the RO optional attribute: InstalledClosedLimitLift\n"); - err = Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitLift_33(); + ChipLogProgress(chipTool, + " ***** Test Step 33 : 3a: write a value into the RO optional attribute: InstalledOpenLimitTilt\n"); + err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitTilt_33(); break; case 34: - ChipLogProgress(chipTool, " ***** Test Step 34 : 2: read the RO optional attribute default: InstalledOpenLimitTilt\n"); - err = Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitTilt_34(); + ChipLogProgress(chipTool, " ***** Test Step 34 : 3b: reads back the RO optional attribute: InstalledOpenLimitTilt\n"); + err = Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitTilt_34(); break; case 35: ChipLogProgress(chipTool, - " ***** Test Step 35 : 3a: write a value into the RO optional attribute: InstalledOpenLimitTilt\n"); - err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitTilt_35(); + " ***** Test Step 35 : 2: read the RO optional attribute default: InstalledClosedLimitTilt\n"); + err = Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitTilt_35(); break; case 36: - ChipLogProgress(chipTool, " ***** Test Step 36 : 3b: reads back the RO optional attribute: InstalledOpenLimitTilt\n"); - err = Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitTilt_36(); + ChipLogProgress(chipTool, + " ***** Test Step 36 : 3a: write a value into the RO optional attribute: InstalledClosedLimitTilt\n"); + err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitTilt_36(); break; case 37: - ChipLogProgress(chipTool, - " ***** Test Step 37 : 2: read the RO optional attribute default: InstalledClosedLimitTilt\n"); - err = Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitTilt_37(); + ChipLogProgress(chipTool, " ***** Test Step 37 : 3b: reads back the RO optional attribute: InstalledClosedLimitTilt\n"); + err = Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitTilt_37(); break; case 38: - ChipLogProgress(chipTool, - " ***** Test Step 38 : 3a: write a value into the RO optional attribute: InstalledClosedLimitTilt\n"); - err = Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitTilt_38(); + ChipLogProgress(chipTool, " ***** Test Step 38 : 4: read the RO mandatory attribute default: SafetyStatus\n"); + err = Test4ReadTheRoMandatoryAttributeDefaultSafetyStatus_38(); break; case 39: - ChipLogProgress(chipTool, " ***** Test Step 39 : 3b: reads back the RO optional attribute: InstalledClosedLimitTilt\n"); - err = Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitTilt_39(); + ChipLogProgress(chipTool, " ***** Test Step 39 : 5a: write a value into the RO mandatory attribute: SafetyStatus\n"); + err = Test5aWriteAValueIntoTheRoMandatoryAttributeSafetyStatus_39(); break; case 40: - ChipLogProgress(chipTool, " ***** Test Step 40 : 4: read the RO mandatory attribute default: SafetyStatus\n"); - err = Test4ReadTheRoMandatoryAttributeDefaultSafetyStatus_40(); + ChipLogProgress(chipTool, " ***** Test Step 40 : 5b: reads back the RO mandatory attribute: SafetyStatus\n"); + err = Test5bReadsBackTheRoMandatoryAttributeSafetyStatus_40(); break; case 41: - ChipLogProgress(chipTool, " ***** Test Step 41 : 5a: write a value into the RO mandatory attribute: SafetyStatus\n"); - err = Test5aWriteAValueIntoTheRoMandatoryAttributeSafetyStatus_41(); + ChipLogProgress(chipTool, " ***** Test Step 41 : 4: read the RO optional attribute default: CurrentPositionLift\n"); + err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLift_41(); break; case 42: - ChipLogProgress(chipTool, " ***** Test Step 42 : 5b: reads back the RO mandatory attribute: SafetyStatus\n"); - err = Test5bReadsBackTheRoMandatoryAttributeSafetyStatus_42(); + ChipLogProgress(chipTool, + " ***** Test Step 42 : 5a: write a value into the RO optional attribute: CurrentPositionLift\n"); + err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLift_42(); break; case 43: - ChipLogProgress(chipTool, " ***** Test Step 43 : 4: read the RO optional attribute default: CurrentPositionLift\n"); - err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLift_43(); + ChipLogProgress(chipTool, " ***** Test Step 43 : 5b: reads back the RO optional attribute: CurrentPositionLift\n"); + err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionLift_43(); break; case 44: - ChipLogProgress(chipTool, - " ***** Test Step 44 : 5a: write a value into the RO optional attribute: CurrentPositionLift\n"); - err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLift_44(); + ChipLogProgress(chipTool, " ***** Test Step 44 : 4: read the RO optional attribute default: CurrentPositionTilt\n"); + err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTilt_44(); break; case 45: - ChipLogProgress(chipTool, " ***** Test Step 45 : 5b: reads back the RO optional attribute: CurrentPositionLift\n"); - err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionLift_45(); + ChipLogProgress(chipTool, + " ***** Test Step 45 : 5a: write a value into the RO optional attribute: CurrentPositionTilt\n"); + err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTilt_45(); break; case 46: - ChipLogProgress(chipTool, " ***** Test Step 46 : 4: read the RO optional attribute default: CurrentPositionTilt\n"); - err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTilt_46(); + ChipLogProgress(chipTool, " ***** Test Step 46 : 5b: reads back the RO optional attribute: CurrentPositionTilt\n"); + err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionTilt_46(); break; case 47: ChipLogProgress(chipTool, - " ***** Test Step 47 : 5a: write a value into the RO optional attribute: CurrentPositionTilt\n"); - err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTilt_47(); + " ***** Test Step 47 : 4: read the RO optional attribute default: CurrentPositionLiftPercentage\n"); + err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercentage_47(); break; case 48: - ChipLogProgress(chipTool, " ***** Test Step 48 : 5b: reads back the RO optional attribute: CurrentPositionTilt\n"); - err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionTilt_48(); - break; - case 49: - ChipLogProgress(chipTool, - " ***** Test Step 49 : 4: read the RO optional attribute default: CurrentPositionLiftPercentage\n"); - err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercentage_49(); - break; - case 50: ChipLogProgress( chipTool, - " ***** Test Step 50 : 5a: write a value into the RO optional attribute: CurrentPositionLiftPercentage\n"); - err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercentage_50(); + " ***** Test Step 48 : 5a: write a value into the RO optional attribute: CurrentPositionLiftPercentage\n"); + err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercentage_48(); break; - case 51: + case 49: ChipLogProgress(chipTool, - " ***** Test Step 51 : 5b: reads back the RO optional attribute: CurrentPositionLiftPercentage\n"); - err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercentage_51(); + " ***** Test Step 49 : 5b: reads back the RO optional attribute: CurrentPositionLiftPercentage\n"); + err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercentage_49(); break; - case 52: + case 50: ChipLogProgress(chipTool, - " ***** Test Step 52 : 4: read the RO optional attribute default: CurrentPositionTiltPercentage\n"); - err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercentage_52(); + " ***** Test Step 50 : 4: read the RO optional attribute default: CurrentPositionTiltPercentage\n"); + err = Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercentage_50(); break; - case 53: + case 51: ChipLogProgress( chipTool, - " ***** Test Step 53 : 5a: write a value into the RO optional attribute: CurrentPositionTiltPercentage\n"); - err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercentage_53(); + " ***** Test Step 51 : 5a: write a value into the RO optional attribute: CurrentPositionTiltPercentage\n"); + err = Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercentage_51(); break; - case 54: + case 52: ChipLogProgress(chipTool, - " ***** Test Step 54 : 5b: reads back the RO optional attribute: CurrentPositionTiltPercentage\n"); - err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercentage_54(); + " ***** Test Step 52 : 5b: reads back the RO optional attribute: CurrentPositionTiltPercentage\n"); + err = Test5bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercentage_52(); break; } @@ -57253,7 +57245,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 55; + const uint16_t mTestCount = 53; chip::Optional mNodeId; chip::Optional mCluster; @@ -57285,7 +57277,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand (static_cast(context))->OnFailureResponse_1(error); } - static void OnSuccessCallback_1(void * context, uint8_t type) + static void OnSuccessCallback_1(void * context, chip::app::Clusters::WindowCovering::Type type) { (static_cast(context))->OnSuccessResponse_1(type); } @@ -57302,9 +57294,9 @@ class Test_TC_WNCV_2_1Suite : public TestCommand (static_cast(context))->OnFailureResponse_3(error); } - static void OnSuccessCallback_3(void * context, uint8_t type) + static void OnSuccessCallback_3(void * context, uint8_t configStatus) { - (static_cast(context))->OnSuccessResponse_3(type); + (static_cast(context))->OnSuccessResponse_3(configStatus); } static void OnFailureCallback_4(void * context, CHIP_ERROR error) @@ -57312,26 +57304,26 @@ class Test_TC_WNCV_2_1Suite : public TestCommand (static_cast(context))->OnFailureResponse_4(error); } - static void OnSuccessCallback_4(void * context, uint8_t configStatus) - { - (static_cast(context))->OnSuccessResponse_4(configStatus); - } + static void OnSuccessCallback_4(void * context) { (static_cast(context))->OnSuccessResponse_4(); } static void OnFailureCallback_5(void * context, CHIP_ERROR error) { (static_cast(context))->OnFailureResponse_5(error); } - static void OnSuccessCallback_5(void * context) { (static_cast(context))->OnSuccessResponse_5(); } + static void OnSuccessCallback_5(void * context, uint8_t configStatus) + { + (static_cast(context))->OnSuccessResponse_5(configStatus); + } static void OnFailureCallback_6(void * context, CHIP_ERROR error) { (static_cast(context))->OnFailureResponse_6(error); } - static void OnSuccessCallback_6(void * context, uint8_t configStatus) + static void OnSuccessCallback_6(void * context, uint8_t operationalStatus) { - (static_cast(context))->OnSuccessResponse_6(configStatus); + (static_cast(context))->OnSuccessResponse_6(operationalStatus); } static void OnFailureCallback_7(void * context, CHIP_ERROR error) @@ -57339,26 +57331,26 @@ class Test_TC_WNCV_2_1Suite : public TestCommand (static_cast(context))->OnFailureResponse_7(error); } - static void OnSuccessCallback_7(void * context, uint8_t operationalStatus) - { - (static_cast(context))->OnSuccessResponse_7(operationalStatus); - } + static void OnSuccessCallback_7(void * context) { (static_cast(context))->OnSuccessResponse_7(); } static void OnFailureCallback_8(void * context, CHIP_ERROR error) { (static_cast(context))->OnFailureResponse_8(error); } - static void OnSuccessCallback_8(void * context) { (static_cast(context))->OnSuccessResponse_8(); } + static void OnSuccessCallback_8(void * context, uint8_t operationalStatus) + { + (static_cast(context))->OnSuccessResponse_8(operationalStatus); + } static void OnFailureCallback_9(void * context, CHIP_ERROR error) { (static_cast(context))->OnFailureResponse_9(error); } - static void OnSuccessCallback_9(void * context, uint8_t operationalStatus) + static void OnSuccessCallback_9(void * context, chip::app::Clusters::WindowCovering::EndProductType endProductType) { - (static_cast(context))->OnSuccessResponse_9(operationalStatus); + (static_cast(context))->OnSuccessResponse_9(endProductType); } static void OnFailureCallback_10(void * context, CHIP_ERROR error) @@ -57366,27 +57358,24 @@ class Test_TC_WNCV_2_1Suite : public TestCommand (static_cast(context))->OnFailureResponse_10(error); } - static void OnSuccessCallback_10(void * context, uint8_t endProductType) - { - (static_cast(context))->OnSuccessResponse_10(endProductType); - } + static void OnSuccessCallback_10(void * context) { (static_cast(context))->OnSuccessResponse_10(); } static void OnFailureCallback_11(void * context, CHIP_ERROR error) { (static_cast(context))->OnFailureResponse_11(error); } - static void OnSuccessCallback_11(void * context) { (static_cast(context))->OnSuccessResponse_11(); } + static void OnSuccessCallback_11(void * context, uint8_t mode) + { + (static_cast(context))->OnSuccessResponse_11(mode); + } static void OnFailureCallback_12(void * context, CHIP_ERROR error) { (static_cast(context))->OnFailureResponse_12(error); } - static void OnSuccessCallback_12(void * context, uint8_t endProductType) - { - (static_cast(context))->OnSuccessResponse_12(endProductType); - } + static void OnSuccessCallback_12(void * context) { (static_cast(context))->OnSuccessResponse_12(); } static void OnFailureCallback_13(void * context, CHIP_ERROR error) { @@ -57403,17 +57392,18 @@ class Test_TC_WNCV_2_1Suite : public TestCommand (static_cast(context))->OnFailureResponse_14(error); } - static void OnSuccessCallback_14(void * context) { (static_cast(context))->OnSuccessResponse_14(); } + static void OnSuccessCallback_14(void * context, + const chip::app::DataModel::Nullable & targetPositionLiftPercent100ths) + { + (static_cast(context))->OnSuccessResponse_14(targetPositionLiftPercent100ths); + } static void OnFailureCallback_15(void * context, CHIP_ERROR error) { (static_cast(context))->OnFailureResponse_15(error); } - static void OnSuccessCallback_15(void * context, uint8_t mode) - { - (static_cast(context))->OnSuccessResponse_15(mode); - } + static void OnSuccessCallback_15(void * context) { (static_cast(context))->OnSuccessResponse_15(); } static void OnFailureCallback_16(void * context, CHIP_ERROR error) { @@ -57431,18 +57421,18 @@ class Test_TC_WNCV_2_1Suite : public TestCommand (static_cast(context))->OnFailureResponse_17(error); } - static void OnSuccessCallback_17(void * context) { (static_cast(context))->OnSuccessResponse_17(); } + static void OnSuccessCallback_17(void * context, + const chip::app::DataModel::Nullable & targetPositionTiltPercent100ths) + { + (static_cast(context))->OnSuccessResponse_17(targetPositionTiltPercent100ths); + } static void OnFailureCallback_18(void * context, CHIP_ERROR error) { (static_cast(context))->OnFailureResponse_18(error); } - static void OnSuccessCallback_18(void * context, - const chip::app::DataModel::Nullable & targetPositionLiftPercent100ths) - { - (static_cast(context))->OnSuccessResponse_18(targetPositionLiftPercent100ths); - } + static void OnSuccessCallback_18(void * context) { (static_cast(context))->OnSuccessResponse_18(); } static void OnFailureCallback_19(void * context, CHIP_ERROR error) { @@ -57460,18 +57450,18 @@ class Test_TC_WNCV_2_1Suite : public TestCommand (static_cast(context))->OnFailureResponse_20(error); } - static void OnSuccessCallback_20(void * context) { (static_cast(context))->OnSuccessResponse_20(); } + static void OnSuccessCallback_20(void * context, + const chip::app::DataModel::Nullable & currentPositionLiftPercent100ths) + { + (static_cast(context))->OnSuccessResponse_20(currentPositionLiftPercent100ths); + } static void OnFailureCallback_21(void * context, CHIP_ERROR error) { (static_cast(context))->OnFailureResponse_21(error); } - static void OnSuccessCallback_21(void * context, - const chip::app::DataModel::Nullable & targetPositionTiltPercent100ths) - { - (static_cast(context))->OnSuccessResponse_21(targetPositionTiltPercent100ths); - } + static void OnSuccessCallback_21(void * context) { (static_cast(context))->OnSuccessResponse_21(); } static void OnFailureCallback_22(void * context, CHIP_ERROR error) { @@ -57489,18 +57479,18 @@ class Test_TC_WNCV_2_1Suite : public TestCommand (static_cast(context))->OnFailureResponse_23(error); } - static void OnSuccessCallback_23(void * context) { (static_cast(context))->OnSuccessResponse_23(); } + static void OnSuccessCallback_23(void * context, + const chip::app::DataModel::Nullable & currentPositionTiltPercent100ths) + { + (static_cast(context))->OnSuccessResponse_23(currentPositionTiltPercent100ths); + } static void OnFailureCallback_24(void * context, CHIP_ERROR error) { (static_cast(context))->OnFailureResponse_24(error); } - static void OnSuccessCallback_24(void * context, - const chip::app::DataModel::Nullable & currentPositionLiftPercent100ths) - { - (static_cast(context))->OnSuccessResponse_24(currentPositionLiftPercent100ths); - } + static void OnSuccessCallback_24(void * context) { (static_cast(context))->OnSuccessResponse_24(); } static void OnFailureCallback_25(void * context, CHIP_ERROR error) { @@ -57518,18 +57508,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand (static_cast(context))->OnFailureResponse_26(error); } - static void OnSuccessCallback_26(void * context) { (static_cast(context))->OnSuccessResponse_26(); } + static void OnSuccessCallback_26(void * context, uint16_t installedOpenLimitLift) + { + (static_cast(context))->OnSuccessResponse_26(installedOpenLimitLift); + } static void OnFailureCallback_27(void * context, CHIP_ERROR error) { (static_cast(context))->OnFailureResponse_27(error); } - static void OnSuccessCallback_27(void * context, - const chip::app::DataModel::Nullable & currentPositionTiltPercent100ths) - { - (static_cast(context))->OnSuccessResponse_27(currentPositionTiltPercent100ths); - } + static void OnSuccessCallback_27(void * context) { (static_cast(context))->OnSuccessResponse_27(); } static void OnFailureCallback_28(void * context, CHIP_ERROR error) { @@ -57546,17 +57535,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand (static_cast(context))->OnFailureResponse_29(error); } - static void OnSuccessCallback_29(void * context) { (static_cast(context))->OnSuccessResponse_29(); } + static void OnSuccessCallback_29(void * context, uint16_t installedClosedLimitLift) + { + (static_cast(context))->OnSuccessResponse_29(installedClosedLimitLift); + } static void OnFailureCallback_30(void * context, CHIP_ERROR error) { (static_cast(context))->OnFailureResponse_30(error); } - static void OnSuccessCallback_30(void * context, uint16_t installedOpenLimitLift) - { - (static_cast(context))->OnSuccessResponse_30(installedOpenLimitLift); - } + static void OnSuccessCallback_30(void * context) { (static_cast(context))->OnSuccessResponse_30(); } static void OnFailureCallback_31(void * context, CHIP_ERROR error) { @@ -57573,17 +57562,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand (static_cast(context))->OnFailureResponse_32(error); } - static void OnSuccessCallback_32(void * context) { (static_cast(context))->OnSuccessResponse_32(); } + static void OnSuccessCallback_32(void * context, uint16_t installedOpenLimitTilt) + { + (static_cast(context))->OnSuccessResponse_32(installedOpenLimitTilt); + } static void OnFailureCallback_33(void * context, CHIP_ERROR error) { (static_cast(context))->OnFailureResponse_33(error); } - static void OnSuccessCallback_33(void * context, uint16_t installedClosedLimitLift) - { - (static_cast(context))->OnSuccessResponse_33(installedClosedLimitLift); - } + static void OnSuccessCallback_33(void * context) { (static_cast(context))->OnSuccessResponse_33(); } static void OnFailureCallback_34(void * context, CHIP_ERROR error) { @@ -57600,17 +57589,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand (static_cast(context))->OnFailureResponse_35(error); } - static void OnSuccessCallback_35(void * context) { (static_cast(context))->OnSuccessResponse_35(); } + static void OnSuccessCallback_35(void * context, uint16_t installedClosedLimitTilt) + { + (static_cast(context))->OnSuccessResponse_35(installedClosedLimitTilt); + } static void OnFailureCallback_36(void * context, CHIP_ERROR error) { (static_cast(context))->OnFailureResponse_36(error); } - static void OnSuccessCallback_36(void * context, uint16_t installedOpenLimitTilt) - { - (static_cast(context))->OnSuccessResponse_36(installedOpenLimitTilt); - } + static void OnSuccessCallback_36(void * context) { (static_cast(context))->OnSuccessResponse_36(); } static void OnFailureCallback_37(void * context, CHIP_ERROR error) { @@ -57627,17 +57616,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand (static_cast(context))->OnFailureResponse_38(error); } - static void OnSuccessCallback_38(void * context) { (static_cast(context))->OnSuccessResponse_38(); } + static void OnSuccessCallback_38(void * context, uint16_t safetyStatus) + { + (static_cast(context))->OnSuccessResponse_38(safetyStatus); + } static void OnFailureCallback_39(void * context, CHIP_ERROR error) { (static_cast(context))->OnFailureResponse_39(error); } - static void OnSuccessCallback_39(void * context, uint16_t installedClosedLimitTilt) - { - (static_cast(context))->OnSuccessResponse_39(installedClosedLimitTilt); - } + static void OnSuccessCallback_39(void * context) { (static_cast(context))->OnSuccessResponse_39(); } static void OnFailureCallback_40(void * context, CHIP_ERROR error) { @@ -57654,17 +57643,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand (static_cast(context))->OnFailureResponse_41(error); } - static void OnSuccessCallback_41(void * context) { (static_cast(context))->OnSuccessResponse_41(); } + static void OnSuccessCallback_41(void * context, const chip::app::DataModel::Nullable & currentPositionLift) + { + (static_cast(context))->OnSuccessResponse_41(currentPositionLift); + } static void OnFailureCallback_42(void * context, CHIP_ERROR error) { (static_cast(context))->OnFailureResponse_42(error); } - static void OnSuccessCallback_42(void * context, uint16_t safetyStatus) - { - (static_cast(context))->OnSuccessResponse_42(safetyStatus); - } + static void OnSuccessCallback_42(void * context) { (static_cast(context))->OnSuccessResponse_42(); } static void OnFailureCallback_43(void * context, CHIP_ERROR error) { @@ -57681,17 +57670,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand (static_cast(context))->OnFailureResponse_44(error); } - static void OnSuccessCallback_44(void * context) { (static_cast(context))->OnSuccessResponse_44(); } + static void OnSuccessCallback_44(void * context, const chip::app::DataModel::Nullable & currentPositionTilt) + { + (static_cast(context))->OnSuccessResponse_44(currentPositionTilt); + } static void OnFailureCallback_45(void * context, CHIP_ERROR error) { (static_cast(context))->OnFailureResponse_45(error); } - static void OnSuccessCallback_45(void * context, const chip::app::DataModel::Nullable & currentPositionLift) - { - (static_cast(context))->OnSuccessResponse_45(currentPositionLift); - } + static void OnSuccessCallback_45(void * context) { (static_cast(context))->OnSuccessResponse_45(); } static void OnFailureCallback_46(void * context, CHIP_ERROR error) { @@ -57708,17 +57697,18 @@ class Test_TC_WNCV_2_1Suite : public TestCommand (static_cast(context))->OnFailureResponse_47(error); } - static void OnSuccessCallback_47(void * context) { (static_cast(context))->OnSuccessResponse_47(); } + static void OnSuccessCallback_47(void * context, + const chip::app::DataModel::Nullable & currentPositionLiftPercentage) + { + (static_cast(context))->OnSuccessResponse_47(currentPositionLiftPercentage); + } static void OnFailureCallback_48(void * context, CHIP_ERROR error) { (static_cast(context))->OnFailureResponse_48(error); } - static void OnSuccessCallback_48(void * context, const chip::app::DataModel::Nullable & currentPositionTilt) - { - (static_cast(context))->OnSuccessResponse_48(currentPositionTilt); - } + static void OnSuccessCallback_48(void * context) { (static_cast(context))->OnSuccessResponse_48(); } static void OnFailureCallback_49(void * context, CHIP_ERROR error) { @@ -57736,18 +57726,18 @@ class Test_TC_WNCV_2_1Suite : public TestCommand (static_cast(context))->OnFailureResponse_50(error); } - static void OnSuccessCallback_50(void * context) { (static_cast(context))->OnSuccessResponse_50(); } + static void OnSuccessCallback_50(void * context, + const chip::app::DataModel::Nullable & currentPositionTiltPercentage) + { + (static_cast(context))->OnSuccessResponse_50(currentPositionTiltPercentage); + } static void OnFailureCallback_51(void * context, CHIP_ERROR error) { (static_cast(context))->OnFailureResponse_51(error); } - static void OnSuccessCallback_51(void * context, - const chip::app::DataModel::Nullable & currentPositionLiftPercentage) - { - (static_cast(context))->OnSuccessResponse_51(currentPositionLiftPercentage); - } + static void OnSuccessCallback_51(void * context) { (static_cast(context))->OnSuccessResponse_51(); } static void OnFailureCallback_52(void * context, CHIP_ERROR error) { @@ -57760,24 +57750,6 @@ class Test_TC_WNCV_2_1Suite : public TestCommand (static_cast(context))->OnSuccessResponse_52(currentPositionTiltPercentage); } - static void OnFailureCallback_53(void * context, CHIP_ERROR error) - { - (static_cast(context))->OnFailureResponse_53(error); - } - - static void OnSuccessCallback_53(void * context) { (static_cast(context))->OnSuccessResponse_53(); } - - static void OnFailureCallback_54(void * context, CHIP_ERROR error) - { - (static_cast(context))->OnFailureResponse_54(error); - } - - static void OnSuccessCallback_54(void * context, - const chip::app::DataModel::Nullable & currentPositionTiltPercentage) - { - (static_cast(context))->OnSuccessResponse_54(currentPositionTiltPercentage); - } - // // Tests methods // @@ -57805,7 +57777,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ThrowFailureResponse(); } - void OnSuccessResponse_1(uint8_t type) + void OnSuccessResponse_1(chip::app::Clusters::WindowCovering::Type type) { VerifyOrReturn(CheckConstraintType("type", "", "enum8")); VerifyOrReturn(CheckConstraintMinValue("type", type, 0)); @@ -57819,8 +57791,8 @@ class Test_TC_WNCV_2_1Suite : public TestCommand chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - uint8_t typeArgument; - typeArgument = 250; + chip::app::Clusters::WindowCovering::Type typeArgument; + typeArgument = static_cast(250); ReturnErrorOnFailure(cluster.WriteAttribute( typeArgument, this, OnSuccessCallback_2, OnFailureCallback_2)); @@ -57836,13 +57808,13 @@ class Test_TC_WNCV_2_1Suite : public TestCommand void OnSuccessResponse_2() { ThrowSuccessResponse(); } - CHIP_ERROR Test3bReadsBackTheRoMandatoryAttributeType_3() + CHIP_ERROR Test2ReadTheRoMandatoryAttributeDefaultConfigStatus_3() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - ReturnErrorOnFailure(cluster.ReadAttribute( + ReturnErrorOnFailure(cluster.ReadAttribute( this, OnSuccessCallback_3, OnFailureCallback_3, true)); return CHIP_NO_ERROR; } @@ -57853,32 +57825,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ThrowFailureResponse(); } - void OnSuccessResponse_3(uint8_t type) - { - VerifyOrReturn(CheckConstraintType("type", "", "enum8")); - VerifyOrReturn(CheckConstraintNotValue("type", type, 250)); - - NextTest(); - } - - CHIP_ERROR Test2ReadTheRoMandatoryAttributeDefaultConfigStatus_4() - { - const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; - chip::Controller::WindowCoveringClusterTest cluster; - cluster.Associate(mDevices[kIdentityAlpha], endpoint); - - ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4, true)); - return CHIP_NO_ERROR; - } - - void OnFailureResponse_4(CHIP_ERROR error) - { - chip::app::StatusIB status(error); - ThrowFailureResponse(); - } - - void OnSuccessResponse_4(uint8_t configStatus) + void OnSuccessResponse_3(uint8_t configStatus) { VerifyOrReturn(CheckConstraintType("configStatus", "", "map8")); VerifyOrReturn(CheckConstraintMinValue("configStatus", configStatus, 0)); @@ -57886,7 +57833,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test3aWriteAValueIntoTheRoMandatoryAttributeConfigStatus_5() + CHIP_ERROR Test3aWriteAValueIntoTheRoMandatoryAttributeConfigStatus_4() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -57896,37 +57843,37 @@ class Test_TC_WNCV_2_1Suite : public TestCommand configStatusArgument = 128; ReturnErrorOnFailure(cluster.WriteAttribute( - configStatusArgument, this, OnSuccessCallback_5, OnFailureCallback_5)); + configStatusArgument, this, OnSuccessCallback_4, OnFailureCallback_4)); return CHIP_NO_ERROR; } - void OnFailureResponse_5(CHIP_ERROR error) + void OnFailureResponse_4(CHIP_ERROR error) { chip::app::StatusIB status(error); VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); } - void OnSuccessResponse_5() { ThrowSuccessResponse(); } + void OnSuccessResponse_4() { ThrowSuccessResponse(); } - CHIP_ERROR Test3bReadsBackTheRoMandatoryAttributeConfigStatus_6() + CHIP_ERROR Test3bReadsBackTheRoMandatoryAttributeConfigStatus_5() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_6, OnFailureCallback_6, true)); + this, OnSuccessCallback_5, OnFailureCallback_5, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_6(CHIP_ERROR error) + void OnFailureResponse_5(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_6(uint8_t configStatus) + void OnSuccessResponse_5(uint8_t configStatus) { VerifyOrReturn(CheckConstraintType("configStatus", "", "map8")); VerifyOrReturn(CheckConstraintNotValue("configStatus", configStatus, 128)); @@ -57934,24 +57881,24 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test2ReadTheRoMandatoryAttributeDefaultOperationalStatus_7() + CHIP_ERROR Test2ReadTheRoMandatoryAttributeDefaultOperationalStatus_6() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_7, OnFailureCallback_7, true)); + this, OnSuccessCallback_6, OnFailureCallback_6, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_7(CHIP_ERROR error) + void OnFailureResponse_6(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_7(uint8_t operationalStatus) + void OnSuccessResponse_6(uint8_t operationalStatus) { VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8")); VerifyOrReturn(CheckConstraintMinValue("operationalStatus", operationalStatus, 0)); @@ -57959,7 +57906,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test3aWriteAValueIntoTheRoMandatoryAttributeOperationalStatus_8() + CHIP_ERROR Test3aWriteAValueIntoTheRoMandatoryAttributeOperationalStatus_7() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -57969,37 +57916,37 @@ class Test_TC_WNCV_2_1Suite : public TestCommand operationalStatusArgument = 128; ReturnErrorOnFailure(cluster.WriteAttribute( - operationalStatusArgument, this, OnSuccessCallback_8, OnFailureCallback_8)); + operationalStatusArgument, this, OnSuccessCallback_7, OnFailureCallback_7)); return CHIP_NO_ERROR; } - void OnFailureResponse_8(CHIP_ERROR error) + void OnFailureResponse_7(CHIP_ERROR error) { chip::app::StatusIB status(error); VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); } - void OnSuccessResponse_8() { ThrowSuccessResponse(); } + void OnSuccessResponse_7() { ThrowSuccessResponse(); } - CHIP_ERROR Test3bReadsBackTheRoMandatoryAttributeOperationalStatus_9() + CHIP_ERROR Test3bReadsBackTheRoMandatoryAttributeOperationalStatus_8() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_9, OnFailureCallback_9, true)); + this, OnSuccessCallback_8, OnFailureCallback_8, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_9(CHIP_ERROR error) + void OnFailureResponse_8(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_9(uint8_t operationalStatus) + void OnSuccessResponse_8(uint8_t operationalStatus) { VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8")); VerifyOrReturn(CheckConstraintNotValue("operationalStatus", operationalStatus, 128)); @@ -58007,24 +57954,24 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test2ReadTheRoMandatoryAttributeDefaultEndProductType_10() + CHIP_ERROR Test2ReadTheRoMandatoryAttributeDefaultEndProductType_9() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_10, OnFailureCallback_10, true)); + this, OnSuccessCallback_9, OnFailureCallback_9, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_10(CHIP_ERROR error) + void OnFailureResponse_9(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_10(uint8_t endProductType) + void OnSuccessResponse_9(chip::app::Clusters::WindowCovering::EndProductType endProductType) { VerifyOrReturn(CheckConstraintType("endProductType", "", "enum8")); VerifyOrReturn(CheckConstraintMinValue("endProductType", endProductType, 0)); @@ -58032,72 +57979,47 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test3aWriteAValueIntoTheRoMandatoryAttributeEndProductType_11() + CHIP_ERROR Test3aWriteAValueIntoTheRoMandatoryAttributeEndProductType_10() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); - uint8_t endProductTypeArgument; - endProductTypeArgument = 250; + chip::app::Clusters::WindowCovering::EndProductType endProductTypeArgument; + endProductTypeArgument = static_cast(250); ReturnErrorOnFailure(cluster.WriteAttribute( - endProductTypeArgument, this, OnSuccessCallback_11, OnFailureCallback_11)); + endProductTypeArgument, this, OnSuccessCallback_10, OnFailureCallback_10)); return CHIP_NO_ERROR; } - void OnFailureResponse_11(CHIP_ERROR error) + void OnFailureResponse_10(CHIP_ERROR error) { chip::app::StatusIB status(error); VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); } - void OnSuccessResponse_11() { ThrowSuccessResponse(); } - - CHIP_ERROR Test3bReadsBackTheRoMandatoryAttributeEndProductType_12() - { - const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; - chip::Controller::WindowCoveringClusterTest cluster; - cluster.Associate(mDevices[kIdentityAlpha], endpoint); - - ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_12, OnFailureCallback_12, true)); - return CHIP_NO_ERROR; - } - - void OnFailureResponse_12(CHIP_ERROR error) - { - chip::app::StatusIB status(error); - ThrowFailureResponse(); - } - - void OnSuccessResponse_12(uint8_t endProductType) - { - VerifyOrReturn(CheckConstraintType("endProductType", "", "enum8")); - VerifyOrReturn(CheckConstraintNotValue("endProductType", endProductType, 250)); - - NextTest(); - } + void OnSuccessResponse_10() { ThrowSuccessResponse(); } - CHIP_ERROR Test2ReadTheRwMandatoryAttributeDefaultMode_13() + CHIP_ERROR Test2ReadTheRwMandatoryAttributeDefaultMode_11() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_13, OnFailureCallback_13, true)); + this, OnSuccessCallback_11, OnFailureCallback_11, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_13(CHIP_ERROR error) + void OnFailureResponse_11(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_13(uint8_t mode) + void OnSuccessResponse_11(uint8_t mode) { VerifyOrReturn(CheckConstraintType("mode", "", "map8")); VerifyOrReturn(CheckConstraintMinValue("mode", mode, 0)); @@ -58105,7 +58027,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test3aWriteAValueIntoTheRwMandatoryAttributeMode_14() + CHIP_ERROR Test3aWriteAValueIntoTheRwMandatoryAttributeMode_12() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58115,43 +58037,43 @@ class Test_TC_WNCV_2_1Suite : public TestCommand modeArgument = 8; ReturnErrorOnFailure(cluster.WriteAttribute( - modeArgument, this, OnSuccessCallback_14, OnFailureCallback_14)); + modeArgument, this, OnSuccessCallback_12, OnFailureCallback_12)); return CHIP_NO_ERROR; } - void OnFailureResponse_14(CHIP_ERROR error) + void OnFailureResponse_12(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_14() { NextTest(); } + void OnSuccessResponse_12() { NextTest(); } - CHIP_ERROR Test3bReadsBackTheRwMandatoryAttributeMode_15() + CHIP_ERROR Test3bReadsBackTheRwMandatoryAttributeMode_13() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_15, OnFailureCallback_15, true)); + this, OnSuccessCallback_13, OnFailureCallback_13, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_15(CHIP_ERROR error) + void OnFailureResponse_13(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_15(uint8_t mode) + void OnSuccessResponse_13(uint8_t mode) { VerifyOrReturn(CheckValue("mode", mode, 8)); NextTest(); } - CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultTargetPositionLiftPercent100ths_16() + CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultTargetPositionLiftPercent100ths_14() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58159,17 +58081,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_16, OnFailureCallback_16, true)); + this, OnSuccessCallback_14, OnFailureCallback_14, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_16(CHIP_ERROR error) + void OnFailureResponse_14(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_16(const chip::app::DataModel::Nullable & targetPositionLiftPercent100ths) + void OnSuccessResponse_14(const chip::app::DataModel::Nullable & targetPositionLiftPercent100ths) { VerifyOrReturn(CheckConstraintType("targetPositionLiftPercent100ths", "", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("targetPositionLiftPercent100ths", targetPositionLiftPercent100ths, 0U)); @@ -58177,7 +58099,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionLiftPercent100ths_17() + CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionLiftPercent100ths_15() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58189,20 +58111,20 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.WriteAttribute( - targetPositionLiftPercent100thsArgument, this, OnSuccessCallback_17, OnFailureCallback_17)); + targetPositionLiftPercent100thsArgument, this, OnSuccessCallback_15, OnFailureCallback_15)); return CHIP_NO_ERROR; } - void OnFailureResponse_17(CHIP_ERROR error) + void OnFailureResponse_15(CHIP_ERROR error) { chip::app::StatusIB status(error); VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); } - void OnSuccessResponse_17() { ThrowSuccessResponse(); } + void OnSuccessResponse_15() { ThrowSuccessResponse(); } - CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeTargetPositionLiftPercent100ths_18() + CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeTargetPositionLiftPercent100ths_16() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58210,17 +58132,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_18, OnFailureCallback_18, true)); + this, OnSuccessCallback_16, OnFailureCallback_16, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_18(CHIP_ERROR error) + void OnFailureResponse_16(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_18(const chip::app::DataModel::Nullable & targetPositionLiftPercent100ths) + void OnSuccessResponse_16(const chip::app::DataModel::Nullable & targetPositionLiftPercent100ths) { VerifyOrReturn(CheckConstraintType("targetPositionLiftPercent100ths", "", "Percent100ths")); VerifyOrReturn(CheckConstraintNotValue("targetPositionLiftPercent100ths", targetPositionLiftPercent100ths, 20000U)); @@ -58228,7 +58150,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultTargetPositionTiltPercent100ths_19() + CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultTargetPositionTiltPercent100ths_17() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58236,17 +58158,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_19, OnFailureCallback_19, true)); + this, OnSuccessCallback_17, OnFailureCallback_17, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_19(CHIP_ERROR error) + void OnFailureResponse_17(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_19(const chip::app::DataModel::Nullable & targetPositionTiltPercent100ths) + void OnSuccessResponse_17(const chip::app::DataModel::Nullable & targetPositionTiltPercent100ths) { VerifyOrReturn(CheckConstraintType("targetPositionTiltPercent100ths", "", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("targetPositionTiltPercent100ths", targetPositionTiltPercent100ths, 0U)); @@ -58254,7 +58176,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionTiltPercent100ths_20() + CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeTargetPositionTiltPercent100ths_18() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58266,20 +58188,20 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.WriteAttribute( - targetPositionTiltPercent100thsArgument, this, OnSuccessCallback_20, OnFailureCallback_20)); + targetPositionTiltPercent100thsArgument, this, OnSuccessCallback_18, OnFailureCallback_18)); return CHIP_NO_ERROR; } - void OnFailureResponse_20(CHIP_ERROR error) + void OnFailureResponse_18(CHIP_ERROR error) { chip::app::StatusIB status(error); VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); } - void OnSuccessResponse_20() { ThrowSuccessResponse(); } + void OnSuccessResponse_18() { ThrowSuccessResponse(); } - CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeTargetPositionTiltPercent100ths_21() + CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeTargetPositionTiltPercent100ths_19() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58287,17 +58209,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_21, OnFailureCallback_21, true)); + this, OnSuccessCallback_19, OnFailureCallback_19, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_21(CHIP_ERROR error) + void OnFailureResponse_19(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_21(const chip::app::DataModel::Nullable & targetPositionTiltPercent100ths) + void OnSuccessResponse_19(const chip::app::DataModel::Nullable & targetPositionTiltPercent100ths) { VerifyOrReturn(CheckConstraintType("targetPositionTiltPercent100ths", "", "Percent100ths")); VerifyOrReturn(CheckConstraintNotValue("targetPositionTiltPercent100ths", targetPositionTiltPercent100ths, 20000U)); @@ -58305,7 +58227,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercent100ths_22() + CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercent100ths_20() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58313,17 +58235,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_22, OnFailureCallback_22, true)); + this, OnSuccessCallback_20, OnFailureCallback_20, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_22(CHIP_ERROR error) + void OnFailureResponse_20(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_22(const chip::app::DataModel::Nullable & currentPositionLiftPercent100ths) + void OnSuccessResponse_20(const chip::app::DataModel::Nullable & currentPositionLiftPercent100ths) { VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("currentPositionLiftPercent100ths", currentPositionLiftPercent100ths, 0U)); @@ -58331,7 +58253,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercent100ths_23() + CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercent100ths_21() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58343,20 +58265,20 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.WriteAttribute( - currentPositionLiftPercent100thsArgument, this, OnSuccessCallback_23, OnFailureCallback_23)); + currentPositionLiftPercent100thsArgument, this, OnSuccessCallback_21, OnFailureCallback_21)); return CHIP_NO_ERROR; } - void OnFailureResponse_23(CHIP_ERROR error) + void OnFailureResponse_21(CHIP_ERROR error) { chip::app::StatusIB status(error); VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); } - void OnSuccessResponse_23() { ThrowSuccessResponse(); } + void OnSuccessResponse_21() { ThrowSuccessResponse(); } - CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercent100ths_24() + CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercent100ths_22() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58364,17 +58286,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_24, OnFailureCallback_24, true)); + this, OnSuccessCallback_22, OnFailureCallback_22, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_24(CHIP_ERROR error) + void OnFailureResponse_22(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_24(const chip::app::DataModel::Nullable & currentPositionLiftPercent100ths) + void OnSuccessResponse_22(const chip::app::DataModel::Nullable & currentPositionLiftPercent100ths) { VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "", "Percent100ths")); VerifyOrReturn(CheckConstraintNotValue("currentPositionLiftPercent100ths", currentPositionLiftPercent100ths, 20000U)); @@ -58382,7 +58304,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercent100ths_25() + CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercent100ths_23() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58390,17 +58312,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_25, OnFailureCallback_25, true)); + this, OnSuccessCallback_23, OnFailureCallback_23, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_25(CHIP_ERROR error) + void OnFailureResponse_23(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_25(const chip::app::DataModel::Nullable & currentPositionTiltPercent100ths) + void OnSuccessResponse_23(const chip::app::DataModel::Nullable & currentPositionTiltPercent100ths) { VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("currentPositionTiltPercent100ths", currentPositionTiltPercent100ths, 0U)); @@ -58408,7 +58330,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercent100ths_26() + CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercent100ths_24() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58420,20 +58342,20 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.WriteAttribute( - currentPositionTiltPercent100thsArgument, this, OnSuccessCallback_26, OnFailureCallback_26)); + currentPositionTiltPercent100thsArgument, this, OnSuccessCallback_24, OnFailureCallback_24)); return CHIP_NO_ERROR; } - void OnFailureResponse_26(CHIP_ERROR error) + void OnFailureResponse_24(CHIP_ERROR error) { chip::app::StatusIB status(error); VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); } - void OnSuccessResponse_26() { ThrowSuccessResponse(); } + void OnSuccessResponse_24() { ThrowSuccessResponse(); } - CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercent100ths_27() + CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercent100ths_25() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58441,17 +58363,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_27, OnFailureCallback_27, true)); + this, OnSuccessCallback_25, OnFailureCallback_25, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_27(CHIP_ERROR error) + void OnFailureResponse_25(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_27(const chip::app::DataModel::Nullable & currentPositionTiltPercent100ths) + void OnSuccessResponse_25(const chip::app::DataModel::Nullable & currentPositionTiltPercent100ths) { VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "", "Percent100ths")); VerifyOrReturn(CheckConstraintNotValue("currentPositionTiltPercent100ths", currentPositionTiltPercent100ths, 20000U)); @@ -58459,7 +58381,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitLift_28() + CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitLift_26() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58467,17 +58389,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_28, OnFailureCallback_28, true)); + this, OnSuccessCallback_26, OnFailureCallback_26, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_28(CHIP_ERROR error) + void OnFailureResponse_26(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_28(uint16_t installedOpenLimitLift) + void OnSuccessResponse_26(uint16_t installedOpenLimitLift) { VerifyOrReturn(CheckConstraintType("installedOpenLimitLift", "", "uint16")); VerifyOrReturn(CheckConstraintMinValue("installedOpenLimitLift", installedOpenLimitLift, 0U)); @@ -58485,7 +58407,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitLift_29() + CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitLift_27() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58496,20 +58418,20 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.WriteAttribute( - installedOpenLimitLiftArgument, this, OnSuccessCallback_29, OnFailureCallback_29)); + installedOpenLimitLiftArgument, this, OnSuccessCallback_27, OnFailureCallback_27)); return CHIP_NO_ERROR; } - void OnFailureResponse_29(CHIP_ERROR error) + void OnFailureResponse_27(CHIP_ERROR error) { chip::app::StatusIB status(error); VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); } - void OnSuccessResponse_29() { ThrowSuccessResponse(); } + void OnSuccessResponse_27() { ThrowSuccessResponse(); } - CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitLift_30() + CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitLift_28() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58517,17 +58439,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_30, OnFailureCallback_30, true)); + this, OnSuccessCallback_28, OnFailureCallback_28, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_30(CHIP_ERROR error) + void OnFailureResponse_28(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_30(uint16_t installedOpenLimitLift) + void OnSuccessResponse_28(uint16_t installedOpenLimitLift) { VerifyOrReturn(CheckConstraintType("installedOpenLimitLift", "", "uint16")); VerifyOrReturn(CheckConstraintMinValue("installedOpenLimitLift", installedOpenLimitLift, 0U)); @@ -58535,7 +58457,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitLift_31() + CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitLift_29() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58543,17 +58465,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_31, OnFailureCallback_31, true)); + this, OnSuccessCallback_29, OnFailureCallback_29, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_31(CHIP_ERROR error) + void OnFailureResponse_29(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_31(uint16_t installedClosedLimitLift) + void OnSuccessResponse_29(uint16_t installedClosedLimitLift) { VerifyOrReturn(CheckConstraintType("installedClosedLimitLift", "", "uint16")); VerifyOrReturn(CheckConstraintMinValue("installedClosedLimitLift", installedClosedLimitLift, 0U)); @@ -58561,7 +58483,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitLift_32() + CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitLift_30() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58572,20 +58494,20 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.WriteAttribute( - installedClosedLimitLiftArgument, this, OnSuccessCallback_32, OnFailureCallback_32)); + installedClosedLimitLiftArgument, this, OnSuccessCallback_30, OnFailureCallback_30)); return CHIP_NO_ERROR; } - void OnFailureResponse_32(CHIP_ERROR error) + void OnFailureResponse_30(CHIP_ERROR error) { chip::app::StatusIB status(error); VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); } - void OnSuccessResponse_32() { ThrowSuccessResponse(); } + void OnSuccessResponse_30() { ThrowSuccessResponse(); } - CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitLift_33() + CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitLift_31() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58593,17 +58515,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_33, OnFailureCallback_33, true)); + this, OnSuccessCallback_31, OnFailureCallback_31, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_33(CHIP_ERROR error) + void OnFailureResponse_31(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_33(uint16_t installedClosedLimitLift) + void OnSuccessResponse_31(uint16_t installedClosedLimitLift) { VerifyOrReturn(CheckConstraintType("installedClosedLimitLift", "", "uint16")); VerifyOrReturn(CheckConstraintMinValue("installedClosedLimitLift", installedClosedLimitLift, 0U)); @@ -58611,7 +58533,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitTilt_34() + CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledOpenLimitTilt_32() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58619,17 +58541,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_34, OnFailureCallback_34, true)); + this, OnSuccessCallback_32, OnFailureCallback_32, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_34(CHIP_ERROR error) + void OnFailureResponse_32(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_34(uint16_t installedOpenLimitTilt) + void OnSuccessResponse_32(uint16_t installedOpenLimitTilt) { VerifyOrReturn(CheckConstraintType("installedOpenLimitTilt", "", "uint16")); VerifyOrReturn(CheckConstraintMinValue("installedOpenLimitTilt", installedOpenLimitTilt, 0U)); @@ -58637,7 +58559,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitTilt_35() + CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledOpenLimitTilt_33() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58648,20 +58570,20 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.WriteAttribute( - installedOpenLimitTiltArgument, this, OnSuccessCallback_35, OnFailureCallback_35)); + installedOpenLimitTiltArgument, this, OnSuccessCallback_33, OnFailureCallback_33)); return CHIP_NO_ERROR; } - void OnFailureResponse_35(CHIP_ERROR error) + void OnFailureResponse_33(CHIP_ERROR error) { chip::app::StatusIB status(error); VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); } - void OnSuccessResponse_35() { ThrowSuccessResponse(); } + void OnSuccessResponse_33() { ThrowSuccessResponse(); } - CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitTilt_36() + CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledOpenLimitTilt_34() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58669,17 +58591,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_36, OnFailureCallback_36, true)); + this, OnSuccessCallback_34, OnFailureCallback_34, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_36(CHIP_ERROR error) + void OnFailureResponse_34(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_36(uint16_t installedOpenLimitTilt) + void OnSuccessResponse_34(uint16_t installedOpenLimitTilt) { VerifyOrReturn(CheckConstraintType("installedOpenLimitTilt", "", "uint16")); VerifyOrReturn(CheckConstraintMinValue("installedOpenLimitTilt", installedOpenLimitTilt, 0U)); @@ -58687,7 +58609,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitTilt_37() + CHIP_ERROR Test2ReadTheRoOptionalAttributeDefaultInstalledClosedLimitTilt_35() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58695,17 +58617,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_37, OnFailureCallback_37, true)); + this, OnSuccessCallback_35, OnFailureCallback_35, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_37(CHIP_ERROR error) + void OnFailureResponse_35(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_37(uint16_t installedClosedLimitTilt) + void OnSuccessResponse_35(uint16_t installedClosedLimitTilt) { VerifyOrReturn(CheckConstraintType("installedClosedLimitTilt", "", "uint16")); VerifyOrReturn(CheckConstraintMinValue("installedClosedLimitTilt", installedClosedLimitTilt, 0U)); @@ -58713,7 +58635,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitTilt_38() + CHIP_ERROR Test3aWriteAValueIntoTheRoOptionalAttributeInstalledClosedLimitTilt_36() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58724,20 +58646,20 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.WriteAttribute( - installedClosedLimitTiltArgument, this, OnSuccessCallback_38, OnFailureCallback_38)); + installedClosedLimitTiltArgument, this, OnSuccessCallback_36, OnFailureCallback_36)); return CHIP_NO_ERROR; } - void OnFailureResponse_38(CHIP_ERROR error) + void OnFailureResponse_36(CHIP_ERROR error) { chip::app::StatusIB status(error); VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); } - void OnSuccessResponse_38() { ThrowSuccessResponse(); } + void OnSuccessResponse_36() { ThrowSuccessResponse(); } - CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitTilt_39() + CHIP_ERROR Test3bReadsBackTheRoOptionalAttributeInstalledClosedLimitTilt_37() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58745,17 +58667,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_39, OnFailureCallback_39, true)); + this, OnSuccessCallback_37, OnFailureCallback_37, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_39(CHIP_ERROR error) + void OnFailureResponse_37(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_39(uint16_t installedClosedLimitTilt) + void OnSuccessResponse_37(uint16_t installedClosedLimitTilt) { VerifyOrReturn(CheckConstraintType("installedClosedLimitTilt", "", "uint16")); VerifyOrReturn(CheckConstraintMinValue("installedClosedLimitTilt", installedClosedLimitTilt, 0U)); @@ -58763,24 +58685,24 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test4ReadTheRoMandatoryAttributeDefaultSafetyStatus_40() + CHIP_ERROR Test4ReadTheRoMandatoryAttributeDefaultSafetyStatus_38() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_40, OnFailureCallback_40, true)); + this, OnSuccessCallback_38, OnFailureCallback_38, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_40(CHIP_ERROR error) + void OnFailureResponse_38(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_40(uint16_t safetyStatus) + void OnSuccessResponse_38(uint16_t safetyStatus) { VerifyOrReturn(CheckConstraintType("safetyStatus", "", "map16")); VerifyOrReturn(CheckConstraintMinValue("safetyStatus", safetyStatus, 0U)); @@ -58788,7 +58710,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test5aWriteAValueIntoTheRoMandatoryAttributeSafetyStatus_41() + CHIP_ERROR Test5aWriteAValueIntoTheRoMandatoryAttributeSafetyStatus_39() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58798,37 +58720,37 @@ class Test_TC_WNCV_2_1Suite : public TestCommand safetyStatusArgument = 4096U; ReturnErrorOnFailure(cluster.WriteAttribute( - safetyStatusArgument, this, OnSuccessCallback_41, OnFailureCallback_41)); + safetyStatusArgument, this, OnSuccessCallback_39, OnFailureCallback_39)); return CHIP_NO_ERROR; } - void OnFailureResponse_41(CHIP_ERROR error) + void OnFailureResponse_39(CHIP_ERROR error) { chip::app::StatusIB status(error); VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); } - void OnSuccessResponse_41() { ThrowSuccessResponse(); } + void OnSuccessResponse_39() { ThrowSuccessResponse(); } - CHIP_ERROR Test5bReadsBackTheRoMandatoryAttributeSafetyStatus_42() + CHIP_ERROR Test5bReadsBackTheRoMandatoryAttributeSafetyStatus_40() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_42, OnFailureCallback_42, true)); + this, OnSuccessCallback_40, OnFailureCallback_40, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_42(CHIP_ERROR error) + void OnFailureResponse_40(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_42(uint16_t safetyStatus) + void OnSuccessResponse_40(uint16_t safetyStatus) { VerifyOrReturn(CheckConstraintType("safetyStatus", "", "map16")); VerifyOrReturn(CheckConstraintNotValue("safetyStatus", safetyStatus, 4096U)); @@ -58836,24 +58758,24 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLift_43() + CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLift_41() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_43, OnFailureCallback_43, true)); + this, OnSuccessCallback_41, OnFailureCallback_41, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_43(CHIP_ERROR error) + void OnFailureResponse_41(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_43(const chip::app::DataModel::Nullable & currentPositionLift) + void OnSuccessResponse_41(const chip::app::DataModel::Nullable & currentPositionLift) { VerifyOrReturn(CheckConstraintType("currentPositionLift", "", "uint16")); VerifyOrReturn(CheckConstraintMinValue("currentPositionLift", currentPositionLift, 0U)); @@ -58861,7 +58783,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLift_44() + CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLift_42() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58872,37 +58794,37 @@ class Test_TC_WNCV_2_1Suite : public TestCommand currentPositionLiftArgument.Value() = 255U; ReturnErrorOnFailure(cluster.WriteAttribute( - currentPositionLiftArgument, this, OnSuccessCallback_44, OnFailureCallback_44)); + currentPositionLiftArgument, this, OnSuccessCallback_42, OnFailureCallback_42)); return CHIP_NO_ERROR; } - void OnFailureResponse_44(CHIP_ERROR error) + void OnFailureResponse_42(CHIP_ERROR error) { chip::app::StatusIB status(error); VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); } - void OnSuccessResponse_44() { ThrowSuccessResponse(); } + void OnSuccessResponse_42() { ThrowSuccessResponse(); } - CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionLift_45() + CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionLift_43() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_45, OnFailureCallback_45, true)); + this, OnSuccessCallback_43, OnFailureCallback_43, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_45(CHIP_ERROR error) + void OnFailureResponse_43(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_45(const chip::app::DataModel::Nullable & currentPositionLift) + void OnSuccessResponse_43(const chip::app::DataModel::Nullable & currentPositionLift) { VerifyOrReturn(CheckConstraintType("currentPositionLift", "", "uint16")); VerifyOrReturn(CheckConstraintMinValue("currentPositionLift", currentPositionLift, 0U)); @@ -58910,24 +58832,24 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTilt_46() + CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTilt_44() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_46, OnFailureCallback_46, true)); + this, OnSuccessCallback_44, OnFailureCallback_44, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_46(CHIP_ERROR error) + void OnFailureResponse_44(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_46(const chip::app::DataModel::Nullable & currentPositionTilt) + void OnSuccessResponse_44(const chip::app::DataModel::Nullable & currentPositionTilt) { VerifyOrReturn(CheckConstraintType("currentPositionTilt", "", "uint16")); VerifyOrReturn(CheckConstraintMinValue("currentPositionTilt", currentPositionTilt, 0U)); @@ -58935,7 +58857,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTilt_47() + CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTilt_45() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58946,37 +58868,37 @@ class Test_TC_WNCV_2_1Suite : public TestCommand currentPositionTiltArgument.Value() = 255U; ReturnErrorOnFailure(cluster.WriteAttribute( - currentPositionTiltArgument, this, OnSuccessCallback_47, OnFailureCallback_47)); + currentPositionTiltArgument, this, OnSuccessCallback_45, OnFailureCallback_45)); return CHIP_NO_ERROR; } - void OnFailureResponse_47(CHIP_ERROR error) + void OnFailureResponse_45(CHIP_ERROR error) { chip::app::StatusIB status(error); VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); } - void OnSuccessResponse_47() { ThrowSuccessResponse(); } + void OnSuccessResponse_45() { ThrowSuccessResponse(); } - CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionTilt_48() + CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionTilt_46() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_48, OnFailureCallback_48, true)); + this, OnSuccessCallback_46, OnFailureCallback_46, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_48(CHIP_ERROR error) + void OnFailureResponse_46(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_48(const chip::app::DataModel::Nullable & currentPositionTilt) + void OnSuccessResponse_46(const chip::app::DataModel::Nullable & currentPositionTilt) { VerifyOrReturn(CheckConstraintType("currentPositionTilt", "", "uint16")); VerifyOrReturn(CheckConstraintMinValue("currentPositionTilt", currentPositionTilt, 0U)); @@ -58984,7 +58906,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercentage_49() + CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionLiftPercentage_47() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -58992,17 +58914,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_49, OnFailureCallback_49, true)); + this, OnSuccessCallback_47, OnFailureCallback_47, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_49(CHIP_ERROR error) + void OnFailureResponse_47(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_49(const chip::app::DataModel::Nullable & currentPositionLiftPercentage) + void OnSuccessResponse_47(const chip::app::DataModel::Nullable & currentPositionLiftPercentage) { VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "", "Percent")); VerifyOrReturn(CheckConstraintMinValue("currentPositionLiftPercentage", currentPositionLiftPercentage, 0)); @@ -59010,7 +58932,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercentage_50() + CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionLiftPercentage_48() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -59022,20 +58944,20 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.WriteAttribute( - currentPositionLiftPercentageArgument, this, OnSuccessCallback_50, OnFailureCallback_50)); + currentPositionLiftPercentageArgument, this, OnSuccessCallback_48, OnFailureCallback_48)); return CHIP_NO_ERROR; } - void OnFailureResponse_50(CHIP_ERROR error) + void OnFailureResponse_48(CHIP_ERROR error) { chip::app::StatusIB status(error); VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); } - void OnSuccessResponse_50() { ThrowSuccessResponse(); } + void OnSuccessResponse_48() { ThrowSuccessResponse(); } - CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercentage_51() + CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionLiftPercentage_49() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -59043,17 +58965,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_51, OnFailureCallback_51, true)); + this, OnSuccessCallback_49, OnFailureCallback_49, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_51(CHIP_ERROR error) + void OnFailureResponse_49(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_51(const chip::app::DataModel::Nullable & currentPositionLiftPercentage) + void OnSuccessResponse_49(const chip::app::DataModel::Nullable & currentPositionLiftPercentage) { VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "", "Percent")); VerifyOrReturn(CheckConstraintNotValue("currentPositionLiftPercentage", currentPositionLiftPercentage, 200)); @@ -59061,7 +58983,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercentage_52() + CHIP_ERROR Test4ReadTheRoOptionalAttributeDefaultCurrentPositionTiltPercentage_50() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -59069,17 +58991,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_52, OnFailureCallback_52, true)); + this, OnSuccessCallback_50, OnFailureCallback_50, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_52(CHIP_ERROR error) + void OnFailureResponse_50(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_52(const chip::app::DataModel::Nullable & currentPositionTiltPercentage) + void OnSuccessResponse_50(const chip::app::DataModel::Nullable & currentPositionTiltPercentage) { VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "", "Percent")); VerifyOrReturn(CheckConstraintMinValue("currentPositionTiltPercentage", currentPositionTiltPercentage, 0)); @@ -59087,7 +59009,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand NextTest(); } - CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercentage_53() + CHIP_ERROR Test5aWriteAValueIntoTheRoOptionalAttributeCurrentPositionTiltPercentage_51() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -59099,20 +59021,20 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.WriteAttribute( - currentPositionTiltPercentageArgument, this, OnSuccessCallback_53, OnFailureCallback_53)); + currentPositionTiltPercentageArgument, this, OnSuccessCallback_51, OnFailureCallback_51)); return CHIP_NO_ERROR; } - void OnFailureResponse_53(CHIP_ERROR error) + void OnFailureResponse_51(CHIP_ERROR error) { chip::app::StatusIB status(error); VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_UNSUPPORTED_WRITE)); NextTest(); } - void OnSuccessResponse_53() { ThrowSuccessResponse(); } + void OnSuccessResponse_51() { ThrowSuccessResponse(); } - CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercentage_54() + CHIP_ERROR Test5bReadsBackTheRoOptionalAttributeCurrentPositionTiltPercentage_52() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 1; chip::Controller::WindowCoveringClusterTest cluster; @@ -59120,17 +59042,17 @@ class Test_TC_WNCV_2_1Suite : public TestCommand ReturnErrorOnFailure( cluster.ReadAttribute( - this, OnSuccessCallback_54, OnFailureCallback_54, true)); + this, OnSuccessCallback_52, OnFailureCallback_52, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_54(CHIP_ERROR error) + void OnFailureResponse_52(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_54(const chip::app::DataModel::Nullable & currentPositionTiltPercentage) + void OnSuccessResponse_52(const chip::app::DataModel::Nullable & currentPositionTiltPercentage) { VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "", "Percent")); VerifyOrReturn(CheckConstraintNotValue("currentPositionTiltPercentage", currentPositionTiltPercentage, 200)); @@ -59345,7 +59267,7 @@ class Test_TC_WNCV_2_4Suite : public TestCommand (static_cast(context))->OnFailureResponse_1(error); } - static void OnSuccessCallback_1(void * context, uint8_t type) + static void OnSuccessCallback_1(void * context, chip::app::Clusters::WindowCovering::Type type) { (static_cast(context))->OnSuccessResponse_1(type); } @@ -59355,7 +59277,7 @@ class Test_TC_WNCV_2_4Suite : public TestCommand (static_cast(context))->OnFailureResponse_2(error); } - static void OnSuccessCallback_2(void * context, uint8_t type) + static void OnSuccessCallback_2(void * context, chip::app::Clusters::WindowCovering::Type type) { (static_cast(context))->OnSuccessResponse_2(type); } @@ -59387,7 +59309,7 @@ class Test_TC_WNCV_2_4Suite : public TestCommand ThrowFailureResponse(); } - void OnSuccessResponse_1(uint8_t type) + void OnSuccessResponse_1(chip::app::Clusters::WindowCovering::Type type) { VerifyOrReturn(CheckValue("type", type, 0)); @@ -59411,7 +59333,7 @@ class Test_TC_WNCV_2_4Suite : public TestCommand ThrowFailureResponse(); } - void OnSuccessResponse_2(uint8_t type) + void OnSuccessResponse_2(chip::app::Clusters::WindowCovering::Type type) { VerifyOrReturn(CheckConstraintType("type", "", "enum8")); VerifyOrReturn(CheckConstraintMinValue("type", type, 0)); @@ -59529,7 +59451,7 @@ class Test_TC_WNCV_2_5Suite : public TestCommand (static_cast(context))->OnFailureResponse_1(error); } - static void OnSuccessCallback_1(void * context, uint8_t endProductType) + static void OnSuccessCallback_1(void * context, chip::app::Clusters::WindowCovering::EndProductType endProductType) { (static_cast(context))->OnSuccessResponse_1(endProductType); } @@ -59539,7 +59461,7 @@ class Test_TC_WNCV_2_5Suite : public TestCommand (static_cast(context))->OnFailureResponse_2(error); } - static void OnSuccessCallback_2(void * context, uint8_t endProductType) + static void OnSuccessCallback_2(void * context, chip::app::Clusters::WindowCovering::EndProductType endProductType) { (static_cast(context))->OnSuccessResponse_2(endProductType); } @@ -59571,7 +59493,7 @@ class Test_TC_WNCV_2_5Suite : public TestCommand ThrowFailureResponse(); } - void OnSuccessResponse_1(uint8_t endProductType) + void OnSuccessResponse_1(chip::app::Clusters::WindowCovering::EndProductType endProductType) { VerifyOrReturn(CheckValue("endProductType", endProductType, 0)); @@ -59595,7 +59517,7 @@ class Test_TC_WNCV_2_5Suite : public TestCommand ThrowFailureResponse(); } - void OnSuccessResponse_2(uint8_t endProductType) + void OnSuccessResponse_2(chip::app::Clusters::WindowCovering::EndProductType endProductType) { VerifyOrReturn(CheckConstraintType("endProductType", "", "enum8")); VerifyOrReturn(CheckConstraintMinValue("endProductType", endProductType, 0));