Skip to content

Commit

Permalink
Merge pull request #2248 from lf-lang/zepyhr-kconfig
Browse files Browse the repository at this point in the history 
Make the Kernel timer the default clock for Zephyr
  • Loading branch information
@erlingrj
erlingrj authored Apr 12, 2024
2 parents 2179837 + 3a64507 commit 9b4d699
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion core/src/main/resources/lib/c/reactor-c
Submodule reactor-c updated 26 files
+46 −21 core/environment.c
+23 −31 core/federated/federate.c
+7 −18 core/modal_models/modes.c
+6 −12 core/reactor.c
+65 −195 core/reactor_common.c
+14 −19 core/threaded/reactor_threaded.c
+6 −15 core/utils/pqueue.c
+27 −17 core/utils/pqueue_base.c
+0 −114 core/utils/pqueue_support.h
+19 −15 core/utils/pqueue_tag.c
+2 −3 include/core/environment.h
+1 −1 include/core/federated/federate.h
+3 −3 include/core/federated/network/net_common.h
+4 −6 include/core/lf_types.h
+9 −10 include/core/reactor_common.h
+5 −35 include/core/utils/pqueue.h
+14 −8 include/core/utils/pqueue_base.h
+42 −1 include/core/utils/pqueue_tag.h
+31 −37 lib/schedule.c
+1 −24 low_level_platform/api/platform/lf_zephyr_board_support.h
+0 −23 low_level_platform/api/platform/lf_zephyr_support.h
+6 −2 low_level_platform/impl/CMakeLists.txt
+0 −2 low_level_platform/impl/src/lf_zephyr_clock_counter.c
+41 −29 low_level_platform/impl/src/lf_zephyr_clock_kernel.c
+0 −2 platform/impl/CMakeLists.txt
+3 −0 tag/api/tag.h
6 changes: 0 additions & 6 deletions core/src/main/resources/lib/platform/zephyr/prj_lf.conf
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
# Lingua Franca Zephyr configuration file

# This is a generated file, do not edit.
# To supply additional configuration parameters add an additional
# configuration file to the build with
# west build -b qemu_cortex_m3 -- -DOVERLAY_CONFIG=my_conf.prj

# Enable printf
CONFIG_PRINTK=y
# Use the newlib C library
CONFIG_NEWLIB_LIBC=y
CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y
# Enable the counter API used for hi-res clock
CONFIG_COUNTER=y
CONFIG_THREAD_CUSTOM_DATA=y

0 comments on commit 9b4d699

Please sign in to comment.