per channel random

This commit is contained in:
2023-02-03 16:02:57 +02:00
parent e4b3c79450
commit aed86d0be4

View File

@ -22,8 +22,9 @@
const int outsPins[6] = {5, 6, 7, 8, 9, 10};
const int outsModes[22] = {-24, -16, -12, -8, -6, -4, -3, -2, -1, 0, 1, 1.5, 2, 3, 4, 5, 6, 7, 8, 16, 32, 100}; //positive - divide, negative - multiply, 0 - off, 100 - random
int outsModeIndex[6] = {10, 8, 12, 14, 9, 8}; //10 - /1, 9 - off
const int outsModes[21] = {-24, -16, -12, -8, -6, -4, -3, -2, -1, 0, 1, 1.5, 2, 3, 4, 5, 6, 7, 8, 16, 32}; //positive - divide, negative - multiply, 0 - off
int outsModeIndex[6] = {7, 7, 9, 9, 9, 9}; //10 - /1, 9 - off
bool outsModeRandom[6] = {0,0,0,0,0,0};
int outsPeriods[6];
int outsClocksCounts[6];
int outsModesPlay[6]; //actual channel modes array updated from outsModeIndex each beat
@ -53,12 +54,15 @@ int a1Input = 0;
bool changesSaved;
int encPositionOld = 0;
unsigned long encPressedTime;
unsigned long encReleasedTime;
bool encPressRegistered;
Adafruit_SSD1306 display(128, 64, &Wire, -1);
RotaryEncoder encoder(ENC_D1_PIN, ENC_D2_PIN, RotaryEncoder::LatchMode::TWO03);
void setup() {
//Serial.begin(9600);
Serial.begin(9600);
pinMode(INPUT_CONNECTED_PIN, INPUT_PULLUP);
pinMode(ENC_BTN_PIN, INPUT_PULLUP);
@ -96,21 +100,17 @@ void internalClock() {
if (a1Input != 0 && i == 5) { //TESTING THE MODULATION ON 6th CHANNEL
outsModesPlay[i] = outsModes[outsModeIndex[i] - a1Input];
}
if (outsModesPlay[i] > 0 && outsModesPlay[i] != 100) {
if (outsModesPlay[i] > 0) {
if (outsClocksCounts[i] == 0) { //Pulse on 0
if (outsModeRandom[i] == 0 || (outsModeRandom[i] == 1 && random(2))) { //random
digitalWrite(outsPins[i], HIGH);
}
}
if (outsClocksCounts[i] < (outsModesPlay[i] - 1)) {
outsClocksCounts[i]++;
} else {
outsClocksCounts[i] = 0;
}
} else if (outsModesPlay[i] == 100) { //random
if (outsClocksCounts[i] == 0) {
if (random(2)) { // random(2) gives either 0 or 1, so it's 50/50 chance
digitalWrite(outsPins[i], HIGH);
}
}
}
}
beatCounted = true;
@ -120,8 +120,10 @@ void internalClock() {
for (int i = 0; i<6; i++) {
if (outsModesPlay[i] < 0) {
if (outsClocksCounts[i] == 0) { //Pulse on 0
if (outsModeRandom[i] == 0 || (outsModeRandom[i] == 1 && random(2))) { //random
digitalWrite(outsPins[i], HIGH);
}
}
if (outsClocksCounts[i] < (PPQN / abs(outsModesPlay[i])) - 1) {
outsClocksCounts[i]++;
} else {
@ -177,6 +179,29 @@ void checkInputs() {
}
//encoder button
if (!digitalRead(ENC_BTN_PIN) && !encPressRegistered) {
encPressRegistered = true;
encPressedTime = millis();
} else if (digitalRead(ENC_BTN_PIN) && encPressRegistered) {
encPressRegistered = false;
encReleasedTime = millis();
Serial.println(encReleasedTime - encPressedTime);
if (encReleasedTime - encPressedTime < 500) { // press shorter than .5s
displayTabOld = displayTab;
displayTab++;
if (displayTab>6) {
displayTab = 0;
}
needToChangeTab = 0;
updateScreen();
} else if (displayTab != 0) { // long press switches random mode
outsModeRandom[displayTab-1] = !outsModeRandom[displayTab-1];
updateScreen();
}
}
/*
if (needToChangeTab == 0 && digitalRead(ENC_BTN_PIN) == 0) {
needToChangeTab = 1;
} else if (needToChangeTab == 1 && digitalRead(ENC_BTN_PIN) == 1) {
@ -187,7 +212,7 @@ void checkInputs() {
}
needToChangeTab = 0;
updateScreen();
}
}*/
//encoder
encoder.tick();
@ -233,7 +258,8 @@ void updateScreen() {
display.clearDisplay();
//Tabs
display.setCursor(0,0);
display.drawRect(0, 0, 128, 2, SSD1306_WHITE);
display.setCursor(0,2);
display.setTextSize(1);
if (displayTab == 0) {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
@ -260,8 +286,11 @@ void updateScreen() {
}
}
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
display.println(F(" "));
//display.println(F(" "));
display.fillRect(108, 2, 20, 8, SSD1306_WHITE);
display.println();
display.println();
display.fillRect(0, 10, 128, 2, SSD1306_WHITE);
//Content
display.setTextSize(3);
@ -272,8 +301,6 @@ void updateScreen() {
} else {
if (outsModes[outsModeIndex[displayTab-1]] == 0) {
display.print(F(" OFF"));
} else if (outsModes[outsModeIndex[displayTab-1]] == 100) {
display.print(F("/RANDOM"));
} else if (outsModes[outsModeIndex[displayTab-1]]>0) {
display.print(F(" /"));
display.print(abs(outsModes[outsModeIndex[displayTab-1]]));
@ -282,6 +309,15 @@ void updateScreen() {
display.print(abs(outsModes[outsModeIndex[displayTab-1]]));
}
}
display.println();
display.setTextSize(1);
display.println();
//Extra params
display.setTextSize(1);
if (displayTab != 0 && outsModeRandom[displayTab-1] == 1) {
display.print(F("RANDOM"));
}
display.display();
}