From a2b67c1a4015bfa0ca8cc2b85bab8f493b034952 Mon Sep 17 00:00:00 2001
From: jonny_l480 <jonny@wwad.de>
Date: Sat, 31 Aug 2024 20:13:03 +0200
Subject: [PATCH] Add support for non-idle default mode, Set startup mode
 ADJUST

---
 board_single/main/config.cpp  |  4 +++-
 board_single/main/control.cpp | 15 +++++++++++----
 board_single/main/control.hpp |  4 +++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/board_single/main/config.cpp b/board_single/main/config.cpp
index a5bb2b5..d5e40ac 100644
--- a/board_single/main/config.cpp
+++ b/board_single/main/config.cpp
@@ -135,7 +135,9 @@ motorctl_config_t configMotorControlRight = {
 //------- control config -------
 //------------------------------
 control_config_t configControl = {
-    .defaultMode = controlMode_t::JOYSTICK, // default mode after startup and toggling IDLE
+    .defaultMode = controlMode_t::ADJUST_CHAIR, // default mode after startup and toggling IDLE
+    .idleAfterStartup = false,  //when true: armchair is in IDLE mode after startup (2x press switches to defaultMode)
+                                //when false: immediately switches to active defaultMode after startup
     //--- timeouts ---
     .timeoutSwitchToIdleMs = 5 * 60 * 1000, // time of inactivity after which the mode gets switched to IDLE
     .timeoutNotifyPowerStillOnMs = 6 * 60 * 60 * 1000 // time in IDLE after which buzzer beeps in certain interval (notify "forgot to turn off")
diff --git a/board_single/main/control.cpp b/board_single/main/control.cpp
index 907c293..8c8c411 100644
--- a/board_single/main/control.cpp
+++ b/board_single/main/control.cpp
@@ -88,6 +88,13 @@ controlledArmchair::controlledArmchair(
 
     // create semaphore for preventing race condition: mode-change operations while currently still executing certain mode
     handleIteration_mutex = xSemaphoreCreateMutex();
+
+    //switch to default active mode if configured
+    if (config.idleAfterStartup == false)
+    {
+        ESP_LOGI(TAG, "idleAfterStartup is disabled -> switching to configured default mode...");
+        changeMode(config.defaultMode, true); //switch to default mode without beeping
+    }
 }
 
 
@@ -434,7 +441,7 @@ void controlledArmchair::handleTimeout()
 //----------- changeMode ------------
 //-----------------------------------
 //function to change to a specified control mode
-void controlledArmchair::changeMode(controlMode_t modeNew)
+void controlledArmchair::changeMode(controlMode_t modeNew, bool noBeep)
 {
     // variable to store configured accel limit before entering massage mode, to restore it later
     static uint32_t massagePreviousAccel = motorLeft->getFade(fadeType_t::ACCEL);
@@ -472,7 +479,7 @@ void controlledArmchair::changeMode(controlMode_t modeNew)
             ESP_LOGI(TAG, "disabling debug output for 'evaluatedJoystick'");
             esp_log_level_set("evaluatedJoystick", ESP_LOG_WARN); // FIXME: loglevel from config
 #endif
-            buzzer->beep(1, 200, 100);
+            if (!noBeep) buzzer->beep(1, 200, 100);
             break;
 
         case controlMode_t::HTTP:
@@ -523,7 +530,7 @@ void controlledArmchair::changeMode(controlMode_t modeNew)
         case controlMode_t::IDLE:
             ESP_LOGW(TAG, "switching to IDLE mode: turning both motors off, beep");
             idleBothMotors();
-            buzzer->beep(1, 900, 0);
+            if (!noBeep) buzzer->beep(1, 900, 0);
             break;
 
         case controlMode_t::HTTP:
@@ -534,7 +541,7 @@ void controlledArmchair::changeMode(controlMode_t modeNew)
         case controlMode_t::ADJUST_CHAIR:
             ESP_LOGW(TAG, "switching to ADJUST_CHAIR mode: turning both motors off, beep");
             idleBothMotors();
-            buzzer->beep(3, 100, 50);
+            if (!noBeep) buzzer->beep(3, 100, 50);
             break;
 
         case controlMode_t::MENU_SETTINGS:
diff --git a/board_single/main/control.hpp b/board_single/main/control.hpp
index fa4d20d..404a3ba 100644
--- a/board_single/main/control.hpp
+++ b/board_single/main/control.hpp
@@ -29,6 +29,8 @@ extern const uint8_t controlModeMaxCount;
 //struct with config parameters
 typedef struct control_config_t {
     controlMode_t defaultMode;  //default mode after startup and toggling IDLE
+    bool idleAfterStartup;  //when true: armchair is in IDLE mode after startup (2x press switches to defaultMode)
+                            //when false: immediately switches to active defaultMode after startup when set to false
     //timeout options
     uint32_t timeoutSwitchToIdleMs;         //time of inactivity after which the mode gets switched to IDLE
     uint32_t timeoutNotifyPowerStillOnMs;
@@ -79,7 +81,7 @@ class controlledArmchair {
         void startHandleLoop();
 
         //function that changes to a specified control mode
-        void changeMode(controlMode_t modeNew);
+        void changeMode(controlMode_t modeNew, bool noBeep = false);
 
         //function that toggle between IDLE and previous active mode (or default if not switched to certain mode yet)
         void toggleIdle();