From 81c732b138f67e07c650bcde4c3d812f60a88904 Mon Sep 17 00:00:00 2001 From: "Edward A. Lee" Date: Fri, 31 May 2024 18:00:58 +0200 Subject: [PATCH 1/3] Fixed CMake generator for pico platform --- .../main/java/org/lflang/generator/c/CCmakeGenerator.java | 6 +++--- core/src/main/resources/lib/c/reactor-c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java index 4349b91dec..a674f09217 100644 --- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java +++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java @@ -558,9 +558,9 @@ private static String setUpMainTargetRp2040( code.pr("pico_sdk_init()"); code.newLine(); code.pr("add_subdirectory(core)"); - code.pr("target_link_libraries(core PUBLIC pico_stdlib)"); - code.pr("target_link_libraries(core PUBLIC pico_multicore)"); - code.pr("target_link_libraries(core PUBLIC pico_sync)"); + code.pr("target_link_libraries(reactor-c PUBLIC pico_stdlib)"); + code.pr("target_link_libraries(reactor-c PUBLIC pico_multicore)"); + code.pr("target_link_libraries(reactor-c PUBLIC pico_sync)"); code.newLine(); code.pr("set(LF_MAIN_TARGET " + executableName + ")"); diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c index d54dbd6435..ca72769bb8 160000 --- a/core/src/main/resources/lib/c/reactor-c +++ b/core/src/main/resources/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit d54dbd64350dc2bb3e173e296580be1ae2401b2d +Subproject commit ca72769bb8a7417900e60ca511ba4def12c00802 From a9c5c13f0c115857c175c6300b078d54b19fa187 Mon Sep 17 00:00:00 2001 From: "Edward A. Lee" Date: Sun, 2 Jun 2024 09:35:26 +0200 Subject: [PATCH 2/3] Do not claim to support threading for NRF52 --- .../main/java/org/lflang/target/property/type/PlatformType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/org/lflang/target/property/type/PlatformType.java b/core/src/main/java/org/lflang/target/property/type/PlatformType.java index 56715c2a9c..145553bddd 100644 --- a/core/src/main/java/org/lflang/target/property/type/PlatformType.java +++ b/core/src/main/java/org/lflang/target/property/type/PlatformType.java @@ -13,7 +13,7 @@ protected Class enumClass() { public enum Platform { AUTO, ARDUINO, // FIXME: not multithreaded - NRF52("Nrf52", true), + NRF52("Nrf52", false), RP2040("Rp2040", false), LINUX("Linux", true), MAC("Darwin", true), From a2453bc8e914545d8c84180c06da90d5fecc71e9 Mon Sep 17 00:00:00 2001 From: Marten Lohstroh Date: Mon, 3 Jun 2024 17:54:47 -0700 Subject: [PATCH 3/3] Update reactor-c submodule --- core/src/main/resources/lib/c/reactor-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c index ca72769bb8..587a8f9498 160000 --- a/core/src/main/resources/lib/c/reactor-c +++ b/core/src/main/resources/lib/c/reactor-c @@ -1 +1 @@ -Subproject commit ca72769bb8a7417900e60ca511ba4def12c00802 +Subproject commit 587a8f9498b69bc82f404e432f881d7bb0bcf383