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

some changes to swing

Browse Source
This commit is contained in:
Oleksiy
2024-11-29 14:32:57 +02:00
parent 2285da9bd4
commit 4a5b1662f9
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Software/Gravity/Gravity.ino
View File

@ -11,7 +11,7 @@
#define VERSION "V:1.2A" #define VERSION "V:1.2A"
byte memCode = 'D'; //Change to different letter if you changed the data structure byte memCode = 'd'; //Change to different letter if you changed the data structure
uint16_t CV1Calibration = 512; uint16_t CV1Calibration = 512;
uint16_t CV2Calibration = 512; uint16_t CV2Calibration = 512;
@ -449,7 +449,7 @@ void calculateCycles() {
} }
playingModes[i] = subDivs[channels[i].subDiv - mod]; //subtracting because the innitial array is backwards playingModes[i] = subDivs[channels[i].subDiv - mod]; //subtracting because the innitial array is backwards
if (channels[i].mode == 2) { //} || channels[i].mode == 3) { //Sequencer and swing plays 1/16th if (channels[i].mode == 2 || channels[i].mode == 3) { //Sequencer and swing plays 1/16th
channelPulsesPerCycle[i] = (PPQN / 4) - 1; channelPulsesPerCycle[i] = (PPQN / 4) - 1;
} else if (playingModes[i] > 0) { } else if (playingModes[i] > 0) {
channelPulsesPerCycle[i] = (playingModes[i] * PPQN) - 1; channelPulsesPerCycle[i] = (playingModes[i] * PPQN) - 1;

6
Software/Gravity/Interactions.ino
View File

@ -266,10 +266,10 @@ void checkInputs() {
&& displayTab != 0 && displayTab != 0
&& menuItem == 1) { //Channel Mode && menuItem == 1) { //Channel Mode
channels[displayTab - 1].mode = channels[displayTab - 1].mode + change; channels[displayTab - 1].mode = channels[displayTab - 1].mode + change;
if (channels[displayTab - 1].mode > 100) { if (channels[displayTab - 1].mode == 7) {
channels[displayTab - 1].mode = 0; channels[displayTab - 1].mode = 4; //to make it cycle through all the modes
} else if (channels[displayTab - 1].mode > 4) { } else if (channels[displayTab - 1].mode > 4) {
channels[displayTab - 1].mode = 4; channels[displayTab - 1].mode = 0;
} }
channels[displayTab - 1].CV1Target = 0; channels[displayTab - 1].CV1Target = 0;
channels[displayTab - 1].CV2Target = 0; channels[displayTab - 1].CV2Target = 0;

2
Software/Gravity/UI.ino
View File

@ -235,7 +235,7 @@ void updateScreen() {
valueStr = valueStr + String(channels[displayTab - 1].seqPattern - 7); valueStr = valueStr + String(channels[displayTab - 1].seqPattern - 7);
} }
} else if (channels[displayTab - 1].mode == 3) { } else if (channels[displayTab - 1].mode == 3) {
byte swingVals[6] = {50, 54, 58, 62, 66, 71}; byte swingVals[6] = {50, 58, 66, 75, 83, 92};
valueStr = String(swingVals[channels[displayTab - 1].swing]) + "%"; valueStr = String(swingVals[channels[displayTab - 1].swing]) + "%";
} else if (channels[displayTab - 1].mode == 4) { } else if (channels[displayTab - 1].mode == 4) {
valueStr = String(channels[displayTab - 1].gate); valueStr = String(channels[displayTab - 1].gate);