16mm
/
intval2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove delay() from Frame() and inter-frame delay 

This gives the user the ability to stop sequences between exposures, or
during them.
This commit is contained in:
Matt McWilliams 2016-05-12 16:10:19 -04:00
parent 291ae33595
commit 59a696f6aa
1 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
ino/intval2_buttons.ino
View File

@ -39,11 +39,14 @@ volatile int bwd_speed = 255;
volatile boolean sequence = false;
volatile boolean running = false;
volatile boolean cam_dir = true;
volatile boolean delaying = false;
volatile int micro_position = 0;
volatile boolean micro_primed = false;
unsigned long timer = 0;
unsigned long frame_start = 0;
unsigned long delay_start = 0;
volatile int cam_count = 0;
volatile int cam_pos = 0;
@ -61,7 +64,12 @@ void loop () {
Btn(2);
Btn(3);
if (running) {
timer = millis();
if (sequence && delaying) {
Watch_delay();
} else {
Read_micro();
}
} else {
delay(LOOP_DELAY);
}
@ -74,8 +82,8 @@ void Pins_init () {
pinMode(PIN_INDICATOR, OUTPUT);
}
void Frame (boolean dir) {
cam_dir = dir;
void Frame () {
frame_start = millis();
if (cam_dir) {
analogWrite(PIN_MOTOR_FORWARD, fwd_speed);
analogWrite(PIN_MOTOR_BACKWARD, 0);
@ -84,15 +92,24 @@ void Frame (boolean dir) {
analogWrite(PIN_MOTOR_FORWARD, 0);
}
running = true;
if (fwd_speed == 255) {
delay(300);
} else {
delay(600);
}
micro_primed = false;
}
boolean Read_delay () {
if (fwd_speed == 255) {
if (timer - frame_start >= 300) {
return true;
}
} else {
if (timer - frame_start >= 600) {
return true;
}
}
return false;
}
void Read_micro () {
if (Read_delay()) {
micro_position = digitalRead(PIN_MICRO);
if (micro_position == LOW
&& micro_primed == false) {
@ -103,6 +120,14 @@ void Read_micro () {
}
delay(2);//smooths out signal
}
}
void Watch_delay () {
if (timer - delay_start >= seq_delay) {
delaying = false;
Frame();
}
}
void Stop () {
delay(10);
@ -120,8 +145,8 @@ void Stop () {
micro_primed = false;
if (sequence) {
delay(seq_delay);
Trigger();
delaying = true;
delay_start = millis();
}
}
@ -169,9 +194,9 @@ void button_end (int index, long buttontime) {
sequence = true;
Output(2, 250);
}
Trigger();
Frame();
} else {
Trigger();
Frame();
}
} else if (index == 1) { //set direction
if (buttontime < 1000) {
@ -203,10 +228,6 @@ void button_end (int index, long buttontime) {
buttontime = 0;
}
void Trigger () {
Frame(cam_dir);
}
void Output (int number, int len) {
for (int i = 0; i < number; i++) {
Indicator(true);