Merge remote-tracking branch 'origin/gui' into gui

damian0815 · Jul 14, 2011 · 3aa8ff1 · 3aa8ff1
2 parents 339bfec + a2f4349
commit 3aa8ff1
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/Wind.cpp b/src/Wind.cpp
@@ -54,6 +54,7 @@ void Wind::setup( ofxXmlSettings& data )
 
 #ifdef SCREEN
 	screen.setup( "/dev/spidev1.1", /*SPI_CPHA | SPI_CPOL*/0, 40000000 );
+	input.setup( "/dev/spidev1.0", 0, 10000000 );
 #endif
 
 	// gui