Skip to content

Commit

Permalink
Update ZAP.
Browse files Browse the repository at this point in the history 
Fixes type sizes for external attributes for which a size is known.

Fixes project-chip#19647

The darwin-framework-tool change for bitmaps was needed because
presumably something changed on the ZAP side in terms of weak bitmaps
suddenly testing true for if_is_bitmap, which I thought they had
already been doing...
  • Loading branch information
@bzbarsky-apple
bzbarsky-apple committed Jun 22, 2022
1 parent d1a4bb7 commit 88315da
Show file tree
Hide file tree
Showing 46 changed files with 3,075 additions and 3,075 deletions.
2 changes: 1 addition & 1 deletion examples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/ZAPSHA.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fd3adabbb2ac031d765da028fb51475260b7cfaf
9a4e455c3a4956842d11971148b2d5ee0ccead53
230 changes: 115 additions & 115 deletions ...ples/chef/zzz_generated/rootnode_contactsensor_DreXRHtsq9/zap-generated/endpoint_config.h
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/ZAPSHA.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fd3adabbb2ac031d765da028fb51475260b7cfaf
9a4e455c3a4956842d11971148b2d5ee0ccead53
230 changes: 115 additions & 115 deletions ...ples/chef/zzz_generated/rootnode_dimmablelight_gY80DaqEUL/zap-generated/endpoint_config.h
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/ZAPSHA.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fd3adabbb2ac031d765da028fb51475260b7cfaf
9a4e455c3a4956842d11971148b2d5ee0ccead53
230 changes: 115 additions & 115 deletions examples/chef/zzz_generated/rootnode_flowsensor_nRfPWc0i3j/zap-generated/endpoint_config.h
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/ZAPSHA.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fd3adabbb2ac031d765da028fb51475260b7cfaf
9a4e455c3a4956842d11971148b2d5ee0ccead53
230 changes: 115 additions & 115 deletions ...chef/zzz_generated/rootnode_heatingcoolingunit_Yt3sl2ssuP/zap-generated/endpoint_config.h
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/ZAPSHA.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fd3adabbb2ac031d765da028fb51475260b7cfaf
9a4e455c3a4956842d11971148b2d5ee0ccead53
230 changes: 115 additions & 115 deletions ...les/chef/zzz_generated/rootnode_humiditysensor_bCXcaZPQ1O/zap-generated/endpoint_config.h
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/ZAPSHA.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fd3adabbb2ac031d765da028fb51475260b7cfaf
9a4e455c3a4956842d11971148b2d5ee0ccead53
230 changes: 115 additions & 115 deletions ...es/chef/zzz_generated/rootnode_occupancysensor_52g0FarxiO/zap-generated/endpoint_config.h
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/ZAPSHA.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fd3adabbb2ac031d765da028fb51475260b7cfaf
9a4e455c3a4956842d11971148b2d5ee0ccead53
230 changes: 115 additions & 115 deletions ...s/chef/zzz_generated/rootnode_onofflightswitch_zbddTYGOPV/zap-generated/endpoint_config.h
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/ZAPSHA.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fd3adabbb2ac031d765da028fb51475260b7cfaf
9a4e455c3a4956842d11971148b2d5ee0ccead53
230 changes: 115 additions & 115 deletions ...es/chef/zzz_generated/rootnode_onoffpluginunit_Jgnh29qK1p/zap-generated/endpoint_config.h
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/ZAPSHA.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fd3adabbb2ac031d765da028fb51475260b7cfaf
9a4e455c3a4956842d11971148b2d5ee0ccead53
230 changes: 115 additions & 115 deletions ...les/chef/zzz_generated/rootnode_pressuresensor_fBO7Lvhj9j/zap-generated/endpoint_config.h
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/ZAPSHA.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fd3adabbb2ac031d765da028fb51475260b7cfaf
9a4e455c3a4956842d11971148b2d5ee0ccead53
230 changes: 115 additions & 115 deletions examples/chef/zzz_generated/rootnode_speaker_TlTVZFjAlM/zap-generated/endpoint_config.h
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/ZAPSHA.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fd3adabbb2ac031d765da028fb51475260b7cfaf
9a4e455c3a4956842d11971148b2d5ee0ccead53
230 changes: 115 additions & 115 deletions .../chef/zzz_generated/rootnode_temperaturesensor_19A4msmCzW/zap-generated/endpoint_config.h
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/ZAPSHA.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fd3adabbb2ac031d765da028fb51475260b7cfaf
9a4e455c3a4956842d11971148b2d5ee0ccead53
230 changes: 115 additions & 115 deletions examples/chef/zzz_generated/rootnode_thermostat_dtbxxgX9aj/zap-generated/endpoint_config.h
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/ZAPSHA.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fd3adabbb2ac031d765da028fb51475260b7cfaf
9a4e455c3a4956842d11971148b2d5ee0ccead53
230 changes: 115 additions & 115 deletions ...les/chef/zzz_generated/rootnode_windowcovering_hv8WSnPgSV/zap-generated/endpoint_config.h
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions examples/darwin-framework-tool/templates/partials/decodable_value.zapt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
{{#if_chip_enum type}}
{{target}} = [NSNumber numberWith{{asObjectiveCNumberType "" type false}}:chip::to_underlying({{source}})];
{{else}}
{{#if_is_bitmap type}}
{{#if_is_strongly_typed_bitmap type}}
{{target}} = [NSNumber numberWith{{asObjectiveCNumberType "" type false}}:{{source}}.Raw()];
{{else if (isOctetString type)}}
{{target}} = [NSData dataWithBytes:{{source}}.data() length:{{source}}.size()];
{{else if (isCharString type)}}
{{target}} = [[NSString alloc] initWithBytes:{{source}}.data() length:{{source}}.size() encoding:NSUTF8StringEncoding];
{{else}}
{{target}} = [NSNumber numberWith{{asObjectiveCNumberType "" type false}}:{{source}}];
{{/if_is_bitmap}}
{{/if_is_strongly_typed_bitmap}}
{{/if_chip_enum}}
{{/if_is_struct}}
{{/if}}
2 changes: 1 addition & 1 deletion third_party/zap/repo
Submodule repo updated 71 files
+2 −1 .github/workflows/cypress.yml
+6 −3 .github/workflows/release.yml
+5 −1 .github/workflows/sonarcloud.yml
+9 −14 .github/workflows/zap.yml
+1 −0 Jenkinsfile
+1 −1 apack.json
+2 −0 cypress.json
+18 −0 cypress/integration/attributes/check-cluster-attributes-singleton-in-zigbee-mode.spec.js
+0 −4 cypress/integration/custom_xml/custom_xml.zap
+32 −0 cypress/integration/file_operation/file_open.spec.js
+6 −13 cypress/integration/theme/theme.spec.js
+17 −0 cypress/support/commands.js
+36,598 −33,356 package-lock.json
+9 −5 package.json
+1 −0 src-electron/db/db-mapping.js
+2 −1 src-electron/db/query-attribute.js
+2 −2 src-electron/db/query-bitmap.js
+30 −8 src-electron/db/query-cluster.js
+6 −3 src-electron/db/query-command.js
+58 −16 src-electron/db/query-endpoint-type.js
+2 −2 src-electron/db/query-enum.js
+5 −2 src-electron/db/query-loader.js
+82 −201 src-electron/db/zap-schema.sql
+26 −13 src-electron/generator/helper-endpointconfig.js
+54 −0 src-electron/generator/helper-session.js
+6 −151 src-electron/generator/helper-zcl.js
+142 −0 src-electron/generator/helper-zigbee-zcl.js
+1 −0 src-electron/generator/template-engine.js
+3 −3 src-electron/ide-integration/studio-rest-api.ts
+5 −1 src-electron/importexport/import-json.js
+19 −7 src-electron/main-process/main.ts
+100 −125 src-electron/main-process/startup.js
+45 −19 src-electron/rest/file-ops.js
+43 −58 src-electron/rest/user-data.js
+2 −6 src-electron/server/http-server.js
+3 −3 src-electron/ui/browser-api.js
+21 −24 src-electron/ui/main-ui.ts
+22 −2 src-electron/util/args.ts
+5 −0 src-electron/util/env.ts
+34 −6 src-electron/util/util.js
+34 −3 src-electron/zcl/zcl-loader-silabs.js
+42 −4 src-electron/zcl/zcl-loader.js
+0 −27 src-script/refresh-zap.js
+2 −0 src-shared/rend-api.js
+1 −0 src-shared/rest-api.js
+4 −1 src/App.vue
+13 −0 src/api/renderer_api.js
+3 −0 src/components/ZclAttributeManager.vue
+11 −3 src/components/ZclDomainClusterView.vue
+0 −7 src/components/ZclGeneralOptionsBar.vue
+51 −45 src/layouts/ZclConfiguratorLayout.vue
+9 −8 src/layouts/ZclLayout.vue
+0 −34 src/pages/PreferenceGeneration.vue
+2 −2 src/store/zap/actions.js
+8 −0 src/store/zap/state.js
+0 −5 src/util/common-mixin.js
+5 −7 test/custom-cluster.test.js
+11 −13 test/custom-zcl.test.js
+109 −0 test/gen-template/matter/endpoint-config.zapt
+5 −0 test/gen-template/matter/gen-test.json
+1 −1 test/gen-template/zigbee/zap-cli.zapt
+20 −6 test/gen-zigbee.test.js
+25 −5 test/query.test.js
+0 −4 test/resource/bead.zap
+547 −8 test/resource/gp-combo-basic-test.zap
+752 −0 test/resource/matter-sensor.zap
+28 −2 test/test-query.js
+2 −1 test/test-util.js
+6 −7 test/validation.test.js
+2 −2 test/zcl-loader-consecutive.test.js
+2 −3 zcl-builtin/silabs/zcl.json
270 changes: 135 additions & 135 deletions zzz_generated/all-clusters-app/zap-generated/endpoint_config.h
View file

Large diffs are not rendered by default.

136 changes: 68 additions & 68 deletions zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h
View file

Large diffs are not rendered by default.

240 changes: 120 additions & 120 deletions zzz_generated/bridge-app/zap-generated/endpoint_config.h
View file

Large diffs are not rendered by default.

240 changes: 120 additions & 120 deletions zzz_generated/light-switch-app/zap-generated/endpoint_config.h
View file

Large diffs are not rendered by default.

240 changes: 120 additions & 120 deletions zzz_generated/lighting-app/zap-generated/endpoint_config.h
View file

Large diffs are not rendered by default.

236 changes: 118 additions & 118 deletions zzz_generated/lock-app/zap-generated/endpoint_config.h
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions zzz_generated/log-source-app/zap-generated/endpoint_config.h
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 88315da

Please sign in to comment.