Diff: hardwareIO/hardwareIO.h

Revision:

23:bf666fcc61bc

Parent:

22:d87317d7ca91

Child:

26:c9329c4fc20a

--- a/hardwareIO/hardwareIO.h	Sat Jun 02 06:38:12 2012 +0000
+++ b/hardwareIO/hardwareIO.h	Wed Jun 13 10:09:41 2012 +0000
@@ -6,8 +6,8 @@
 #include "lockin.h"
 
 
-// potentiometer to change sensitivity by hand:
-//AnalogIn ain(p20);
+// potentiometer to change sensitivity by hand, or other things. 
+#define POT_ANALOG_INPUT p15 // note: analog inputs in the mbed are from 15 to 20
 
 // NOTE: the SPI library uses the following pins, but we don't have to set them and inputs or outputs (this is done when the library is initialized, which is done by pre-instantiation. 
 #define SCK_PIN   p7 //SPI Clock
@@ -19,9 +19,9 @@
 #define CS_DAC_MIRRORS   p8 //Chip Select of the first DAC (mirrors)
 
 //**** LASERS pins:
-#define LASER_RED_PIN   p28
-#define LASER_GREEN_PIN p29
-#define LASER_BLUE_PIN  p30
+#define LASER_RED_PIN   p28 // NOT YET USED!! (NOTE: this is NOT the locking sensing laser (also called red, but could be infrared...)
+#define LASER_GREEN_PIN p29 // USED (TTL control)
+#define LASER_BLUE_PIN  p30 // USED (TTL control)
 
 //**** MIRRORS: 
 //The DAC is 12 bytes capable (Max=4096), but we will limit this a little. 
@@ -125,7 +125,7 @@
     // Blue laser: 
     void setBluePower(int powerBlue);
 
-    void setRGBPower(char color); // we will use the 3 LSB bits to set each color
+    void setRGBPower(unsigned char color); // we will use the 3 LSB bits to set each color
     
     //void setupPWM();
     /* IN ADVANCED HARDWARE: