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.

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

[qr-code] Align QR Code format with the spec #7272

Merged
merged 5 commits into from
Jun 7, 2021

Conversation

Damian-Nordic
Copy link
Contributor

Problem

QR Code format is no longer aligned with the spec after recent changes.

Change overview

  1. Replace boolean requiresCustomFlow with 2-bit field with
    the following meaning:
    0 - device automatically enters paring mode upon power-up
    1 - device needs user interaction to enter pairing mode
    2 - device uses a vendor-specific flow that should be
    retrieved from the distributed ledger.
  2. Replace CH: prefix with MT:

Testing

  • There are many unit tests that cover QR Code and Manual Pairing Code parsing.
    • Reviewed existing test cases and added a few more
  • Additionally, tested the change manually using nRF Connect lighting-app and Android CHIP Tool
  • Also, tested parsing QR Codes with optional data using Python CHIP Controller setup-payload parse-qr command.

@woody-apple
Copy link
Contributor

@shana-apple ?

@Damian-Nordic Damian-Nordic force-pushed the update-setup-payload branch from 2aa119b to b4322e4 Compare June 3, 2021 15:56
@github-actions
Copy link

github-actions bot commented Jun 3, 2021

Size increase report for "gn_qpg6100-example-build" from 575f99d

File Section File VM
chip-qpg6100-lighting-example.out .text 48 48
Full report output
BLOAT REPORT

Files found only in the build output:
    report.csv

Comparing ./master_artifact/chip-qpg6100-lighting-example.out and ./pull_artifact/chip-qpg6100-lighting-example.out:

sections,vmsize,filesize
.debug_info,0,368
.debug_str,0,164
.debug_ranges,0,112
.debug_abbrev,0,73
.text,48,48
.shstrtab,0,2
.debug_aranges,0,-8
.debug_frame,0,-20
.debug_line,0,-42
.symtab,0,-48
[Unmapped],0,-48
.strtab,0,-74
.debug_loc,0,-195

Comparing ./master_artifact/chip-qpg6100-lighting-example.out.map and ./pull_artifact/chip-qpg6100-lighting-example.out.map:

BLOAT EXECUTION FAILED WITH CODE 1:
bloaty: unknown file type for file './pull_artifact/chip-qpg6100-lighting-example.out.map'


@github-actions
Copy link

github-actions bot commented Jun 3, 2021

Size increase report for "nrfconnect-example-build" from 575f99d

File Section File VM
chip-lock.elf text 12 12
chip-lock.elf device_handles 4 4
Full report output
BLOAT REPORT

Files found only in the build output:
    report.csv

Comparing ./master_artifact/chip-lock.elf and ./pull_artifact/chip-lock.elf:

sections,vmsize,filesize
.debug_info,0,388
.debug_abbrev,0,73
.debug_str,0,29
.debug_loc,0,19
text,12,12
.debug_line,0,11
device_handles,4,4
.debug_ranges,0,-16

Comparing ./master_artifact/chip-shell.elf and ./pull_artifact/chip-shell.elf:

sections,vmsize,filesize


@github-actions
Copy link

github-actions bot commented Jun 3, 2021

Size increase report for "esp32-example-build" from 575f99d

File Section File VM
chip-all-clusters-app.elf .flash.text 8 8
Full report output
BLOAT REPORT

Files found only in the build output:
    report.csv

Comparing ./master_artifact/chip-pigweed-app.elf and ./pull_artifact/chip-pigweed-app.elf:

sections,vmsize,filesize

Comparing ./master_artifact/chip-all-clusters-app.elf and ./pull_artifact/chip-all-clusters-app.elf:

sections,vmsize,filesize
.debug_loc,0,41951
.debug_info,0,576
.debug_line,0,542
.debug_str,0,106
.debug_abbrev,0,73
.flash.text,8,8
.debug_ranges,0,-152


@woody-apple
Copy link
Contributor

/rebase

Damian-Nordic and others added 5 commits June 7, 2021 08:32
1. Replace boolean requiresCustomFlow with 2-bit field with
   the following meaning:
   0 - device automatically enters paring mode upon power-up
   1 - device needs user interaction to enter pairing mode
   2 - device uses a vendor-specific flow that should be
       retrieved from the distributed ledger.
2. Replace CH: prefix with MT:
@Damian-Nordic Damian-Nordic force-pushed the update-setup-payload branch from b4322e4 to d24997c Compare June 7, 2021 06:33
@woody-apple woody-apple merged commit 955679e into project-chip:master Jun 7, 2021
nikita-s-wrk pushed a commit to nikita-s-wrk/connectedhomeip that referenced this pull request Sep 23, 2021
* [qr-code] Align QR Code format with the spec

1. Replace boolean requiresCustomFlow with 2-bit field with
   the following meaning:
   0 - device automatically enters paring mode upon power-up
   1 - device needs user interaction to enter pairing mode
   2 - device uses a vendor-specific flow that should be
       retrieved from the distributed ledger.
2. Replace CH: prefix with MT:

* Restyled by clang-format

* Update src/setup_payload/QRCodeSetupPayloadParser.cpp

Co-authored-by: Boris Zbarsky <[email protected]>

* Restyled by clang-format

* Fixes after rebase

Co-authored-by: Restyled.io <[email protected]>
Co-authored-by: Justin Wood <[email protected]>
Co-authored-by: Boris Zbarsky <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants