From 4cb6b41a6b8e3cffa5234acae95e6b32201a6ed7 Mon Sep 17 00:00:00 2001
From: jonny_ji7 <jonny@wwad.de>
Date: Fri, 23 Sep 2022 10:33:42 +0200
Subject: [PATCH] Add blinking at RESET; Adjust preset values

Blink 'IST' value on top display when reset (as with presets)
Adjust preset values to current labeling
---
 main/control.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/main/control.cpp b/main/control.cpp
index 6a9ec92..3b6263d 100644
--- a/main/control.cpp
+++ b/main/control.cpp
@@ -193,6 +193,7 @@ void task_control(void *pvParameter)
             rotary_encoder_reset(&encoder);
             lengthNow = 0;
             buzzer.beep(1, 700, 100);
+            displayTop.blink(2, 100, 100, "1ST     ");
             //TODO: stop cutter with reset switch?
             //cutter_stop();
         }
@@ -283,20 +284,20 @@ void task_control(void *pvParameter)
         //--- target length presets ---
         if (controlState != systemState_t::MANUAL) { //dont apply preset length while controlling motor with preset buttons
             if (SW_PRESET1.risingEdge) {
-                lengthTarget = 1000;
-                buzzer.beep(lengthTarget/1000, 25, 30);
-                displayBot.blink(3, 100, 100, "S0LL    ");
-            }
-            else if (SW_PRESET2.risingEdge) {
                 lengthTarget = 5000;
                 buzzer.beep(lengthTarget/1000, 25, 30);
                 displayBot.blink(2, 100, 100, "S0LL    ");
             }
-            else if (SW_PRESET3.risingEdge) {
+            else if (SW_PRESET2.risingEdge) {
                 lengthTarget = 10000;
                 buzzer.beep(lengthTarget/1000, 25, 30);
                 displayBot.blink(2, 100, 100, "S0LL    ");
             }
+            else if (SW_PRESET3.risingEdge) {
+                lengthTarget = 15000;
+                buzzer.beep(lengthTarget/1000, 25, 30);
+                displayBot.blink(2, 100, 100, "S0LL    ");
+            }
         }