feat: add Twist support to headless and core_pkg

Left stick y is forward/backward, right stick x is turn/angular. Still uses duty cycle. Published on /core/twist. On headless, needs CORE_MODE constant changed to "twist" to use new Twist command.

Also added TwistStamped to core_pkg for /cmd_vel. Will use velocity control. Needs wheel measurements from Core CAD. Will be used for Autonomy.

src/core_pkg/core_pkg/core_node.py

@@ -1,6 +1,7 @@
 import rclpy
 from rclpy.node import Node
 from rclpy import qos
+from rclpy.duration import Duration
 from std_srvs.srv import Empty
 
 import signal
@@ -12,6 +13,7 @@ import os
 import sys
 import threading
 import glob
+from math import sqrt
 
 from std_msgs.msg import String
 from ros2_interfaces_pkg.msg import CoreFeedback
@@ -19,20 +21,24 @@ from ros2_interfaces_pkg.msg import CoreControl
 
 # NEW
 from sensor_msgs.msg import Imu, NavSatFix
-from geometry_msgs.msg import TwistStamped
+from geometry_msgs.msg import TwistStamped, Twist
 
 serial_pub = None
 thread = None
 
+CORE_WHEELBASE = 0.34  # meters  -- TODO: verify
+CORE_WHEEL_RADIUS = 0.075  # meters -- TODO: verify
+CORE_GEAR_RATIO = 100  # Clucky: 100:1, Testbed: 64:1
+
 control_qos = qos.QoSProfile(
     history=qos.QoSHistoryPolicy.KEEP_LAST,
     depth=2,
     reliability=qos.QoSReliabilityPolicy.BEST_EFFORT,
     durability=qos.QoSDurabilityPolicy.VOLATILE,
-    deadline=1000,
+    deadline=Duration(seconds=1),
-    lifespan=500,
+    lifespan=Duration(nanoseconds=500_000_000),  # 500ms
     liveliness=qos.QoSLivelinessPolicy.SYSTEM_DEFAULT,
-    liveliness_lease_duration=5000
+    liveliness_lease_duration=Duration(seconds=5)
 )
 
 class SerialRelay(Node):
@@ -70,8 +76,8 @@ class SerialRelay(Node):
         self.gps_pub_ = self.create_publisher(NavSatFix, '/gps/fix', 10)
         self.gps_state = NavSatFix()
 
-        self.twist_sub_ = self.create_subscription(TwistStamped, '/twist', self.twist_callback, qos_profile=control_qos)
+        self.cmd_vel_sub_ = self.create_subscription(TwistStamped, '/cmd_vel', self.cmd_vel_callback, qos_profile=control_qos)
-
+        self.twist_man_sub_ = self.create_subscription(Twist, '/core/twist', self.twist_man_callback, qos_profile=control_qos)
 
         if self.launch_mode == 'core':
             # Loop through all serial devices on the computer to check for the MCU
@@ -209,12 +215,35 @@ class SerialRelay(Node):
 
         #print(f"[Sys] Relaying: {command}")
 
-    def twist_callback(self, msg: TwistStamped):
+    def cmd_vel_callback(self, msg: TwistStamped):
         linear = msg.twist.linear.x
         angular = msg.twist.angular.z
 
-        # send that bitch straight to embedded (hope we're running through core rn...)
+        vel_left_rads = (linear - (angular * CORE_WHEELBASE / 2)) / CORE_WHEEL_RADIUS
-        command = f"joystick_ctrl,{angular},{linear}\n"
+        vel_right_rads = (linear + (angular * CORE_WHEELBASE / 2)) / CORE_WHEEL_RADIUS
+
+        vel_left_rpm = round((vel_left_rads * 60) / (2 * 3.14159)) * CORE_GEAR_RATIO
+        vel_right_rpm = round((vel_right_rads * 60) / (2 * 3.14159)) * CORE_GEAR_RATIO
+
+        command = f"can_relay_tovic,core,20,{vel_left_rpm},{vel_right_rpm}\n"
+        self.send_cmd(command)
+    
+    def twist_man_callback(self, msg: Twist):
+        linear = msg.linear.x  # [-1 1] for forward/back from left joy y
+        angular = -msg.angular.z  # [-1 1] for left/right from right joy x
+
+        if abs(linear) > 1 or abs(angular) > 1:
+            # if speed is greater than 1, then there is a problem
+            # make it look like a problem and don't just run away lmao
+            drive_speed = 0.25
+        
+        duty_left = linear - angular
+        duty_right = linear + angular
+        scale = max(1, abs(duty_left), abs(duty_right))
+        duty_left /= scale
+        duty_right /= scale
+
+        command = f"can_relay_tovic,core,19,{duty_left},{duty_right}\n"
         self.send_cmd(command)
 
     def send_cmd(self, msg: str):

