Skip to content

Commit 11d0ae6

Browse files
committed
pushing changes from the wet test
1 parent 37b0a16 commit 11d0ae6

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

main_module/gyro/ros_middleman.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,25 @@ def __init__(self):
99
del sys
1010

1111
self._roll, self._pitch, self._yaw = [0.0, 0.0, 0.0]
12+
self.got_first_angle = False
1213

1314
@property
1415
def roll(self):
15-
return self._roll
16+
return self._roll - self.angle.tare_angles[0]
1617

1718
@property
1819
def pitch(self):
19-
return self._pitch
20+
return self._pitch - self.angle.tare_angles[1]
2021

2122
@property
2223
def yaw(self):
23-
return self._yaw
24+
return self._yaw - self.angle.tare_angles[2]
2425

2526
def callback(self, new_message):
26-
"""value should be in degrees"""
27-
self._roll = new_message.vector.x# degrees
28-
self._pitch = new_message.vector.y# degrees
29-
self._yaw = new_message.vector.z# degrees
27+
if not self.got_first_angle:
28+
self.got_first_angle = True
29+
self.set_tare([new_message.vector.x, new_message.vector.y, new_message.vector.z], False)
30+
else:
31+
self._roll = new_message.vector.y# degrees
32+
self._pitch = new_message.vector.x# degrees
33+
self._yaw = new_message.vector.z# degrees

main_module/planning/s2018/test.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ def __init__(self, gyro, odometer):
2424

2525
def _get_leash(self):
2626
p0 = [0,0,0]
27+
p3 = [0,0.5,0]
2728
p1 = [0.75,0.75,-0.5]
2829
p2 = [-0.75,0.75,-0.5]
29-
path0 = PointList([p0, p1, p2, p0], 0.0)
30+
path0 = PointList([p0, p3, p1, p2, p0], 0.0)
3031
return Leash([path0], 0.05, 0.005)
3132

3233
def _get_events(self):

main_module/propulsion/ros_middleman.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
from ._abstract import Propulsion
44
class Middleman(Propulsion):
5-
TRANSLATIONAL_P = 0.05
5+
TRANSLATIONAL_P = 1.0
66
TRANSLATIONAL_I = 0.0
77
TRANSLATIONAL_D = 0.0
88

0 commit comments

Comments
 (0)