lars/joy-it-robot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

bug fix

Browse Source
This commit is contained in:
Lars Bogner
2019-05-18 21:43:05 +02:00
parent e22b21c11a
commit 86a9dd4311
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RobotLib.py
+2
View File
@@ -33,6 +33,7 @@ class Robot:
def _calc_previous(self):
if self.previous_servos:
self.total_angle_deg = 0
for servo in self.previous_servos:
self.total_angle_deg += servo.deg
self.delta = self.deg + self.previous_servos[-1].deg
@@ -40,6 +41,7 @@ class Robot:
self.delta *= -1
else:
self.delta = self.deg
self.total_angle_deg = self.deg
self.total_angle_rad = self._get_rad(self.total_angle_deg)
def set_angle(self, angle):
databaseCreatorv2.py
+1 -1
View File
@@ -34,7 +34,7 @@ test = Robot(Robot.Servo(1, Robot.Servo.Geometry(0.55, 2.3, 1.4)),
Robot.Servo(2, Robot.Servo.Geometry(2.5, 0.55, 1.55)),
Robot.Servo(3, Robot.Servo.Geometry(0.7, 2.25, 2.25)),
Robot.CoordinateSystem([-100, 100], [-100, 100]))
test.init_depending(Robot.Arm(test.servo1, 10.26, 0.84), Robot.Arm(test.servo2, 9.85), Robot.Arm(test.servo3, 12, 9),
test.init_depending(Robot.Arm(test.servo1, 10.26, 0.84), Robot.Arm(test.servo2, 9.85), Robot.Arm(test.servo3, 12, -3),
None, [test.servo1], [test.servo1, test.servo2])
looper = Looper(test)
terminalControl.py
+2 -1
View File
@@ -14,7 +14,7 @@ joy_it = Robot(Robot.Servo(1, Robot.Servo.Geometry(0.55, 2.3, 1.4)),
Robot.Servo(3, Robot.Servo.Geometry(0.7, 2.25, 2.25)),
Robot.CoordinateSystem([-100, 100], [-100, 100]))
joy_it.init_depending(Robot.Arm(joy_it.servo1, 10.26, 0.84), Robot.Arm(joy_it.servo2, 9.85),
Robot.Arm(joy_it.servo3, 12, 9), None, [joy_it.servo1], [joy_it.servo1, joy_it.servo2])
Robot.Arm(joy_it.servo3, 12, -3), None, [joy_it.servo1], [joy_it.servo1, joy_it.servo2])
# the values for all the servos (are different for each robot)
servo0min = 0.5
@@ -25,6 +25,7 @@ servo4max = 2.5
servo4mid = 1.5
servo0actual = 0
class argvReader:
def __init__(self, argv):
self.argv = argv