Skip to content

Use 'constexpr' when including pio header files from a C++ compiler #2651

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

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Use 'constexpr' when including pio header files from a C++ compiler #2651

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24205f9
Use 'constexpr' when including pio header files from a C++ compiler
rhulme Sep 6, 2025
e8be6de
Use feature test macro to check for 'constexpr' support
rhulme Sep 13, 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
11 changes: 9 additions & 2 deletions tools/pioasm/c_sdk_output.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,13 @@ struct c_sdk_output : public output_format {
fprintf(out, "#endif\n");
fprintf(out, "\n");

fprintf(out, "#ifdef __cpp_constexpr\n");
fprintf(out, "#define PIO_CONST constexpr\n");
fprintf(out, "#else\n");
fprintf(out, "#define PIO_CONST const\n");
fprintf(out, "#endif\n");
fprintf(out, "\n");

output_symbols(out, "", source.global_symbols);

for (const auto &program : source.programs) {
Expand All @@ -93,7 +100,7 @@ struct c_sdk_output : public output_format {

output_symbols(out, prefix, program.symbols);

fprintf(out, "static const uint16_t %sprogram_instructions[] = {\n", prefix.c_str());
fprintf(out, "static PIO_CONST uint16_t %sprogram_instructions[] = {\n", prefix.c_str());
for (int i = 0; i < (int)program.instructions.size(); i++) {
const auto &inst = program.instructions[i];
if (i == program.wrap_target) {
Expand All @@ -109,7 +116,7 @@ struct c_sdk_output : public output_format {
fprintf(out, "\n");

fprintf(out, "#if !PICO_NO_HARDWARE\n");
fprintf(out, "static const struct pio_program %sprogram = {\n", prefix.c_str());
fprintf(out, "static PIO_CONST struct pio_program %sprogram = {\n", prefix.c_str());
fprintf(out, " .instructions = %sprogram_instructions,\n", prefix.c_str());
fprintf(out, " .length = %d,\n", (int) program.instructions.size());
fprintf(out, " .origin = %d,\n", program.origin.get());
Expand Down
Loading