Hardware control: mirrors

Revision:
1:b1f5ed22087a
Parent:
0:3fe2fe307968
--- a/hardwareIO.h	Wed Aug 01 03:01:45 2012 +0000
+++ b/hardwareIO.h	Fri Sep 07 06:35:22 2012 +0000
@@ -3,13 +3,10 @@
 #define hardwareIO_h
 
 #include "mbed.h"
-#include "lockin.h"
 
 
-// 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. 
+//SPI library (for ADC chip) 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
 #define MISO_PIN  p6 //SPI input (data comming from DAC, here not connected) 
 #define MOSI_PIN  p5 //SPI output (data going to DAC)
@@ -19,7 +16,7 @@
 #define CS_DAC_MIRRORS   p8 //Chip Select of the first DAC (mirrors)
 
 //**** LASERS pins:
-#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_RED_PIN   p28 // NOT YET USED (TTL control). NOTE: this is NOT the locking sensing laser!
 #define LASER_GREEN_PIN p29 // USED (TTL control)
 #define LASER_BLUE_PIN  p30 // USED (TTL control)
 
@@ -32,48 +29,8 @@
 #define CENTER_AD_MIRROR_Y 2047 // This MUST BE the direction of the photodetector.
 
 
-//**** Look-Up Table:
-#define uint16 unsigned short
-#define LUT_RESOLUTION  33   // resolution of the Look-Up Table (power of 2 +1)
-#define LUT_BITS_SHIFT  7    // bits shift from mirror DAC (12 bits) to LUT ( root_square(LUT_RESOLUTION - 1) )
-#define LUT_BITS_MASK   127   // bits mask to obtain the position remainder ( 2^LUT_BITS_SHIFT - 1 )
-//  possible configurations:
-//  LUT_RESOLUTION  LUT_BITS_SHIFT  LUT_BITS_MASK
-//      9               9               511
-//      17              8               255
-//      33              7               127
-//      65              6               63
-//  ...
-#define NB_SCANS 8 // number of scans performed to generate the LUT table (actually, each site CUMULATES NB_SCANS values)
-                   // IMPORTANT: NB_SCANS*4095 should not exceed the capacity of uint16, this is 2^16-1=65535.
-                   // In other terms, NB_SCANS should be < 65535/4095=16
-
-#define LUT_FILENAME "/local/LUT.txt"
-
-// For checking (define if human readable file is required - note: it is not used by the program, just as output for human reading)
-#define LUT_H_FILENAME "/local/LUT_pos.txt"
-
-// Current Look-up table approximation (only one at a time!): 
-//#define LUT_BILINEAR 
-//#define LUT_DIRECT
-//#define LUT_LINEAR
-#define NO_LUT
-
-//Current method for lockin data acquisition and correction
-#define lockin_read() lockin.getMedianValue() // lockin.getSmoothValue(); //return the average of the value stored on the buffer
-                                              // lockin.getLastValue(); //return the last conversion of the ADC
-                                              // lockin.getMedianValue(); //return the median value of the buffer
-
-
 extern  DigitalOut Laser_Red, Laser_Green, Laser_Blue;
 
-// **** REFERENCE SIGNAL: 
-/*
-#define testPin_OC1A 11 // this is, output compare pin OC1A //connected to CK2 = lockIn clock
-#define testPin_OC1B 12 // this is, output compare pin OC1B //connected to CK1 = laser clock
-#define testPin_OC1C 13
-*/
-
 // ==================================================================================================================================================================
 
 class HardwareIO {
@@ -82,64 +39,25 @@
 
     void init(void);
 
-    //Lock-in acquisition methods:
-   // float LockInRead_Volts(); 
-   // int LockInRead_AD(); 
-  //  float LockInAD_to_Volts(int); 
-    
-    //Look-Up Table:
-    unsigned short lut[LUT_RESOLUTION][LUT_RESOLUTION]; //Look-Up Table (uint16 is "unsigned short")
-    void scanLUT(); //create and save the Look-Up Table
-    void setLUT(); //set the Look-Up Table: either from scanning, or from the file LUT.TXT (if it is present)
-    float lockInCorrectedValue(unsigned short x, unsigned short y); //return the lockin value corrected with the Look-UpTable (this is, a RATIO of reflectivities, and <1)
-    
-    void scan_serial(unsigned short pointsPerLine = 400);
-
     void showLimitsMirrors( int times );
 
     // SPI control for DAC for mirrors and red laser power (low level): 
     void writeOutX(unsigned short value);
     void writeOutY(unsigned short value);
-    
-    // mirror degree-to-AD units conversion factors: 
-    //float AD_to_Deg_MIRROR_X;//=1.0*(MAX_DEG_MIRROR_X-MIN_DEG_MIRROR_X)/(MAX_AD_MIRRORS-MIN_AD_MIRRORS);
-    //float AD_to_Deg_MIRROR_Y;//=1.0*(MAX_DEG_MIRROR_Y-MIN_DEG_MIRROR_Y)/(MAX_AD_MIRRORS-MIN_AD_MIRRORS);
-
-    /*
-    // Mirror position:
-    void setMirrorX_Deg(float _Az); 
-    void setMirrorY_Deg(float _El);
-    void setMirrorX_AD(int _AzAD); 
-    void setMirrorY_AD(int _ElAD);
-    void setMirrorsXY_AD(int _xAD, int _yAD); 
-    void setMirrorsCenter();
-    void getAnglesFromAD(float &Az, float &El, int _xAD, int _yAD); 
-    //void setZoneDelimiters(...) // this could be here, instead on the LivingSpot class
-    */
-    
-    
-    //Laser Power, for the moment laser are TTL but we can use int:
-    //if powerValue > 0 ==> 'true'; else 'false'
+    void writeOutXY(unsigned short valueX, unsigned short valueY) {writeOutX(valueX); writeOutY(valueY);};
+ 
+     
+    //Displaying lasers: 
+    // Again: for the moment laser are TTL but these could be analog. Now, it is just: powerValue > 0 ==> 'true'; else 'false'
     // Red laser:
     void setRedPower(int powerRed);
     // Green laser: 
     void setGreenPower(int powerGreen);
     // Blue laser: 
     void setBluePower(int powerBlue);
-
+    // Setting all colors at once: 
     void setRGBPower(unsigned char color); // we will use the 3 LSB bits to set each color
     
-    //void setupPWM();
-    /* IN ADVANCED HARDWARE: 
-    // init PWM for reference generation:
-    void initPWM();
-    // reference signal: 
-    void setRefFreq(int);
-    void incRefFreq(int inc=1);
-    void decRefFreq(int dec=1);
-    */
-
-    //float refFreq; // could be private
 
     
 private: