Diff: main.cpp

Revision:

13:76a40e4c8982

Parent:

12:92a64fe08de8

Child:

14:6ec84bfda0f3

--- a/main.cpp	Mon Oct 06 10:42:33 2014 +0000
+++ b/main.cpp	Wed Oct 08 12:26:27 2014 +0000
@@ -35,21 +35,21 @@
         looptimerflag = false;
         //---------------------------------------------------------leest potentiometer (?), probably won't do what I want it to do ------------------
         //---------------------------------------------------------int 6? ---------------------------------------------------------------------------
-        if ( 4.5 < potmeter.read()< 6)
+        if ( 4.5 < potmeter.read() && potmeter.read()< 6.0 && angle<maxangle)
         {
-            setpoint = v3 //experimenteel bepaald, snelheid om bovenste goal te raken
+            setpoint = v3; //experimenteel bepaald, snelheid om bovenste goal te raken
         }
-        else if ( 3 < potmeter.read() < 4.5)
+        else if ( 3 < potmeter.read())
         {
-            setpoint = v2 //experimenteel bepaald, snelheid om middelste goal te raken
+            setpoint = v2; //experimenteel bepaald, snelheid om middelste goal te raken
         }
-        else if (1.5 < potmeter.read() < 3)
+        else if (1.5 < potmeter.read())
         {
-            setpoint = v1 //experimenteel bepaald, snelheid om bovenste goal te raken
+            setpoint = v1; //experimenteel bepaald, snelheid om bovenste goal te raken
         }
         else 
         {
-            setpoint = 0
+            setpoint = 0;
         }
         // setpoint = (potmeter.read()-.5)*500;  
         //----------------------------------------------------------------------new_pwm = getal?.....----------------------------------------------------