Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions src/Bringup/launch/control.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,6 @@ def generate_launch_description():
output="screen",
condition=IfCondition(use_arm),
)
eef_distance = Node(
package="gpio_controller",
executable="distance_sensor",
output="screen",
condition=IfCondition(use_arm),
)

arm_controller_servo_spawner = Node(
package="controller_manager",
Expand Down Expand Up @@ -176,7 +170,6 @@ def generate_launch_description():
ld.add_action(delayed_spawners)
ld.add_action(arm_launch)
ld.add_action(eef_launch)
ld.add_action(eef_distance)
ld.add_action(arm_control_node)
ld.add_action(drive_control_node)
return ld

This file was deleted.

73 changes: 73 additions & 0 deletions src/HW-Devices/gpio_controller/gpio_controller/mast_esp.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import rclpy
from rclpy.node import Node
from interfaces.msg import Distance
import serial
from std_msgs.msg import Float32


def convert_from_radians(angle, servo_min, servo_max, servo_rom):
total_range = servo_max - servo_min
return int(servo_min + (total_range * angle / servo_rom))


class MastESP(Node):
def __init__(self):
super().__init__("mast_esp")
self.ser = serial.Serial(
"/dev/serial/by-id/usb-Espressif_USB_JTAG_serial_debug_unit_20:6E:F1:69:EE:E0-if00",
115200,
)
self.pub = self.create_publisher(Distance, "eef_distance", 10)
self.us_sub = self.create_subscription(Float32, "/mast_angle", self.mast_callback, 3)

self.declare_parameter("min", 350.0)
self.declare_parameter("max", 2500.0)
self.declare_parameter("rom", 6.2832)

self.servo_min = self.get_parameter("min").get_parameter_value().double_value
self.servo_max = self.get_parameter("max").get_parameter_value().double_value
self.servo_rom = self.get_parameter("rom").get_parameter_value().double_value

self.create_timer(0.001, self.loop)
self.get_logger().info("Mast ESP node started")

def mast_callback(self, msg: Float32):
us = convert_from_radians(
msg.data, self.servo_min, self.servo_max, self.servo_rom
)
data = bytes("M" + str(us), "utf-8")
self.ser.write(data)

def loop(self):
if self.ser.in_waiting:
line = self.ser.readline().decode().strip()
try:
reading = int(line)
msg = Distance()
msg.header.stamp = self.get_clock().now().to_msg()
if reading == -2:
mm = 0
msg.status = Distance.STATUS_ERROR
elif reading == -1:
mm = 0
msg.status = Distance.STATUS_INVALID
else:
msg.status = Distance.STATUS_OK
mm = reading
msg.distance = mm / 1000.0
self.get_logger().debug(f"Distance: {msg.distance:.3f} m")
self.pub.publish(msg)
except ValueError:
pass


def main(args=None):
rclpy.init(args=args)
node = MastESP()
rclpy.spin(node)
node.destroy_node()
rclpy.shutdown()


if __name__ == "__main__":
main()
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ def generate_launch_description():
),
launch_ros.actions.Node(
package="gpio_controller",
executable="distance_sensor",
name="distance_sensor_node",
executable="mast_esp",
name="mast_esp_node",
),
launch_ros.actions.Node(
package="gpio_controller",
Expand Down
2 changes: 1 addition & 1 deletion src/HW-Devices/gpio_controller/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
entry_points={
"console_scripts": [
"lights = gpio_controller.lights:main",
"distance_sensor = gpio_controller.esp_distance_sensor:main",
"mast_esp = gpio_controller.mast_esp:main",
"pdb_rails = gpio_controller.pdb_rails:main",
],
},
Expand Down
Loading