src/headless_pkg/src/headless_node.py

@@ -1,4 +1,6 @@
 import rclpy
+from rclpy import qos
+from rclpy.duration import Duration
 from rclpy.node import Node
 
 import pygame
@@ -14,6 +16,7 @@ import os
 import importlib
 from std_msgs.msg import String
 from ros2_interfaces_pkg.msg import CoreControl, ArmManual
+from geometry_msgs.msg import Twist
 
 
 os.environ["SDL_VIDEODRIVER"] = "dummy"  # Prevents pygame from trying to open a display
@@ -27,6 +30,14 @@ core_stop_msg.left_stick = 0.0
 core_stop_msg.right_stick = 0.0
 core_stop_msg.max_speed = 0
 
+core_stop_twist_msg = Twist()
+core_stop_twist_msg.linear.x = 0.0
+core_stop_twist_msg.linear.y = 0.0
+core_stop_twist_msg.linear.z = 0.0
+core_stop_twist_msg.angular.x = 0.0
+core_stop_twist_msg.angular.y = 0.0
+core_stop_twist_msg.angular.z = 0.0
+
 arm_stop_msg = ArmManual()
 arm_stop_msg.axis0 = 0
 arm_stop_msg.axis1 = 0
@@ -39,6 +50,18 @@ arm_stop_msg.linear_actuator = 0
 arm_stop_msg.laser = 0
 
 ctrl_mode = "core"
+CORE_MODE = "duty"  # "twist" or "duty"
+
+control_qos = qos.QoSProfile(
+    history=qos.QoSHistoryPolicy.KEEP_LAST,
+    depth=2,
+    reliability=qos.QoSReliabilityPolicy.BEST_EFFORT,
+    durability=qos.QoSDurabilityPolicy.VOLATILE,
+    deadline=Duration(seconds=1),
+    lifespan=Duration(nanoseconds=500_000_000),  # 500ms
+    liveliness=qos.QoSLivelinessPolicy.SYSTEM_DEFAULT,
+    liveliness_lease_duration=Duration(seconds=5)
+)
 
 
 class Headless(Node):
@@ -69,6 +92,7 @@ class Headless(Node):
         self.create_timer(0.15, self.send_controls)
         self.core_publisher = self.create_publisher(CoreControl, '/core/control', 10)
         self.arm_publisher = self.create_publisher(ArmManual, '/arm/control/manual', 10)
+        self.core_twist_pub_ = self.create_publisher(Twist, '/core/twist', qos_profile=control_qos)
 
     def run(self):
         # This thread makes all the update processes run in the background
@@ -111,7 +135,7 @@ class Headless(Node):
 
 
         # CORE
-        if ctrl_mode == "core":
+        if ctrl_mode == "core" and CORE_MODE == "duty":
             input = CoreControl()
             input.max_speed = max_speed
 
@@ -138,6 +162,28 @@ class Headless(Node):
             self.core_publisher.publish(input)
             self.arm_publisher.publish(arm_stop_msg)
         
+        elif ctrl_mode == "core" and CORE_MODE == "twist":
+            input = Twist()
+
+            # Collect controller state
+            left_stick_y = deadzone(self.gamepad.get_axis(1))
+            right_stick_x = deadzone(self.gamepad.get_axis(3))
+
+
+            # Forward/back
+            input.linear.x = float(round(-1 * left_stick_y, 2))
+
+            # Turn
+            input.angular.z = float(round(right_stick_x, 2))
+
+
+            # Debug
+            output = f'Lin X: {input.linear.x}, Ang Z: {input.angular.z}'
+            self.get_logger().info(f"[Ctrl] {output}")
+
+            self.core_twist_pub_.publish(input)
+            self.arm_publisher.publish(arm_stop_msg)
+
 
         # ARM
         if ctrl_mode == "arm":