Extracted staffVolumeDown to seperate file
All checks were successful
Build Code / build (push) Successful in 1m16s

This commit is contained in:
2025-10-22 15:01:19 +02:00
parent ff67e2438f
commit 2292e2f736
3 changed files with 28 additions and 21 deletions

View File

@@ -1,3 +1,4 @@
#pragma once #pragma once
void staffVolumeUp(int *maxVolume); void staffVolumeUp(int *maxVolume);
void staffVolumeDown(int maxVolume, int *userVolume, int *oldUserVolume);

View File

@@ -55,26 +55,7 @@ void loop()
// SW2 - Staff Volume Down // SW2 - Staff Volume Down
if (!debounceRead(BTN_STAFF_DWN)) if (!debounceRead(BTN_STAFF_DWN))
{ {
if (maxVolume > STAFF_STEPS) staffVolumeDown(maxVolume, &userVolume, &oldUserVolume);
{
maxVolume -= STAFF_STEPS;
if (userVolume > maxVolume)
{
for (int i = 0; i < (userVolume - maxVolume); i++)
{
potDecrement();
}
userVolume = maxVolume;
oldUserVolume = userVolume;
}
if (oldUserVolume > maxVolume)
{
oldUserVolume = maxVolume;
}
}
} }
// Remote D - Mute // Remote D - Mute

View File

@@ -1,5 +1,6 @@
#include <staffFunctions.h> #include <staffFunctions.h>
#include <constants.h> #include <constants.h>
#include <potControlls.h>
void staffVolumeUp(int *maxVolume) void staffVolumeUp(int *maxVolume)
{ {
@@ -8,3 +9,27 @@ void staffVolumeUp(int *maxVolume)
*maxVolume += STAFF_STEPS; *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;
}
}
}