Oleksiy/GravityFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor formatting changes

Browse Source
This commit is contained in:
Oleksiy
2025-04-03 21:31:11 +03:00
parent 4767c2942f
commit 91511da688
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Software/Gravity/Gravity.ino
View File

@ -99,7 +99,7 @@ int playingModes[7]; // should be renamed to currentSubdivs or something. Updat
int playingModesOld[7]; int playingModesOld[7];
uint16_t pulsePeriod; uint16_t pulsePeriod;
bool isPlaying;// = false; // replace to something like uint8_t status where 1xxxxxx isPlaying, x1xxxxx isRecording etc bool isPlaying;// = false; // replace with some flags like uint8_t status where 1xxxxxx isPlaying, x1xxxxx isRecording etc
bool isRecording = false; bool isRecording = false;
bool recordToNextStep = false; bool recordToNextStep = false;
bool MIDIClockReceived = false; bool MIDIClockReceived = false;
@ -125,12 +125,13 @@ bool menuItemSelected = false;
uint8_t lastMenuItem = 3; uint8_t lastMenuItem = 3;
uint8_t displayScreen = 0; //0 - main, 1 - sequencer, 2 - settings uint8_t displayScreen = 0; //0 - main, 1 - sequencer, 2 - settings
bool playBtnPushed = false;
bool shiftBtnPushed = false;
int16_t CV1Input = 0; int16_t CV1Input = 0;
int16_t CV2Input = 0; int16_t CV2Input = 0;
bool playBtnPushed = false;
bool shiftBtnPushed = false;
bool encBtnPushed;
int encPositionOld = 0; int encPositionOld = 0;
uint8_t encDirectionOld = 0; uint8_t encDirectionOld = 0;
uint32_t encPressedTime; uint32_t encPressedTime;
@ -139,7 +140,7 @@ uint32_t playPressedTime;
uint32_t playReleasedTime; uint32_t playReleasedTime;
uint32_t shiftPressedTime; uint32_t shiftPressedTime;
uint32_t shiftReleasedTime; uint32_t shiftReleasedTime;
bool encBtnPushed;
int extResetCountdown; int extResetCountdown;
int extTriggerCount; int extTriggerCount;

8
Software/Gravity/Interactions.ino
View File

@ -108,8 +108,8 @@ void checkInputs() {
//channels[displayTab - 1].offset = 0; //channels[displayTab - 1].offset = 0;
if (channels[displayTab - 1].subDiv > 100) { if (channels[displayTab - 1].subDiv > 100) {
channels[displayTab - 1].subDiv = 0; channels[displayTab - 1].subDiv = 0;
} if (channels[displayTab - 1].subDiv > (sizeof(subDivs) / sizeof(int)) - 1) { } if (channels[displayTab - 1].subDiv > (sizeof(subDivs) / sizeof(subDivs[0])) - 1) {
channels[displayTab - 1].subDiv = (sizeof(subDivs) / sizeof(int)) - 1; channels[displayTab - 1].subDiv = (sizeof(subDivs) / sizeof(subDivs[0])) - 1;
} }
if (!isPlaying) { if (!isPlaying) {
calculateCycles(); calculateCycles();
@ -268,8 +268,8 @@ void checkInputs() {
channels[displayTab - 1].subDiv = channels[displayTab - 1].subDiv - change; channels[displayTab - 1].subDiv = channels[displayTab - 1].subDiv - change;
if (channels[displayTab - 1].subDiv > 200) { if (channels[displayTab - 1].subDiv > 200) {
channels[displayTab - 1].subDiv = 0; channels[displayTab - 1].subDiv = 0;
} else if (channels[displayTab - 1].subDiv > (sizeof(subDivs) / sizeof(int)) - 1) { } else if (channels[displayTab - 1].subDiv > (sizeof(subDivs) / sizeof(subDivs[0])) - 1) {
channels[displayTab - 1].subDiv = (sizeof(subDivs) / sizeof(int)) - 1; channels[displayTab - 1].subDiv = (sizeof(subDivs) / sizeof(subDivs[0])) - 1;
} }
if (!isPlaying) { if (!isPlaying) {
calculateCycles(); calculateCycles();