Diff: hardwareIO/hardwareIO.h

Revision:

44:46e25fa1669b

Parent:

42:c4e9c1116af4

Child:

48:7633d8e7b0d3

diff -r 5ff1a26d99ac -r 46e25fa1669b hardwareIO/hardwareIO.h
--- a/hardwareIO/hardwareIO.h	Fri Mar 28 10:25:06 2014 +0000
+++ b/hardwareIO/hardwareIO.h	Mon Mar 31 10:57:35 2014 +0000
@@ -19,7 +19,7 @@
 #define SWITCH_TWO p11 // interrupt pin
 
 // Two state switch: 
-#define TWO_STATE_SWITCH p24
+#define TWO_STATE_SWITCH p12
 
 // 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
@@ -27,8 +27,7 @@
 #define MOSI_PIN  p5 //SPI output (data going to DAC)
 
 //**** CHIP SELECT pins for MP4922 DAC (mirrors and red laser)
-// VERY IMPORTANT: the chip select for the DACs should be different from the default SPI "SS" pin (Slave Select), which is 53 by default (and will be used by the Ethernet Shield). 
-#define CS_DAC_MIRRORS   p8 //Chip Select of the first DAC (mirrors)
+#define CS_DAC_MIRRORS   p8 
 
 //**** 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...)