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

Bluetooth: Mesh: Store comp data hash as Number in JSON file #20449

Merged

Conversation

ludvigsj
Copy link
Contributor

@ludvigsj ludvigsj commented Feb 18, 2025

The comp data hash is an integer (32-bit unsigned integer), and, like other integers in the JSON file (CID, PID, etc. for instance), should be stored as a number in the JSON file, not a hex-encoded string.

@github-actions github-actions bot added doc-required PR must not be merged without tech writer approval. changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Feb 18, 2025
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Feb 18, 2025

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 2

Inputs:

Sources:

sdk-nrf: PR head: c0c95ecd0bd11319a6b15b7ed96f5298defce34c

more details

sdk-nrf:

PR head: c0c95ecd0bd11319a6b15b7ed96f5298defce34c
merge base: 4ba9b34a6f327498e36d332240172eb5f4f2e8ab
target head (main): 4ba9b34a6f327498e36d332240172eb5f4f2e8ab
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (3)
doc
│  ├── nrf
│  │  ├── protocols
│  │  │  ├── bt
│  │  │  │  ├── bt_mesh
│  │  │  │  │  │ dfu_over_bt_mesh.rst
scripts
│  ├── bluetooth
│  │  ├── mesh
│  │  │  │ mesh_dfu_metadata.py
tests
│  ├── subsys
│  │  ├── bluetooth
│  │  │  ├── mesh
│  │  │  │  ├── metadata_extraction
│  │  │  │  │  │ verify_metadata.py

Outputs:

Toolchain

Version: 0f22b642ed
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:0f22b642ed_bece0367df

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 465
  • ✅ Integration tests
    • ✅ test-fw-nrfconnect-ble_mesh
Disabled integration tests
    • desktop52_verification
    • doc-internal
    • test_ble_nrf_config
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_samples
    • test-fw-nrfconnect-boot
    • test-fw-nrfconnect-chip
    • test-fw-nrfconnect-fem
    • test-fw-nrfconnect-nfc
    • test-fw-nrfconnect-nrf-iot_cloud
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_mosh
    • test-fw-nrfconnect-nrf-iot_positioning
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • test-fw-nrfconnect-nrf-iot_thingy91
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-nrf_crypto
    • test-fw-nrfconnect-proprietary_esb
    • test-fw-nrfconnect-ps
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-rs
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-thread
    • test-fw-nrfconnect-zigbee
    • test-low-level
    • test-sdk-audio
    • test-sdk-dfu
    • test-sdk-find-my
    • test-sdk-mcuboot
    • test-sdk-pmic-samples
    • test-sdk-sidewalk
    • test-sdk-wifi
    • test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link.

Note: This comment is automatically posted by the Documentation Publish GitHub Action.

Copy link
Contributor

@omkar3141 omkar3141 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine with me.

@omkar3141
Copy link
Contributor

Btw ... it is 32 bit "unsigned" integer.

@ludvigsj
Copy link
Contributor Author

Btw ... it is 32 bit "unsigned" integer.

Sure, I guess this only affects the commit message? The handling of this is already doing unsigned using struct.unpack and has been doing this correctly the entire time, it only encoded it back into a hex string for some reason.

@ludvigsj ludvigsj marked this pull request as ready for review February 19, 2025 09:21
@ludvigsj ludvigsj requested review from a team as code owners February 19, 2025 09:21
@ludvigsj ludvigsj requested a review from omkar3141 February 19, 2025 09:42
The comp data hash is an integer (32-bit unsigned integer), and, like
other integers in the JSON file (CID, PID, etc. for instance), should be
stored as a number in the JSON file, not a hex-encoded string.

Signed-off-by: Ludvig Jordet <[email protected]>
@ludvigsj ludvigsj force-pushed the develop/mesh_metadata_hash_as_int_in_json branch from c11978b to c0c95ec Compare February 19, 2025 09:47
@nordicjm nordicjm merged commit 4adaba8 into nrfconnect:main Feb 19, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. doc-required PR must not be merged without tech writer approval.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants