-
Notifications
You must be signed in to change notification settings - Fork 0
Current Merge List
David B edited this page Jun 25, 2021
·
60 revisions
branches to merge fawkes-robotino:
dbosen/conductive_gripper_fingers
branches to merge fawkes:
merged fawkes-robotino:
neltester/yolo_opencv
neltester/tag_vision_no_opencv_capi
dbosen/no_reset
dbosen/new_gripper_endstop
dbosen/gripper_close_slowdown
dbosen/tweak_a_toggle_steps
merged fawkes:
neltester/realsense2_save_image
neltester/cvmatadapter
thofmann/skillgui-fix-uuid-handling
put branches you want merged here!
ONLY FOR A TEST GAME
origin/neltester/motor_move_disable_catch
origin/dhabering/lua-exit-before-reset
origin/dhabering/robotino-sensor-moving-average
origin/master
origin/thofmann/clips-robot-memory-catch-bsoncxx-exception
origin/vmatare/ros-tf_dont_croak_on_quaternions
origin/dhabering/cx-plan-action-resource-locks
origin/nlimpert/map_laser_filter_improvement
origin/master
put branches you want merged here!
origin/common/cx-add-type-to-wm-facts
origin/cgollok/realsense_cfg_delay_between_errors
origin/dbosen/rc_2019_map
origin/dhabering/cx-distance-check
origin/dhabering/cx-enhance-timeout-timer
origin/dhabering/cx-fix-continuation-goals
origin/dhabering/cx-fix-mps-side-free-on-broken-mps
origin/dhabering/cx-retry-decision
origin/dhabering/cx-ignore-puck-check-in-retry
origin/dhabering/cx-pause-action-selection
origin/dhabering/cx-plan-action-resource-lcoks
origin/dhabering/cx-timeout-rework
origin/dhabering/ignore-puck-check
origin/msonnet/arduino_calibration
origin/msonnet/more_verbose_arduino_reflash
origin/msonnet/shelf_pick_revised
origin/msonnet/skiller-state
origin/neltester/debug_in_goto
origin/neltester/goto_waiting_regex_fix
origin/neltester/remove_unused_parameter
origin/neltester/rework_drive_into_field
origin/neltester/puck_check_in_shelf_pick
origin/nlimpert/laser-filters2019
origin/nlimpert/mps-laser-gen-non-static
origin/nlimpert/robotino_limits
origin/nlimpert/use_laser_pointclouds_in_ros
origin/nobuild/nlimpert/goto_fix
origin/nlimpert/wait_after_goto_in_drive_to
origin/nlimpert/laser-calibration
origin/nlimpert/ros_navigator_fail_on_unavailability
origin/tviehmann/cx-block-formulating-dupe-goals
origin/tviehmann/cx-formulate-goals-while-holding
origin/tviehmann/cx-increase-clear-bs-priority
origin/tviehmann/cx-ignore-deadline
origin/vmatare/conveyor_align_switch_realsense
origin/vmatare/conveyor_plane_cropbox_depth
origin/vmatare/conveyor_pose_laserline_selection
origin/vmatare/pick_put_safe_transform
origin/vmatare/shelf_pick_x_movement
origin/vmatare/tag_vision_rc19
origin/thofmann/rc19-crypto-key
origin/master