From 2292e2f7362998304ba9650b5cb1bf3ee1aad788 Mon Sep 17 00:00:00 2001
From: Lyubomir Penev <me@lpenev.com>
Date: Wed, 22 Oct 2025 15:01:19 +0200
Subject: [PATCH] Extracted staffVolumeDown to seperate file

---
 include/staffFunctions.h |  3 ++-
 src/main.cpp             | 21 +--------------------
 src/staffFunctions.cpp   | 25 +++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/include/staffFunctions.h b/include/staffFunctions.h
index 963cb07..89a32aa 100644
--- a/include/staffFunctions.h
+++ b/include/staffFunctions.h
@@ -1,3 +1,4 @@
 #pragma once
 
-void staffVolumeUp(int *maxVolume);
\ No newline at end of file
+void staffVolumeUp(int *maxVolume);
+void staffVolumeDown(int maxVolume, int *userVolume, int *oldUserVolume);
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 7a28f06..28f746d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -55,26 +55,7 @@ void loop()
   // SW2 - Staff Volume Down
   if (!debounceRead(BTN_STAFF_DWN))
   {
-    if (maxVolume > STAFF_STEPS)
-    {
-      maxVolume -= STAFF_STEPS;
-
-      if (userVolume > maxVolume)
-      {
-        for (int i = 0; i < (userVolume - maxVolume); i++)
-        {
-          potDecrement();
-        }
-
-        userVolume = maxVolume;
-        oldUserVolume = userVolume;
-      }
-
-      if (oldUserVolume > maxVolume)
-      {
-        oldUserVolume = maxVolume;
-      }
-    }
+    staffVolumeDown(maxVolume, &userVolume, &oldUserVolume);
   }
 
   // Remote D - Mute
diff --git a/src/staffFunctions.cpp b/src/staffFunctions.cpp
index 25b13bb..8309e0e 100644
--- a/src/staffFunctions.cpp
+++ b/src/staffFunctions.cpp
@@ -1,5 +1,6 @@
 #include <staffFunctions.h>
 #include <constants.h>
+#include <potControlls.h>
 
 void staffVolumeUp(int *maxVolume)
 {
@@ -7,4 +8,28 @@ void staffVolumeUp(int *maxVolume)
     {
         *maxVolume += STAFF_STEPS;
     }
+}
+
+void staffVolumeDown(int maxVolume, int *userVolume, int *oldUserVolume)
+{
+    if (maxVolume > STAFF_STEPS)
+    {
+        maxVolume -= STAFF_STEPS;
+
+        if (*userVolume > maxVolume)
+        {
+            for (int i = 0; i < (*userVolume - maxVolume); i++)
+            {
+                potDecrement();
+            }
+
+            *userVolume = maxVolume;
+            *oldUserVolume = *userVolume;
+        }
+
+        if (*oldUserVolume > maxVolume)
+        {
+            *oldUserVolume = maxVolume;
+        }
+    }
 }
\ No newline at end of file