Diff: main.cpp

Revision:

46:85c4b722baa7

Parent:

45:54d18ab80fd1

Child:

49:80d4ffabec16

--- a/main.cpp	Thu Mar 29 20:02:25 2018 +0000
+++ b/main.cpp	Fri Mar 30 20:25:25 2018 +0000
@@ -36,7 +36,6 @@
 DigitalOut laser(LZR_ENABLE);
 AnalogIn mux_out (MUX_OUT);
 BusOut mux_select(MUX_S0, MUX_S1, MUX_S2, MUX_S3);
-DigitalIn station_select(UI_STATION_SELECT);       //station variable (1 == STATION_A, 2 == STATION_B)
 int station = -1;
 int *cal_status = NOT_CALIBRATED;
 
@@ -60,29 +59,34 @@
 
     pc.printf("Press user button to test.\n");
     
-    //test_target_leds();
-    //pc.printf("LED's tested");
+    test_target_leds();
+    pc.printf("LED's tested\n");
     
-    //test_phototransistors();
-    //pc.printf("Phototransistors tested");
+    test_phototransistors();
+    pc.printf("Phototransistors tested\n");
     
     step_test();
     pc.printf("Step motor tested.");
     
-    while (uti_chk_ubutton() == 0);
-    pc.printf("test begin\n");
-    lzr_init();
-    while (uti_chk_ubutton() == 0) {
+    pc.printf("laser test\n");
+    while(1){
         lzr_on();
         wait(0.5);
         lzr_off();
         wait(0.5);
     }
-<<<<<<< local
+    /*
+    while (my_button.read() == 0);
+    pc.printf("test begin\n");
     lzr_init();
-=======
-    
+    while (my_button.read() == 0) {
+        lzr_on();
+        wait(0.5);
+        lzr_off();
+        wait(0.5);
+    }
+    lzr_init();
+    */
     // determine if the wag is connected to station A or station B
     station = station_select.read();
->>>>>>> other
 } 
\ No newline at end of file