derped/robolab
1
0
Fork 0
Code Pull requests Releases Activity

Resolved merge/rebase conflicts.

Browse source
This commit is contained in:
d3rped 2018-03-22 03:27:48 +01:00
parent 74e78cf2ee
commit 7bd9ce7582
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/move.py
View file

@ -92,7 +92,6 @@ class Move:
self._wheel_r.speed_set(24) self._wheel_r.speed_set(24)
self._wheel_l.run() self._wheel_l.run()
self._wheel_r.run() self._wheel_r.run()
<<<<<<< HEAD
while (not (self._bumper.value() or self._sensor.isRed() or self._sensor.isBlue())): while (not (self._bumper.value() or self._sensor.isRed() or self._sensor.isBlue())):
self._wheel_l.speed_set(48 - self._sensor.getbrightness()) self._wheel_l.speed_set(48 - self._sensor.getbrightness())
self._wheel_r.speed_set(self._sensor.getbrightness()) self._wheel_r.speed_set(self._sensor.getbrightness())