Skip to content

Commit

Permalink
Merge branch 'main' into autopushing
Browse files Browse the repository at this point in the history
  • Loading branch information
cbrxyz committed Dec 27, 2024
2 parents 5f8109f + d011e80 commit 9540a26
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 2 additions & 2 deletions scripts/setup.bash
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
MIL_REPO="$HOME/mil2/src"
MIL_REPO="$HOME/mil2"

if [[ $(ps -p $$ | tail -n 1 | awk '{ print $4 }') == "zsh" ]]; then
source /opt/ros/jazzy/setup.zsh
Expand All @@ -8,7 +8,7 @@ fi

_list_complete() {
local THING
THINGS=("$1")
THINGS=("$1")
for THING in "${THINGS[@]}"; do
if [[ -z $2 || -n "$(echo "${THING:0:${#2}}" | grep "$2")" ]]; then
COMPREPLY+=("$THING")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from typing import Union

import rclpy
from rclpy.duration import Duration
from std_msgs.msg import Float32, String
from std_srvs.srv import Empty

Expand Down Expand Up @@ -94,7 +93,6 @@ def trigger(self, _: Empty.Request, response: Empty.Response):
self.send_packet(
RequestAddPacket(number_one=self.num_one, number_two=self.num_two),
)
self.get_clock().sleep_for(Duration(seconds=1))
return response

def trigger_two(self, _: Empty.Request, response: Empty.Response):
Expand Down

0 comments on commit 9540a26

Please sign in to comment.