Skip to content

Commit bffa484

Browse files
committed
Merge branch 'main' into amaln/ros2_dummy_nodes
2 parents fef89c0 + 420f68f commit bffa484

File tree

7 files changed

+48
-42
lines changed

7 files changed

+48
-42
lines changed

feeding_web_app_ros2_test/feeding_web_app_ros2_test/publisher.py

+5-6
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@
66

77

88
class MinimalPublisher(Node):
9-
109
def __init__(self):
11-
super().__init__('minimal_publisher')
12-
self.publisher_ = self.create_publisher(String, 'test_topic', 10)
10+
super().__init__("minimal_publisher")
11+
self.publisher_ = self.create_publisher(String, "test_topic", 10)
1312
timer_period = 0.5 # seconds
1413
self.timer = self.create_timer(timer_period, self.timer_callback)
1514
self.i = 0
1615

1716
def timer_callback(self):
1817
msg = String()
19-
msg.data = 'Hello World: %d' % self.i
18+
msg.data = "Hello World: %d" % self.i
2019
self.publisher_.publish(msg)
2120
self.get_logger().info('Publishing: "%s"' % msg.data)
2221
self.i += 1
@@ -36,5 +35,5 @@ def main(args=None):
3635
rclpy.shutdown()
3736

3837

39-
if __name__ == '__main__':
40-
main()
38+
if __name__ == "__main__":
39+
main()
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
#!/usr/bin/env python3
2-
from feeding_web_app_ros2_msgs.srv import ReverseString # CHANGE
2+
from feeding_web_app_ros2_msgs.srv import ReverseString # CHANGE
33

44
import rclpy
55
from rclpy.node import Node
66

77

88
class MinimalService(Node):
9-
109
def __init__(self):
11-
super().__init__('reverse_string')
12-
self.srv = self.create_service(ReverseString, 'reverse_string', self.reverse_string_callback)
10+
super().__init__("reverse_string")
11+
self.srv = self.create_service(
12+
ReverseString, "reverse_string", self.reverse_string_callback
13+
)
1314

1415
def reverse_string_callback(self, request, response):
1516
response.reversed = request.input[::-1]
16-
self.get_logger().info('Incoming request\ninput: %s' % (request.input))
17+
self.get_logger().info("Incoming request\ninput: %s" % (request.input))
1718
return response
1819

20+
1921
def main(args=None):
2022
rclpy.init(args=args)
2123

@@ -25,5 +27,6 @@ def main(args=None):
2527

2628
rclpy.shutdown()
2729

28-
if __name__ == '__main__':
29-
main()
30+
31+
if __name__ == "__main__":
32+
main()

feeding_web_app_ros2_test/feeding_web_app_ros2_test/sort_by_character_frequency_action.py

+18-13
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,35 @@
99
import inspect
1010
from feeding_web_app_ros2_msgs.action import SortByCharacterFrequency
1111

12-
class MinimalAction(Node):
1312

13+
class MinimalAction(Node):
1414
def __init__(self, sleep_time=0.1):
15-
super().__init__('sort_by_character_frequency')
15+
super().__init__("sort_by_character_frequency")
1616
self.sleep_time = sleep_time
1717
self._action_server = ActionServer(
1818
self,
1919
SortByCharacterFrequency,
20-
'sort_by_character_frequency',
20+
"sort_by_character_frequency",
2121
self.execute_callback,
2222
goal_callback=self.goal_callback,
23-
cancel_callback=self.cancel_callback)
23+
cancel_callback=self.cancel_callback,
24+
)
2425

2526
def goal_callback(self, goal_request):
2627
"""Accept or reject a client request to begin an action."""
2728
# This server allows multiple goals in parallel
28-
self.get_logger().info('Received goal request')
29+
self.get_logger().info("Received goal request")
2930
return GoalResponse.ACCEPT
3031

3132
def cancel_callback(self, goal_handle):
3233
"""Accept or reject a client request to cancel an action."""
33-
self.get_logger().info('Received cancel request')
34+
self.get_logger().info("Received cancel request")
3435
return CancelResponse.ACCEPT
3536

