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

changed most declarations typedefs. the ones that are not changed yet need to be reviewed in detail

Browse Source
This commit is contained in:
Oleksiy
2025-03-15 11:44:06 +02:00
parent 4b30e2ee9f
commit 9136a494e5
4 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Software/Gravity/UI.ino
View File

@ -2,8 +2,8 @@ void updateScreen() {
u8g2.firstPage();
do {
byte leftOffset;
byte width;
uint8_t leftOffset;
uint8_t width;
String valueStr;
u8g2.setDrawColor(1);
@ -27,7 +27,7 @@ void updateScreen() {
lastMenuItem = 1;
}
for (byte i = 1; i <= lastMenuItem; i++) {
for (uint8_t i = 1; i <= lastMenuItem; i++) {
if (i == 1) {
valueStr = F("MODE:");
} else if (i == 2 && masterClockMode == 0) {
@ -48,7 +48,7 @@ void updateScreen() {
}
//Values
for (byte i = 1; i <= lastMenuItem; i++) {
for (uint8_t i = 1; i <= lastMenuItem; i++) {
if (i == 1 && masterClockMode == 0) { //Channel mode
valueStr = F("INT");
} else if (i == 1 && masterClockMode == 1) {
@ -127,7 +127,7 @@ void updateScreen() {
}
width = 32;
leftOffset = 62;
for (byte i = 1; i <= lastMenuItem; i++) {
for (uint8_t i = 1; i <= lastMenuItem; i++) {
if (i == 1) {
valueStr = F("MODE:");
} else if (i == 2 && channels[displayTab - 1].mode == 0) {
@ -149,7 +149,7 @@ void updateScreen() {
}
//Values
for (byte i = 1; i <= lastMenuItem; i++) {
for (uint8_t i = 1; i <= lastMenuItem; i++) {
if (i == 1 && channels[displayTab - 1].mode == 0) { //Channel mode
valueStr = F("CLOCK");
} else if (i == 1 && channels[displayTab - 1].mode == 1) {
@ -243,7 +243,7 @@ void updateScreen() {
valueStr = valueStr + String(channels[displayTab - 1].seqPattern - 23);
}
} else if (channels[displayTab - 1].mode == 3) {
byte swingVals[6] = {50, 58, 66, 75, 83, 92};
uint8_t swingVals[6] = {50, 58, 66, 75, 83, 92};
valueStr = String(swingVals[channels[displayTab - 1].swing]) + "%";
} else if (channels[displayTab - 1].mode == 4) {
valueStr = String(channels[displayTab - 1].gate) + "%";
@ -261,8 +261,8 @@ void updateScreen() {
//Tabs
u8g2.drawHLine(0, 53, 128);
u8g2.setFont(stkS);
byte yPos = 61;
byte xWidth = 12;
uint8_t yPos = 61;
uint8_t xWidth = 12;
valueStr = F("w");
if (displayTab == 0) {
if (insideTab == true || shiftBtnPushed == true) {
@ -274,7 +274,7 @@ void updateScreen() {
u8g2.drawButtonUTF8(xWidth/2, yPos, U8G2_BTN_BW0|U8G2_BTN_HCENTER, xWidth, 0, 2, valueStr.c_str() );
}
for (int i = 1; i <= (extraChannel ? 7 : 6); i++) {
for (uint8_t i = 1; i <= (extraChannel ? 7 : 6); i++) {
valueStr = String(i);
if (displayTab == i) {
if (insideTab == true || shiftBtnPushed == true) {
@ -299,7 +299,7 @@ void updateScreen() {
//Edit Pattern Screen (Sequencer)
else if (displayScreen == 1) {
u8g2.setFont(stkS);
byte pattern = channels[displayTab - 1].seqPattern;
uint8_t pattern = channels[displayTab - 1].seqPattern;
if (pattern < 8) {
valueStr = F("PATTERN A");
valueStr = valueStr + String(pattern + 1);
@ -327,7 +327,7 @@ void updateScreen() {
}
u8g2.drawHLine(0, 8, 128);
for (byte i = 0; i <= sequences[patternToEdit].length; i++) {
for (uint8_t i = 0; i <= sequences[patternToEdit].length; i++) {
u8g2.drawUTF8(19 + (i % 8)*12, 33 - ((sequences[patternToEdit].length / 8) * 5) + ((i / 8) * 11), (bitRead(sequences[patternToEdit].sequence, i) ? "q" : "p"));
}
if (!isRecording && stepNumSelected >= 0) {
@ -347,8 +347,8 @@ void updateScreen() {
u8g2.drawStr(122 - (u8g2.getStrWidth(version.c_str())), 5, version.c_str() );
u8g2.drawHLine(0, 8, 128);
lastMenuItem = 4;
byte width = 112;
for (byte i = 0; i <= lastMenuItem; i++) {
uint8_t width = 112;
for (uint8_t i = 0; i <= lastMenuItem; i++) {
switch(i) {
case 0:
valueStr = F("CALIBRATE CV INS");