Fix/k210 module registration#6
Merged
Merged
Conversation
IDF 6.0 ships mbedTLS v4, which moved the crypto headers under mbedtls/private/. The repo-root component CMakeLists already requires the Kern-style mbedtls_compat shim on IDF >= 6; the CI smoke app now mirrors that conditional and vendors a minimal header-only copy of the shim (the sha256 redirect only — the single mbedTLS API cUR uses). mbedtls_sha256() itself still exists in v4, so no source file is needed. The esp-idf job becomes a two-leg matrix: v5.5.4/esp32 keeps covering the plain-mbedtls path, v6.0.2/esp32p4 (Kern's target) exercises the shim path. Verified locally against ESP-IDF v6.0.2 for esp32p4: the smoke app builds and links, with cUR resolving mbedtls_sha256 through the shim's include path.
The K210 MaixPy build generates genhdr/moduledefs.h by regex-scanning raw C sources for the registration macro, ignoring preprocessor conditionals. With 4ecccea's dual registration (2-arg modern form plus 3-arg legacy form under #if MICROPY_VERSION), the DOTALL 3-group pattern matched across the #else and emitted a mangled header ("#else after #else", "#if (bc_ur_module, MODULE_BC_UR_ENABLED)"), breaking the Krux Amigo firmware build. Register the modern branch through a UR_REGISTER_MODULE alias: the legacy raw-text scanner no longer matches that line and sees only the 3-arg form (its generated header is again identical in shape to the pre-4ecccea output), while modern MicroPython (>= 1.19, incl. 1.27) collects registrations from preprocessed source, where the alias has already expanded to the real 2-arg macro — the same token stream already verified on-device for 1.27. Verified by running Krux's own makemoduledefs.py against uUR.c (mangled before, clean after) and by preprocessing the modern branch with MICROPY_VERSION=1.27.0. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.