Skip to content
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

Make the Kernel timer the default clock for Zephyr #2248

Merged
merged 7 commits into from
Apr 12, 2024
Merged

Make the Kernel timer the default clock for Zephyr #2248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a455f38
Select kernel clock or counter clock with a Kconfig option
erlingrj Mar 21, 2024
c5ae05a
Make Zephyr kernel clock the default.
erlingrj Mar 22, 2024
b82e6a9
Merge branch 'master' into zepyhr-kconfig
erlingrj Mar 22, 2024
d996b8c
Bump reactor-c
erlingrj Mar 23, 2024
3e8b707
Merge branch 'zepyhr-kconfig' of github.com:lf-lang/lingua-franca int…
erlingrj Mar 23, 2024
bb445c0
Remove outdated changes in Kconfig
erlingrj Apr 12, 2024
3a64507
Merge remote-tracking branch 'origin/master' into zepyhr-kconfig
erlingrj Apr 12, 2024
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
2 changes: 1 addition & 1 deletion core/src/main/resources/lib/c/reactor-c
Open in desktop
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
Open in desktop
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
Loading