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

Moved modes to enum

Browse Source
This commit is contained in:
Oleksiy
2025-03-27 19:55:15 +02:00
parent cd29fedbfb
commit 4767c2942f
3 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Software/Gravity/Interactions.ino
View File

@ -12,7 +12,7 @@ void checkInputs() {
} else if (encReleasedTime - encPressedTime <= 300) { // press shorter than .3s is for entering the submenu
if (!insideTab && displayScreen == 0) {
insideTab = true;
} else if (insideTab && channels[displayTab - 1].mode == 2 && menuItem == 2 && displayScreen == 0) { //enter the pattern editor
} else if (insideTab && channels[displayTab - 1].mode == Sequencer && menuItem == 2 && displayScreen == 0) { //enter the pattern editor
patternToEdit = channels[displayTab - 1].seqPattern;
displayScreen = 1;
isRecording = 0;
@ -103,7 +103,7 @@ void checkInputs() {
|| (insideTab && menuItem == 0
&& (menuItemSelected || shiftBtnPushed)))
&& displayTab != 0
&& channels[displayTab - 1].mode == 0) {
&& channels[displayTab - 1].mode == Clock) {
channels[displayTab - 1].subDiv = channels[displayTab - 1].subDiv - change;
//channels[displayTab - 1].offset = 0;
if (channels[displayTab - 1].subDiv > 100) {
@ -128,7 +128,7 @@ void checkInputs() {
|| (insideTab && menuItem == 0
&& (menuItemSelected || shiftBtnPushed)))
&& displayTab != 0
&& channels[displayTab - 1].mode == 1) { //Change Random
&& channels[displayTab - 1].mode == Random) { //Change Random
channels[displayTab - 1].random = channels[displayTab - 1].random + change;
if (channels[displayTab - 1].random > 100) {
channels[displayTab - 1].random = 0;
@ -140,7 +140,7 @@ void checkInputs() {
|| (insideTab && menuItem == 0
&& (menuItemSelected || shiftBtnPushed)))
&& displayTab != 0
&& channels[displayTab - 1].mode == 2) { //Change SEQ pattern
&& channels[displayTab - 1].mode == Sequencer) { //Change SEQ pattern
if (channels[displayTab - 1].seqPattern == 0 && change == -1) {
channels[displayTab - 1].seqPattern = 0;
} else if (channels[displayTab - 1].seqPattern == 31 && change == 1) {
@ -153,7 +153,7 @@ void checkInputs() {
|| (insideTab && menuItem == 0
&& (menuItemSelected || shiftBtnPushed)))
&& displayTab != 0
&& channels[displayTab - 1].mode == 3) { //Change SWING
&& channels[displayTab - 1].mode == Swing) { //Change SWING
channels[displayTab - 1].swing = channels[displayTab - 1].swing + change;
if (channels[displayTab - 1].swing > 6) {
channels[displayTab - 1].swing = 0;
@ -165,7 +165,7 @@ void checkInputs() {
|| (insideTab && menuItem == 0
&& (menuItemSelected || shiftBtnPushed)))
&& displayTab != 0
&& channels[displayTab - 1].mode == 4) { //Change GATE
&& channels[displayTab - 1].mode == Gate) { //Change GATE
channels[displayTab - 1].gate = channels[displayTab - 1].gate + change;
if (channels[displayTab - 1].gate > 100 || channels[displayTab - 1].gate == 0) {
channels[displayTab - 1].gate = 1;
@ -252,7 +252,7 @@ void checkInputs() {
} else if (insideTab
&& (menuItemSelected || shiftBtnPushed)
&& displayTab != 0 && menuItem == 2
&& channels[displayTab - 1].mode == 0) { //Offset
&& channels[displayTab - 1].mode == Clock) { //Offset
channels[displayTab - 1].offset = channels[displayTab - 1].offset + change;
if (channels[displayTab - 1].offset == 255) { // 0 - 1 for uint8 is 255
channels[displayTab - 1].offset = 0;
@ -264,7 +264,7 @@ void checkInputs() {
&& (menuItemSelected || shiftBtnPushed)
&& displayTab != 0
&& menuItem == 2
&& (channels[displayTab - 1].mode == 1 || channels[displayTab - 1].mode == 4)) { //SUBDIV for RANDOM and GATE
&& (channels[displayTab - 1].mode == Random || channels[displayTab - 1].mode == Gate)) { //SUBDIV for RANDOM and GATE
channels[displayTab - 1].subDiv = channels[displayTab - 1].subDiv - change;
if (channels[displayTab - 1].subDiv > 200) {
channels[displayTab - 1].subDiv = 0;
@ -279,7 +279,7 @@ void checkInputs() {
&& (menuItemSelected || shiftBtnPushed)
&& displayTab != 0
&& menuItem == 3
&& channels[displayTab - 1].mode == 0) { //CV for CLK
&& channels[displayTab - 1].mode == Clock) { //CV for CLK
if (channels[displayTab - 1].CV1Target == 1 && channels[displayTab - 1].CV2Target == 0) {
channelCV = 1;
} else if (channels[displayTab - 1].CV1Target == 0 && channels[displayTab - 1].CV2Target == 1) {
@ -301,7 +301,7 @@ void checkInputs() {
channels[displayTab - 1].CV2Target = 1;
}
saveState();
} else if (insideTab && (menuItemSelected || shiftBtnPushed) && displayTab != 0 && menuItem == 3 && channels[displayTab - 1].mode == 1) { //CV for RND
} else if (insideTab && (menuItemSelected || shiftBtnPushed) && displayTab != 0 && menuItem == 3 && channels[displayTab - 1].mode == Random) { //CV for RND
if (channels[displayTab - 1].CV1Target == 2 && channels[displayTab - 1].CV2Target == 0) {
channelCV = 1;
} else if (channels[displayTab - 1].CV1Target == 0 && channels[displayTab - 1].CV2Target == 2) {
@ -323,7 +323,7 @@ void checkInputs() {
channels[displayTab - 1].CV2Target = 2;
}
saveState();
} else if (insideTab && (menuItemSelected || shiftBtnPushed) && displayTab != 0 && menuItem == 3 && channels[displayTab - 1].mode == 2) { //CV1 for SEQ
} else if (insideTab && (menuItemSelected || shiftBtnPushed) && displayTab != 0 && menuItem == 3 && channels[displayTab - 1].mode == Sequencer) { //CV1 for SEQ
if (channels[displayTab - 1].CV1Target == 3 && channels[displayTab - 1].CV2Target == 0) {
channelCV = 1;
} else if (channels[displayTab - 1].CV1Target == 0 && channels[displayTab - 1].CV2Target == 3) {