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

basic rework of UI for rev 2

Browse Source
This commit is contained in:
Oleksiy
2023-07-23 17:15:04 +03:00
parent cf31a7574a
commit d1493f8e18
2 changed files with 280 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

194
software/GToE/GToE.ino
View File

@ -13,9 +13,9 @@
#define PULSE_LENGTH 12 //ms (with 12 ms you can't get higher than 208bpm) #define PULSE_LENGTH 12 //ms (with 12 ms you can't get higher than 208bpm)
#define MAXBPM 200 //250 at 24ppqn with 5ms pulse will be 50/50 square wave #define MAXBPM 200 //250 at 24ppqn with 5ms pulse will be 50/50 square wave
#define MINBPM 20 #define MINBPM 20
#define SCREEN_TIMEOUT 300000 //Turn display off after 5 min #define SCREEN_TIMEOUT 600000 //Turn display off after 5 min
///* Rev 1 Config /* Rev 1 Config
#define ENC_BTN_PIN 14 #define ENC_BTN_PIN 14
#define ENC_D1_PIN 17 #define ENC_D1_PIN 17
#define ENC_D2_PIN 4 #define ENC_D2_PIN 4
@ -26,9 +26,9 @@
#define ANALOGUE_INPUT_2_PIN A1 #define ANALOGUE_INPUT_2_PIN A1
const int outsPins[6] = {6, 11, 7, 10, 8, 9}; const int outsPins[6] = {6, 11, 7, 10, 8, 9};
//*/ */
/* Rev 2 Config ///* Rev 2 Config
#define ENC_BTN_PIN 14 #define ENC_BTN_PIN 14
#define ENC_D1_PIN 17 #define ENC_D1_PIN 17
#define ENC_D2_PIN 4 #define ENC_D2_PIN 4
@ -40,7 +40,7 @@ const int outsPins[6] = {6, 11, 7, 10, 8, 9};
#define ANALOGUE_INPUT_2_PIN A6 #define ANALOGUE_INPUT_2_PIN A6
const int outsPins[6] = { 7, 8, 10, 6, 9, 11 }; const int outsPins[6] = { 7, 8, 10, 6, 9, 11 };
*/ //*/
const int clockModes[17] = { -24, -12, -8, -6, -4, -3, -2, 1, 2, 3, 4, 5, 6, 7, 8, 16, 32 }; //positive - divide, negative - multiply, 0 - off const int clockModes[17] = { -24, -12, -8, -6, -4, -3, -2, 1, 2, 3, 4, 5, 6, 7, 8, 16, 32 }; //positive - divide, negative - multiply, 0 - off
@ -118,6 +118,7 @@ const unsigned char splash_logo [] PROGMEM = {
0xff, 0xc0, 0x00 0xff, 0xc0, 0x00
}; };
void setup() { void setup() {
//Serial.begin(9600); //Serial.begin(9600);
@ -149,12 +150,14 @@ void setup() {
} }
display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS); display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS);
display.setRotation(2);
display.clearDisplay();
//Splash screen //Splash screen
display.clearDisplay(); //displayLogo();
//display.setRotation(2); //rotate display for rev 2 display.drawBitmap(48, 0, splash_logo, 33, 39, 1);
display.drawBitmap(48, 18, splash_logo, 33, 39, 1);
display.setCursor(90,1); display.setCursor(0, 56);
display.setTextSize(1); display.setTextSize(1);
display.setTextColor(SSD1306_WHITE); display.setTextColor(SSD1306_WHITE);
display.print(F("V:")); display.print(F("V:"));
@ -172,10 +175,10 @@ void setup() {
void loop() { void loop() {
checkInputs(); checkInputs();
if ((millis() - lastInteractionTime) > SCREEN_TIMEOUT) { /*if ((millis() - lastInteractionTime) > SCREEN_TIMEOUT) {
display.clearDisplay(); display.clearDisplay();
display.display(); display.display();
} }*/
if (masterClockMode == 2 || masterClockMode == 3) { if (masterClockMode == 2 || masterClockMode == 3) {
calculateBPMTiming(); calculateBPMTiming();
} }
@ -229,7 +232,6 @@ void clock() {
digitalWrite(outsPins[i], LOW); digitalWrite(outsPins[i], LOW);
} }
} }
} }
} }
@ -298,8 +300,6 @@ void externalClock() {
resetClocks(); resetClocks();
extResetCountdown++; //to get out of the loop extResetCountdown++; //to get out of the loop
} }
} }
} }
@ -358,7 +358,6 @@ void calculateCycles() {
} else { } else {
channelPulsesPerCycle[i] = (PPQN / abs(playingModes[i])) - 1; channelPulsesPerCycle[i] = (PPQN / abs(playingModes[i])) - 1;
} }
} }
} }
@ -537,168 +536,3 @@ void checkInputs() {
a2Input = analogRead(ANALOGUE_INPUT_2_PIN); a2Input = analogRead(ANALOGUE_INPUT_2_PIN);
} }
void updateScreen() {
display.clearDisplay();
lastInteractionTime = millis(); //not sure if it's a right place for this, but should do for now
//Tabs
display.drawRect(0, 0, 128, 2, SSD1306_WHITE);
display.setCursor(0,2);
display.setTextSize(1);
if (displayTab == 0) {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
display.print(F(" "));
display.setTextColor(SSD1306_WHITE);
display.print(F(" bpm "));
} else {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
display.print(F(" bpm"));
}
for (int i = 1; i <= 6; i++) {
if (displayTab == i) {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
display.print(" ");
display.setTextColor(SSD1306_WHITE);
display.print(" ");
display.print(i);
display.print(" ");
} else {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
display.print(" ");
display.print(i);
}
}
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
display.fillRect(108, 2, 20, 8, SSD1306_WHITE);
display.println();
display.println();
display.fillRect(0, 10, 128, 2, SSD1306_WHITE);
//Content
display.setCursor(4,16);
display.setTextSize(3);
display.setTextColor(SSD1306_WHITE);
if (displayTab == 0 && masterClockMode == 0) {
if (bpm<100) {
display.print(" ");
}
display.println(bpm);
display.setCursor(21,40);
display.setTextSize(2);
display.println(F("bpm"));
} else if (displayTab == 0 && masterClockMode == 1) {
display.println(F(" 24"));
display.setCursor(8,40);
display.setTextSize(2);
display.println(F("PPQN"));
} else if (displayTab == 0 && masterClockMode == 2) {
display.setCursor(8,16);
display.setTextSize(2);
display.println(F("BEAT"));
} else if (displayTab == 0 && masterClockMode == 3) {
display.setCursor(8,16);
display.setTextSize(2);
display.println(F("1/16"));
} else {
if (clockModes[channels[displayTab-1].mode] == 0) {
display.print(F("OFF"));
} else if (clockModes[channels[displayTab-1].mode]>0) {
display.print(F("/"));
display.print(abs(clockModes[channels[displayTab-1].mode]));
} else {
display.print(F("x"));
display.print(abs(clockModes[channels[displayTab-1].mode]));
}
}
display.println();
display.setTextSize(1);
display.println();
//Extra params
display.setCursor(58,16);
display.setTextSize(1);
if (displayTab == 0) {
if (insideTab == 1) {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
} else {
display.setTextColor(SSD1306_WHITE);
}
display.print(F(" CLK:"));
if (masterClockMode == 1) {
display.println(F("EXT24 "));
} else if (masterClockMode == 2) {
display.println(F("EXT-B "));
} else if (masterClockMode == 3) {
display.println(F("EXT16 "));
} else {
display.println(F("INT "));
}
if (insideTab == 2) {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
} else {
display.setTextColor(SSD1306_WHITE);
}
display.setCursor(58,30);
display.print(F(" MOD:"));
if (bpmModulationRange != 0 && masterClockMode == 0) {
display.print(F("CV"));
display.print(bpmModulationChannel+1);
display.print("+");
display.print(bpmModulationRange * 10);
} else {
display.print(F("Off "));
}
} else {
if (insideTab == 1) {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
} else {
display.setTextColor(SSD1306_WHITE);
}
display.print(F(" RND:"));
if (channels[displayTab-1].random > 0) {
display.print(channels[displayTab-1].random);
display.print(F("0% "));
} else {
display.print(F("Off "));
}
if (insideTab == 2) {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
} else {
display.setTextColor(SSD1306_WHITE);
}
display.setCursor(58,30);
display.print(F(" MOD:"));
if (channels[displayTab-1].modulationChannel && channels[displayTab-1].modulationRange != 0) {
display.print(F("CV2"));
if (channels[displayTab-1].modulationRange > 0) {
display.print(F("+"));
}
display.print(channels[displayTab-1].modulationRange);
display.print(F(" "));
} else if (!channels[displayTab-1].modulationChannel && channels[displayTab-1].modulationRange != 0) {
display.print(F("CV1"));
if (channels[displayTab-1].modulationRange > 0) {
display.print(F("+"));
}
display.print(channels[displayTab-1].modulationRange);
display.print(F(" "));
} else {
display.print(F("Off "));
}
if (insideTab == 3) {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
} else {
display.setTextColor(SSD1306_WHITE);
}
display.setCursor(58,44);
display.print(F(" OFT:"));
display.print(channels[displayTab-1].offset);
display.print(F("/"));
display.print(channelPulsesPerCycle[displayTab-1]+1);
display.print(F(" "));
}
display.display();
}