3637
async def execute_callback(self, goal_handle):
37-
self.get_logger().info('Executing goal...%s | %s' % (goal_handle, repr(goal_handle.request.input)))
38+
self.get_logger().info(
39+
"Executing goal...%s | %s" % (goal_handle, repr(goal_handle.request.input))
40+
)
3841
input = goal_handle.request.input
3942

4043
feedback_msg = SortByCharacterFrequency.Feedback()
@@ -43,7 +46,7 @@ async def execute_callback(self, goal_handle):
4346
for i in range(len(input)):
4447
# Check if there is a cancel request
4548
if goal_handle.is_cancel_requested:
46-
self.get_logger().info('Goal canceled')
49+
self.get_logger().info("Goal canceled")
4750
goal_handle.canceled()
4851
return SortByCharacterFrequency.Result()
4952

@@ -55,18 +58,20 @@ async def execute_callback(self, goal_handle):
5558

5659
# Update our progress
5760
feedback_msg.progress = float(i) / float(len(input))
58-
self.get_logger().info('Feedback: %f' % feedback_msg.progress)
61+
self.get_logger().info("Feedback: %f" % feedback_msg.progress)
5962
goal_handle.publish_feedback(feedback_msg)
6063

61-
# Sleep (to simulate the delay that a robot might have during a
64+
# Sleep (to simulate the delay that a robot might have during a
6265
# ROS action)
6366
time.sleep(self.sleep_time)
6467

6568
goal_handle.succeed()
6669

6770
result = SortByCharacterFrequency.Result()
6871
uniqueLetters = "".join(character_frequency.keys())
69-
result.result = "".join(sorted(uniqueLetters, key=lambda x: character_frequency[x], reverse=True))
72+
result.result = "".join(
73+
sorted(uniqueLetters, key=lambda x: character_frequency[x], reverse=True)
74+
)
7075
return result
7176

7277

@@ -81,5 +86,5 @@ def main(args=None):
8186
rclpy.spin(minimal_action, executor=executor)
8287

8388

84-
if __name__ == '__main__':
85-
main()
89+
if __name__ == "__main__":
90+
main()

feeding_web_app_ros2_test/feeding_web_app_ros2_test/subscriber.py

+5-8
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@
66

77

88
class MinimalSubscriber(Node):
9-
109
def __init__(self):
11-
super().__init__('minimal_subscriber')
10+
super().__init__("minimal_subscriber")
1211
self.subscription = self.create_subscription(
13-
String,
14-
'test_topic',
15-
self.listener_callback,
16-
10)
12+
String, "test_topic", self.listener_callback, 10
13+
)
1714
self.subscription # prevent unused variable warning
1815

1916
def listener_callback(self, msg):
@@ -34,5 +31,5 @@ def main(args=None):
3431
rclpy.shutdown()
3532

3633

37-
if __name__ == '__main__':
38-
main()
34+
if __name__ == "__main__":
35+
main()

feeding_web_app_ros2_test/test/test_copyright.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717

1818

1919
# Remove the `skip` decorator once the source file(s) have a copyright header
20-
@pytest.mark.skip(reason='No copyright header has been placed in the generated source file.')
20+
@pytest.mark.skip(
21+
reason="No copyright header has been placed in the generated source file."
22+
)
2123
@pytest.mark.copyright
2224
@pytest.mark.linter
2325
def test_copyright():
24-
rc = main(argv=['.', 'test'])
25-
assert rc == 0, 'Found errors'
26+
rc = main(argv=[".", "test"])
27+
assert rc == 0, "Found errors"

feeding_web_app_ros2_test/test/test_flake8.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
@pytest.mark.linter
2121
def test_flake8():
2222
rc, errors = main_with_errors(argv=[])
23-
assert rc == 0, \
24-
'Found %d code style errors / warnings:\n' % len(errors) + \
25-
'\n'.join(errors)
23+
assert rc == 0, "Found %d code style errors / warnings:\n" % len(
24+
errors
25+
) + "\n".join(errors)

feeding_web_app_ros2_test/test/test_pep257.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@
1919
@pytest.mark.linter
2020
@pytest.mark.pep257
2121
def test_pep257():
22-
rc = main(argv=['.', 'test'])
23-
assert rc == 0, 'Found code style errors / warnings'
22+
rc = main(argv=[".", "test"])
23+
assert rc == 0, "Found code style errors / warnings"

0 commit comments

Comments
 (0)