From 0672d08cb85f4d4dbef6c83b6782ca5be062aa0c Mon Sep 17 00:00:00 2001
From: jonny_l480 <jonny@wwad.de>
Date: Wed, 21 Feb 2024 14:23:07 +0100
Subject: [PATCH] Adjust beeping

Tested on actual hardware.
- adjust count and duration of beeps
---
 board_single/main/button.cpp  |  6 +++---
 board_single/main/control.cpp |  2 +-
 board_single/main/main.cpp    |  4 ++--
 board_single/main/menu.cpp    | 16 +++++++++++-----
 common/buzzer.cpp             |  2 +-
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/board_single/main/button.cpp b/board_single/main/button.cpp
index 40962ac..6b7e618 100644
--- a/board_single/main/button.cpp
+++ b/board_single/main/button.cpp
@@ -67,7 +67,7 @@ void buttonCommands::action (uint8_t count, bool lastPressLong){
     // ## no command ##
     default:
         ESP_LOGE(TAG, "no command for count=%d and long=%d defined", count, lastPressLong);
-        buzzer->beep(3, 400, 100);
+        buzzer->beep(3, 200, 100);
         break;
 
     case 1:
@@ -76,7 +76,7 @@ void buttonCommands::action (uint8_t count, bool lastPressLong){
         {
             control->changeMode(controlMode_t::MENU);
             ESP_LOGW(TAG, "1x long press -> change to menu mode");
-            buzzer->beep(1, 1000, 1);
+            buzzer->beep(20, 20, 10);
             vTaskDelay(500 / portTICK_PERIOD_MS);
         }
         // ## toggle joystick freeze ##
@@ -214,4 +214,4 @@ void buttonCommands::startHandleLoop()
             }
         } //end queue
     } //end while(1)
-} //end function
\ No newline at end of file
+} //end function
diff --git a/board_single/main/control.cpp b/board_single/main/control.cpp
index e32c448..3d36346 100644
--- a/board_single/main/control.cpp
+++ b/board_single/main/control.cpp
@@ -419,7 +419,7 @@ void controlledArmchair::changeMode(controlMode_t modeNew) {
             break;
 
 		case controlMode_t::IDLE:
-			buzzer->beep(1, 1500, 0);
+			buzzer->beep(1, 1000, 0);
 #ifdef JOYSTICK_LOG_IN_IDLE
 			esp_log_level_set("evaluatedJoystick", ESP_LOG_DEBUG);
 #endif
diff --git a/board_single/main/main.cpp b/board_single/main/main.cpp
index 1640635..afdc31c 100644
--- a/board_single/main/main.cpp
+++ b/board_single/main/main.cpp
@@ -159,8 +159,8 @@ void createObjects()
     httpJoystickMain = new httpJoystick(configHttpJoystickMain);
     http_init_server(on_joystick_url);
 
-    // create buzzer object on pin 12 with gap between queued events of 100ms
-    buzzer = new buzzer_t(GPIO_NUM_12, 100);
+    // create buzzer object on pin 12 with gap between queued events of 1ms
+    buzzer = new buzzer_t(GPIO_NUM_12, 1);
 
     // create objects for controlling the chair position
     //                       gpio_up, gpio_down, name
diff --git a/board_single/main/menu.cpp b/board_single/main/menu.cpp
index 6b7fd20..2dad775 100644
--- a/board_single/main/menu.cpp
+++ b/board_single/main/menu.cpp
@@ -222,6 +222,7 @@ void item_debugJoystick_action(display_task_parameters_t * objects, SSD1306_t *
             case RE_ET_BTN_CLICKED:
             case RE_ET_BTN_LONG_PRESSED:
                 running = false;
+                objects->buzzer->beep(1, 100, 10);
                 break;
             case RE_ET_CHANGED:
             case RE_ET_BTN_PRESSED:
@@ -586,19 +587,24 @@ void handleMenu(display_task_parameters_t * objects, SSD1306_t *display)
             {
             case RE_ET_CHANGED:
                 //--- scroll in list ---
-                objects->buzzer->beep(1, 10, 5);
                 if (event.diff < 0)
                 {
                     if (selectedItem != itemCount - 1)
+                    {
+                        objects->buzzer->beep(1, 20, 0);
                         selectedItem++;
-                    ESP_LOGD(TAG, "showing next item: %d '%s'", selectedItem, menuItems[selectedItem].title);
+                        ESP_LOGD(TAG, "showing next item: %d '%s'", selectedItem, menuItems[selectedItem].title);
+                    }
                     //note: display will update at start of next run
                 }
                 else
                 {
                     if (selectedItem != 0)
+                    {
+                        objects->buzzer->beep(1, 20, 0);
                         selectedItem--;
-                    ESP_LOGD(TAG, "showing previous item: %d '%s'", selectedItem, menuItems[selectedItem].title);
+                        ESP_LOGD(TAG, "showing previous item: %d '%s'", selectedItem, menuItems[selectedItem].title);
+                    }
                     //note: display will update at start of next run
                 }
                 break;
@@ -623,7 +629,7 @@ void handleMenu(display_task_parameters_t * objects, SSD1306_t *display)
             case RE_ET_BTN_LONG_PRESSED:
                 //--- exit menu mode ---
                 // change to previous mode (e.g. JOYSTICK)
-                objects->buzzer->beep(4, 15, 5);
+                objects->buzzer->beep(12, 15, 8);
                 objects->control->toggleMode(controlMode_t::MENU); //currently already in MENU -> changes to previous mode
                 ssd1306_clear_screen(display, false);
                 break;
@@ -708,4 +714,4 @@ void handleMenu(display_task_parameters_t * objects, SSD1306_t *display)
         objects->control->changeMode(controlMode_t::IDLE);
         return;
     }
-}
\ No newline at end of file
+}
diff --git a/common/buzzer.cpp b/common/buzzer.cpp
index e320885..a80ec75 100644
--- a/common/buzzer.cpp
+++ b/common/buzzer.cpp
@@ -82,7 +82,7 @@ void buzzer_t::processQueue(){
             // otherwise waits for at least 7 weeks
             if( xQueueReceive( beepQueue, &entryRead, portMAX_DELAY ) )
             {
-                ESP_LOGW(TAG_BUZZER, "Read entry from queue: count=%d, msOn=%d, msOff=%d", entryRead.count, entryRead.msOn, entryRead.msOff);
+                ESP_LOGI(TAG_BUZZER, "Read entry from queue: count=%d, msOn=%d, msOff=%d", entryRead.count, entryRead.msOn, entryRead.msOff);
 
                 //beep requested count with requested delays
                 for (int i = entryRead.count; i--;){