Merge branch 'master' of https://github.com/OSURoboticsClub/Rover_2017_2018

2025-11-08 10:11:14 +00:00 · 2018-01-11 16:45:19 -08:00
parent b2c495e6b6 7fbc0ac797
commit 84ec2ebcfd
17 changed files with 11 additions and 4 deletions
--- a/electrical/schematics/circuitmaker/485_termination.SchDoc
+++ b/electrical/schematics/circuitmaker/485_termination.SchDoc
--- a/electrical/schematics/circuitmaker/485_tranceiver.SchDoc
+++ b/electrical/schematics/circuitmaker/485_tranceiver.SchDoc
--- a/electrical/schematics/circuitmaker/5v_power.SchDoc
+++ b/electrical/schematics/circuitmaker/5v_power.SchDoc
--- a/electrical/schematics/circuitmaker/mcu.SchDoc
+++ b/electrical/schematics/circuitmaker/mcu.SchDoc
--- a/electrical/schematics/circuitmaker/reverse_protection.SchDoc
+++ b/electrical/schematics/circuitmaker/reverse_protection.SchDoc
--- a/electrical/schematics/circuitmaker/rs485_transceiver.SchDoc
+++ b/electrical/schematics/circuitmaker/rs485_transceiver.SchDoc
--- a/electrical/schematics/circuitmaker_stuff.md
+++ b/electrical/schematics/circuitmaker_stuff.md
@@ -11,7 +11,6 @@ Next download the sheets you will need for your project, at the bare minimum you
 * mcu
 * reverse protection
 * rs485_tranceiver
-* rs485_termination
 * 5v_power
 * 3v3_power

--- a/mechanical/drawings.md
+++ b/mechanical/drawings.md
@@ -0,0 +1,8 @@
+# Part Drawing Checklist
+----
+
+1. Units
+2. Tolerances / fits
+3. No clutter (uneccisary dimensions)
+4. Everything needed (hole callouts)
+5. Material assigned
--- a/mechanical/part_drawings/mr1718-arm-base-cup_bearing.PDF
+++ b/mechanical/part_drawings/mr1718-arm-base-cup_bearing.PDF
--- a/mechanical/part_drawings/mr1718-arm-base-encoder_mount_standoff.PDF
+++ b/mechanical/part_drawings/mr1718-arm-base-encoder_mount_standoff.PDF
--- a/mechanical/part_drawings/mr1718-arm-base-large_pulley_bearing_spacer.PDF
+++ b/mechanical/part_drawings/mr1718-arm-base-large_pulley_bearing_spacer.PDF
--- a/mechanical/part_drawings/mr1718-arm-base-mounting_output.PDF
+++ b/mechanical/part_drawings/mr1718-arm-base-mounting_output.PDF
--- a/mechanical/part_drawings/mr1718-arm-base-output_shaft.PDF
+++ b/mechanical/part_drawings/mr1718-arm-base-output_shaft.PDF
--- a/mechanical/part_drawings/mr1718-arm-base-rotor_shaft-inner.PDF
+++ b/mechanical/part_drawings/mr1718-arm-base-rotor_shaft-inner.PDF
--- a/mechanical/part_drawings/mr1718-arm-base-rotor_shaft-outer_sleeve.PDF
+++ b/mechanical/part_drawings/mr1718-arm-base-rotor_shaft-outer_sleeve.PDF
--- a/rover/rover_main/launch/rover_main.launch
+++ b/rover/rover_main/launch/rover_main.launch
@@ -19,7 +19,7 @@
 <!-- ### Start 2D Cameras ### -->
 <group ns="cameras">
 <!-- Start Undercarriage Camera -->
-    <node name="camera_undercarriage" pkg="rover_camera" type="rover_camera" launch-prefix="taskset -c 1" respawn="true" output="screen">
+    <node name="undercarriage" pkg="rover_camera" type="rover_camera" launch-prefix="taskset -c 1" respawn="true" output="screen">
        <param name="device_path" value="/dev/rover/camera_undercarriage"/>
    </node>

@@ -29,7 +29,7 @@
    </node>

 <!-- Start Gimbal Camera -->
-    <node name="gimbal" pkg="rover_camera" type="rover_camera" launch-prefix="taskset -c 3" respawn="true" output="screen" >
+    <node name="chassis" pkg="rover_camera" type="rover_camera" launch-prefix="taskset -c 3" respawn="true" output="screen" >
        <param name="device_path" value="/dev/rover/camera_gimbal" />
    </node>

--- a/rover/ublox-master/ublox_gps/config/nmea.yaml
+++ b/rover/ublox-master/ublox_gps/config/nmea.yaml
@@ -1,5 +1,5 @@
 # Sample NMEA parameter configuration
-device: /dev/ttyUSB4
+device: /dev/rover/ttyGPS

 uart1:
  baudrate: 9600           # C94-M8P specific