1 Commits

Author SHA1 Message Date
lars 7001f9063f bug fix 2019-05-19 11:25:24 +02:00
+6 -3
View File
@@ -31,7 +31,7 @@ class Robot:
rad = deg * math.pi / 180 rad = deg * math.pi / 180
return rad return rad
def _calc_previous(self): def calc_previous(self):
if self.previous_servos: if self.previous_servos:
self.total_angle_deg = 0 self.total_angle_deg = 0
for servo in self.previous_servos: for servo in self.previous_servos:
@@ -44,11 +44,12 @@ class Robot:
self.total_angle_deg = self.deg self.total_angle_deg = self.deg
if self.delta < 0: if self.delta < 0:
self.delta *= -1 self.delta *= -1
self.total_angle_rad = self._get_rad(self.total_angle_deg)
def set_angle(self, angle): def set_angle(self, angle):
self.deg = angle self.deg = angle
self.rad = self._get_rad(self.deg) self.rad = self._get_rad(self.deg)
self._calc_previous() self.calc_previous()
def _get_angle(self, ms): def _get_angle(self, ms):
val_min = self.geometry.min val_min = self.geometry.min
@@ -67,7 +68,7 @@ class Robot:
self.ms = ms self.ms = ms
self.deg = self._get_angle(self.ms) self.deg = self._get_angle(self.ms)
self.rad = self._get_rad(self.deg) self.rad = self._get_rad(self.deg)
self._calc_previous() self.calc_previous()
def get_ms(self, calc=False): def get_ms(self, calc=False):
if calc: if calc:
@@ -200,6 +201,8 @@ class Robot:
return effi return effi
def calculate(self): def calculate(self):
for servo in [self.servo1, self.servo2, self.servo3]:
servo.calc_previous()
self.x, self.y = self._get_position() self.x, self.y = self._get_position()
self.efficency = self._get_efficency() self.efficency = self._get_efficency()
self.x = self._round(self.x) self.x = self._round(self.x)