From ac240fcf5bd2ff42ba8498c38a9b130e6af97529 Mon Sep 17 00:00:00 2001 From: Mohamed Amine Elfelsoufi Date: Tue, 16 Aug 2022 16:45:44 +0000 Subject: [PATCH] =?UTF-8?q?Pull=20request=20#22:=20=F0=9F=90=9B=20Lighting?= =?UTF-8?q?=20bugfix.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge in WMN_TOOLS/matter from minor_bugfix_BT to silabs Squashed commit of the following: commit 5f721726e1b9d5be71b8330009dbdfb2dc5b6fc2 Author: Elfelsoufi-SiLabs Date: Fri Aug 5 16:55:35 2022 -0400 🔨 If value is greater than max level, set to max level. commit cb8a4a27a7a5573413cf1b0ffe71024b58bc6a60 Author: Elfelsoufi-SiLabs Date: Fri Aug 5 16:52:40 2022 -0400 🐛 Return if wrong level value is received. commit c639c6b6f205763c4b97e5abf557ac3c86295f6c Author: Elfelsoufi-SiLabs Date: Thu Aug 4 19:40:13 2022 -0400 🎨 Remove color enum. Use color struct. commit 1bd420a2d8786a9386bd70be1d22ec5d1fb776b4 Author: Elfelsoufi-SiLabs Date: Thu Aug 4 14:37:38 2022 -0400 ⛳ Remove all endpoints from the code. commit f45cf02c47e4508802fe0dcb6e764debe8a9e404 Author: Elfelsoufi-SiLabs Date: Wed Aug 3 19:01:32 2022 -0400 ✨ Remove useless callback. commit da69394d72f7febe170278fb5bbba652f8d2655b Author: Elfelsoufi-SiLabs Date: Wed Aug 3 18:48:15 2022 -0400 📬 Post Light Control event using PostEvent. Remove LightControl Callback. commit 5b58d6ba1ddd6ce318e89dbf89669bc3181bc942 Author: Elfelsoufi-SiLabs Date: Wed Aug 3 14:43:48 2022 -0400 🎨 Use current level as the parameter value in the HSV to RGB conversion. commit 11e02cdd7b1312f8737817974989502d08d53c4e Author: Elfelsoufi-SiLabs Date: Tue Aug 2 19:49:27 2022 -0400 ✨ Code improvements. commit 40e9fa1c8d37a18dfd5218307582c0d215e01021 Author: Elfelsoufi-SiLabs Date: Mon Jul 25 12:22:31 2022 -0400 🎬 Change currentLevel attribute to 254 in ZAP generated files for New-Light. commit 94fe176c33826d3b4dc7aac1faf2db9ca32228df Author: Elfelsoufi-SiLabs Date: Sun Jul 24 19:20:07 2022 -0400 🎨 Scale color with current level. commit 2c7958ec31fe61e4a15d83c94159b38ad599a0d9 Author: Elfelsoufi-SiLabs Date: Sun Jul 24 19:18:59 2022 -0400 🐛 Fix Hardfault in LightingManager.cpp. commit 057fd61fdb35b98bd23936cdff4d833c99d04d7d Author: Elfelsoufi-SiLabs Date: Wed Jul 20 14:29:51 2022 -0400 🐛 Bugfix for Light Level. --- .../sl-newLight/efr32/include/AppEvent.h | 6 + .../sl-newLight/efr32/include/AppTask.h | 3 +- .../efr32/light_modules/LightingManager.cpp | 21 +- .../efr32/light_modules/LightingManager.h | 3 - .../efr32/light_modules/led_widget_rgb.cpp | 224 +++--- .../efr32/light_modules/led_widget_rgb.h | 51 +- .../sl-newLight/efr32/src/AppTask.cpp | 66 +- .../sl-newLight/efr32/src/ZclCallbacks.cpp | 2 +- .../sl_newLight.matter | 2 +- .../newLight_DataModel_config/sl_newLight.zap | 757 ++++++++++++------ .../zap-generated/endpoint_config.h | 2 +- 11 files changed, 725 insertions(+), 412 deletions(-) diff --git a/silabs_examples/sl-newLight/efr32/include/AppEvent.h b/silabs_examples/sl-newLight/efr32/include/AppEvent.h index 7a19b719edad25..f54eb7044da852 100644 --- a/silabs_examples/sl-newLight/efr32/include/AppEvent.h +++ b/silabs_examples/sl-newLight/efr32/include/AppEvent.h @@ -49,6 +49,12 @@ struct AppEvent uint8_t Action; int32_t Actor; } LightEvent; + struct + { + uint8_t Action; + int32_t Actor; + uint8_t Value; + } LightControlEvent; }; EventHandler Handler; diff --git a/silabs_examples/sl-newLight/efr32/include/AppTask.h b/silabs_examples/sl-newLight/efr32/include/AppTask.h index d465ea81b1c7e1..dd0628b67cda4a 100644 --- a/silabs_examples/sl-newLight/efr32/include/AppTask.h +++ b/silabs_examples/sl-newLight/efr32/include/AppTask.h @@ -47,6 +47,7 @@ class AppTask static void AppTaskMain(void * pvParameter); void PostLightActionRequest(int32_t aActor, LightingManager::Action_t aAction); + void PostLightControlActionRequest(int32_t aActor, LightingManager::Action_t aAction, uint8_t value); void PostEvent(const AppEvent * event); void ButtonEventHandler(const sl_button_t * buttonHandle, uint8_t btnAction); @@ -58,7 +59,6 @@ class AppTask static void ActionInitiated(LightingManager::Action_t aAction, int32_t aActor); static void ActionCompleted(LightingManager::Action_t aAction); - static void ActionChangeLight(LightingManager::Action_t aAction, uint16_t endpoint, uint8_t value); void CancelTimer(void); @@ -67,6 +67,7 @@ class AppTask static void FunctionTimerEventHandler(AppEvent * aEvent); static void FunctionHandler(AppEvent * aEvent); static void LightActionEventHandler(AppEvent * aEvent); + static void LightControlEventHandler(AppEvent * aEvent); static void TimerEventHandler(TimerHandle_t xTimer); static void UpdateClusterState(intptr_t context); diff --git a/silabs_examples/sl-newLight/efr32/light_modules/LightingManager.cpp b/silabs_examples/sl-newLight/efr32/light_modules/LightingManager.cpp index 3fbfc6a8405482..b97d0cedc0177a 100644 --- a/silabs_examples/sl-newLight/efr32/light_modules/LightingManager.cpp +++ b/silabs_examples/sl-newLight/efr32/light_modules/LightingManager.cpp @@ -68,11 +68,6 @@ void LightingManager::SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Ca mActionCompleted_CB = aActionCompleted_CB; } -void LightingManager::SetLightCallbacks(Callback_fn_set_light aChangeLight_CB) -{ - mChangeLight_CB = aChangeLight_CB; -} - bool LightingManager::IsActionInProgress() { return (mState == kState_OffInitiated || mState == kState_OnInitiated); @@ -140,15 +135,19 @@ bool LightingManager::InitiateAction(int32_t aActor, Action_t aAction) bool LightingManager::InitiateActionLight(int32_t aActor, Action_t aAction, uint16_t endpoint, uint8_t value) { bool action_initiated = false; - bool onoff_complete = (mState == kState_OnCompleted || mState == kState_OffCompleted); - bool led_action = ((aAction == MOVE_TO_LEVEL) || (aAction == MOVE_TO_HUE) || (aAction == MOVE_TO_SAT)); - if (onoff_complete && led_action) + switch(aAction) { - action_initiated = true; - mChangeLight_CB(aAction, endpoint, value); + case MOVE_TO_LEVEL: + case MOVE_TO_HUE: + case MOVE_TO_SAT: + action_initiated = true; + GetAppTask().PostLightControlActionRequest(aActor, aAction, value); + break; + default: + break; } - + return action_initiated; } diff --git a/silabs_examples/sl-newLight/efr32/light_modules/LightingManager.h b/silabs_examples/sl-newLight/efr32/light_modules/LightingManager.h index 8d7a8ee0b34774..53e3533fbf9c5e 100644 --- a/silabs_examples/sl-newLight/efr32/light_modules/LightingManager.h +++ b/silabs_examples/sl-newLight/efr32/light_modules/LightingManager.h @@ -61,9 +61,7 @@ class LightingManager typedef void (*Callback_fn_initiated)(Action_t, int32_t aActor); typedef void (*Callback_fn_completed)(Action_t); - typedef void (*Callback_fn_set_light)(Action_t, uint16_t endpoint, uint8_t value); void SetCallbacks(Callback_fn_initiated aActionInitiated_CB, Callback_fn_completed aActionCompleted_CB); - void SetLightCallbacks(Callback_fn_set_light aChangeLight_CB); private: friend LightingManager & LightMgr(void); @@ -71,7 +69,6 @@ class LightingManager Callback_fn_initiated mActionInitiated_CB; Callback_fn_completed mActionCompleted_CB; - Callback_fn_set_light mChangeLight_CB; bool mAutoTurnOff; uint32_t mAutoTurnOffDuration; diff --git a/silabs_examples/sl-newLight/efr32/light_modules/led_widget_rgb.cpp b/silabs_examples/sl-newLight/efr32/light_modules/led_widget_rgb.cpp index d70710af292afd..5982b0dbbf5ff2 100644 --- a/silabs_examples/sl-newLight/efr32/light_modules/led_widget_rgb.cpp +++ b/silabs_examples/sl-newLight/efr32/light_modules/led_widget_rgb.cpp @@ -145,21 +145,17 @@ void LEDWidgetRGB::Init(const sl_led_rgb_pwm_t* led) /* 1. Initialize the value of class variables. */ sl_simple_rgb_pwm_led_context_t* led_context; led_context = reinterpret_cast(led->led_common.context); - this->level_resolution_ = led_context->resolution; - this->current_hue_ = INITIAL_HUE; - this->current_saturation_ = INITIAL_SATURATION; - this->led_rgb_ = led; - /* 2. Set the RGB values to INITIAL_RGB. This does not affect the driver. */ - for (uint8_t i = 0; i < 3; i++) - { - this->current_rgb_[i] = INITIAL_RGB; - } + this->level_resolution_ = led_context->resolution; + this->current_hue_ = INITIAL_HUE; + this->current_level_ = INITIAL_RGB; + this->current_saturation_ = INITIAL_SATURATION; + this->led_rgb_ = led; - /* 3. Initialize the value of the base class member variables. */ + /* 2. Initialize the value of the base class member variables. */ LEDWidget::Init(&(led->led_common)); - /* 4. Turn on the RGB LED pins. */ + /* 3. Turn on the RGB LED pins. */ GPIO_PinOutSet(gpioPortJ, 14); GPIO_PinOutSet(gpioPortI, 0); GPIO_PinOutSet(gpioPortI, 1); @@ -168,167 +164,149 @@ void LEDWidgetRGB::Init(const sl_led_rgb_pwm_t* led) } -void LEDWidgetRGB::Set(bool state) -{ - this->Set(state, LED_ENDPOINT_DEFAULT); -} - - -void LEDWidgetRGB::Set(bool state, uint16_t led_endpoint) +void LEDWidgetRGB::SetLevel(uint8_t level) { - uint8_t rgb[3] = {0, 0, 0}; - bool save_values = false; - - if (state == true) + /* 1. Check if the input value is correct. */ + if (level > ATTRIBUTE_LEVEL_MAX) + { + EFR32_LOG(" Error in led_widget_rgb.cpp. The level received is too great."); + this->current_level_ = PWM_MAX_VALUE; + } + else { - save_values = true; - bool turned_on = false; - - for (int i = 0; i < 3; i++) - { - if (this->current_rgb_[i] > 1) - { - turned_on = true; - } - } - - if (turned_on == true) - { - for (int i = 0; i < 3; i++) - { - rgb[i] = current_rgb_[i]; - } - } - else - { - for (int i = 0; i < 3; i++) - { - rgb[i] = PWM_MAX_VALUE; - } - } + // The Levelcontrol cluster takes values from 0 to 254. + // However, the PWM driver is sensitive to values from 0 to 100. + // For more information, see "appclusters.pdf", section 1.6.6.1. + this->current_level_ = (level * PWM_MAX_VALUE) / ATTRIBUTE_LEVEL_MAX; } - this->SetRGB(rgb, led_endpoint, save_values); + /* 2. Update the color. */ + this->SetColor(this->current_hue_, this->current_saturation_, this->current_level_); } -void LEDWidgetRGB::SetLevel(uint8_t level, uint16_t led_endpoint) +void LEDWidgetRGB::GetLevel(ColorElements* rgb) { - if(led_endpoint == 1) + /* 1. Check if the argument struct is not null. */ + if (rgb == nullptr) { - /* 1. Adjust the color level. */ - // The Levelcontrol cluster takes values from 0 to 254. - // However, the PWM driver accepts values from 0 to 100. - // See appclusters, section 1.6.6.1. - uint8_t adjusted_level = (level * PWM_MAX_VALUE) / ATTRIBUTE_LEVEL_MAX; - - /* 2. Set the colors. */ - uint8_t rgb[3] = {adjusted_level, adjusted_level, adjusted_level}; - this->SetRGB(rgb, led_endpoint, true); + EFR32_LOG(" Error in led_widget_rgb.cpp. Argument struct is null."); + return; } -} + /* 2. Get the current RGB value from the driver. */ + uint16_t red = 0; + uint16_t green = 0; + uint16_t blue = 0; + this->led_rgb_->get_rgb_color(this->led_rgb_->led_common.context, &red, &green, &blue); -void LEDWidgetRGB::GetLevel(uint8_t* rgb, uint32_t size) -{ - /* 1. Create a buffer and assign it to the pointer. */ - if (rgb == nullptr || rgb == NULL || size < 3) + /* 3. Verify that the colors are in-bound. */ + if (red > PWM_MAX_VALUE) + { + EFR32_LOG(" In led_widget_rgb.cpp. get_rgb_color() returned red value of %d.", red); + red = PWM_MAX_VALUE; + } + if(green > PWM_MAX_VALUE) + { + EFR32_LOG(" In led_widget_rgb.cpp. get_rgb_color() returned green value of %d.", green); + green = PWM_MAX_VALUE; + } + if(blue > PWM_MAX_VALUE) { - EFR32_LOG(" Error in led_widget_rgb.cpp. Array refused."); - return; - } + EFR32_LOG(" In led_widget_rgb.cpp. get_rgb_color() returned blue value of %d.", blue); + blue = PWM_MAX_VALUE; + } - /* 2. Get the current RGB value from the driver. */ - uint16_t red = 0; - uint16_t green = 0; - uint16_t blue = 0; - void* led_rgb_context = this->led_rgb_->led_common.context; - this->led_rgb_->get_rgb_color(led_rgb_context, &red, &green, &blue); - - /* 3. Assign the colors in the array. */ - rgb[0] = static_cast(red); - rgb[1] = static_cast(green); - rgb[2] = static_cast(blue); + /* 4. Assign the colors to the argument struct. */ + rgb->red_value = static_cast(red); + rgb->green_value = static_cast(green); + rgb->blue_value = static_cast(blue); } -void LEDWidgetRGB::SetHue(uint8_t hue, uint16_t led_endpoint) +void LEDWidgetRGB::SetHue(uint8_t hue) { // Hue takes a value [0, 360] and is expressed in degrees. // See appclusters, section 3.2.7.1. this->current_hue_ = static_cast((hue * 360) / ATTRIBUTE_LEVEL_MAX); - this->SetColor(this->current_hue_, this->current_saturation_, led_endpoint); + this->SetColor(this->current_hue_, this->current_saturation_, this->current_level_); } -void LEDWidgetRGB::SetSaturation(uint8_t sat, uint16_t led_endpoint) +void LEDWidgetRGB::SetSaturation(uint8_t sat) { // Saturation takes a value [0, 1] representing a percentage. // The Color Control cluster accepts saturation values 0 to 254. // See appclusters, section 3.2.7.2. this->current_saturation_ = sat/254.0; - this->SetColor(this->current_hue_, this->current_saturation_, led_endpoint); + this->SetColor(this->current_hue_, this->current_saturation_, this->current_level_); } -void LEDWidgetRGB::SetColor(uint8_t* rgb, uint16_t led_endpoint) -{ - /* 1. Set the color values. */ - this->SetRGB(rgb, led_endpoint, true); -} - - -void LEDWidgetRGB::SetColor(uint8_t hue, uint8_t saturation, uint16_t led_endpoint) +void LEDWidgetRGB::SetColor(uint8_t hue, float saturation, uint8_t level) { /* 1. Convert the hue and saturation input to RGB values. (HSV to RGB conversion) */ - uint8_t rgb[3] = {0, 0, 0}; - HueToRGB(this->current_hue_, this->current_saturation_, rgb, PWM_MAX_VALUE); + ColorElements rgb = + { + .red_value = 0, + .green_value = 0, + .blue_value = 0 + }; - /* 2. Update the LEDs RGB values. */ - this->SetRGB(rgb, led_endpoint, true); + HueToRGB(hue, saturation, level, &rgb, PWM_MAX_VALUE); + + /* 2. Set the color values. */ + this->SetColorRGB(&rgb); } -void LEDWidgetRGB::SetRGB(uint8_t* rgb, uint16_t led_endpoint, bool memorize) +void LEDWidgetRGB::SetColorRGB(ColorElements* rgb) { - /* 1. Call the PWM driver to set the new values. */ - void* led_rgb_context = this->led_rgb_->led_common.context; - this->led_rgb_->set_rgb_color(led_rgb_context, rgb[0], rgb[1], rgb[2]); - - /* 2. Save the current RGB values. */ - if (memorize == true) + /* 1. Verify that the struct argument is not null. */ + if (rgb == nullptr) { - memcpy(this->current_rgb_, rgb, sizeof(this->current_rgb_)); + EFR32_LOG(" Error in led_widget_rgb.cpp. Argument struct is null."); + return; } + + /* 2. Call the PWM driver to set the new values. */ + this->led_rgb_->set_rgb_color(this->led_rgb_->led_common.context, rgb->red_value, rgb->green_value, rgb->blue_value); } /** * @note This code is based on the HSV to RGB mathematical formula - * which was retrieved from: https://en.wikipedia.org/wiki/HSL_and_HSV + * which was retrieved from: https://en.wikipedia.org/wiki/HSL_and_HSV */ -void LEDWidgetRGB::HueToRGB(uint16_t hue, float saturation, uint8_t* rgb, uint8_t max_value) +void LEDWidgetRGB::HueToRGB(uint16_t hue, float saturation, uint8_t value, ColorElements* rgb, uint8_t max_value) { - /* 1. Normalize the values. */ + /* 1. Verify that the struct argument is not null. */ + if (rgb == nullptr) + { + EFR32_LOG(" Error in led_widget_rgb.cpp. Struct argument is null."); + return; + } + + /* 2. Normalize the values. */ uint16_t hue_degrees = hue; float saturation_decimal = saturation; - float hsv_value = 1.0; + float hsv_value = static_cast(value) / 100.0; if (hue_degrees == 360) { hue_degrees = 0; - } - - /* 2. Calculate the formula parameters. */ - float chroma = hsv_value * saturation_decimal; - float hue_prime = hue_degrees / 60.0; - float hue_modulo = fmod(hue_prime, 2.0); - float hue_diff = hue_modulo - 1.0; - float hue_abs = fabs(hue_diff); - float median_value = chroma * (1.0 - hue_abs); - float m = hsv_value - chroma; - - /* 3. Determine the points R', G' and B'. */ + } + + /* 3. Calculate the formula parameters. */ + float chroma = hsv_value * saturation_decimal; + float hue_prime = hue_degrees / 60.0; + float hue_modulo = fmod(hue_prime, 2.0); + float hue_diff = hue_modulo - 1.0; + float hue_abs = fabs(hue_diff); + float median_value = chroma * (1.0 - hue_abs); + float m = hsv_value - chroma; + + /* 4. Determine the points R', G' and B'. */ float r_prime, g_prime, b_prime = 0; if ( hue_degrees < 60 ) @@ -368,8 +346,8 @@ void LEDWidgetRGB::HueToRGB(uint16_t hue, float saturation, uint8_t* rgb, uint8_ b_prime = median_value; } - /* 4. Calculate the final values of RGB. */ - rgb[0] = (uint8_t) ( (r_prime + m) * max_value ); - rgb[1] = (uint8_t) ( (g_prime + m) * max_value ); - rgb[2] = (uint8_t) ( (b_prime + m) * max_value ); -} \ No newline at end of file + /* 5. Calculate the final values of RGB. */ + rgb->red_value = static_cast( (r_prime + m) * max_value ); + rgb->green_value = static_cast( (g_prime + m) * max_value ); + rgb->blue_value = static_cast( (b_prime + m) * max_value ); +} diff --git a/silabs_examples/sl-newLight/efr32/light_modules/led_widget_rgb.h b/silabs_examples/sl-newLight/efr32/light_modules/led_widget_rgb.h index 80c873ba6d68dd..353722fd9af35a 100644 --- a/silabs_examples/sl-newLight/efr32/light_modules/led_widget_rgb.h +++ b/silabs_examples/sl-newLight/efr32/light_modules/led_widget_rgb.h @@ -35,46 +35,49 @@ #include "sl_simple_rgb_pwm_led.h" +#define PWM_FREQUENCY 10000 +#define PWM_MAX_VALUE 100 +#define PWM_RESOLUTION_LEVELS 100 +#define LED_RGB_INITIAL_STATE 1 +#define LED_RGB_POLARITY 0U +/* Max and min level as defined in "appclusters.pdf" section 1.6.5. */ #define ATTRIBUTE_LEVEL_MAX 254 +#define ATTRIBUTE_LEVEL_MIN 1 // Default Saturation in the cluster is zero. #define INITIAL_SATURATION 0.0f // Default Hue in the color control cluster is zero. #define INITIAL_HUE 0 -#define INITIAL_RGB 0 - -#define LED_ENDPOINT_DEFAULT 1 -#define LED_RGB_INITIAL_STATE 1 -#define LED_RGB_POLARITY 0U -#define PWM_FREQUENCY 10000 -#define PWM_MAX_VALUE 100 -#define PWM_RESOLUTION_LEVELS 100 +#define INITIAL_RGB PWM_MAX_VALUE // RGB PWM Led instance with preset parameters. extern const sl_led_rgb_pwm_t sl_led_rgb_pwm; +struct ColorElements +{ + uint8_t red_value; + uint8_t green_value; + uint8_t blue_value; +}; class LEDWidgetRGB : public LEDWidget { public: static void InitGpioRGB(); void Init(const sl_led_rgb_pwm_t* led); - void Set(bool state); - void Set(bool state, uint16_t led_endpoint); - void SetLevel(uint8_t level, uint16_t led_endpoint); - void GetLevel(uint8_t rgb[], uint32_t size); - void SetHue(uint8_t hue, uint16_t led_endpoint); - void SetSaturation(uint8_t sat, uint16_t led_endpoint); - void SetColor(uint8_t hue, uint8_t saturation, uint16_t led_endpoint); - void SetColor(uint8_t* rgb, uint16_t led_endpoint); + void SetLevel(uint8_t level); + void GetLevel(ColorElements* rgb); + void SetHue(uint8_t hue); + void SetSaturation(uint8_t sat); + void SetColor(uint8_t hue, float saturation, uint8_t level); + void SetColorRGB(ColorElements* rgb); + +private: + void HueToRGB(uint16_t hue, float saturation, uint8_t value, ColorElements* rgb, uint8_t max_value); -private: - void HueToRGB(uint16_t hue, float saturation, uint8_t* rgb, uint8_t max_value); - void SetRGB(uint8_t* rgb, uint16_t led_endpoint, bool memorize); - - uint16_t current_hue_; - uint8_t current_rgb_[3]; - float current_saturation_; + uint16_t current_hue_; + uint8_t current_level_; + float current_saturation_; const sl_led_rgb_pwm_t* led_rgb_; - uint32_t level_resolution_; + uint32_t level_resolution_; }; diff --git a/silabs_examples/sl-newLight/efr32/src/AppTask.cpp b/silabs_examples/sl-newLight/efr32/src/AppTask.cpp index 97663f34ab5913..0e9ca4b00f7734 100644 --- a/silabs_examples/sl-newLight/efr32/src/AppTask.cpp +++ b/silabs_examples/sl-newLight/efr32/src/AppTask.cpp @@ -282,7 +282,6 @@ CHIP_ERROR AppTask::Init() } LightMgr().SetCallbacks(ActionInitiated, ActionCompleted); - LightMgr().SetLightCallbacks(ActionChangeLight); // Initialize LEDs LEDWidget::InitGpio(); @@ -450,6 +449,37 @@ void AppTask::LightActionEventHandler(AppEvent * aEvent) } } + +void AppTask::LightControlEventHandler(AppEvent * aEvent) +{ + /* 1. Unpack the AppEvent */ + uint8_t light_action = aEvent->LightControlEvent.Action; + uint8_t value = aEvent->LightControlEvent.Value; + + /* 2. Excute the control command. */ + if (light_action == LightingManager::MOVE_TO_LEVEL) + { +#ifdef RGB_LED_ENABLED + sLightLED.SetLevel(value); +#endif //RGB_LED_ENABLED + EFR32_LOG("Level set to: %d.", value); + } + else if (light_action == LightingManager::MOVE_TO_HUE) + { +#ifdef RGB_LED_ENABLED + sLightLED.SetHue(value); +#endif //RGB_LED_ENABLED + EFR32_LOG("Light LED hue set."); + } + else if (light_action == LightingManager::MOVE_TO_SAT) + { +#ifdef RGB_LED_ENABLED + sLightLED.SetSaturation(value); +#endif //RGB_LED_ENABLED + EFR32_LOG("Light LED saturation set."); + } +} + void AppTask::ButtonEventHandler(const sl_button_t * buttonHandle, uint8_t btnAction) { if (buttonHandle == NULL) @@ -640,29 +670,6 @@ void AppTask::ActionCompleted(LightingManager::Action_t aAction) } } -void AppTask::ActionChangeLight(LightingManager::Action_t aAction, uint16_t endpoint, uint8_t value) -{ -#ifdef RGB_LED_ENABLED - if (aAction == LightingManager::MOVE_TO_LEVEL) - { - sLightLED.SetLevel(value, endpoint); - EFR32_LOG("Light LED Level set to: %d.", value); - } - else if (aAction == LightingManager::MOVE_TO_HUE) - { - sLightLED.SetHue(value, endpoint); - EFR32_LOG("Light LED hue set."); - } - else if (aAction == LightingManager::MOVE_TO_SAT) - { - sLightLED.SetSaturation(value, endpoint); - EFR32_LOG("Light LED saturation set."); - } -#else - EFR32_LOG(" Level Control and Color control are unavailable on your board."); -#endif //RGB_LED_ENABLED -} - void AppTask::PostLightActionRequest(int32_t aActor, LightingManager::Action_t aAction) { AppEvent event; @@ -673,6 +680,17 @@ void AppTask::PostLightActionRequest(int32_t aActor, LightingManager::Action_t a PostEvent(&event); } +void AppTask::PostLightControlActionRequest(int32_t aActor, LightingManager::Action_t aAction, uint8_t value) +{ + AppEvent light_event = {}; + light_event.Type = AppEvent::kEventType_Light; + light_event.LightControlEvent.Actor = aActor; + light_event.LightControlEvent.Action = aAction; + light_event.LightControlEvent.Value = value; + light_event.Handler = LightControlEventHandler; + PostEvent(&light_event); +} + void AppTask::PostEvent(const AppEvent * aEvent) { if (sAppEventQueue != NULL) diff --git a/silabs_examples/sl-newLight/efr32/src/ZclCallbacks.cpp b/silabs_examples/sl-newLight/efr32/src/ZclCallbacks.cpp index a3dd8bef632cf1..dfda9bbab22563 100644 --- a/silabs_examples/sl-newLight/efr32/src/ZclCallbacks.cpp +++ b/silabs_examples/sl-newLight/efr32/src/ZclCallbacks.cpp @@ -54,7 +54,7 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & if (attributeId == LevelControl::Attributes::CurrentLevel::Id) { action_type = LightingManager::MOVE_TO_LEVEL; - } + } LightMgr().InitiateActionLight(AppEvent::kEventType_Light, action_type, endpoint, *value); } diff --git a/silabs_examples/sl-newLight/newLight_DataModel_config/sl_newLight.matter b/silabs_examples/sl-newLight/newLight_DataModel_config/sl_newLight.matter index 8866db84fa2df6..b5f1185b812bbc 100644 --- a/silabs_examples/sl-newLight/newLight_DataModel_config/sl_newLight.matter +++ b/silabs_examples/sl-newLight/newLight_DataModel_config/sl_newLight.matter @@ -1929,7 +1929,7 @@ endpoint 1 { } server cluster LevelControl { - persist attribute currentLevel default = 0x01; + persist attribute currentLevel default = 0xFE; ram attribute remainingTime; ram attribute minLevel; ram attribute maxLevel default = 0xFE; diff --git a/silabs_examples/sl-newLight/newLight_DataModel_config/sl_newLight.zap b/silabs_examples/sl-newLight/newLight_DataModel_config/sl_newLight.zap index df2a191e7bb3a4..92db31dc24edfc 100644 --- a/silabs_examples/sl-newLight/newLight_DataModel_config/sl_newLight.zap +++ b/silabs_examples/sl-newLight/newLight_DataModel_config/sl_newLight.zap @@ -1,5 +1,5 @@ { - "featureLevel": 67, + "featureLevel": 75, "creator": "zap", "keyValuePairs": [ { @@ -19,14 +19,16 @@ { "pathRelativity": "relativeToZap", "path": "../../../src/app/zap-templates/zcl/zcl.json", - "version": "ZCL Test Data", - "type": "zcl-properties" + "type": "zcl-properties", + "category": "matter", + "version": 1, + "description": "Matter SDK ZCL data" }, { "pathRelativity": "relativeToZap", "path": "../../../src/app/zap-templates/app-templates.json", - "version": "chip-v1", - "type": "gen-templates-json" + "type": "gen-templates-json", + "version": "chip-v1" } ], "endpointTypes": [ @@ -51,14 +53,6 @@ "source": "client", "incoming": 1, "outgoing": 0 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 } ], "attributes": [ @@ -67,6 +61,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -86,22 +81,14 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", "code": 0, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -117,6 +104,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -192,6 +180,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -251,6 +240,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "bitmap8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -266,6 +256,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -349,6 +340,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -420,10 +412,11 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -435,10 +428,11 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -450,10 +444,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -465,10 +460,11 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -480,10 +476,11 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", + "type": "bitmap8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -499,6 +496,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -550,6 +548,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -576,6 +575,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -591,6 +591,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -617,6 +618,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -643,6 +645,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "enum8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -658,6 +661,7 @@ "code": 16, "mfgCode": null, "side": "server", + "type": "enum8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -673,6 +677,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -764,6 +769,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -790,6 +796,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -805,6 +812,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -831,6 +839,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -857,6 +866,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -872,6 +882,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -887,6 +898,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -902,6 +914,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -917,6 +930,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -943,6 +957,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -969,6 +984,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -984,6 +1000,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -999,6 +1016,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1014,6 +1032,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1029,6 +1048,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -1044,6 +1064,7 @@ "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -1059,6 +1080,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1085,6 +1107,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 1, @@ -1111,8 +1134,9 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 1, "bounded": 0, "defaultValue": "10", @@ -1126,6 +1150,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1141,6 +1166,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 1, @@ -1156,6 +1182,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1171,6 +1198,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 1, @@ -1186,6 +1214,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "NVM", "singleton": 1, @@ -1201,6 +1230,7 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1216,6 +1246,7 @@ "code": 7, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 1, @@ -1231,6 +1262,7 @@ "code": 8, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1246,6 +1278,7 @@ "code": 9, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "External", "singleton": 1, @@ -1261,6 +1294,7 @@ "code": 10, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1276,6 +1310,7 @@ "code": 11, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1291,6 +1326,7 @@ "code": 12, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1306,6 +1342,7 @@ "code": 13, "mfgCode": null, "side": "server", + "type": "long_char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1321,6 +1358,7 @@ "code": 14, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1336,6 +1374,7 @@ "code": 15, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1351,6 +1390,7 @@ "code": 16, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "NVM", "singleton": 1, @@ -1366,6 +1406,7 @@ "code": 17, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "RAM", "singleton": 1, @@ -1381,6 +1422,7 @@ "code": 18, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -1396,6 +1438,7 @@ "code": 19, "mfgCode": null, "side": "server", + "type": "CapabilityMinimaStruct", "included": 1, "storageOption": "External", "singleton": 0, @@ -1411,6 +1454,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 1, @@ -1462,6 +1506,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1505,6 +1550,7 @@ "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -1520,6 +1566,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -1535,6 +1582,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1570,6 +1618,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1596,6 +1645,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -1611,6 +1661,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1626,6 +1677,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "OTAUpdateStateEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1641,6 +1693,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1656,6 +1709,7 @@ "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -1671,6 +1725,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -1686,6 +1741,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1717,31 +1773,17 @@ "enabled": 1, "commands": [], "attributes": [ - { - "name": "ActiveLocale", - "code": 1, - "mfgCode": null, - "side": "server", - "included": 1, - "storageOption": "NVM", - "singleton": 0, - "bounded": 0, - "defaultValue": "en-US", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "SupportedLocales", - "code": 2, + "code": 1, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "en-US", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -1752,6 +1794,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1788,6 +1831,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "HourFormat", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -1803,6 +1847,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "CalendarType", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -1818,6 +1863,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -1833,6 +1879,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1869,6 +1916,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "TempUnit", "included": 0, "storageOption": "NVM", "singleton": 0, @@ -1884,6 +1932,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1899,6 +1948,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -1950,6 +2000,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2001,6 +2052,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2016,6 +2068,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "BasicCommissioningInfo", "included": 1, "storageOption": "External", "singleton": 0, @@ -2031,8 +2084,9 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "RegulatoryLocationType", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -2046,8 +2100,9 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "RegulatoryLocationType", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -2061,6 +2116,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "External", "singleton": 0, @@ -2076,6 +2132,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2091,6 +2148,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2166,6 +2224,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2217,6 +2276,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2232,6 +2292,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -2247,6 +2308,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2262,6 +2324,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2277,6 +2340,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2292,6 +2356,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "NetworkCommissioningStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2307,6 +2372,7 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "octet_string", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2322,6 +2388,7 @@ "code": 7, "mfgCode": null, "side": "server", + "type": "int32s", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2337,6 +2404,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2352,6 +2420,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2397,6 +2466,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2423,6 +2493,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -2438,8 +2509,9 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -2453,8 +2525,9 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -2468,8 +2541,9 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x00000000", @@ -2483,8 +2557,9 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "enum8", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -2498,6 +2573,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -2513,6 +2589,7 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -2528,6 +2605,7 @@ "code": 7, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -2543,6 +2621,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2578,6 +2657,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2604,6 +2684,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -2619,8 +2700,9 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -2634,8 +2716,9 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -2649,8 +2732,9 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -2664,6 +2748,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2679,6 +2764,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2714,6 +2800,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -2740,8 +2827,9 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -2755,8 +2843,9 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "RoutingRole", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -2770,8 +2859,9 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0", @@ -2785,8 +2875,9 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -2800,8 +2891,9 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -2815,8 +2907,9 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "octet_string", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -2830,8 +2923,9 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -2845,6 +2939,7 @@ "code": 7, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -2860,6 +2955,7 @@ "code": 8, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -2875,8 +2971,9 @@ "code": 9, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -2890,8 +2987,9 @@ "code": 10, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -2905,8 +3003,9 @@ "code": 11, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -2920,8 +3019,9 @@ "code": 12, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -2935,8 +3035,9 @@ "code": 13, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -2950,8 +3051,9 @@ "code": 14, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -2965,8 +3067,9 @@ "code": 15, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -2980,8 +3083,9 @@ "code": 16, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -2995,8 +3099,9 @@ "code": 17, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3010,8 +3115,9 @@ "code": 18, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3025,8 +3131,9 @@ "code": 19, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3040,8 +3147,9 @@ "code": 20, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3055,8 +3163,9 @@ "code": 21, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3070,8 +3179,9 @@ "code": 22, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3085,8 +3195,9 @@ "code": 23, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3100,8 +3211,9 @@ "code": 24, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3115,8 +3227,9 @@ "code": 25, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3130,8 +3243,9 @@ "code": 26, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3145,8 +3259,9 @@ "code": 27, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3160,8 +3275,9 @@ "code": 28, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3175,8 +3291,9 @@ "code": 29, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3190,8 +3307,9 @@ "code": 30, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3205,8 +3323,9 @@ "code": 31, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3220,8 +3339,9 @@ "code": 32, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3235,8 +3355,9 @@ "code": 33, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3250,8 +3371,9 @@ "code": 34, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3265,8 +3387,9 @@ "code": 35, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3280,8 +3403,9 @@ "code": 36, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3295,8 +3419,9 @@ "code": 37, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3310,8 +3435,9 @@ "code": 38, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3325,8 +3451,9 @@ "code": 39, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3340,8 +3467,9 @@ "code": 40, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3355,8 +3483,9 @@ "code": 41, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3370,8 +3499,9 @@ "code": 42, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3385,8 +3515,9 @@ "code": 43, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3400,8 +3531,9 @@ "code": 44, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3415,8 +3547,9 @@ "code": 45, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3430,8 +3563,9 @@ "code": 46, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3445,8 +3579,9 @@ "code": 47, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3460,8 +3595,9 @@ "code": 48, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3475,8 +3611,9 @@ "code": 49, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3490,8 +3627,9 @@ "code": 50, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3505,8 +3643,9 @@ "code": 51, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3520,8 +3659,9 @@ "code": 52, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3535,8 +3675,9 @@ "code": 53, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3550,8 +3691,9 @@ "code": 54, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3565,8 +3707,9 @@ "code": 55, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3580,8 +3723,9 @@ "code": 56, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -3595,8 +3739,9 @@ "code": 57, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -3610,8 +3755,9 @@ "code": 58, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3625,6 +3771,7 @@ "code": 59, "mfgCode": null, "side": "server", + "type": "SecurityPolicy", "included": 1, "storageOption": "External", "singleton": 0, @@ -3640,8 +3787,9 @@ "code": 60, "mfgCode": null, "side": "server", + "type": "octet_string", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3655,6 +3803,7 @@ "code": 61, "mfgCode": null, "side": "server", + "type": "OperationalDatasetComponents", "included": 1, "storageOption": "External", "singleton": 0, @@ -3670,6 +3819,7 @@ "code": 62, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -3685,6 +3835,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3700,6 +3851,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3735,6 +3887,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3761,8 +3914,9 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "octet_string", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -3776,8 +3930,9 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "SecurityType", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -3791,8 +3946,9 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "WiFiVersionType", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -3806,8 +3962,9 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000", @@ -3821,8 +3978,9 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "int8s", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x00", @@ -3836,8 +3994,9 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x00000000", @@ -3851,8 +4010,9 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x00000000", @@ -3866,8 +4026,9 @@ "code": 7, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x00000000", @@ -3881,8 +4042,9 @@ "code": 8, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x00000000", @@ -3896,8 +4058,9 @@ "code": 9, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x00000000", @@ -3911,8 +4074,9 @@ "code": 10, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x00000000", @@ -3926,8 +4090,9 @@ "code": 11, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -3941,8 +4106,9 @@ "code": 12, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -3956,6 +4122,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -3971,6 +4138,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4006,6 +4174,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4032,8 +4201,9 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "PHYRateType", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -4047,8 +4217,9 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x00", @@ -4062,8 +4233,9 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -4077,8 +4249,9 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -4092,8 +4265,9 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -4107,8 +4281,9 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -4122,8 +4297,9 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -4137,8 +4313,9 @@ "code": 7, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x00", @@ -4152,8 +4329,9 @@ "code": 8, "mfgCode": null, "side": "server", + "type": "int64u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0000000000000000", @@ -4167,6 +4345,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4182,6 +4361,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4253,6 +4433,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4279,6 +4460,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "External", "singleton": 0, @@ -4294,6 +4476,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "fabric_idx", "included": 1, "storageOption": "External", "singleton": 0, @@ -4309,6 +4492,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -4324,6 +4508,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4407,14 +4592,6 @@ "source": "client", "incoming": 1, "outgoing": 1 - }, - { - "name": "RemoveTrustedRootCertificate", - "code": 12, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 } ], "attributes": [ @@ -4423,6 +4600,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4482,6 +4660,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -4497,6 +4676,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -4512,8 +4692,9 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -4527,8 +4708,9 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -4542,6 +4724,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -4557,6 +4740,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "fabric_idx", "included": 1, "storageOption": "External", "singleton": 0, @@ -4572,6 +4756,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4658,6 +4843,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -4673,6 +4859,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -4688,6 +4875,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -4703,6 +4891,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -4718,6 +4907,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4754,6 +4944,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -4769,6 +4960,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4805,6 +4997,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -4820,6 +5013,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4856,14 +5050,6 @@ "incoming": 1, "outgoing": 0 }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, { "name": "TriggerEffect", "code": 64, @@ -4879,6 +5065,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4898,22 +5085,14 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", "code": 0, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4929,6 +5108,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "enum8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4944,6 +5124,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5019,6 +5200,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5078,6 +5260,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "bitmap8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5093,6 +5276,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5200,6 +5384,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5271,10 +5456,11 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5286,10 +5472,11 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5301,10 +5488,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5316,10 +5504,11 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5331,10 +5520,11 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", + "type": "bitmap8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5350,6 +5540,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5425,6 +5616,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5451,6 +5643,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -5466,6 +5659,7 @@ "code": 16384, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5481,6 +5675,7 @@ "code": 16385, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5496,6 +5691,7 @@ "code": 16386, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5511,6 +5707,7 @@ "code": 16387, "mfgCode": null, "side": "server", + "type": "OnOffStartUpOnOff", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -5526,6 +5723,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5541,6 +5739,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5632,6 +5831,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5658,11 +5858,12 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "NVM", "singleton": 0, "bounded": 0, - "defaultValue": "0x01", + "defaultValue": "0xFE", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -5673,6 +5874,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5688,6 +5890,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5703,6 +5906,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5718,6 +5922,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5733,6 +5938,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5748,6 +5954,7 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5763,6 +5970,7 @@ "code": 15, "mfgCode": null, "side": "server", + "type": "bitmap8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5778,6 +5986,7 @@ "code": 16, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5793,6 +6002,7 @@ "code": 17, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5808,6 +6018,7 @@ "code": 18, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5823,6 +6034,7 @@ "code": 19, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5838,6 +6050,7 @@ "code": 20, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5853,6 +6066,7 @@ "code": 16384, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -5868,6 +6082,7 @@ "code": 65528, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -5883,6 +6098,7 @@ "code": 65529, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -5898,6 +6114,7 @@ "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -5913,6 +6130,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5928,6 +6146,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5954,6 +6173,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5980,6 +6200,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -5995,6 +6216,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -6010,6 +6232,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -6025,6 +6248,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "array", "included": 1, "storageOption": "External", "singleton": 0, @@ -6040,6 +6264,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 0, @@ -6066,6 +6291,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 1, @@ -6092,8 +6318,9 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 1, "bounded": 0, "defaultValue": "10", @@ -6107,6 +6334,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -6122,6 +6350,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "vendor_id", "included": 1, "storageOption": "External", "singleton": 1, @@ -6137,6 +6366,7 @@ "code": 3, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -6152,6 +6382,7 @@ "code": 4, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 1, @@ -6167,6 +6398,7 @@ "code": 5, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "NVM", "singleton": 1, @@ -6182,6 +6414,7 @@ "code": 6, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -6197,6 +6430,7 @@ "code": 7, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "External", "singleton": 1, @@ -6212,6 +6446,7 @@ "code": 8, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -6227,6 +6462,7 @@ "code": 9, "mfgCode": null, "side": "server", + "type": "int32u", "included": 1, "storageOption": "External", "singleton": 1, @@ -6242,6 +6478,7 @@ "code": 10, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -6257,6 +6494,7 @@ "code": 11, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -6272,6 +6510,7 @@ "code": 12, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -6287,6 +6526,7 @@ "code": 13, "mfgCode": null, "side": "server", + "type": "long_char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -6302,6 +6542,7 @@ "code": 14, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -6317,6 +6558,7 @@ "code": 15, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -6332,6 +6574,7 @@ "code": 16, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "NVM", "singleton": 1, @@ -6347,6 +6590,7 @@ "code": 17, "mfgCode": null, "side": "server", + "type": "boolean", "included": 1, "storageOption": "RAM", "singleton": 1, @@ -6362,6 +6606,7 @@ "code": 18, "mfgCode": null, "side": "server", + "type": "char_string", "included": 1, "storageOption": "External", "singleton": 1, @@ -6377,6 +6622,7 @@ "code": 19, "mfgCode": null, "side": "server", + "type": "CapabilityMinimaStruct", "included": 1, "storageOption": "External", "singleton": 0, @@ -6392,6 +6638,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 1, @@ -6571,6 +6818,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6593,10 +6841,11 @@ "commands": [], "attributes": [ { - "name": "current hue", + "name": "CurrentHue", "code": 0, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6608,10 +6857,11 @@ "reportableChange": 0 }, { - "name": "current saturation", + "name": "CurrentSaturation", "code": 1, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6623,10 +6873,11 @@ "reportableChange": 0 }, { - "name": "remaining time", + "name": "RemainingTime", "code": 2, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6638,10 +6889,11 @@ "reportableChange": 0 }, { - "name": "current x", + "name": "CurrentX", "code": 3, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6653,10 +6905,11 @@ "reportableChange": 0 }, { - "name": "current y", + "name": "CurrentY", "code": 4, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6668,10 +6921,11 @@ "reportableChange": 0 }, { - "name": "drift compensation", + "name": "DriftCompensation", "code": 5, "mfgCode": null, "side": "server", + "type": "enum8", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6683,10 +6937,11 @@ "reportableChange": 0 }, { - "name": "compensation text", + "name": "CompensationText", "code": 6, "mfgCode": null, "side": "server", + "type": "char_string", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6698,10 +6953,11 @@ "reportableChange": 0 }, { - "name": "color temperature", + "name": "ColorTemperature", "code": 7, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6713,10 +6969,11 @@ "reportableChange": 0 }, { - "name": "color mode", + "name": "ColorMode", "code": 8, "mfgCode": null, "side": "server", + "type": "enum8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6728,10 +6985,11 @@ "reportableChange": 0 }, { - "name": "color control options", + "name": "Options", "code": 15, "mfgCode": null, "side": "server", + "type": "bitmap8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6743,10 +7001,11 @@ "reportableChange": 0 }, { - "name": "number of primaries", + "name": "NumberOfPrimaries", "code": 16, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6758,10 +7017,11 @@ "reportableChange": 0 }, { - "name": "primary 1 x", + "name": "Primary1X", "code": 17, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6773,10 +7033,11 @@ "reportableChange": 0 }, { - "name": "primary 1 y", + "name": "Primary1Y", "code": 18, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6788,10 +7049,11 @@ "reportableChange": 0 }, { - "name": "primary 1 intensity", + "name": "Primary1Intensity", "code": 19, "mfgCode": null, "side": "server", + "type": "int8u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6803,10 +7065,11 @@ "reportableChange": 0 }, { - "name": "primary 2 x", + "name": "Primary2X", "code": 21, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6818,10 +7081,11 @@ "reportableChange": 0 }, { - "name": "primary 2 y", + "name": "Primary2Y", "code": 22, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6833,10 +7097,11 @@ "reportableChange": 0 }, { - "name": "primary 2 intensity", + "name": "Primary2Intensity", "code": 23, "mfgCode": null, "side": "server", + "type": "int8u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6848,10 +7113,11 @@ "reportableChange": 0 }, { - "name": "primary 3 x", + "name": "Primary3X", "code": 25, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6863,10 +7129,11 @@ "reportableChange": 0 }, { - "name": "primary 3 y", + "name": "Primary3Y", "code": 26, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6878,10 +7145,11 @@ "reportableChange": 0 }, { - "name": "primary 3 intensity", + "name": "Primary3Intensity", "code": 27, "mfgCode": null, "side": "server", + "type": "int8u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6893,10 +7161,11 @@ "reportableChange": 0 }, { - "name": "primary 4 x", + "name": "Primary4X", "code": 32, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6908,10 +7177,11 @@ "reportableChange": 0 }, { - "name": "primary 4 y", + "name": "Primary4Y", "code": 33, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6923,10 +7193,11 @@ "reportableChange": 0 }, { - "name": "primary 4 intensity", + "name": "Primary4Intensity", "code": 34, "mfgCode": null, "side": "server", + "type": "int8u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6938,10 +7209,11 @@ "reportableChange": 0 }, { - "name": "primary 5 x", + "name": "Primary5X", "code": 36, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6953,10 +7225,11 @@ "reportableChange": 0 }, { - "name": "primary 5 y", + "name": "Primary5Y", "code": 37, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6968,10 +7241,11 @@ "reportableChange": 0 }, { - "name": "primary 5 intensity", + "name": "Primary5Intensity", "code": 38, "mfgCode": null, "side": "server", + "type": "int8u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6983,10 +7257,11 @@ "reportableChange": 0 }, { - "name": "primary 6 x", + "name": "Primary6X", "code": 40, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -6998,10 +7273,11 @@ "reportableChange": 0 }, { - "name": "primary 6 y", + "name": "Primary6Y", "code": 41, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -7013,10 +7289,11 @@ "reportableChange": 0 }, { - "name": "primary 6 intensity", + "name": "Primary6Intensity", "code": 42, "mfgCode": null, "side": "server", + "type": "int8u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -7028,10 +7305,11 @@ "reportableChange": 0 }, { - "name": "white point x", + "name": "WhitePointX", "code": 48, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -7043,10 +7321,11 @@ "reportableChange": 0 }, { - "name": "white point y", + "name": "WhitePointY", "code": 49, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -7058,10 +7337,11 @@ "reportableChange": 0 }, { - "name": "color point r x", + "name": "ColorPointRX", "code": 50, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -7073,10 +7353,11 @@ "reportableChange": 0 }, { - "name": "color point r y", + "name": "ColorPointRY", "code": 51, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -7088,10 +7369,11 @@ "reportableChange": 0 }, { - "name": "color point r intensity", + "name": "ColorPointRIntensity", "code": 52, "mfgCode": null, "side": "server", + "type": "int8u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -7103,10 +7385,11 @@ "reportableChange": 0 }, { - "name": "color point g x", + "name": "ColorPointGX", "code": 54, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -7118,10 +7401,11 @@ "reportableChange": 0 }, { - "name": "color point g y", + "name": "ColorPointGY", "code": 55, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -7133,10 +7417,11 @@ "reportableChange": 0 }, { - "name": "color point g intensity", + "name": "ColorPointGIntensity", "code": 56, "mfgCode": null, "side": "server", + "type": "int8u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -7148,10 +7433,11 @@ "reportableChange": 0 }, { - "name": "color point b x", + "name": "ColorPointBX", "code": 58, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -7163,10 +7449,11 @@ "reportableChange": 0 }, { - "name": "color point b y", + "name": "ColorPointBY", "code": 59, "mfgCode": null, "side": "server", + "type": "int16u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -7178,10 +7465,11 @@ "reportableChange": 0 }, { - "name": "color point b intensity", + "name": "ColorPointBIntensity", "code": 60, "mfgCode": null, "side": "server", + "type": "int8u", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -7193,10 +7481,11 @@ "reportableChange": 0 }, { - "name": "enhanced current hue", + "name": "EnhancedCurrentHue", "code": 16384, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7208,10 +7497,11 @@ "reportableChange": 0 }, { - "name": "enhanced color mode", + "name": "EnhancedColorMode", "code": 16385, "mfgCode": null, "side": "server", + "type": "enum8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7223,10 +7513,11 @@ "reportableChange": 0 }, { - "name": "color loop active", + "name": "ColorLoopActive", "code": 16386, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7238,10 +7529,11 @@ "reportableChange": 0 }, { - "name": "color loop direction", + "name": "ColorLoopDirection", "code": 16387, "mfgCode": null, "side": "server", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7253,10 +7545,11 @@ "reportableChange": 0 }, { - "name": "color loop time", + "name": "ColorLoopTime", "code": 16388, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7268,10 +7561,11 @@ "reportableChange": 0 }, { - "name": "color loop start enhanced hue", + "name": "ColorLoopStartEnhancedHue", "code": 16389, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7283,10 +7577,11 @@ "reportableChange": 0 }, { - "name": "color loop stored enhanced hue", + "name": "ColorLoopStoredEnhancedHue", "code": 16390, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7298,10 +7593,11 @@ "reportableChange": 0 }, { - "name": "color capabilities", + "name": "ColorCapabilities", "code": 16394, "mfgCode": null, "side": "server", + "type": "bitmap16", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7313,10 +7609,11 @@ "reportableChange": 0 }, { - "name": "color temp physical min", + "name": "ColorTempPhysicalMinMireds", "code": 16395, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7328,10 +7625,11 @@ "reportableChange": 0 }, { - "name": "color temp physical max", + "name": "ColorTempPhysicalMaxMireds", "code": 16396, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7343,10 +7641,11 @@ "reportableChange": 0 }, { - "name": "couple color temp to level min-mireds", + "name": "CoupleColorTempToLevelMinMireds", "code": 16397, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7358,10 +7657,11 @@ "reportableChange": 0 }, { - "name": "start up color temperature mireds", + "name": "StartUpColorTemperatureMireds", "code": 16400, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7377,6 +7677,7 @@ "code": 65528, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -7392,6 +7693,7 @@ "code": 65529, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -7407,6 +7709,7 @@ "code": 65531, "mfgCode": null, "side": "server", + "type": "array", "included": 0, "storageOption": "External", "singleton": 0, @@ -7422,6 +7725,7 @@ "code": 65532, "mfgCode": null, "side": "server", + "type": "bitmap32", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7437,6 +7741,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7463,6 +7768,7 @@ "code": 65533, "mfgCode": null, "side": "client", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7489,6 +7795,7 @@ "code": 0, "mfgCode": null, "side": "server", + "type": "bitmap8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7504,6 +7811,7 @@ "code": 1, "mfgCode": null, "side": "server", + "type": "enum8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7519,6 +7827,7 @@ "code": 2, "mfgCode": null, "side": "server", + "type": "bitmap8", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7534,6 +7843,7 @@ "code": 65533, "mfgCode": null, "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7568,5 +7878,6 @@ "endpointVersion": 1, "deviceIdentifier": 257 } - ] + ], + "log": [] } \ No newline at end of file diff --git a/zzz_generated/sl_newLight/zap-generated/endpoint_config.h b/zzz_generated/sl_newLight/zap-generated/endpoint_config.h index 79a1d13a3c4368..9493b7bd6d890b 100644 --- a/zzz_generated/sl_newLight/zap-generated/endpoint_config.h +++ b/zzz_generated/sl_newLight/zap-generated/endpoint_config.h @@ -435,7 +435,7 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(4) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Level Control (server) */ \ - { 0x00000000, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE), ZAP_SIMPLE_DEFAULT(0x01) }, /* current level */ \ + { 0x00000000, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(TOKENIZE), ZAP_SIMPLE_DEFAULT(0xFE) }, /* current level */ \ { 0x00000001, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* remaining time */ \ { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* min level */ \ { 0x00000003, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0xFE) }, /* max level */ \