-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adding new valves, components, and smaller fixes (#7)
* Update setup.cfg * Cosmetic updates in autofish_gui.py * Add templates for missing docstrings * First clean up of error messages when initiating robot. * changes to help that volume file is updated rather than always recreated should close #4 * small updates in documentation * small changes * update gitignore * remove not needed blanks * some more cosmetic clean-ups * correct bug with wrongly assigned feed for valve * Add support for Longer pump * cosmetic changes * Update README.md * update gitignore * continue integration of Longer pump * bug fixing for Longer control * Smaller fixes for longer pump support * clean up * Started bug fix on reading csv file from french computers Some cleanup * Update README.md * Correct bug for flow sensor, zero robot when closing interface * New sync option via creation of text file Smaller cosmetic changes Corrected bug in demo mode * Correction of bug with moving to zero and keeping old position in memory * TTL trigger * Update .DS_Store * TTL cleanup * Update autofish_manual.pdf * Update imager.py * remove tests * Add control for outlet valve * updated config files for outlet valve * Updated docs * Added control for pycromanager Specify stage-speed and Core-timeout in config file. * Update .gitignore * Added code to test components * Update pump-longer-bt100.py * new valve added * updates on documentation * update readme and remove pdfs * update bug when trying to open TTL without specified file * Delete .DS_Store * Various small bug fixes
- Loading branch information
1 parent
d2ce796
commit 5dc9b6b
Showing
29 changed files
with
2,109 additions
and
924 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -86,4 +86,7 @@ env.bak/ | |
venv.bak/ | ||
|
||
# mkdocs documentation | ||
/site | ||
/site | ||
.DS_Store | ||
.DS_Store | ||
.DS_Store |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
String serial_InBytes; | ||
|
||
|
||
// Define pins | ||
int TTL_start_OUT = 12; | ||
int TTL_finished_IN = 10; | ||
int val_TTL_finished_IN; | ||
|
||
void setup() { | ||
pinMode(LED_BUILTIN, OUTPUT); | ||
pinMode(TTL_start_OUT, OUTPUT); | ||
pinMode(TTL_finished_IN, INPUT); | ||
|
||
Serial.begin(9600); | ||
Serial.setTimeout(1000); | ||
|
||
// TTL signal for debugging | ||
pinMode(7, OUTPUT); | ||
pinMode(8, OUTPUT); | ||
|
||
} | ||
void loop() { | ||
|
||
// TTL signal for debugging (pin 8 can be used to simulate incoming TTL) | ||
digitalWrite(7, HIGH); | ||
digitalWrite(8, LOW); | ||
|
||
|
||
if (Serial.available() > 0){ | ||
|
||
/* | ||
// DEBUGGIN : print TTL signal | ||
val_TTL_in = digitalRead(TTL_in); // read the input pin | ||
Serial.println(val_TTL_in); | ||
delay(10); | ||
*/ | ||
|
||
// Read from serial port | ||
serial_InBytes = Serial.readStringUntil('\n'); | ||
//Serial.println(InBytes); | ||
|
||
// Start acquisition | ||
if (serial_InBytes == "start"){ | ||
Serial.println("Sending TTL trigger to launch acquisition"); | ||
digitalWrite(TTL_start_OUT, HIGH); | ||
digitalWrite(LED_BUILTIN, HIGH); | ||
|
||
// Wait for trigger that acquisition is done | ||
val_TTL_finished_IN = 0; | ||
while (val_TTL_finished_IN==0) { | ||
val_TTL_finished_IN = digitalRead(TTL_finished_IN); // read the input pin | ||
Serial.println(val_TTL_finished_IN); | ||
delay(500); | ||
} | ||
|
||
// Signal received that acquisition is finished | ||
Serial.println("finished"); | ||
digitalWrite(TTL_start_OUT, LOW); | ||
digitalWrite(LED_BUILTIN, LOW); | ||
} | ||
|
||
// Unknown command | ||
else{ | ||
Serial.println("Unknown command: " + serial_InBytes); | ||
} | ||
|
||
delay(500); | ||
|
||
} | ||
} | ||
|
Oops, something went wrong.