From e04b4f31058ca99cc779c6bd2a9c3d7dc28bc7ba Mon Sep 17 00:00:00 2001
From: mpasynkov <pasynkovmaksim957@gmail.com>
Date: Mon, 28 Oct 2024 20:25:56 +0300
Subject: [PATCH 1/2] P-regulator was added

---
 launch/square.launch.py | 25 +++++++++++++++++++++
 lesson_05/square.py     | 49 +++++++++++++++++++++++++++++++++++++++++
 setup.py                |  1 +
 3 files changed, 75 insertions(+)
 create mode 100644 launch/square.launch.py
 create mode 100644 lesson_05/square.py

diff --git a/launch/square.launch.py b/launch/square.launch.py
new file mode 100644
index 0000000..6456b18
--- /dev/null
+++ b/launch/square.launch.py
@@ -0,0 +1,25 @@
+from launch import LaunchDescription
+from launch_ros.actions import Node
+
+
+def generate_launch_description():
+    return LaunchDescription([
+        Node(
+            package='turtlesim',
+            namespace='',
+            executable='turtlesim_node',
+            name='sim'
+        ),
+        Node(
+            package='lesson_05',
+            namespace='',
+            executable='mover',
+            name='mover'
+        ),
+        Node(
+            package='rqt_plot',
+            namespace='',
+            executable='rqt_plot',
+            name='rqt'
+        )
+    ])
\ No newline at end of file
diff --git a/lesson_05/square.py b/lesson_05/square.py
new file mode 100644
index 0000000..c70e987
--- /dev/null
+++ b/lesson_05/square.py
@@ -0,0 +1,49 @@
+import rclpy
+from rclpy.node import Node
+
+from geometry_msgs.msg import Twist
+from turtlesim.msg import Pose
+import math
+
+
+def angle_diff(a1, a2):
+    a = a1-a2
+    return (a+math.pi)%(2*math.pi)-math.pi
+
+
+class RurMover(Node):
+    def __init__(self):
+        super().__init__('minimal_publisher')
+        self.publisher_twist = self.create_publisher(Twist, 'turtle1/cmd_vel', 10)
+        self.pose_subscriber = self.create_subscription(Pose, 'turtle1/pose', self.pose_callback, 10)
+        self.desired_heading = - math.pi / 2
+        self.SIDE_TIME = 5.0
+        self.LINEAR_SPEED = 0.5
+        self.timer = self.create_timer(self.SIDE_TIME, self.pub_timer_callback)
+
+    def pose_callback(self, msg):
+        self.get_logger().info('Current heading: "%f"' % msg.theta)
+        self.get_logger().info('Setpoint: "%f"' % self.desired_heading)
+        msg_pub = Twist()
+        msg_pub.linear.x = self.LINEAR_SPEED
+        error = angle_diff(self.desired_heading, msg.theta)
+        msg_pub.angular.z = 13*error
+        self.publisher_twist.publish(msg_pub)
+
+    def pub_timer_callback(self):
+        self.desired_heading += math.pi / 2
+        self.desired_heading %= 2 * math.pi
+        self.get_logger().info('New angle setpoint: "%f"' % self.desired_heading)
+
+def main(args=None):
+    rclpy.init(args=args)
+
+    mover = RurMover()
+
+    rclpy.spin(mover)
+
+    mover.destroy_node()
+    rclpy.shutdown()
+
+if __name__ == '__main__':
+    main()
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 0e83277..a16ea8b 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,7 @@ setup(
             'step_2 = lesson_05.step_2:main',
             'step_3 = lesson_05.step_3:main',
             'step_4 = lesson_05.step_4:main',
+            'mover = lesson_05.mover:main',
         ],
     },
 )
-- 
GitLab


From 2e2c8bbde1279efe583618b203b5e171405aa03b Mon Sep 17 00:00:00 2001
From: mpasynkov <pasynkovmaksim957@gmail.com>
Date: Mon, 28 Oct 2024 20:37:25 +0300
Subject: [PATCH 2/2] rqt was added

---
 launch/square.launch.py | 4 ++--
 setup.py                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/launch/square.launch.py b/launch/square.launch.py
index 6456b18..558068d 100644
--- a/launch/square.launch.py
+++ b/launch/square.launch.py
@@ -13,8 +13,8 @@ def generate_launch_description():
         Node(
             package='lesson_05',
             namespace='',
-            executable='mover',
-            name='mover'
+            executable='square',
+            name='square'
         ),
         Node(
             package='rqt_plot',
diff --git a/setup.py b/setup.py
index a16ea8b..629c0c7 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ setup(
             'step_2 = lesson_05.step_2:main',
             'step_3 = lesson_05.step_3:main',
             'step_4 = lesson_05.step_4:main',
-            'mover = lesson_05.mover:main',
+            'square = lesson_05.square:main',
         ],
     },
 )
-- 
GitLab