TDP3 Go-Yeti / Mbed 2 deprecated Barcode

Dependencies:   mbed

Files at this revision

API Documentation at this revision

Comitter:
joankangro
Date:
Thu Mar 10 12:20:06 2016 +0000
Parent:
1:43821545c10e
Child:
3:62d7b07dafff
Commit message:
some changes

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file
--- a/main.cpp	Wed Mar 09 11:52:51 2016 +0000
+++ b/main.cpp	Thu Mar 10 12:20:06 2016 +0000
@@ -1,7 +1,7 @@
 #include "mbed.h"
 
 //Pull everything up
-DigitalOut pull1(PTA1);
+DigitalOut pull1(PTE2);
 DigitalOut pull2(PTA2);
 //DigitalOut pull4(PTA12);
 //DigitalOut pull5(PTA4);
@@ -74,7 +74,7 @@
 
 DigitalIn back(PTB10);
 DigitalIn midbar(PTB11);
-DigitalIn front(PTE2);
+DigitalIn front(PTA1);
 
 //debugging led outputs
 DigitalOut ledleftmost(PTE20);
@@ -116,25 +116,29 @@
 {
     if(front==1) {
         ledfront=1;
-         ENA=0.28;
-         ENB=0.28;
+         ENA=0.25;
+         ENB=0.25;
     } else {
         ledfront=0;
     }
 
     if(midbar==1) {
         ledmidbar=1;
+        ENA=0.25;
+        ENB=0.25;
     } else {
         ledmidbar=0;
     }
 
     if(back==1) {
         ledback=1;
+        ENA=0.25;
+        ENB=0.25;
     } else {
         ledback=0;
     }
 
-    if(front==0 and midbar==1 and back==1) {
+    if(midbar==1 and back==1) {
         //shoot balls
         ENA=0;
         ENB=0;
@@ -146,7 +150,7 @@
         wait(3);
         motors=0;
         return bar==1;
-    } else if(front==1 and midbar==0 and back==1) { //test barcode
+    } else if(front==1 and back==1) { //test barcode
         ENA=0;
         ENB=0;
         wait(5);
@@ -275,25 +279,25 @@
 
         if(middle>0.4) {
             ledmiddle=1;
-            ENA=0.4;
-            ENB=0.4;
+            ENA=0.5;
+            ENB=0.5;
         } else {
             ledmiddle=0;
-            ENA=0.37;
-            ENB=0.37;
+            ENA=0.45;
+            ENB=0.45;
         }
 
         if(left>0.4) {
             ledleft=1;
             indicator=1;
-            ENA=0.29;
+            ENA=0.25;
         } else {
             ledleft=0;
         }
 
         if(right>0.4) {
             ledright=1;
-            ENB=0.29;
+            ENB=0.25;
         } else {
             ledright=0;
         }