diff --git a/include/pinDefinitions.h b/include/constants.h similarity index 85% rename from include/pinDefinitions.h rename to include/constants.h index 95f23b4..b5d9c4f 100644 --- a/include/pinDefinitions.h +++ b/include/constants.h @@ -1,5 +1,8 @@ #pragma once +const int USER_STEPS = 2; +const int STAFF_STEPS = 16; + const int POT_CS = 10; const int POT_UD = 9; diff --git a/include/userFunctions.h b/include/userFunctions.h new file mode 100644 index 0000000..427a139 --- /dev/null +++ b/include/userFunctions.h @@ -0,0 +1,3 @@ +#pragma once + +void volumeDown(int *userVolume, int *oldUserVolume); \ No newline at end of file diff --git a/src/ledControlls.cpp b/src/ledControlls.cpp index c883909..b9f45a8 100644 --- a/src/ledControlls.cpp +++ b/src/ledControlls.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include void resetLeds() diff --git a/src/main.cpp b/src/main.cpp index e1ba6b8..31e54c6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,10 +1,8 @@ #include -#include +#include #include #include - -const int USER_STEPS = 2; -const int STAFF_STEPS = 16; +#include int maxVolume = 64; int userVolume = 64; @@ -197,26 +195,7 @@ void loop() // Remote C - Volume Down if (debounceRead(REMOTE_C) && !(oldUserVolume > userVolume)) { - 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; - } + volumeDown(&userVolume, &oldUserVolume); } } diff --git a/src/potControlls.cpp b/src/potControlls.cpp index 88ae62c..434bea1 100644 --- a/src/potControlls.cpp +++ b/src/potControlls.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include void potIncrement() diff --git a/src/userFunctions.cpp b/src/userFunctions.cpp new file mode 100644 index 0000000..db03327 --- /dev/null +++ b/src/userFunctions.cpp @@ -0,0 +1,27 @@ +#include +#include +#include + +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; + } +} \ No newline at end of file