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

Jump to bottom

Watchdog support for the C target #1730

Merged
merged 139 commits into from
May 19, 2023
Merged

Watchdog support for the C target #1730

merged 139 commits into from
May 19, 2023

Conversation

Benichiwa
Copy link
Contributor

This implements the watchdog feature as mentioned in the discussion: "Watchdogs #1379", and is meant to replace PR #1605, which is unmergeable because of formatting issues.

This is coauthored with @edwardalee.

Benjamin Asch and others added 30 commits December 25, 2022 16:29
added func for watchdog name, created watchdog instance class
718eaab
made some progress on code generation
43bb491
more functions added for code generation
20531f0
saving progress before pushing
371385e
fixed grammar(added watchdog to 'varreformodetransition', removed wat…
86c369d 
…chdog from reaction)
added watchdog grammar to reactor
15fc495
making sure updated before push
6124cae
code generation steps (excluding mutex initialization) should be done…
3798f3a 
…, I think
generatewatchdogstruct in generateselfstruct
bf4fd4c
save changes to watchdog
b87327f
merge conflicts resolved
4f2fbb1
@lhstrh
Added a few missing imports, but plenty compile errors remain
c8c569c
saving before merging
10cf741
think fixed merge conflicts?
63c624f
at least it compiles now
90d002f
Merge remote-tracking branch 'origin/master' into watchdogs
45f0f9f
fixed build problems
4db9e0f
tried, unsuccessfully, to fix variable grammar error
f7b177e
watchdog example test
0487e8e
saving reactorc and changes to scopeprovider
ca78125
saving changes to scope provider
c36cc80
@lhstrh
Fixed the scope provider
94185e7
Merge branch 'watchdogs' of github.com:lf-lang/lingua-franca into wat…
41e9487 
…chdogs
fixed trigger table
1726124
saved?
6994d46
merged from main
29b7890
@lhstrh
Merge master into watchdogs
43f8999
fixed compile issues
3393c58
fixing before merge
78405a3
added casewatchdogs, still not fixed
976b102
@lhstrh lhstrh changed the title Watchdogs-eal2 Watchdog support for the C target May 12, 2023
@edwardalee edwardalee mentioned this pull request May 15, 2023
Merged
edwardalee
edwardalee approved these changes May 17, 2023
View reviewed changes
Copy link
Collaborator

@edwardalee edwardalee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

lhstrh
lhstrh approved these changes May 18, 2023
View reviewed changes
Copy link
Member

@lhstrh lhstrh left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great! Only one (very minor) issue; I flagged an unaddressed FIXME.

org.lflang/src/org/lflang/generator/c/CWatchdogGenerator.java Outdated Show resolved Hide resolved
@edwardalee edwardalee merged commit 03310fa into master May 19, 2023
@cmnrd cmnrd deleted the watchdogs-eal2 branch June 8, 2023 07:44
@petervdonovan petervdonovan added the feature New feature label Aug 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edwardalee edwardalee edwardalee approved these changes

@lhstrh lhstrh lhstrh approved these changes

Assignees
No one assigned
Labels
feature New feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Benichiwa @edwardalee @lhstrh @petervdonovan