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

This commit is contained in:
2025-10-22 14:43:06 +02:00
parent 033526ce00
commit 6e4df40ba0
6 changed files with 38 additions and 26 deletions

View File

@@ -1,5 +1,8 @@
#pragma once #pragma once
const int USER_STEPS = 2;
const int STAFF_STEPS = 16;
const int POT_CS = 10; const int POT_CS = 10;
const int POT_UD = 9; const int POT_UD = 9;

3
include/userFunctions.h Normal file
View File

@@ -0,0 +1,3 @@
#pragma once
void volumeDown(int *userVolume, int *oldUserVolume);

View File

@@ -1,5 +1,5 @@
#include <Arduino.h> #include <Arduino.h>
#include <pinDefinitions.h> #include <constants.h>
#include <ledControlls.h> #include <ledControlls.h>
void resetLeds() void resetLeds()

View File

@@ -1,10 +1,8 @@
#include <Arduino.h> #include <Arduino.h>
#include <pinDefinitions.h> #include <constants.h>
#include <potControlls.h> #include <potControlls.h>
#include <ledControlls.h> #include <ledControlls.h>
#include <userFunctions.h>
const int USER_STEPS = 2;
const int STAFF_STEPS = 16;
int maxVolume = 64; int maxVolume = 64;
int userVolume = 64; int userVolume = 64;
@@ -197,26 +195,7 @@ void loop()
// Remote C - Volume Down // Remote C - Volume Down
if (debounceRead(REMOTE_C) && !(oldUserVolume > userVolume)) if (debounceRead(REMOTE_C) && !(oldUserVolume > userVolume))
{ {
if ((userVolume - USER_STEPS) < 0) volumeDown(&userVolume, &oldUserVolume);
{
for (int i = 0; i < userVolume; i++)
{
potDecrement();
}
userVolume = 0;
oldUserVolume = userVolume;
}
else
{
for (int i = 0; i < USER_STEPS; i++)
{
potDecrement();
}
userVolume -= USER_STEPS;
oldUserVolume = userVolume;
}
} }
} }

View File

@@ -1,5 +1,5 @@
#include <Arduino.h> #include <Arduino.h>
#include <pinDefinitions.h> #include <constants.h>
#include <potControlls.h> #include <potControlls.h>
void potIncrement() void potIncrement()

27
src/userFunctions.cpp Normal file
View File

@@ -0,0 +1,27 @@
#include <userFunctions.h>
#include <constants.h>
#include <potControlls.h>
void volumeDown(int *userVolume, int *oldUserVolume)
{
if ((*userVolume - USER_STEPS) < 0)
{
for (int i = 0; i < *userVolume; i++)
{
potDecrement();
}
*userVolume = 0;
*oldUserVolume = *userVolume;
}
else
{
for (int i = 0; i < USER_STEPS; i++)
{
potDecrement();
}
*userVolume -= USER_STEPS;
*oldUserVolume = *userVolume;
}
}