Extracted volumeUp to seperate file
All checks were successful
Build Code / build (push) Successful in 1m23s
All checks were successful
Build Code / build (push) Successful in 1m23s
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
#pragma once
|
||||
|
||||
void volumeUp(int *userVolume, int *oldUserVolume, int maxVolume);
|
||||
void volumeDown(int *userVolume, int *oldUserVolume);
|
||||
21
src/main.cpp
21
src/main.cpp
@@ -170,26 +170,7 @@ void loop()
|
||||
// Make sure we are not is a state of mute or lowered
|
||||
if (debounceRead(REMOTE_B) && !(oldUserVolume > userVolume))
|
||||
{
|
||||
if ((userVolume + USER_STEPS) > maxVolume)
|
||||
{
|
||||
for (int i = 0; i < maxVolume - userVolume; i++)
|
||||
{
|
||||
potIncrement();
|
||||
}
|
||||
|
||||
userVolume = maxVolume;
|
||||
oldUserVolume = userVolume;
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int i = 0; i < USER_STEPS; i++)
|
||||
{
|
||||
potIncrement();
|
||||
}
|
||||
|
||||
userVolume += USER_STEPS;
|
||||
oldUserVolume = userVolume;
|
||||
}
|
||||
volumeUp(&userVolume, &oldUserVolume, maxVolume);
|
||||
}
|
||||
|
||||
// Remote C - Volume Down
|
||||
|
||||
@@ -2,6 +2,30 @@
|
||||
#include <constants.h>
|
||||
#include <potControlls.h>
|
||||
|
||||
void volumeUp(int *userVolume, int *oldUserVolume, int maxVolume)
|
||||
{
|
||||
if ((*userVolume + USER_STEPS) > maxVolume)
|
||||
{
|
||||
for (int i = 0; i < maxVolume - *userVolume; i++)
|
||||
{
|
||||
potIncrement();
|
||||
}
|
||||
|
||||
*userVolume = maxVolume;
|
||||
*oldUserVolume = *userVolume;
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int i = 0; i < USER_STEPS; i++)
|
||||
{
|
||||
potIncrement();
|
||||
}
|
||||
|
||||
*userVolume += USER_STEPS;
|
||||
*oldUserVolume = *userVolume;
|
||||
}
|
||||
}
|
||||
|
||||
void volumeDown(int *userVolume, int *oldUserVolume)
|
||||
{
|
||||
if ((*userVolume - USER_STEPS) < 0)
|
||||
|
||||
Reference in New Issue
Block a user