HelloZephyr compiles and runs on qemu

lf-lang · Jan 9, 2023 · 6236283 · 6236283 · lhstrh · Jan 9, 2023
1 parent ffd4669
commit 6236283
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 20 deletions.
diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
diff --git a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java
@@ -118,13 +118,15 @@ CodeBuilder generateCMakeCode(
         cMakeCode.newLine();
 
         cMakeCode.pr("cmake_minimum_required(VERSION " + MIN_CMAKE_VERSION + ")");
-        cMakeCode.pr("project("+executableName+" LANGUAGES C)");
-        cMakeCode.newLine();
+
         if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
             cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})");
             cMakeCode.newLine();
         }
 
+        cMakeCode.pr("project("+executableName+" LANGUAGES C)");
+        cMakeCode.newLine();
+
         // The Test build type is the Debug type plus coverage generation
         cMakeCode.pr("if(CMAKE_BUILD_TYPE STREQUAL \"Test\")");
         cMakeCode.pr("  set(CMAKE_BUILD_TYPE \"Debug\")");

diff --git a/test/C/src/zephyr/HelloZephyr.lf b/test/C/src/zephyr/HelloZephyr.lf
@@ -2,7 +2,6 @@ target C {
     platform: "Zephyr",
     build: "bash scripts/zephyr_build.sh qemu_cortex_m3 flash",
     threading: false,
-    cmake-include: "scripts/zephyr.cmake"
 }
 
 main reactor {

diff --git a/test/C/src/zephyr/scripts/zephyr.cmake b/test/C/src/zephyr/scripts/zephyr.cmake
diff --git a/test/C/src/zephyr/scripts/zephyr_build.sh b/test/C/src/zephyr/scripts/zephyr_build.sh
@@ -50,3 +50,5 @@ else
     echo "Unrecognized board $BOARD" 
     exit 1
 fi
+
+fi
+5 −5		.github/workflows/ci.yml
+9 −0		CMakeLists.txt
+58 −64		core/CMakeLists.txt
+5 −2		core/modal_models/CMakeLists.txt
+14 −5		core/platform/CMakeLists.txt
+2 −0		core/platform/Platform.cmake
+5 −2		core/platform/lf_arduino_support.c
+2 −6		core/platform/lf_nrf52_support.c
+531 −0		core/platform/lf_zephyr_support.c
+25 −8		core/reactor.c
+45 −19		core/reactor_common.c
+6 −2		core/threaded/CMakeLists.txt
+7 −6		core/threaded/reactor_threaded.c
+11 −3		core/utils/CMakeLists.txt
+105 −0		docs/zephyr.md
+14 −4		include/core/platform.h
+62 −0		include/core/platform/lf_zephyr_board_support.h
+82 −0		include/core/platform/lf_zephyr_support.h
+2 −2		include/core/reactor.h
+0 −1		lib/CMakeLists.txt
+1 −1		lingua-franca-ref.txt
+1 −2		test/CMakeLists.txt
+0 −1		test/Tests.cmake
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,3 +50,5 @@ else @@
         echo "Unrecognized board $BOARD"
         exit 1
     fi
+    fi