diff --git a/include/staffFunctions.h b/include/staffFunctions.h new file mode 100644 index 0000000..963cb07 --- /dev/null +++ b/include/staffFunctions.h @@ -0,0 +1,3 @@ +#pragma once + +void staffVolumeUp(int *maxVolume); \ No newline at end of file diff --git a/include/userFunctions.h b/include/userFunctions.h index 392db24..7874deb 100644 --- a/include/userFunctions.h +++ b/include/userFunctions.h @@ -1,6 +1,6 @@ #pragma once -void mute(int *userVolume, int *oldUserVolume, int maxVolume); -void lowerVolume(int *userVolume, int *oldUserVolume, int maxVolume); void volumeUp(int *userVolume, int *oldUserVolume, int maxVolume); -void volumeDown(int *userVolume, int *oldUserVolume); \ No newline at end of file +void volumeDown(int *userVolume, int *oldUserVolume); +void lowerVolume(int *userVolume, int *oldUserVolume, int maxVolume); +void mute(int *userVolume, int *oldUserVolume, int maxVolume); \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 33edca7..7a28f06 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3,6 +3,7 @@ #include #include #include +#include int maxVolume = 64; int userVolume = 64; @@ -48,10 +49,7 @@ void loop() // SW1 - Staff Volume Up if (!debounceRead(BTN_STAFF_UP)) { - if (maxVolume < 100) - { - maxVolume += STAFF_STEPS; - } + staffVolumeUp(&maxVolume); } // SW2 - Staff Volume Down diff --git a/src/staffFunctions.cpp b/src/staffFunctions.cpp new file mode 100644 index 0000000..25b13bb --- /dev/null +++ b/src/staffFunctions.cpp @@ -0,0 +1,10 @@ +#include +#include + +void staffVolumeUp(int *maxVolume) +{ + if (*maxVolume < 64) + { + *maxVolume += STAFF_STEPS; + } +} \ No newline at end of file