From e574248a7fd0e13bb73a497a693249fc5c819987 Mon Sep 17 00:00:00 2001 From: Ronald Schaten Date: Thu, 10 Feb 2022 14:53:35 +0100 Subject: [PATCH] pass LCD to scenerunner() --- PhotoStepper/PhotoStepper.ino | 2 +- PhotoStepper/Scenerunner.cpp | 6 ++++-- PhotoStepper/Scenerunner.h | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/PhotoStepper/PhotoStepper.ino b/PhotoStepper/PhotoStepper.ino index 70bca6a..b3c79d4 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; +Scenerunner scenerunner(&lcd); void lcd_print(int line, String string) { Serial.print("lcd_print("); diff --git a/PhotoStepper/Scenerunner.cpp b/PhotoStepper/Scenerunner.cpp index 476fd45..c55bd1b 100644 --- a/PhotoStepper/Scenerunner.cpp +++ b/PhotoStepper/Scenerunner.cpp @@ -1,8 +1,10 @@ #include "Arduino.h" +#include + #include "Scenerunner.h" -Scenerunner::Scenerunner() { - // TODO: initialize +Scenerunner::Scenerunner(LiquidCrystal *lcd) { + _lcd = lcd; } void Scenerunner::nextAction(){ diff --git a/PhotoStepper/Scenerunner.h b/PhotoStepper/Scenerunner.h index ae84c6f..b63c3f0 100644 --- a/PhotoStepper/Scenerunner.h +++ b/PhotoStepper/Scenerunner.h @@ -2,6 +2,7 @@ #define Scenerunner_h #include "Arduino.h" +#include class Scenerunner { @@ -17,10 +18,11 @@ class Scenerunner { int nSteps = 10; float distance = 0.5; - Scenerunner(); + Scenerunner(LiquidCrystal *lcd); void nextAction(); private: + LiquidCrystal *_lcd; enum RunStep { RUN_OFF, RUN_SETTLE, RUN_FOCUS, RUN_SHUTTER, RUN_RETURN }; RunStep runStep = RUN_OFF;