From 886f72f03a37014531cedb838ffcdaaa1c9b7a15 Mon Sep 17 00:00:00 2001
From: Ronald Schaten <ronald@schatenseite.de>
Date: Thu, 10 Feb 2022 15:27:39 +0100
Subject: [PATCH] refactor, move debug code

---
 PhotoStepper/PhotoStepper.ino | 13 +++++--------
 PhotoStepper/Scenerunner.cpp  |  4 ++++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/PhotoStepper/PhotoStepper.ino b/PhotoStepper/PhotoStepper.ino
index b0bc644..cb627ca 100644
--- a/PhotoStepper/PhotoStepper.ino
+++ b/PhotoStepper/PhotoStepper.ino
@@ -81,11 +81,6 @@ result enter_jog() {
 
 result enter_run() {
   Serial.println("enter_run()");
-  lcd.clear();
-  lcd.print("Running...");
-  lcd.setCursor(0, 1);
-  lcd.print("[sel] to exit");
-  digitalWrite(PIN_CAMERA_SHUTTER, HIGH);
   state = STATE_RUN;
   return proceed;
 }
@@ -212,12 +207,13 @@ void ButtonHandler_run(const ButtonParam& param) {
   switch (param.state) {
     default:
       Serial.println();
+      stepper.stop();
+      stepper.setRPM(STEPPER_RPM);
       state = STATE_MENU;
       mainMenu.dirty = true;
       nav.doOutput();
       break;
   }
-  digitalWrite(PIN_CAMERA_SHUTTER, LOW);
 }
 
 void setup() {
@@ -253,11 +249,12 @@ void loop() {
       break;
     case STATE_JOG:
       keypad.loop(ButtonHandler_jog);
+      stepper.nextAction();
       break;
     case STATE_RUN:
       keypad.loop(ButtonHandler_run);
+      stepper.nextAction();
+      scenerunner.nextAction();
       break;
   }
-  stepper.nextAction();
-  scenerunner.nextAction();
 }
diff --git a/PhotoStepper/Scenerunner.cpp b/PhotoStepper/Scenerunner.cpp
index 2db0960..5ad41fa 100644
--- a/PhotoStepper/Scenerunner.cpp
+++ b/PhotoStepper/Scenerunner.cpp
@@ -13,4 +13,8 @@ Scenerunner::Scenerunner(LiquidCrystal *lcd, BasicStepperDriver *stepper, int pi
 
 void Scenerunner::nextAction(){
   // TODO: implement actions
+  _lcd->clear();
+  _lcd->print("Running...");
+  _lcd->setCursor(0, 1);
+  _lcd->print("[sel] to exit");
 }