162
software/GToE/UI.ino Normal file
View File

@ -0,0 +1,162 @@
void updateScreen() {
display.clearDisplay();
lastInteractionTime = millis(); //not sure if it's a right place for this, but should do for now
//Tabs
display.drawRect(0, 48, 128, 1, SSD1306_WHITE);
display.setCursor(0, 50);
display.setTextSize(1);
if (displayTab == 0) {
//display.setTextColor(SSD1306_WHITE, SSD1306_BLACK);
//display.print(F(" "));
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
display.print(F(" bpm "));
} else {
display.setTextColor(SSD1306_WHITE, SSD1306_BLACK);
display.print(F(" bpm"));
}
for (int i = 1; i <= 6; i++) {
if (displayTab == i) {
display.setTextColor(SSD1306_WHITE, SSD1306_BLACK);
display.print(" ");
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
display.print(" ");
display.print(i);
display.print(" ");
} else {
display.setTextColor(SSD1306_WHITE, SSD1306_BLACK);
display.print(" ");
display.print(i);
}
}
//display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
//display.fillRect(108, 60, 20, 8, SSD1306_WHITE);
//display.println();
//display.println();
//display.fillRect(0, 10, 128, 2, SSD1306_WHITE);
//Content
display.setCursor(4, 0);
display.setTextSize(3);
display.setTextColor(SSD1306_WHITE);
if (displayTab == 0 && masterClockMode == 0) {
if (bpm < 100) {
display.print(" ");
}
display.println(bpm);
display.setCursor(21, 24);
display.setTextSize(2);
display.println(F("bpm"));
} else if (displayTab == 0 && masterClockMode == 1) {
display.println(F(" 24"));
display.setCursor(8, 24);
display.setTextSize(2);
display.println(F("PPQN"));
} else if (displayTab == 0 && masterClockMode == 2) {
display.setCursor(8, 8);
display.setTextSize(2);
display.println(F("BEAT"));
} else if (displayTab == 0 && masterClockMode == 3) {
display.setCursor(8, 8);
display.setTextSize(2);
display.println(F("1/16"));
} else {
if (clockModes[channels[displayTab - 1].mode] == 0) {
display.print(F("OFF"));
} else if (clockModes[channels[displayTab - 1].mode] > 0) {
display.print(F("/"));
display.print(abs(clockModes[channels[displayTab - 1].mode]));
} else {
display.print(F("x"));
display.print(abs(clockModes[channels[displayTab - 1].mode]));
}
}
//Extra params
display.setCursor(58, 0);
display.setTextSize(1);
if (displayTab == 0) {
if (insideTab == 1) {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
} else {
display.setTextColor(SSD1306_WHITE);
}
display.print(F(" CLK:"));
if (masterClockMode == 1) {
display.println(F("EXT24 "));
} else if (masterClockMode == 2) {
display.println(F("EXT-B "));
} else if (masterClockMode == 3) {
display.println(F("EXT16 "));
} else {
display.println(F("INT "));
}
if (insideTab == 2) {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
} else {
display.setTextColor(SSD1306_WHITE);
}
display.setCursor(58, 16);
display.print(F(" MOD:"));
if (bpmModulationRange != 0 && masterClockMode == 0) {
display.print(F("CV"));
display.print(bpmModulationChannel + 1);
display.print("+");
display.print(bpmModulationRange * 10);
} else {
display.print(F("Off "));
}
} else {
if (insideTab == 1) {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
} else {
display.setTextColor(SSD1306_WHITE);
}
display.print(F(" RND:"));
if (channels[displayTab - 1].random > 0) {
display.print(channels[displayTab - 1].random);
display.print(F("0% "));
} else {
display.print(F("Off "));
}
if (insideTab == 2) {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
} else {
display.setTextColor(SSD1306_WHITE);
}
display.setCursor(58, 16);
display.print(F(" MOD:"));
if (channels[displayTab - 1].modulationChannel && channels[displayTab - 1].modulationRange != 0) {
display.print(F("CV2"));
if (channels[displayTab - 1].modulationRange > 0) {
display.print(F("+"));
}
display.print(channels[displayTab - 1].modulationRange);
display.print(F(" "));
} else if (!channels[displayTab - 1].modulationChannel && channels[displayTab - 1].modulationRange != 0) {
display.print(F("CV1"));
if (channels[displayTab - 1].modulationRange > 0) {
display.print(F("+"));
}
display.print(channels[displayTab - 1].modulationRange);
display.print(F(" "));
} else {
display.print(F("Off "));
}
if (insideTab == 3) {
display.setTextColor(SSD1306_BLACK, SSD1306_WHITE);
} else {
display.setTextColor(SSD1306_WHITE);
}
display.setCursor(58, 32);
display.print(F(" OFT:"));
display.print(channels[displayTab - 1].offset);
display.print(F("/"));
display.print(channelPulsesPerCycle[displayTab - 1] + 1);
display.print(F(" "));
}
display.display();
}