From 97398cffd74ae4bc515fdffcd58c73cd1e9051b6 Mon Sep 17 00:00:00 2001 From: Ronald Schaten Date: Thu, 10 Feb 2022 15:14:28 +0100 Subject: [PATCH] pass camera connection to scenerunner() --- PhotoStepper/PhotoStepper.ino | 2 +- PhotoStepper/Scenerunner.cpp | 4 +++- PhotoStepper/Scenerunner.h | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/PhotoStepper/PhotoStepper.ino b/PhotoStepper/PhotoStepper.ino index 2090bc2..b0bc644 100644 --- a/PhotoStepper/PhotoStepper.ino +++ b/PhotoStepper/PhotoStepper.ino @@ -62,7 +62,7 @@ BasicStepperDriver stepper(STEPPER_STEPS, PIN_STEPPER_DIR, PIN_STEPPER_STEP); enum State { STATE_MENU, STATE_JOG, STATE_RUN }; State state = STATE_MENU; -Scenerunner scenerunner(&lcd, &stepper); +Scenerunner scenerunner(&lcd, &stepper, PIN_CAMERA_FOCUS, PIN_CAMERA_SHUTTER); // === // Order of menu entries looks chaotic. It makes sense on screen. diff --git a/PhotoStepper/Scenerunner.cpp b/PhotoStepper/Scenerunner.cpp index 9a8f823..2db0960 100644 --- a/PhotoStepper/Scenerunner.cpp +++ b/PhotoStepper/Scenerunner.cpp @@ -4,9 +4,11 @@ #include "Scenerunner.h" -Scenerunner::Scenerunner(LiquidCrystal *lcd, BasicStepperDriver *stepper) { +Scenerunner::Scenerunner(LiquidCrystal *lcd, BasicStepperDriver *stepper, int pin_focus, int pin_shutter) { _lcd = lcd; _stepper = stepper; + _pin_focus = pin_focus; + _pin_shutter = pin_shutter; } void Scenerunner::nextAction(){ diff --git a/PhotoStepper/Scenerunner.h b/PhotoStepper/Scenerunner.h index ec18dad..a9ab253 100644 --- a/PhotoStepper/Scenerunner.h +++ b/PhotoStepper/Scenerunner.h @@ -19,12 +19,14 @@ class Scenerunner { int nSteps = 10; float distance = 0.5; - Scenerunner(LiquidCrystal *lcd, BasicStepperDriver *stepper); + Scenerunner(LiquidCrystal *lcd, BasicStepperDriver *stepper, int pin_focus, int pin_shutter); void nextAction(); private: LiquidCrystal *_lcd; BasicStepperDriver *_stepper; + int _pin_focus; + int _pin_shutter; enum RunStep { RUN_OFF, RUN_SETTLE, RUN_FOCUS, RUN_SHUTTER, RUN_RETURN }; RunStep runStep = RUN_OFF;