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.

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

Prepare RosConn Deliberation workshop example #32

Merged
merged 49 commits into from
Sep 20, 2024
Merged
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
d5f6734
new names for action results
ct2034 Sep 5, 2024
91dcdfb
workshop problem 1
ct2034 Sep 5, 2024
088ef48
Small doc image adjustment
MarcoLm993 Sep 6, 2024
a0d7e08
Prepend additional string converting ROS fields
MarcoLm993 Sep 6, 2024
cfc3cd5
New pattern to define additional arguments in ROS SCXML entries. Move…
MarcoLm993 Sep 6, 2024
edf7429
Improve conversion of ROS scxml expression to plain SCXML
MarcoLm993 Sep 6, 2024
a733415
Improve regex in expression conversion
MarcoLm993 Sep 9, 2024
d13d4a1
Introduce CallbackType in Scxml entries for enforcing ROS events in e…
MarcoLm993 Sep 9, 2024
64a77ae
Remove deprecated ROS callback and trigger reading and continue CB ty…
MarcoLm993 Sep 9, 2024
b66cfa9
Change implementation of cb type, not constructor based anymore
MarcoLm993 Sep 9, 2024
2f50848
Test adjustments
MarcoLm993 Sep 9, 2024
900b123
Address leftover for callback type integration
MarcoLm993 Sep 9, 2024
f71d738
scxml_converter tests green
MarcoLm993 Sep 9, 2024
7b10c3d
Working version of scxml ROS action
MarcoLm993 Sep 9, 2024
3753c65
Fix service handler in jani conversion, too
MarcoLm993 Sep 9, 2024
d6328ae
Fixed all remaining tests
MarcoLm993 Sep 9, 2024
2f43158
Update robotics example, too
MarcoLm993 Sep 9, 2024
e82ce37
Introduce canceled and aborted actions
MarcoLm993 Sep 9, 2024
7a4553a
Add unit test for expression conversion
MarcoLm993 Sep 9, 2024
08c32df
Additional check for expr test
MarcoLm993 Sep 9, 2024
cd94dc8
Add missing test cases for ROS action expressions
MarcoLm993 Sep 10, 2024
62a2bb5
Prepare test for extended array support
MarcoLm993 Sep 10, 2024
8b258e7
Disable test for advanced array features
MarcoLm993 Sep 10, 2024
1258acb
Implement BT-based nav controller for demo
MarcoLm993 Sep 10, 2024
f3fe227
Handle comments in tags' children
MarcoLm993 Sep 10, 2024
79c8d4b
Refine scxml in example
MarcoLm993 Sep 10, 2024
2683988
Handle possible function calls in params expressions
MarcoLm993 Sep 10, 2024
02195fd
Working BT based robotic navigation
MarcoLm993 Sep 10, 2024
107003f
Configurable bt tick rate
MarcoLm993 Sep 10, 2024
3d2b495
Customize rate frequencies
MarcoLm993 Sep 10, 2024
076b9b1
Fix timers handle and unit tests
MarcoLm993 Sep 10, 2024
ceab29c
Improve type handling functionalities in scxml utils
MarcoLm993 Sep 11, 2024
86c8d54
Add missing array types and start using new data related functions
MarcoLm993 Sep 12, 2024
306c62b
Integrate functionalities for array init using ecmascript expressions
MarcoLm993 Sep 12, 2024
fc791e7
First successful translation
MarcoLm993 Sep 12, 2024
e175ce3
Fix bugs preventing new test to pass
MarcoLm993 Sep 12, 2024
c322b2d
Move some utilities to separated file
MarcoLm993 Sep 12, 2024
d1ad9f8
Add support for explicit array in send_event
MarcoLm993 Sep 12, 2024
9bbf56a
Introduce actions used in the example
MarcoLm993 Sep 13, 2024
3240b9d
Fix models implementation and update tags
MarcoLm993 Sep 13, 2024
178551a
Enable delib-example test and bugfixes
MarcoLm993 Sep 13, 2024
9430012
First compiling example
MarcoLm993 Sep 13, 2024
1daa086
Fix missing jani variables
MarcoLm993 Sep 13, 2024
83d7467
Disable delib test, since it requires some work
MarcoLm993 Sep 13, 2024
7e1e394
Remove unused argument in main.xml BT example
MarcoLm993 Sep 18, 2024
646d669
using enum auto
ct2034 Sep 19, 2024
e6993da
Apply review changes
MarcoLm993 Sep 20, 2024
a0d0555
Allow SMC step skip in unit test
MarcoLm993 Sep 20, 2024
2a79fbb
Change expressions to match javascript syntax. Add tests
MarcoLm993 Sep 20, 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
Prev Previous commit
Next Next commit
Update robotics example, too
Signed-off-by: Marco Lampacrescia <marco.lampacrescia@de.bosch.com>
  • Loading branch information
MarcoLm993 committed Sep 18, 2024
commit 2f431588d111df572b82db81bd13d3f9366d893f
Original file line number Diff line number Diff line change
@@ -15,15 +15,15 @@
"op": "<",
"left": {
"op": "abs",
"exp": "topic_robot_pose_msg.x"
"exp": "topic_robot_pose_msg.ros_fields__x"
},
"right": 10.0
},
"right": {
"op": "<",
"left": {
"op": "abs",
"exp": "topic_robot_pose_msg.y"
"exp": "topic_robot_pose_msg.ros_fields__y"
},
"right": 10.0
}
@@ -37,7 +37,7 @@
"op": "abs",
"exp": {
"op": "-",
"left": "topic_robot_pose_msg.x",
"left": "topic_robot_pose_msg.ros_fields__x",
"right": 5.0
}
},
@@ -49,7 +49,7 @@
"op": "abs",
"exp": {
"op": "-",
"left": "topic_robot_pose_msg.y",
"left": "topic_robot_pose_msg.ros_fields__y",
"right": -2.0
}
},