Skip to content

manifest: update zephyr fork #677

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

Merged
merged 2 commits into from
Sep 17, 2025
Merged

manifest: update zephyr fork #677

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
d572e48
tdf: remove misleading format variables
JordanYates Sep 17, 2025
0dadff9
manifest: update zephyr fork
JordanYates Sep 17, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/codecov.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
-T infuse-sdk/tests --coverage-tool gcovr \
-e nano --coverage-basedir infuse-sdk \
-x=CONFIG_TEST_EXTRA_STACK_SIZE=4096 \
-x=CONFIG_COVERAGE_DUMP_PATH_EXCLUSIVE=\"*twister-out/*infuse-sdk*\"
-x=CONFIG_COVERAGE_DUMP_PATH_EXCLUDE=\"*modules/crypto/mbedtls*\"

- name: Print ccache stats
if: always()
Expand Down
2 changes: 1 addition & 1 deletion scripts/twister_coverage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ echo "Twister Coverage - mps2/an385"
./zephyr/scripts/twister -i --force-color -N -v --filter runnable \
-p mps2/an385 --coverage -T infuse-sdk/tests --coverage-tool gcovr \
-x=CONFIG_TEST_EXTRA_STACK_SIZE=4096 -e nano --coverage-basedir infuse-sdk \
-x=CONFIG_COVERAGE_DUMP_PATH_EXCLUSIVE=\"*twister-out/*infuse-sdk*\"
-x=CONFIG_COVERAGE_DUMP_PATH_EXCLUDE=\"*modules/crypto/mbedtls*\"
11 changes: 3 additions & 8 deletions subsys/tdf/tdf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,11 +275,6 @@ int tdf_add_core(struct tdf_buffer_state *state, uint16_t tdf_id, uint8_t tdf_le
is_diff = (format == TDF_DATA_FORMAT_DIFF_ARRAY_16_8) ||
(format == TDF_DATA_FORMAT_DIFF_ARRAY_32_8) ||
(format == TDF_DATA_FORMAT_DIFF_ARRAY_32_16);
#else
/* Override requested diff */
if (!is_idx) {
format = TDF_DATA_FORMAT_TIME_ARRAY;
}
#endif /* CONFIG_TDF_DIFF */

/* Input validation */
Expand Down Expand Up @@ -323,22 +318,19 @@ int tdf_add_core(struct tdf_buffer_state *state, uint16_t tdf_id, uint8_t tdf_le

if (diffs < 0) {
/* No diff encoding */
format = TDF_DATA_FORMAT_TIME_ARRAY;
is_diff = false;
tdf_num = -diffs;
} else {
tdf_num = 1 + diffs;
}
}
} else {
format = TDF_DATA_FORMAT_SINGLE;
is_diff = false;
}
#endif /* CONFIG_TDF_DIFF */
if ((tdf_num > 1) || is_idx) {
array_header = sizeof(struct tdf_array_header);
} else {
format = TDF_DATA_FORMAT_SINGLE;
is_diff = false;
}
total_header = sizeof(struct tdf_header) + array_header + timestamp_header;
Expand Down Expand Up @@ -394,6 +386,8 @@ int tdf_add_core(struct tdf_buffer_state *state, uint16_t tdf_id, uint8_t tdf_le
#endif /* CONFIG_TDF_DIFF */
}

__ASSERT_NO_MSG(tdf_num > 0);

/* Base Headers */
struct tdf_header *header =
tdf_add_header(state, tdf_header, tdf_id, tdf_len, time, timestamp_delta);
Expand Down Expand Up @@ -426,6 +420,7 @@ int tdf_add_core(struct tdf_buffer_state *state, uint16_t tdf_id, uint8_t tdf_le

encode_fn((tdf_num - 1) * per_tdf_fields, current, next, diff_ptr);
}
__ASSERT_NO_MSG(array_header_ptr != NULL);
array_header_ptr->diff_info = (tdf_diff_encoded[format] << 6) | (tdf_num - 1);
} else {
#endif /* CONFIG_TDF_DIFF */
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ manifest:

projects:
- name: zephyr
revision: 3adee498273dd5f86f038c65fcd7e9347fd14f77
revision: c593302558d84f2ae145e2278c342984fc6624c0
# Limit imported repositories to reduce clone time
import:
name-allowlist:
Expand Down