Skip to content

Commit

Permalink
Regening after rebase
Browse files Browse the repository at this point in the history 
JIRA: ZAPP-757
  • Loading branch information
@brdandu
brdandu committed May 11, 2022
1 parent 835a544 commit bb15a4e
Show file tree
Hide file tree
Showing 22 changed files with 1,632 additions and 3,995 deletions.
16 changes: 1 addition & 15 deletions examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2466,25 +2466,11 @@ server cluster OperationalCredentials = 62 {
}

struct FabricDescriptor {
<<<<<<< HEAD
OCTET_STRING<65> rootPublicKey = 1;
<<<<<<< HEAD
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
=======
INT16U vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
>>>>>>> Changes for cleaner regen
CHAR_STRING<32> label = 5;
=======
octet_string<65> rootPublicKey = 1;
int16u vendorId = 2;
vendor_id vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
char_string<32> label = 5;
>>>>>>> Reverting the changes to the zapt template files
fabric_idx fabricIndex = 254;
}

Expand Down
16 changes: 1 addition & 15 deletions examples/bridge-app/bridge-common/bridge-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -724,25 +724,11 @@ server cluster OperationalCredentials = 62 {
}

struct FabricDescriptor {
<<<<<<< HEAD
OCTET_STRING<65> rootPublicKey = 1;
<<<<<<< HEAD
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
=======
INT16U vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
>>>>>>> Changes for cleaner regen
CHAR_STRING<32> label = 5;
=======
octet_string<65> rootPublicKey = 1;
int16u vendorId = 2;
vendor_id vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
char_string<32> label = 5;
>>>>>>> Reverting the changes to the zapt template files
fabric_idx fabricIndex = 254;
}

Expand Down
16 changes: 1 addition & 15 deletions examples/light-switch-app/light-switch-common/light-switch-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1158,25 +1158,11 @@ server cluster OperationalCredentials = 62 {
}

struct FabricDescriptor {
<<<<<<< HEAD
OCTET_STRING<65> rootPublicKey = 1;
<<<<<<< HEAD
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
=======
INT16U vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
>>>>>>> Changes for cleaner regen
CHAR_STRING<32> label = 5;
=======
octet_string<65> rootPublicKey = 1;
int16u vendorId = 2;
vendor_id vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
char_string<32> label = 5;
>>>>>>> Reverting the changes to the zapt template files
fabric_idx fabricIndex = 254;
}

Expand Down
16 changes: 1 addition & 15 deletions examples/lighting-app/lighting-common/lighting-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1250,25 +1250,11 @@ server cluster OperationalCredentials = 62 {
}

struct FabricDescriptor {
<<<<<<< HEAD
OCTET_STRING<65> rootPublicKey = 1;
<<<<<<< HEAD
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
=======
INT16U vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
>>>>>>> Changes for cleaner regen
CHAR_STRING<32> label = 5;
=======
octet_string<65> rootPublicKey = 1;
int16u vendorId = 2;
vendor_id vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
char_string<32> label = 5;
>>>>>>> Reverting the changes to the zapt template files
fabric_idx fabricIndex = 254;
}

Expand Down
16 changes: 1 addition & 15 deletions examples/lock-app/lock-common/lock-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1358,25 +1358,11 @@ server cluster OperationalCredentials = 62 {
}

struct FabricDescriptor {
<<<<<<< HEAD
OCTET_STRING<65> rootPublicKey = 1;
<<<<<<< HEAD
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
=======
INT16U vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
>>>>>>> Changes for cleaner regen
CHAR_STRING<32> label = 5;
=======
octet_string<65> rootPublicKey = 1;
int16u vendorId = 2;
vendor_id vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
char_string<32> label = 5;
>>>>>>> Reverting the changes to the zapt template files
fabric_idx fabricIndex = 254;
}

Expand Down
16 changes: 1 addition & 15 deletions examples/log-source-app/log-source-common/log-source-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,25 +315,11 @@ server cluster OperationalCredentials = 62 {
}

struct FabricDescriptor {
<<<<<<< HEAD
OCTET_STRING<65> rootPublicKey = 1;
<<<<<<< HEAD
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
=======
INT16U vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
>>>>>>> Changes for cleaner regen
CHAR_STRING<32> label = 5;
=======
octet_string<65> rootPublicKey = 1;
int16u vendorId = 2;
vendor_id vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
char_string<32> label = 5;
>>>>>>> Reverting the changes to the zapt template files
fabric_idx fabricIndex = 254;
}

Expand Down
16 changes: 1 addition & 15 deletions examples/ota-provider-app/ota-provider-common/ota-provider-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,25 +468,11 @@ server cluster OperationalCredentials = 62 {
}

struct FabricDescriptor {
<<<<<<< HEAD
OCTET_STRING<65> rootPublicKey = 1;
<<<<<<< HEAD
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
=======
INT16U vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
>>>>>>> Changes for cleaner regen
CHAR_STRING<32> label = 5;
=======
octet_string<65> rootPublicKey = 1;
int16u vendorId = 2;
vendor_id vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
char_string<32> label = 5;
>>>>>>> Reverting the changes to the zapt template files
fabric_idx fabricIndex = 254;
}

Expand Down
16 changes: 1 addition & 15 deletions examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -507,25 +507,11 @@ server cluster OperationalCredentials = 62 {
}

struct FabricDescriptor {
<<<<<<< HEAD
OCTET_STRING<65> rootPublicKey = 1;
<<<<<<< HEAD
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
=======
INT16U vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
>>>>>>> Changes for cleaner regen
CHAR_STRING<32> label = 5;
=======
octet_string<65> rootPublicKey = 1;
int16u vendorId = 2;
vendor_id vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
char_string<32> label = 5;
>>>>>>> Reverting the changes to the zapt template files
fabric_idx fabricIndex = 254;
}

Expand Down
32 changes: 2 additions & 30 deletions examples/placeholder/linux/apps/app1/config.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1516,25 +1516,11 @@ client cluster OperationalCredentials = 62 {
}

struct FabricDescriptor {
<<<<<<< HEAD
OCTET_STRING<65> rootPublicKey = 1;
<<<<<<< HEAD
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
=======
INT16U vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
>>>>>>> Changes for cleaner regen
CHAR_STRING<32> label = 5;
=======
octet_string<65> rootPublicKey = 1;
int16u vendorId = 2;
vendor_id vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
char_string<32> label = 5;
>>>>>>> Reverting the changes to the zapt template files
fabric_idx fabricIndex = 254;
}

Expand Down Expand Up @@ -1612,25 +1598,11 @@ server cluster OperationalCredentials = 62 {
}

struct FabricDescriptor {
<<<<<<< HEAD
OCTET_STRING<65> rootPublicKey = 1;
<<<<<<< HEAD
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
=======
INT16U vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
>>>>>>> Changes for cleaner regen
CHAR_STRING<32> label = 5;
=======
octet_string<65> rootPublicKey = 1;
int16u vendorId = 2;
vendor_id vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
char_string<32> label = 5;
>>>>>>> Reverting the changes to the zapt template files
fabric_idx fabricIndex = 254;
}

Expand Down
32 changes: 2 additions & 30 deletions examples/placeholder/linux/apps/app2/config.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1516,25 +1516,11 @@ client cluster OperationalCredentials = 62 {
}

struct FabricDescriptor {
<<<<<<< HEAD
OCTET_STRING<65> rootPublicKey = 1;
<<<<<<< HEAD
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
=======
INT16U vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
>>>>>>> Changes for cleaner regen
CHAR_STRING<32> label = 5;
=======
octet_string<65> rootPublicKey = 1;
int16u vendorId = 2;
vendor_id vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
char_string<32> label = 5;
>>>>>>> Reverting the changes to the zapt template files
fabric_idx fabricIndex = 254;
}

Expand Down Expand Up @@ -1612,25 +1598,11 @@ server cluster OperationalCredentials = 62 {
}

struct FabricDescriptor {
<<<<<<< HEAD
OCTET_STRING<65> rootPublicKey = 1;
<<<<<<< HEAD
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
=======
INT16U vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
>>>>>>> Changes for cleaner regen
CHAR_STRING<32> label = 5;
=======
octet_string<65> rootPublicKey = 1;
int16u vendorId = 2;
vendor_id vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
char_string<32> label = 5;
>>>>>>> Reverting the changes to the zapt template files
fabric_idx fabricIndex = 254;
}

Expand Down
16 changes: 1 addition & 15 deletions examples/pump-app/pump-common/pump-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -984,25 +984,11 @@ server cluster OperationalCredentials = 62 {
}

struct FabricDescriptor {
<<<<<<< HEAD
OCTET_STRING<65> rootPublicKey = 1;
<<<<<<< HEAD
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
=======
INT16U vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
>>>>>>> Changes for cleaner regen
CHAR_STRING<32> label = 5;
=======
octet_string<65> rootPublicKey = 1;
int16u vendorId = 2;
vendor_id vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
char_string<32> label = 5;
>>>>>>> Reverting the changes to the zapt template files
fabric_idx fabricIndex = 254;
}

Expand Down
16 changes: 1 addition & 15 deletions examples/pump-controller-app/pump-controller-common/pump-controller-app.matter
View file
Original file line number Diff line number Diff line change
Expand Up @@ -870,25 +870,11 @@ server cluster OperationalCredentials = 62 {
}

struct FabricDescriptor {
<<<<<<< HEAD
OCTET_STRING<65> rootPublicKey = 1;
<<<<<<< HEAD
VENDOR_ID vendorId = 2;
FABRIC_ID fabricId = 3;
NODE_ID nodeId = 4;
=======
INT16U vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
>>>>>>> Changes for cleaner regen
CHAR_STRING<32> label = 5;
=======
octet_string<65> rootPublicKey = 1;
int16u vendorId = 2;
vendor_id vendorId = 2;
fabric_id fabricId = 3;
node_id nodeId = 4;
char_string<32> label = 5;
>>>>>>> Reverting the changes to the zapt template files
fabric_idx fabricIndex = 254;
}

Expand Down
Loading

0 comments on commit bb15a4e

Please sign in to comment.