Merge branch 'feature/autostart' into develop

.gitignore

@@ -1,9 +1,5 @@
-.DS_Store
 applet
-application.linux32
-application.linux64
-application.windows32
-application.windows64
-application.macosx
+application.*
 
-ephimera/data/
+ephimera/data/*
+ephimera/history/*

ephimera/ephimera.pde

@@ -9,7 +9,7 @@ Serial port;
 //Capture video;
 GLCapture video;
 PImage img;
-boolean countingColors = false, makeBackup = false, takePicture = true;
+boolean takePicture = true;
 int videoWidth = 480;
 int videoHeight = 240;
 
@@ -17,14 +17,14 @@ int sending = 0;
 
 void setup() {
   size(480, 240, P2D);
-  frameRate(2);
+  frameRate(10);
   colorMode(HSB, 100, 100, 100);
 
   String portName = Serial.list()[0];
   port = new Serial(this, portName, 9600);
   
   String[] cameras = GLCapture.list();
-  video = new GLCapture(this, cameras[0], width, height, 30);
+  video = new GLCapture(this, cameras[0], width, height, 10);
   video.start();  
   
   GPIO.pinMode(4, GPIO.INPUT); 
@@ -33,23 +33,27 @@ void setup() {
 // video.start();  
   
   background(0);
+  delay(2000);
 
 }
 
 void draw() {   
   ephPercentage(); 
   
+  
   if (GPIO.digitalRead(4) == GPIO.LOW && takePicture == true){
     takePicture = false;
-    video.pause();
     delay(4000);
+    video.pause();
     makePicture(); 
   }  
+  
   if(GPIO.digitalRead(4) == GPIO.HIGH && takePicture == false){ 
     takePicture = true;     
     video.start();
   }
   
+  
 }
 
 void keyPressed() {

script/ephimera.sh

@@ -0,0 +1,2 @@
+sleep 5
+/home/pi/Desktop/ephimera/ephimera/application.linux-armv6hf/ephimera && sleep 5 && sudo halt