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
9 changes: 9 additions & 0 deletions src/Arm/arm_control/config/rover_urdf.srdf
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@
<joint name="Joint_6" value="0.0"/>
</group_state>

<group_state name="Lowest front" group="arm">
<joint name="Joint_1" value="0.0"/>
<joint name="Joint_2" value="-1.4164782714913322"/>
<joint name="Joint_3" value="1.4664856332186729"/>
<joint name="Joint_4" value="0.0"/>
<joint name="Joint_5" value="0.8933393281059383"/>
<joint name="Joint_6" value="0.0"/>
</group_state>

<group_state name="Front 40cm" group="arm">
<joint name="Joint_1" value="0.0"/>
<joint name="Joint_2" value="-1.026693041726237"/>
Expand Down
5 changes: 1 addition & 4 deletions src/Cameras/video_streaming/config/cameras.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ input_node:
- "EndEffector"
- "Belly"
- "Mast"
- "Test"
Drive:
path: "/dev/v4l/by-id/drive_camera"
type: 0
Expand All @@ -30,6 +29,4 @@ input_node:
type: 0
encoded: true
height: 768
width: 1024
Test:
type: 1
width: 1024
4 changes: 2 additions & 2 deletions src/HW-Devices/gpio_controller/gpio_controller/mast_esp.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ def mast_callback(self, msg: Float32):
msg.data, self.servo_min, self.servo_max, self.servo_rom
)
self.get_logger().debug(f"Received angle: {msg.data:.3f} rad -> PWM: {us} us")
data = bytes("S" + str(us), "utf-8")
data = bytes("S" + str(us) + "\n", "utf-8")
self.ser.write(data)

def morse_callback(self, msg: String):
self.get_logger().info(f"Transmitting morse: {msg.data}")
data = bytes("M" + msg.data, "utf-8")
data = bytes("M" + msg.data + "\n", "utf-8")
self.ser.write(data)

def loop(self):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ def generate_launch_description():
[
launch_ros.actions.Node(
package="gpio_controller",
executable="lights",
name="led_strip_nodes",
executable="headlights",
name="headlight_node",
),
launch_ros.actions.Node(
package="gpio_controller",
Expand Down
Loading