Diff: main.cpp

Revision:

3:89f592efbe84

Parent:

2:383b2acec6e4

Child:

4:1428775752f7

diff -r 383b2acec6e4 -r 89f592efbe84 main.cpp
--- a/main.cpp	Mon May 26 08:37:38 2014 +0000
+++ b/main.cpp	Wed Jun 04 09:47:04 2014 +0000
@@ -14,11 +14,6 @@
 
     // SETUP: --------------------------------------------------------------------------------------------
     IO.init(); // note: serial speed can be changed by checking in the hardwareIO.cpp initialization
-  
-    // Set displaying laser powers: 
-    IO.setRedPower(1);//turn on the red (displaying) laser
-    IO.setGreenPower(0);
-    IO.setBluePower(0);
 
     wait_ms(100);
 
@@ -87,7 +82,8 @@
    
     else if (val=='L') {     
     stringData[indexStringData] = 0 ;
-    if(atoi(stringData)>0)  IO.setRedPower(1); else  IO.setRedPower(0);
+    //if(atoi(stringData)>0)  IO.setRedPower(1); else  IO.setRedPower(0);
+     if(atoi(stringData)>0)  IO.setLockinPower(1); else  IO.setLockinPower(0); // for the time being, we only use the lockin laser
     indexStringData=0;
   }