supleed2/ELEC60013-ES-CW2
1
0
Fork 0
mirror of https://github.com/supleed2/ELEC60013-ES-CW2.git synced 2024-12-22 05:35:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Encoder Driver Perfected

Browse source 
Added debug print to display
This commit is contained in:
Aadi Desai 2022-03-25 19:58:14 +00:00
parent 3c8c3def94
commit 9722483056
No known key found for this signature in database
GPG key ID: CFFFE425830EF4D9
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/knob/knob.cpp
View file

@ -43,7 +43,7 @@ void Knob::updateRotation(bool ANew, bool BNew) {
if (cwRot) { if (cwRot) {
if (previousRotation == CW && fullstep) { if (previousRotation == CW && fullstep) {
rotationInternal++; rotationInternal++;
} else if (previousRotation == ACW) { } else if (previousRotation == ACW && fullstep) {
previousRotation = NONE; previousRotation = NONE;
} else { } else {
previousRotation = CW; previousRotation = CW;
@ -51,7 +51,7 @@ void Knob::updateRotation(bool ANew, bool BNew) {
} else if (acwRot) { } else if (acwRot) {
if (previousRotation == ACW && fullstep) { if (previousRotation == ACW && fullstep) {
rotationInternal--; rotationInternal--;
} else if (previousRotation == CW) { } else if (previousRotation == CW && fullstep) {
previousRotation = NONE; previousRotation = NONE;
} else { } else {
previousRotation = ACW; previousRotation = ACW;

13
src/main.cpp
View file

@ -233,7 +233,7 @@ void announceMainSynth() {
// Task to update keyArray values at a higher priority // Task to update keyArray values at a higher priority
void scanKeysTask(void *pvParameters) { void scanKeysTask(void *pvParameters) {
const TickType_t xFrequency = 50 / portTICK_PERIOD_MS; const TickType_t xFrequency = 20 / portTICK_PERIOD_MS;
TickType_t xLastWakeTime = xTaskGetTickCount(); TickType_t xLastWakeTime = xTaskGetTickCount();
while (1) { while (1) {
vTaskDelayUntil(&xLastWakeTime, xFrequency); vTaskDelayUntil(&xLastWakeTime, xFrequency);
@ -259,7 +259,7 @@ void scanKeysTask(void *pvParameters) {
announceMainSynth(); announceMainSynth();
} }
if (volumeFiner) { if (volumeFiner) {
K3.changeLimitsVolume(0, 10); K3.changeLimitsVolume(0, 20);
} else { } else {
K3.changeLimitsVolume(0, 5); K3.changeLimitsVolume(0, 5);
} }
@ -286,10 +286,10 @@ void displayUpdateTask(void *pvParameters) {
u8g2.setFont(u8g2_font_profont12_mf); // choose a suitable font u8g2.setFont(u8g2_font_profont12_mf); // choose a suitable font
u8g2.drawStr(2, 10, notes[latestKey]); // Print the currently pressed keys u8g2.drawStr(2, 10, notes[latestKey]); // Print the currently pressed keys
// u8g2.setCursor(2, 20); u8g2.setCursor(2, 20);
// for (uint8_t i = 0; i < 7; i++) { for (uint8_t i = 0; i < 7; i++) {
// u8g2.print(keyArray[i], HEX); u8g2.print(keyArray[i], HEX);
// }; };
// u8g2.setCursor(100, 10); // Debug print of received CAN message // u8g2.setCursor(100, 10); // Debug print of received CAN message
// u8g2.print((char)RX_Message[0]); // u8g2.print((char)RX_Message[0]);
// u8g2.print(RX_Message[1]); // u8g2.print(RX_Message[1]);
@ -322,6 +322,7 @@ void displayUpdateTask(void *pvParameters) {
u8g2.drawHLine(1, 6, 26); u8g2.drawHLine(1, 6, 26);
u8g2.drawHLine(36, 26, 18); u8g2.drawHLine(36, 26, 18);
u8g2.drawHLine(110, 26, 16); u8g2.drawHLine(110, 26, 16);
u8g2.drawStr(40, 10, "Secondary Mode");
} }
u8g2.sendBuffer(); // transfer internal memory to the display u8g2.sendBuffer(); // transfer internal memory to the display