Skip to content

Commit 38d304e

Browse files
updated code from science:
1 parent 0b4dc5f commit 38d304e

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

config/esw.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ brushed_motors:
311311
limit_1_readjust_position: 0.2452 # meters
312312
quad_ratio: 48.0 # encoder ratio compared to motor
313313
driver_voltage: 10.0 # used to calculate max pwm
314-
motor_max_voltage: 6.0 # used to calculate max pwm
314+
motor_max_voltage: 12.0 # used to calculate max pwm
315315
min_velocity: -1.0
316316
max_velocity: 1.0
317317
min_position: 0.0
@@ -360,7 +360,7 @@ brushed_motors:
360360
limit_0_readjust_position: 0.0 # radians
361361
limit_1_readjust_position: 0.0 # radians
362362
quad_ratio: 48.0 # encoder ratio compared to motor
363-
driver_voltage: 11.0 # used to calculate max pwm
363+
driver_voltage: 8.0 # used to calculate max pwm
364364
motor_max_voltage: 12.0 # used to calculate max pwm
365365
calibration_throttle: 0.5 # throttle during calibration
366366
sensor_actuator:

launch/jetson_base_cameras.launch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
<param name="height" value="720"/>
1111
</node>
1212

13-
<node pkg="mrover" type="gst_websocket_streamer" name="mobility_streamer"
13+
<!-- <node pkg="mrover" type="gst_websocket_streamer" name="static_streamer"
1414
output="screen">
1515
<param name="dev_path" value="/devices/platform/3610000.xhci/usb1/1-2/1-2.4/1-2.4.3"/>
1616
<param name="port" value="8082"/>
17-
</node>
17+
</node> -->
1818

19-
<!-- <node pkg="mrover" type="gst_websocket_streamer" name="static_streamer"
19+
<node pkg="mrover" type="gst_websocket_streamer" name="mobility_streamer"
2020
output="screen">
2121
<param name="dev_path" value="/devices/platform/3610000.xhci/usb1/1-2/1-2.4/1-2.4.4"/>
2222
<param name="port" value="8083"/>
23-
</node> -->
23+
</node>
2424
</launch>

src/perception/panorama.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,14 @@ def capture_panorama(self, goal: CapturePanoramaGoal):
8787
# TODO: Don't hardcode or parametrize this?
8888
current_angle = 0
8989
stitched_pc = np.empty((0, 8), dtype=np.float32)
90-
90+
goal.angle = 1.0
9191
while current_angle < goal.angle:
9292
# current_pos
9393
# calculate angle
9494
rospy.loginfo("rotating mast...")
9595
time_start = rospy.Time.now()
9696
while rospy.Time.now() - time_start < rospy.Duration(1.5):
97-
self.mast_throttle.publish(Throttle(["mast_gimbal_z"], [1.0]))
97+
# self.mast_throttle.publish(Throttle(["mast_gimbal_z"], [1.0]))
9898
rospy.Rate(10).sleep()
9999

100100
self.mast_throttle.publish(Throttle(["mast_gimbal_z"], [0.0]))

0 commit comments

Comments
 (0)