clean
authorMjolnir <thomas.pietrzak@inria.fr>
Fri, 21 Aug 2015 15:17:35 +0000 (17:17 +0200)
committerMjolnir <thomas.pietrzak@inria.fr>
Fri, 21 Aug 2015 15:17:35 +0000 (17:17 +0200)
ArduinoKeyboard/ArduinoKeyboard.ino
ArduinoKeyboard/motorcontrol.ino
Library/LivingKeyboard.cpp
Library/XYPlotter.cpp

index 7bdf52115f7ce380d9a60c1054b95191a3dca452..1298f275b8cd8fa488717c56b628a71e01818838 100644 (file)
@@ -1,5 +1,3 @@
-#include <Stepper.h>
-
 //Motors
 const int leftmotor1   =  5; 
 const int leftmotor2   =  6;
index 505a798d14a53aea0dc073a400b8a1f55dfa6b0b..d82ecdc8ccdbab38d0953847bf1682f91bce80ac 100644 (file)
@@ -1,3 +1,5 @@
+#include <Stepper.h>
+
 //DC motors
 const int motorspeed         =  33; // mm/s
 const int motorrotationspeed =  60; // deg/s
@@ -8,7 +10,7 @@ Stepper stepper = Stepper(steps, stepper1, stepper2, stepper3, stepper4);
 
 void init_motors()
 {
-    //Motors
+  //Motors
   pinMode(leftmotor1, OUTPUT);
   pinMode(leftmotor2, OUTPUT);
   pinMode(rightmotor1, OUTPUT);
index 45cbcdb908a0cdd764c5dd54f4171ecc35373000..07a10cb66d598806cd218a66f8f74b7023dae927 100644 (file)
@@ -28,6 +28,7 @@ LivingKeyboard::LivingKeyboard()
             //ask fo his name
             serialPort->write("I\n", 2);
             serialPort->flush();
+            //wait a little so that we get the whole string at once
             QThread::msleep(500);
             char buffer[32];
             //memset(buffer,0, 32*sizeof(char));
index c243b35be9fbb5768da3031a3f29d50a12c7534a..ed760553163a4f8e5c9f2e958af4e4ff04d5f1ce 100644 (file)
@@ -25,12 +25,12 @@ XYPlotter::XYPlotter()
 
             qDebug() << "Trying port " << serialports[i];
 
-            //ask fo his name
+            //wait the plotter to finish the calibration
             QThread::sleep(13);
+            //ask fo his name
             serialPort->write("I\n", 2);
             serialPort->flush();
             char buffer[32];
-            //memset(buffer,0, 32*sizeof(char));
             qDebug() << "Waiting for data";
             if (serialPort->waitForReadyRead(1500))
             {