Skip to content

Commit

Permalink
add support for cabot3-kx (#90)
Browse files Browse the repository at this point in the history
* kufusha wip

Signed-off-by: Daisuke Sato <[email protected]>

* bugfix

Signed-off-by: Daisuke Sato <[email protected]>

* Revert "bugfix"

This reverts commit f65fe86.

* temporal fix of cabot rotation shim controller

Signed-off-by: Daisuke Sato <[email protected]>

* update the default parameter values of TF speed control node

Signed-off-by: Masayuki Murata <[email protected]>

* add a diagnostic config file for cabot3-k1

Signed-off-by: Masayuki Murata <[email protected]>

* update the ublox node config file for diagnostic

Signed-off-by: Masayuki Murata <[email protected]>

* temporarily change version of dependency packages

Signed-off-by: yushi-minemura <[email protected]>

* use dev branches

Signed-off-by: Daisuke Sato <[email protected]>

---------

Signed-off-by: Daisuke Sato <[email protected]>
Signed-off-by: Masayuki Murata <[email protected]>
Signed-off-by: yushi-minemura <[email protected]>
Co-authored-by: Daisuke Sato <[email protected]>
Co-authored-by: Masayuki Murata <[email protected]>
  • Loading branch information
3 people authored Nov 20, 2024
1 parent 68e0757 commit efba53d
Show file tree
Hide file tree
Showing 5 changed files with 148 additions and 8 deletions.
2 changes: 2 additions & 0 deletions cabot/config/cabot-control.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ cabot:
tf_speed_control_node: # old name cabot_e_tf_speed:
ros__parameters:
limit_topic: /cabot/tf_speed
tf_decel_timeout: 0.3
tf_timeout: 0.5

touch_speed_control_node:
ros__parameters:
Expand Down
142 changes: 142 additions & 0 deletions cabot_ui/config/cabot3-k1_diagnostic.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,142 @@
cadiagnostic_aggregator:
ros__parameters:
pub_rate: 1.0
path: CaBot
joy:
type: diagnostic_aggregator/DiscardAnalyzer
path: joy
startswith:
- "joy_node"

discard:
type: diagnostic_aggregator/DiscardAnalyzer
path: discard
contains:
- "Push Button 5"
- "PeoplePredict"
- "realsense2_camera_manager_aligned_depth_to_color: Frequency Status"

soft_cabot_ui:
type: diagnostic_aggregator/GenericAnalyzer
path: "Soft: UI Manager"
contains:
- "UI Manager"
remove_prefix:
- "cabot_ui cabot_ui_manager: "

soft_localize:
type: diagnostic_aggregator/GenericAnalyzer
path: "Soft: Localize"
contains:
- "Localize Status"
remove_prefix:
- "multi_floor_manager: "

soft_odometry:
type: diagnostic_aggregator/GenericAnalyzer
path: "Soft: Odometry"
contains:
- "ekf_node"
remove_prefix:
- "ekf_node: "

soft_people:
type: diagnostic_aggregator/GenericAnalyzer
path: "Soft: People_and_Obstacle"
contains:
- "People"
- "Obstacle"
- "Queue"
remove_prefix:
- "camera detect_darknet_opencv_node: "
- "camera realsense2_camera_manager: "
- "predict_kf_people_py: "
- "track_sort_3d_people_py: "
- "detect_queue_people_py: "
- "track_obstacle: "
- "predict_obstacle: "

soft_rs:
type: diagnostic_aggregator/AnalyzerGroup
path: "Camera"
analyzers:
front:
type: diagnostic_aggregator/GenericAnalyzer
path: "Front"
contains:
- "rs1"
remove_prefix:
- "detect_darknet_people_cpp: "
soft_rs2:
type: cabot_diagnostics/CabotAnalyzer
path: "Right"
contains:
- "rs2"
remove_prefix:
- "detect_darknet_people_cpp: "
treat_as_warning: true
soft_rs3:
type: cabot_diagnostics/CabotAnalyzer
path: "Left"
contains:
- "rs3"
remove_prefix:
- "detect_darknet_people_cpp: "
treat_as_warning: true

soft_ros2:
type: diagnostic_aggregator/GenericAnalyzer
path: "Soft: Navigation2"
contains:
- "ROS2"
- "Nav2"
remove_prefix:
- "lifecycle_manager_navigation"
- "lifecycle_manager_local_navigation"
- "lifecycle_manager_localization"

hard_wireless:
type: diagnostic_aggregator/GenericAnalyzer
path: "Hard: Wireless"
contains:
- "Beacon Scanner"
- "Beacon Converter"
# - "esp32_wifi_scan_converter: "
# - "rosserial_esp32: "
remove_prefix:
- "dbus_ibeacon_scanner: "
- "ble_scan_converter: "
# - "esp32_wifi_scan_converter: "
# - "rosserial_esp32: "

# TODO
# hard_micon:
# type: diagnostic_aggregator/GenericAnalyzer
# path: "Hard: Micro Controller"
# contains:
# - "Rosserial Connection"
# - "Push Button 1"
# - "Push Button 2"
# - "Push Button 3"
# - "Push Button 4"
# - "Touch Sensor"
# - "cabot_serial: "
# remove_prefix:
# - "cabot_serial: "

# TODO
# hard_odrive:
# type: diagnostic_aggregator/GenericAnalyzer
# path: "Hard: Odrive"
# contains:
# - "odrive"
# remove_prefix:
# - "cabot odriver_node: "

hard_hesailidar:
type: diagnostic_aggregator/GenericAnalyzer
path: "Hard: HesaiLidar"
contains:
- "hesai"
remove_prefix:
- "hesai_lidar: "
4 changes: 2 additions & 2 deletions dependency.repos
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ repositories:
cabot-common:
type: git
url: https://github.com/CMU-cabot/cabot-common
version: main
version: dev

cabot-description:
type: git
url: https://github.com/CMU-cabot/cabot-description
version: main
version: dev
6 changes: 0 additions & 6 deletions docker-compose-build.yaml

This file was deleted.

2 changes: 2 additions & 0 deletions mf_localization/configuration_files/ublox/zed_f9p_rover.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ ublox:
uart1:
baudrate: 230400

rate: 10.0 # Hz

# message publishers
publish:
all: false
Expand Down

0 comments on commit efba53d

Please sign in to comment.