oleksiy/GravityHW
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More fixes related to offset

Browse Source
This commit is contained in:
Oleksiy
2023-08-26 22:30:01 +03:00
parent 0a4fba7870
commit 9d07f35908
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Software/Gravity/Gravity.ino
View File

@ -44,7 +44,7 @@ struct channel {
byte CV1Range; byte CV1Range;
byte CV2Target; byte CV2Target;
byte CV2Range; byte CV2Range;
byte offset; unsigned int offset;
byte random; byte random;
byte seqPattern; byte seqPattern;
}; };

24
Software/Gravity/Interactions.ino
View File

@ -108,22 +108,13 @@ void checkInputs() {
} }
saveState(); saveState();
calculateBPMTiming(); calculateBPMTiming();
} else if (((!insideTab && shiftBtnPushed) } else if (((!insideTab && shiftBtnPushed) //Change Subdiv and reset offset
|| (insideTab && menuItem == 0 || (insideTab && menuItem == 0
&& (menuItemSelected || shiftBtnPushed))) && (menuItemSelected || shiftBtnPushed)))
&& displayTab != 0 && displayTab != 0
&& channels[displayTab - 1].mode == 0) { //Change Subdiv and reset offset && channels[displayTab - 1].mode == 0) {
channels[displayTab - 1].subDiv = channels[displayTab - 1].subDiv - change; channels[displayTab - 1].subDiv = channels[displayTab - 1].subDiv - change;
//channels[displayTab - 1].offset = 0; //channels[displayTab - 1].offset = 0;
int PulsesPerStep;
if (subDivs[channels[displayTab - 1].subDiv] < 0) {
PulsesPerStep = PPQN / subDivs[channels[displayTab - 1].subDiv] * -1 ;
} else {
PulsesPerStep = subDivs[channels[displayTab - 1].subDiv] * PPQN;
}
if (channels[displayTab - 1].offset >= PulsesPerStep) {
channels[displayTab - 1].offset = PulsesPerStep - 1;
}
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(int)) - 1) {
@ -132,6 +123,15 @@ void checkInputs() {
if (!isPlaying) { if (!isPlaying) {
calculateCycles(); calculateCycles();
} }
int PulsesPerStep; //offset part
if (subDivs[channels[displayTab - 1].subDiv] < 0) {
PulsesPerStep = PPQN / subDivs[channels[displayTab - 1].subDiv] * -1 ;
} else {
PulsesPerStep = subDivs[channels[displayTab - 1].subDiv] * PPQN;
}
if (channels[displayTab - 1].offset >= PulsesPerStep) {
channels[displayTab - 1].offset = PulsesPerStep - 1;
}
saveState(); saveState();
} else if (((!insideTab && shiftBtnPushed) } else if (((!insideTab && shiftBtnPushed)
|| (insideTab && menuItem == 0 || (insideTab && menuItem == 0
@ -208,7 +208,7 @@ void checkInputs() {
saveState(); saveState();
} else if (insideTab && (menuItemSelected || shiftBtnPushed) && displayTab != 0 && menuItem == 2 && channels[displayTab - 1].mode == 0) { //Offset } else if (insideTab && (menuItemSelected || shiftBtnPushed) && displayTab != 0 && menuItem == 2 && channels[displayTab - 1].mode == 0) { //Offset
channels[displayTab - 1].offset = channels[displayTab - 1].offset + change; channels[displayTab - 1].offset = channels[displayTab - 1].offset + change;
if (channels[displayTab - 1].offset > 100) { if (channels[displayTab - 1].offset > 1000) {
channels[displayTab - 1].offset = 0; channels[displayTab - 1].offset = 0;
} else if (channels[displayTab - 1].offset > channelPulsesPerCycle[displayTab-1]) { } else if (channels[displayTab - 1].offset > channelPulsesPerCycle[displayTab-1]) {
channels[displayTab - 1].offset = channelPulsesPerCycle[displayTab-1]; channels[displayTab - 1].offset = channelPulsesPerCycle[displayTab-1];