From 1771efbf2985b0d96a21e956a115b84e1cbc21c8 Mon Sep 17 00:00:00 2001 From: Andre Maia Chagas Date: Thu, 16 Nov 2017 04:57:52 +0100 Subject: [PATCH 1/7] Update README.md --- 3D_print_files/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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_ From b3181bc2fef66ce9c5104af8379a0cad8d8cf033 Mon Sep 17 00:00:00 2001 From: Andre Maia Chagas Date: Sat, 30 Dec 2017 12:26:10 +0100 Subject: [PATCH 2/7] Update fly_pi_development.ino remove matrix controls. --- Arduino/fly_pi_development/fly_pi_development.ino | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Arduino/fly_pi_development/fly_pi_development.ino b/Arduino/fly_pi_development/fly_pi_development.ino index 822bf2e..2f1e5ee 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); @@ -219,6 +222,7 @@ void loop() { Serial.println("waited"); } +/* //MATRIX if (term1 == "MAT"){ if (term2.toInt() == 0) { @@ -289,7 +293,8 @@ void loop() { matrix.writeDisplay();} Serial.println("waited");} - +*/ + //RING if (term1=="RIN"){ if (term2.toInt() == 1) { //ring on From 5ce801c682177e9c7c4465ed9d77cdd08115dd18 Mon Sep 17 00:00:00 2001 From: Andre Maia Chagas Date: Sat, 30 Dec 2017 12:28:05 +0100 Subject: [PATCH 3/7] Update fly_pi_development.ino remove matrix commands --- Arduino/fly_pi_development/fly_pi_development.ino | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Arduino/fly_pi_development/fly_pi_development.ino b/Arduino/fly_pi_development/fly_pi_development.ino index 2f1e5ee..3dc486f 100644 --- a/Arduino/fly_pi_development/fly_pi_development.ino +++ b/Arduino/fly_pi_development/fly_pi_development.ino @@ -128,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(); @@ -136,6 +136,7 @@ void setup() matrix.writeDisplay(); digitalWrite(servoOnPin, LOW); //Serial.println("waited"); + */ }//end void setup void loop() { From b405f150343be652a5d1ea1155d865bcc24154a6 Mon Sep 17 00:00:00 2001 From: Andre Maia Chagas Date: Fri, 2 Feb 2018 15:09:41 +0100 Subject: [PATCH 4/7] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index db6faa3..c838cd3 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,9 @@ libav library: sudo apt-get update sudo apt-get install libav-tools +Up to date version of the pyserial library: +sudo pip3 install --upgrade pyserial + # *.h264 conversion to *.avi: is done via avconv (which is installed with libav-tools). From 8b4cff0ac0cc579530885c3de61cbd7c2bd127ec Mon Sep 17 00:00:00 2001 From: Andre Maia Chagas Date: Fri, 2 Feb 2018 15:13:46 +0100 Subject: [PATCH 5/7] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index c838cd3..7ef9e2b 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,7 @@ libav library: sudo apt-get update sudo apt-get install libav-tools -Up to date version of the pyserial library: -sudo pip3 install --upgrade pyserial + # *.h264 conversion to *.avi: is done via avconv (which is installed with libav-tools). From 2293f3b34e1dba8caffd274a49aeaafce64ddf2e Mon Sep 17 00:00:00 2001 From: Andre Maia Chagas Date: Fri, 2 Feb 2018 15:18:41 +0100 Subject: [PATCH 6/7] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 7ef9e2b..4c19f8b 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: From 7e8d9ef3937b5fb98ea5a84a12ce4968797b6d1b Mon Sep 17 00:00:00 2001 From: Andre Maia Chagas Date: Fri, 2 Feb 2018 15:19:29 +0100 Subject: [PATCH 7/7] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4c19f8b..88f3b09 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # 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 +## 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 +## 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: