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

Moved button interaction indicator code into const variables

This commit is contained in:
Matt McWilliams 2025-12-03 05:34:01 -08:00
parent 18edaf5192
commit ebf4c1d719
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ino/intval2_4_serial/Intval2.cpp
View File

@ -12,6 +12,11 @@ void Intval2::begin () {
//timed_open = OpenTiming();
}
/***
*
*
**/
void Intval2::loop () {
timer = millis();
@ -231,8 +236,6 @@ void Intval2::TimedExposurePause () {
open_avg = round(((timer - open_start) + open_avg) / 2);
}
void Intval2::TimedExposureWatch () {
if (timed_exposure_opening) {
if (timer - frame_start >= open_stop) {
@ -267,7 +270,7 @@ void Intval2::ButtonEnd (uint8_t index, long time) {
if (time > 1000) {
if (!timelapse && !running) {
timelapse = true;
Output(2, 75);
Output(OUTPUT_TWO, OUTPUT_SHORT);
Camera();
}
} else {
@ -281,28 +284,28 @@ void Intval2::ButtonEnd (uint8_t index, long time) {
} else if (index == 1) { //set delay
if (time < 42) {
timelapse_delay = 42;
Output(1, 500);
Output(OUTPUT_ONE, OUTPUT_LONG);
} else {
timelapse_delay = time;
Output(2, 250);
Output(OUTPUT_TWO, OUTPUT_MEDIUM);
}
} else if (index == 2) { // set speed
if (time >= 1000) {
//timed_delay = time - BOLEX_C;
timed_exposure = true;
Output(2, 250);
Output(OUTPUT_TWO, OUTPUT_MEDIUM);
} else if (time < 1000) {
//timed_delay = 0;
timed_exposure = false;
Output(1, 500);
Output(OUTPUT_ONE, OUTPUT_LONG);
}
} else if (index == 3) { //set direction
if (time < 1000) {
direction = true;
Output(1, 500);
Output(OUTPUT_ONE, OUTPUT_LONG);
} else if (time > 1000) {
direction = false;
Output(2, 250);
Output(OUTPUT_TWO, OUTPUT_MEDIUM);
}
}
//time = 0;

14
ino/intval2_4_serial/Intval2.h
View File

@ -13,6 +13,13 @@ class Intval2 {
const uint8_t PIN_MICROSWITCH = 19; //A5
const uint8_t BUTTONS[4] = {3, 4, 5, 6}; //trigger, delay, speed, direction
const uint16_t OUTPUT_SHORT = 75;
const uint16_t OUTPUT_MEDIUM = 250;
const uint16_t OUTPUT_LONG = 500;
const uint8_t OUTPUT_ONE = 1;
const uint8_t OUTPUT_TWO = 2;
//MOTOR CONST
const uint16_t MOTOR_RPM = 120;
const float MOTOR_OPEN_FORWARD = 0.275; // 99deg
@ -35,9 +42,11 @@ class Intval2 {
volatile boolean delaying = false;
volatile boolean open = false;
volatile boolean closed = true;
volatile boolean timed_exposure_open = false; //is the shutter open only during a timed exposure
volatile boolean timed_exposure_opening = false;
volatile boolean timed_exposure_closing = false;
volatile uint8_t microswitch_position = 0;
volatile boolean microswitch_primed = false;
@ -52,16 +61,11 @@ class Intval2 {
volatile unsigned long delay_start = 0;
volatile unsigned long open_start = 0;
volatile unsigned long close_start = 0;
volatile unsigned long timelapse_delay = 42; //time between frames during timelapse
volatile unsigned long timed_exposure_ms = 0;
volatile unsigned long open_stop = 100; //ms to stop when camera is opened
volatile unsigned long timed_exposure_delay = 0; //ms to delay once camera is open
volatile unsigned long exposure = 0;
volatile unsigned long avg = 600;
volatile unsigned long timed_exposure_avg = 600;
volatile unsigned long open_avg = 300;