Merged functions from INTVAL into camera firmware

Taking functionality from here:
https://github.com/sixteenmillimeter/intval2
This commit is contained in:
Matt 2016-05-12 22:59:10 -04:00
parent a45c8104d8
commit 408c0beb61
1 changed files with 86 additions and 19 deletions

View File

@ -1,13 +1,38 @@
boolean debug_state = false; boolean debug_state = false;
/*const int cam_pin = 4; //relay 8 /*
const int cam_time = {{cam.time}}; ----------------------------------------------------
const int cam_delay = {{cam.delay}}; Microswitch (use INPUT_PULLUP!!)
const int cam_momentary = {{cam.momentary}}; GND-----\ | \-----PIN
----------------------------------------------------
*/
const int cam_dir_1 = 6; //relay 7*/ const int FAST_PWM = 255;
const int SLOW_PWM = 127;
boolean cam_dir = true; //camera defaults to forward /* ------------------------------------------------
* pins
* ------------------------------------------------*/
//Adafruit Metro Mini
const int PIN_INDICATOR = 13;
const int PIN_MOTOR_FORWARD = 9;
const int PIN_MOTOR_BACKWARD = 10;
const int PIN_MICRO = 19; //laser cut version
volatile boolean running = false;
volatile boolean cam_dir = true;
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 fwd_speed = FAST_PWM;
volatile int bwd_speed = FAST_PWM;
volatile long seq_delay = 42;
const char cmd_camera = 'c'; const char cmd_camera = 'c';
const char cmd_cam_forward = 'e'; const char cmd_cam_forward = 'e';
@ -22,6 +47,8 @@ void setup() {
Serial.begin(57600); Serial.begin(57600);
Serial.flush(); Serial.flush();
Serial.setTimeout(serialDelay); Serial.setTimeout(serialDelay);
Pins_init();
} }
void loop() { void loop() {
@ -33,6 +60,11 @@ void loop() {
cmd(cmd_char); cmd(cmd_char);
cmd_char = 'z'; cmd_char = 'z';
} }
timer = millis();
if (running) {
Read_micro();
}
} }
void cmd (char val) { void cmd (char val) {
@ -41,7 +73,7 @@ void cmd (char val) {
} else if (val == cmd_connect) { } else if (val == cmd_connect) {
connect(); connect();
} else if (val == cmd_camera) { } else if (val == cmd_camera) {
camera(); Frame();
} else if (val == cmd_cam_forward) { } else if (val == cmd_cam_forward) {
cam_direction(true); //explicit cam_direction(true); //explicit
} else if (val == cmd_cam_backward) { } else if (val == cmd_cam_backward) {
@ -60,11 +92,15 @@ void connect () {
log("connect()"); log("connect()");
} }
void camera () { void Pins_init () {
/* FROM INTVAL pinMode(PIN_MOTOR_FORWARD, OUTPUT);
* WILL USE OPTICAL ENDSTOP pinMode(PIN_MOTOR_BACKWARD, OUTPUT);
* Time_start(); pinMode(PIN_MICRO, INPUT_PULLUP);
cam_dir = dir; pinMode(PIN_INDICATOR, OUTPUT);
}
void Frame () {
frame_start = millis();
if (cam_dir) { if (cam_dir) {
analogWrite(PIN_MOTOR_FORWARD, fwd_speed); analogWrite(PIN_MOTOR_FORWARD, fwd_speed);
analogWrite(PIN_MOTOR_BACKWARD, 0); analogWrite(PIN_MOTOR_BACKWARD, 0);
@ -73,15 +109,46 @@ void camera () {
analogWrite(PIN_MOTOR_FORWARD, 0); analogWrite(PIN_MOTOR_FORWARD, 0);
} }
running = true; running = true;
if (fwd_speed == 255) { micro_primed = false;
delay(300);
} else {
delay(600);
} }
micro_primed = false;*/
delay(750); //TEMPORARY DELAY FOR TESTING TIMING boolean Read_delay () {
Serial.println(cmd_camera); if (fwd_speed == FAST_PWM) {
log("camera()"); 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) {
micro_primed = true;
} else if (micro_position == HIGH
&& micro_primed == true) {
Stop();
}
delay(2);//smooths out signal
}
}
void Stop () {
delay(10);
analogWrite(PIN_MOTOR_FORWARD, 0);
analogWrite(PIN_MOTOR_BACKWARD, 0);
running = false;
micro_primed = false;
Serial.println(cmd_cam_backward);
log("Frame completed");
} }
void cam_direction (boolean state) { void cam_direction (boolean state) {