Mercurial > ukubik

changeset 32:a4b2f93f0e3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sensor
author Radomir Dopieralski <sheep-devel@sheep.art.pl>
date Tue, 05 Aug 2014 18:17:30 +0200
parents b3cc5e98ef6f
children b9a9b33e8dfd
files joy.py servo/servo.ino
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/joy.py	Tue Aug 05 18:05:41 2014 +0200
+++ b/joy.py	Tue Aug 05 18:17:30 2014 +0200
@@ -31,6 +31,11 @@
                             self.gait = 'rotate_left'
                         else:
                             self.gait = 'rotate_right'
+                    elif event.button == 0:
+                        serial = self.robot.legs[0].hip.serial
+                        serial.write('0xfd')
+                        sensor = ord(serial.read(1))
+                        print "Sensor value: %d" % sensor
                     else:
                         print "Button %d" % event.button
                 elif event.type == pygame.JOYBUTTONUP:
--- a/servo/servo.ino	Tue Aug 05 18:05:41 2014 +0200
+++ b/servo/servo.ino	Tue Aug 05 18:17:30 2014 +0200
@@ -56,8 +56,7 @@
             }
             break;
         case 0xfd:
-            Serial.write(analogRead(A0));
-            Serial.flush();
+            Serial.write(map(analogRead(A0), 0, 1023, 0, 255));
             break;
     }
 }