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

Prepare RosConn Deliberation workshop example #32

merged 49 commits into from
Sep 20, 2024

Conversation

MarcoLm993
Copy link
Collaborator

@MarcoLm993 MarcoLm993 commented Sep 6, 2024

The main changes in this PR are:

@MarcoLm993 MarcoLm993 marked this pull request as ready for review September 12, 2024 15:51
Copy link
Member

@MKlauck MKlauck left a comment

Choose a reason for hiding this comment

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

Uhh, that's a huge PR. Thank you very much for all the work 👍 Looks good to me, as far as I can tell. Not sure if we should wait for Christian's review until merging.

@MarcoLm993
Copy link
Collaborator Author

Yes, let's wait for Christian. I will also turn his example into a test, so we can consider this PR truly complete.

ct2034 and others added 24 commits September 18, 2024 14:55
Co-authored-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Christian Henkel <[email protected]>
Signed-off-by: Christian Henkel <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
… goal_id to args list

Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
def prepend_math_functions(expr: str) -> str:
"""Append 'Math.' to the functions in the provided expression and return a copy."""
for fun in MATH_FUNCTIONS:
expr = re.sub(rf"(^|[^a-zA-Z0-9_]){fun}\(", rf"\g<1>Math.{fun}(", expr)
Copy link
Member

@ct2034 ct2034 Sep 19, 2024

Choose a reason for hiding this comment

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

As discussed, I would prefer to keep the Math., because that's how js works

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, that makes sense. I will change this tomorrow. FYI: @m-morelli @SofiaFaraci

Comment on lines 61 to 69
STATE = 0 # No callback (e.g. state entry/exit)
TRANSITION = 1 # Transition callback
ROS_TIMER = 2 # Timer callback
ROS_TOPIC = 3 # Topic callback
ROS_SERVICE_REQUEST = 4 # Service callback
ROS_SERVICE_RESULT = 5 # Service callback
ROS_ACTION_GOAL = 6 # Action callback
ROS_ACTION_RESULT = 7 # Action callback
ROS_ACTION_FEEDBACK = 8 # Action callback
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
STATE = 0 # No callback (e.g. state entry/exit)
TRANSITION = 1 # Transition callback
ROS_TIMER = 2 # Timer callback
ROS_TOPIC = 3 # Topic callback
ROS_SERVICE_REQUEST = 4 # Service callback
ROS_SERVICE_RESULT = 5 # Service callback
ROS_ACTION_GOAL = 6 # Action callback
ROS_ACTION_RESULT = 7 # Action callback
ROS_ACTION_FEEDBACK = 8 # Action callback
STATE = auto() # No callback (e.g. state entry/exit)
TRANSITION = auto() # Transition callback
ROS_TIMER = auto() # Timer callback
ROS_TOPIC = auto() # Topic callback
ROS_SERVICE_REQUEST = auto() # Service callback
ROS_SERVICE_RESULT = auto() # Service callback
ROS_ACTION_GOAL = auto() # Action callback
ROS_ACTION_RESULT = auto() # Action callback
ROS_ACTION_FEEDBACK = auto() # Action callback

This way its more maintainable. And you need from enum import auto.

ct2034 and others added 4 commits September 19, 2024 16:28
Signed-off-by: Christian Henkel <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Marco Lampacrescia <[email protected]>
@MarcoLm993 MarcoLm993 merged commit b26fcb9 into main Sep 20, 2024
17 checks passed
ct2034 pushed a commit that referenced this pull request Sep 25, 2024
…lities (#32)

Signed-off-by: Marco Lampacrescia <[email protected]>
Signed-off-by: Christian Henkel <[email protected]>
@MarcoLm993 MarcoLm993 deleted the delibws24 branch October 11, 2024 12:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants