diff --git a/3D_print_files/README.md b/3D_print_files/README.md index 0acbc82..faee51e 100644 --- a/3D_print_files/README.md +++ b/3D_print_files/README.md @@ -1,4 +1,4 @@ -# Notes on `FlyPi_v29.scad` +# Notes on `FlyPi_v30.scad` ## _Caution_ diff --git a/Arduino/fly_pi_development/fly_pi_development.ino b/Arduino/fly_pi_development/fly_pi_development.ino index 822bf2e..3dc486f 100644 --- a/Arduino/fly_pi_development/fly_pi_development.ino +++ b/Arduino/fly_pi_development/fly_pi_development.ino @@ -68,11 +68,12 @@ float lowLimit = 13.0; //in Celsius //create function to control LED ring Adafruit_NeoPixel pixels = Adafruit_NeoPixel(ring_nPixels, RingPin, NEO_GRB + NEO_KHZ800); +/* //create function to control matrix -//Adafruit_8x8matrix matrix = Adafruit_8x8matrix(); +Adafruit_8x8matrix matrix = Adafruit_8x8matrix(); //copntrol for long matrix -Adafruit_8x16matrix matrix = Adafruit_8x16matrix(); +//Adafruit_8x16matrix matrix = Adafruit_8x16matrix(); //matrix stimuli static const uint8_t PROGMEM // MATRIX PICS matrixPattern1[] = @@ -106,6 +107,8 @@ matrixPattern4[] = B11111111, B11111111 }; +*/ + void setup() { //start serial port Serial.begin(115200); @@ -125,7 +128,7 @@ void setup() //pinMode(peltierCoolPin2,OUTPUT); focusServo.attach(servoPin); pixels.begin(); - +/* // pass in the address for LED Matrix matrix.begin(0x70); matrix.clear(); @@ -133,6 +136,7 @@ void setup() matrix.writeDisplay(); digitalWrite(servoOnPin, LOW); //Serial.println("waited"); + */ }//end void setup void loop() { @@ -219,6 +223,7 @@ void loop() { Serial.println("waited"); } +/* //MATRIX if (term1 == "MAT"){ if (term2.toInt() == 0) { @@ -289,7 +294,8 @@ void loop() { matrix.writeDisplay();} Serial.println("waited");} - +*/ + //RING if (term1=="RIN"){ if (term2.toInt() == 1) { //ring on diff --git a/README.md b/README.md index db6faa3..88f3b09 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@ # Flypi This is the repository for the flypi project +## to maintain this repository as close as possible to the publication describing it (http://journals.plos.org/plosbiology/article?id=10.1371/journal.pbio.2002702) further development is being done on the following fork: https://github.com/prometheus-science/Flypi/commit/ac9aac55044f0e4dddc3e00e41459db75cc05826 + +## We've created a Forum for users to posts questions and suggestions too! Please take a look at http://forum.prometheus-science.com/home/categories/flypi-user-forum + # necessary libraries: LED Ring from Adafruit: @@ -18,6 +22,8 @@ libav library: sudo apt-get update sudo apt-get install libav-tools + + # *.h264 conversion to *.avi: is done via avconv (which is installed with libav-tools).