Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bouffalolab] Update lighting-app zap, partition table and flash download script #26025

Merged
merged 2 commits into from
Apr 12, 2023
Merged

[Bouffalolab] Update lighting-app zap, partition table and flash download script #26025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e87d761
Update lighting-app zap, partition table and flash download script
wy-hh Apr 8, 2023
8bff8d3
Fix restyled
wy-hh Apr 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 37 additions & 3 deletions examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,8 +1169,6 @@ server cluster ThreadNetworkDiagnostics = 53 {
readonly attribute attrib_id attributeList[] = 65531;
readonly attribute bitmap32 featureMap = 65532;
readonly attribute int16u clusterRevision = 65533;

command ResetCounts(): DefaultSuccess = 0;
}

/** This cluster exposes interactions with a switch device, for the purpose of using those interactions by other devices.
Expand Down Expand Up @@ -1557,6 +1555,24 @@ server cluster ColorControl = 768 {
readonly attribute enum8 colorMode = 8;
attribute bitmap8 options = 15;
readonly attribute nullable int8u numberOfPrimaries = 16;
readonly attribute int16u primary1X = 17;
readonly attribute int16u primary1Y = 18;
readonly attribute nullable int8u primary1Intensity = 19;
readonly attribute int16u primary2X = 21;
readonly attribute int16u primary2Y = 22;
readonly attribute nullable int8u primary2Intensity = 23;
readonly attribute int16u primary3X = 25;
readonly attribute int16u primary3Y = 26;
readonly attribute nullable int8u primary3Intensity = 27;
readonly attribute int16u primary4X = 32;
readonly attribute int16u primary4Y = 33;
readonly attribute nullable int8u primary4Intensity = 34;
readonly attribute int16u primary5X = 36;
readonly attribute int16u primary5Y = 37;
readonly attribute nullable int8u primary5Intensity = 38;
readonly attribute int16u primary6X = 40;
readonly attribute int16u primary6Y = 41;
readonly attribute nullable int8u primary6Intensity = 42;
readonly attribute int16u enhancedCurrentHue = 16384;
readonly attribute enum8 enhancedColorMode = 16385;
readonly attribute int8u colorLoopActive = 16386;
Expand Down Expand Up @@ -2033,7 +2049,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type dimmablelight = 257, version 1;
device type extendedcolorlight = 269, version 1;

server cluster Identify {
ram attribute identifyTime default = 0x0000;
Expand Down Expand Up @@ -2096,6 +2112,24 @@ endpoint 1 {
ram attribute colorMode default = 0x01;
ram attribute options default = 0x00;
ram attribute numberOfPrimaries;
ram attribute primary1X;
ram attribute primary1Y;
ram attribute primary1Intensity;
ram attribute primary2X;
ram attribute primary2Y;
ram attribute primary2Intensity;
ram attribute primary3X;
ram attribute primary3Y;
ram attribute primary3Intensity;
ram attribute primary4X;
ram attribute primary4Y;
ram attribute primary4Intensity;
ram attribute primary5X;
ram attribute primary5Y;
ram attribute primary5Intensity;
ram attribute primary6X;
ram attribute primary6Y;
ram attribute primary6Intensity;
ram attribute enhancedCurrentHue default = 0x0000;
ram attribute enhancedColorMode default = 0x01;
ram attribute colorLoopActive default = 0x00;
Expand Down
51 changes: 26 additions & 25 deletions examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"featureLevel": 92,
"featureLevel": 95,
"creator": "zap",
"keyValuePairs": [
{
Expand Down Expand Up @@ -3045,7 +3045,7 @@
"code": 0,
"mfgCode": null,
"source": "client",
"incoming": 1,
"incoming": 0,
"outgoing": 0
}
],
Expand Down Expand Up @@ -5438,7 +5438,7 @@
]
},
{
"name": "MA-dimmablelight",
"name": "MA-extendedcolorlight",
"deviceTypeName": "MA-dimmablelight",
"deviceTypeCode": 257,
"deviceTypeProfileId": 259,
Expand Down Expand Up @@ -7471,7 +7471,7 @@
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand All @@ -7487,7 +7487,7 @@
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand All @@ -7503,7 +7503,7 @@
"mfgCode": null,
"side": "server",
"type": "int8u",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand All @@ -7519,7 +7519,7 @@
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand All @@ -7535,7 +7535,7 @@
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand All @@ -7551,7 +7551,7 @@
"mfgCode": null,
"side": "server",
"type": "int8u",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand All @@ -7567,7 +7567,7 @@
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand All @@ -7583,7 +7583,7 @@
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand All @@ -7599,7 +7599,7 @@
"mfgCode": null,
"side": "server",
"type": "int8u",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand All @@ -7615,7 +7615,7 @@
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand All @@ -7631,7 +7631,7 @@
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand All @@ -7647,7 +7647,7 @@
"mfgCode": null,
"side": "server",
"type": "int8u",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand All @@ -7663,7 +7663,7 @@
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand All @@ -7679,7 +7679,7 @@
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand All @@ -7695,7 +7695,7 @@
"mfgCode": null,
"side": "server",
"type": "int8u",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand All @@ -7711,7 +7711,7 @@
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand All @@ -7727,7 +7727,7 @@
"mfgCode": null,
"side": "server",
"type": "int16u",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand All @@ -7743,7 +7743,7 @@
"mfgCode": null,
"side": "server",
"type": "int8u",
"included": 0,
"included": 1,
"storageOption": "RAM",
"singleton": 0,
"bounded": 0,
Expand Down Expand Up @@ -8333,13 +8333,14 @@
"deviceIdentifier": 22
},
{
"endpointTypeName": "MA-dimmablelight",
"endpointTypeName": "MA-extendedcolorlight",
"endpointTypeIndex": 1,
"profileId": 259,
"endpointId": 1,
"networkId": 0,
"endpointVersion": 1,
"deviceIdentifier": 257
"deviceIdentifier": 269
}
]
}
],
"log": []
}
48 changes: 37 additions & 11 deletions examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,21 +982,12 @@ server cluster SoftwareDiagnostics = 52 {
kWaterMarks = 0x1;
}

struct ThreadMetricsStruct {
int64u id = 0;
optional char_string<8> name = 1;
optional int32u stackFreeCurrent = 2;
optional int32u stackFreeMinimum = 3;
optional int32u stackSize = 4;
}

info event SoftwareFault = 0 {
INT64U id = 0;
optional CHAR_STRING name = 1;
optional OCTET_STRING faultRecording = 2;
}

readonly attribute ThreadMetricsStruct threadMetrics[] = 0;
readonly attribute int64u currentHeapFree = 1;
readonly attribute int64u currentHeapUsed = 2;
readonly attribute int64u currentHeapHighWatermark = 3;
Expand Down Expand Up @@ -1465,6 +1456,24 @@ server cluster ColorControl = 768 {
readonly attribute enum8 colorMode = 8;
attribute bitmap8 options = 15;
readonly attribute nullable int8u numberOfPrimaries = 16;
readonly attribute int16u primary1X = 17;
readonly attribute int16u primary1Y = 18;
readonly attribute nullable int8u primary1Intensity = 19;
readonly attribute int16u primary2X = 21;
readonly attribute int16u primary2Y = 22;
readonly attribute nullable int8u primary2Intensity = 23;
readonly attribute int16u primary3X = 25;
readonly attribute int16u primary3Y = 26;
readonly attribute nullable int8u primary3Intensity = 27;
readonly attribute int16u primary4X = 32;
readonly attribute int16u primary4Y = 33;
readonly attribute nullable int8u primary4Intensity = 34;
readonly attribute int16u primary5X = 36;
readonly attribute int16u primary5Y = 37;
readonly attribute nullable int8u primary5Intensity = 38;
readonly attribute int16u primary6X = 40;
readonly attribute int16u primary6Y = 41;
readonly attribute nullable int8u primary6Intensity = 42;
readonly attribute int16u enhancedCurrentHue = 16384;
readonly attribute enum8 enhancedColorMode = 16385;
readonly attribute int8u colorLoopActive = 16386;
Expand Down Expand Up @@ -1817,7 +1826,6 @@ endpoint 0 {
}

server cluster SoftwareDiagnostics {
callback attribute threadMetrics;
callback attribute currentHeapFree default = 0x0000000000000000;
callback attribute currentHeapUsed default = 0x0000000000000000;
callback attribute currentHeapHighWatermark default = 0x0000000000000000;
Expand Down Expand Up @@ -1894,7 +1902,7 @@ endpoint 0 {
}
}
endpoint 1 {
device type dimmablelight = 257, version 1;
device type extendedcolorlight = 269, version 1;

server cluster Identify {
ram attribute identifyTime default = 0x0000;
Expand Down Expand Up @@ -1957,6 +1965,24 @@ endpoint 1 {
ram attribute colorMode default = 0x01;
ram attribute options default = 0x00;
ram attribute numberOfPrimaries;
ram attribute primary1X;
ram attribute primary1Y;
ram attribute primary1Intensity;
ram attribute primary2X;
ram attribute primary2Y;
ram attribute primary2Intensity;
ram attribute primary3X;
ram attribute primary3Y;
ram attribute primary3Intensity;
ram attribute primary4X;
ram attribute primary4Y;
ram attribute primary4Intensity;
ram attribute primary5X;
ram attribute primary5Y;
ram attribute primary5Intensity;
ram attribute primary6X;
ram attribute primary6Y;
ram attribute primary6Intensity;
ram attribute enhancedCurrentHue default = 0x0000;
ram attribute enhancedColorMode default = 0x01;
ram attribute colorLoopActive default = 0x00;
Expand Down
Loading