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

Fix/object-key-convention #50

Open
wants to merge 3 commits into
base: humble-devel
Choose a base branch
from
Open

Fix/object-key-convention #50

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb36596
Update OrderState.msg
bekirbostanci Jan 24, 2024
8fc7d8f
fix: changed order object error key convertion to camelCase
bekirbostanci Jan 24, 2024
38f2cd8
Revert "Update OrderState.msg"
bekirbostanci Jan 30, 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
11 changes: 5 additions & 6 deletions vda5050_connector/vda5050_connector_py/vda5050_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1171,8 +1171,8 @@ def _accept_order(self, order: VDAOrder, mode: OrderAcceptModes):
# Only on stitching updates the node and edges base states are kept
self._update_state(
{
"order_id": order.order_id,
"order_update_id": order.order_update_id,
"orderId": order.order_id,
"orderUpdateId": order.order_update_id,
Comment on lines +1174 to +1175
Copy link
Member

Choose a reason for hiding this comment

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

This are already handled by vda5050_connector_py/mqtt_bridge.py using convert_ros_message_to_json, aren't they ?

"errors": errors,
"node_states": (mode == OrderAcceptModes.STITCH) * self._current_state.node_states
+ self._get_node_states(order),
Expand Down Expand Up @@ -1208,19 +1208,18 @@ def _reject_order(self, order: VDAOrder, error: OrderRejectErrors, description:
if error == OrderRejectErrors.ORDER_UPDATE_ERROR:
# On orderUpdateError send orderUpdateId and orderId as reference

# TODO: Question: camelCase or snakeCase (order_id or orderId)
error_references.append(
VDAErrorReference(reference_key="order_id", reference_value=order.order_id)
VDAErrorReference(reference_key="orderId", reference_value=order.order_id)
)
error_references.append(
VDAErrorReference(
reference_key="order_update_id", reference_value=str(order.order_update_id)
reference_key="orderUpdateId", reference_value=str(order.order_update_id)
)
)
elif error == OrderRejectErrors.NO_ROUTE_ERROR:
# On noRouteError send 1st node as reference
error_references.append(
VDAErrorReference(reference_key="node_id", reference_value=order.nodes[0].node_id)
VDAErrorReference(reference_key="nodeId", reference_value=order.nodes[0].node_id)
Comment on lines +1212 to +1222
Copy link
Member

Choose a reason for hiding this comment

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

This are ok to change because it seems they aren't handled by convert_ros_message_to_json()

)

order_error = VDAError()
Expand Down
2 changes: 1 addition & 1 deletion vda5050_msgs/msg/OrderState.msg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ string operating_mode # Enum {AUTOMATIC, SEMIAUTO

vda5050_msgs/Error[] errors # Array of errorobjects. Empty array if there are no errors.

vda5050_msgs/Info[] informations # Array of info-objects. An empty array indicates that the AGV has no information.
vda5050_msgs/Info[] information # Array of info-objects. An empty array indicates that the AGV has no information.
Copy link
Member

Choose a reason for hiding this comment

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

Hey I believe all changes to this field name must be in the same PR. If we merge this PR as is, it can break stuff such as vda5050_connector_py/vda5050_controller.py because it still references informations field

Copy link
Author

Choose a reason for hiding this comment

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

this shouldnt be here it is my wrong there are 2 separated merge request (informations and convention) I can revert it

# This should only be used for visualization or debugging – it must not be used for logic in master control

vda5050_msgs/SafetyState safety_state # Contains all safetyrelated information.
Expand Down