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

Hackathon #4

Merged
merged 101 commits into from
Jul 4, 2024
Merged

Hackathon #4

merged 101 commits into from
Jul 4, 2024

Conversation

ct2034
Copy link
Member

@ct2034 ct2034 commented Jun 12, 2024

No description provided.

ct2034 and others added 30 commits June 12, 2024 10:23
@ct2034
Marcos Question
b51c4e3 
Signed-off-by: Christian Henkel <[email protected]>
@ct2034
Note on architecture
6a6e637 
Signed-off-by: Christian Henkel <[email protected]>
@ct2034
spelling, cleanup
36ab9ab 
Signed-off-by: Christian Henkel <[email protected]>
@ct2034
empty files for future implementations
29d7858 
Signed-off-by: Christian Henkel <[email protected]>
@ct2034
adding return event to bt plugin implementation
3edcf05 
Signed-off-by: Christian Henkel <[email protected]>
@MarcoLm993
Introduce initial scxml entries
16caf95 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Move files to correct folder and add missing entries
b3c1ef8 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Implement scxml param
a56559c 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Implement data and xml conversion for base scxml entries
9628def 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
First untested version of scxml model
911afdd 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Write system test
47fd779 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Resolve cyclic dependencies using FW declaration
7f58f3a 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Running scxml_entries system test
407c707 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Adapt system test for ros to plain scxml. Needs alignment
7921177 
Signed-off-by: Marco Lampacrescia <[email protected]>
@ct2034
eof new line
efad742 
Signed-off-by: Christian Henkel <[email protected]>
@ct2034
instantiation of bt leaves
6cda6d7 
Signed-off-by: Christian Henkel <[email protected]>
@MarcoLm993
Small todo to get clarification
b46b630 
Signed-off-by: Marco Lampacrescia <[email protected]>
@ct2034
making plugin events unique
bbf997c 
Signed-off-by: Christian Henkel <[email protected]>
@ct2034
first steps bt runtime
99e25f6 
Signed-off-by: Christian Henkel <[email protected]>
@MarcoLm993
Remove send targets
151c892 
Signed-off-by: Marco Lampacrescia <[email protected]>
@ct2034
bt translation with events
a1e5771 
Signed-off-by: Christian Henkel <[email protected]>
@ct2034
renaming ros-specific tags
4093b4c 
Signed-off-by: Christian Henkel <[email protected]>
@MarcoLm993
Define Ros specific entries in separated file
3bee6cb 
Signed-off-by: Marco Lampacrescia <[email protected]>
@ct2034
using ros tag in exmpl
ba31ff7 
Signed-off-by: Christian Henkel <[email protected]>
@ct2034
this is generated by the test
ce15acb 
Signed-off-by: Christian Henkel <[email protected]>
@ct2034
asserting existence of file
f4a1858 
Signed-off-by: Christian Henkel <[email protected]>
@ct2034
importing the ros rate timer from somewhere else
7c5210d 
Signed-off-by: Christian Henkel <[email protected]>
@ct2034
fixing line length
eb86a3f 
Signed-off-by: Christian Henkel <[email protected]>
@ct2034
formatting
50f5efc 
Signed-off-by: Christian Henkel <[email protected]>
@MarcoLm993
WIP: Implement ros entries
bd49f83 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Fix If tag conversion
2c916f6 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Add dependency installation for ROS pkgs
cfba14e 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993 MarcoLm993 force-pushed the add/hackathon_240612 branch from aeb0070 to cfba14e Compare June 28, 2024 12:26
@MarcoLm993
Do not test dependency repos
effde20 
Signed-off-by: Marco Lampacrescia <[email protected]>
MarcoLm993
MarcoLm993 reviewed Jun 28, 2024
View reviewed changes
.github/workflows/test.yml Outdated
@@ -28,12 +28,12 @@ jobs:
with:
repository: boschresearch/bt_tools
ref: feature/fsm_conversion
path: colcon_ws/src/bt_tools
path: /colcon_ws/src/bt_tools
Copy link
Collaborator

Choose a reason for hiding this comment

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

It seems GH actions do not like global paths :(
I made it relative again and made sure we test only the pkgs we need

MarcoLm993 and others added 21 commits July 1, 2024 13:43
@MarcoLm993
Add plain scxml check
b4103ca 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Check ros macros validity and fix bug with empty datamodel
1925a4e 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Fix msg import and add missing checks
551afba 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Move RosDeclaration generation to separated method for reusability an…
8cf1f9f 
…d test plain_scxml check

Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Introduce ScxmlBase base cclass and prepare to_plain_scxml method
07aef7d 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Implement basic structure of scxml de-rosification
364a001 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Move utils to separate file for easier dependency tree
3d7849c 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Finish conversion to plain scxml and replace previous one
d547a1c 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Add condition for topic and rate callbacks
da05638 
Signed-off-by: Marco Lampacrescia <[email protected]>
@ct2034
changing name to location in assign tag
0e1a689 
Signed-off-by: Christian Henkel <[email protected]>
@ct2034
implementing if's
d7296da 
Signed-off-by: Christian Henkel <[email protected]>
@ct2034
event fixes
6bd9588 
Signed-off-by: Christian Henkel <[email protected]>
@MarcoLm993
Make sure smc_storm terminates in the tests
2f621b1 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
First version passing the old tests
13f63fb 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Green!
7b2f533 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
First complete and green version! Wohoo
568c311 
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Re-enable timer in bt scxml and spotting more bugs
8012a72 
Signed-off-by: Marco Lampacrescia <[email protected]>
@ct2034
correct expected output
305f51b 
Signed-off-by: Christian Henkel <[email protected]>
@ct2034
fix for if problem
402491d 
Signed-off-by: Christian Henkel <[email protected]>
@MarcoLm993 @ct2034
Fix GT file for in bt test and first battery drained and charged
8db7e90 
Co-authored-by: Christian Henkel <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993
Some more tests
56b11bf 
Signed-off-by: Marco Lampacrescia <[email protected]>
@ct2034 ct2034 marked this pull request as ready for review July 4, 2024 13:31
MarcoLm993
MarcoLm993 approved these changes Jul 4, 2024
View reviewed changes
Copy link
Collaborator

@MarcoLm993 MarcoLm993 left a comment

Choose a reason for hiding this comment

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

Everything looks lovely!

@MarcoLm993 MarcoLm993 merged commit 632f0f3 into main Jul 4, 2024
2 checks passed
@MarcoLm993 MarcoLm993 deleted the add/hackathon_240612 branch July 4, 2024 13:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarcoLm993 MarcoLm993 MarcoLm993 approved these changes

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

Successfully merging this pull request may close these issues.
2 participants
@ct2034 @MarcoLm993