From c0fb7678303200434e4ac828ea7188c8fa9ab543 Mon Sep 17 00:00:00 2001 From: Aadi Desai <21363892+supleed2@users.noreply.github.com> Date: Wed, 23 Mar 2022 17:52:33 +0000 Subject: [PATCH] Catch up to P1S5 --- platformio.ini | 3 +- src/main.cpp | 131 ++++++++++++++++++++++++++++++++----------------- 2 files changed, 87 insertions(+), 47 deletions(-) diff --git a/platformio.ini b/platformio.ini index cd3edda..d545dc8 100644 --- a/platformio.ini +++ b/platformio.ini @@ -13,5 +13,6 @@ platform = ststm32 board = nucleo_l432kc framework = arduino monitor_speed = 115200 -lib_deps = +lib_deps = olikraus/U8g2@^2.32.10 + stm32duino/STM32duino FreeRTOS@^10.3.1 diff --git a/src/main.cpp b/src/main.cpp index 3f3e97e..580eba1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,25 +1,26 @@ -// https://github.com/adamb314/ThreadHandler - #include +#include #include +#include +#include -volatile int32_t currentStepSize; +volatile std::atomic currentStepSize; +static std::atomic keyArray[7]; -#pragma region Config Values const uint32_t interval = 10; // Display update interval const uint8_t octave = 4; // Octave to start on const uint32_t samplingRate = 44100; // Sampling rate -const int32_t stepSizes[] = { - 6370029, 6748811, 7150116, 7575284, 8025734, 8502969, 9008582, - 9544260, 10111791, 10713070, 11350102, 12025014, 12740059, 13497622, - 14300233, 15150569, 16051469, 17005939, 18017164, 19088521, 20223583, - 21426140, 22700205, 24050029, 25480118, 26995245, 28600466, 30301138, - 32102938, 34011878, 36034329, 38177042, 40447167, 42852281, 45400410, - 48100059, 50960237, 53990491, 57200933, 60602277, 64205876, 68023756, - 72068659, 76354085, 80894335, 85704562, 90800821, 96200119, 101920475, - 107980982, 114401866, 121204555, 12841175, 136047513, 144137319, 152708170, - 161788670, 171409125, 181601642, 192400238}; // Step sizes for each note -#pragma endregion +typedef struct { + int32_t stepSize; + std::string note; +} Note; +const Note notes[] = { + {0, "None"}, {3185014, "C1"}, {3374405, "C1#"}, {3575058, "D1"}, {3787642, "D1#"}, {4012867, "E1"}, {4251484, "F1"}, {4504291, "F1#"}, {4772130, "G1"}, {5055895, "G1#"}, {5356535, "A1"}, {5675051, "A1#"}, {6012507, "B1"}, {6370029, "C2"}, {6748811, "C2#"}, {7150116, "D2"}, {7575284, "D2#"}, {8025734, "E2"}, {8502969, "F2"}, {9008582, "F2#"}, {9544260, "G2"}, {10111791, "G2#"}, {10713070, "A2"}, {11350102, "A2#"}, {12025014, "B2"}, {12740059, "C3"}, {13497622, "C3#"}, {14300233, "D3"}, {15150569, "D3#"}, {16051469, "E3"}, {17005939, "F3"}, {18017164, "F3#"}, {19088521, "G3"}, {20223583, "G3#"}, {21426140, "A3"}, {22700205, "A3#"}, {24050029, "B3"}, {25480118, "C4"}, {26995245, "C4#"}, {28600466, "D4"}, {30301138, "D4#"}, {32102938, "E4"}, {34011878, "F4"}, {36034329, "F4#"}, {38177042, "G4"}, {40447167, "G4#"}, {42852281, "A4"}, {45400410, "A4#"}, {48100059, "B4"}, {50960237, "C5"}, {53990491, "C5#"}, {57200933, "D5"}, {60602277, "D5#"}, {64205876, "E5"}, {68023756, "F5"}, {72068659, "F5#"}, {76354085, "G5"}, {80894335, "G5#"}, {85704562, "A5"}, {90800821, "A5#"}, {96200119, "B5"}, {101920475, "C6"}, {107980982, "C6#"}, {114401866, "D6"}, {121204555, "D6#"}, {128411753, "E6"}, {136047513, "F6"}, {144137319, "F6#"}, {152708170, "G6"}, {161788670, "G6#"}, {171409125, "A6"}, {181601642, "A6#"}, {192400238, "B6"}, {203840951, "C7"}, {215961965, "C7#"}, {228803732, "D7"}, {242409110, "D7#"}, {256823506, "E7"}, {272095026, "F7"}, {288274638, "F7#"}, {305416340, "G7"}, {323577341, "G7#"}, {342818251, "A7"}, {363203285, "A7#"}, {384800476, "B7"}}; +#define icon_width 10 +#define icon_height 10 +const unsigned char icon_bits[] = { + 0x00, 0x00, 0x00, 0x00, 0xcc, 0x00, 0xcc, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x02, 0x01, 0x02, 0x01, 0xfe, 0x01, 0x00, 0x00}; #pragma region Pin Definitions // Row select and enable @@ -79,18 +80,57 @@ void setRow(const uint8_t rowIdx) { digitalWrite(REN_PIN, HIGH); } -uint16_t getTopKey(const uint8_t array[]) { +uint16_t getTopKey() { uint16_t topKey = 0; for (uint8_t i = 0; i < 3; i++) { for (uint8_t j = 0; j < 4; j++) { - if (array[i] & (0x1 << j)) { - topKey = (octave - 2) * 12 + i * 4 + j; + if (keyArray[i] & (0x1 << j)) { + topKey = (octave - 2) * 12 + i * 4 + j + 1; } } } return topKey; } +void sampleISR() { + static int32_t phaseAcc = 0; + phaseAcc += currentStepSize; + int32_t Vout = phaseAcc >> 24; + analogWrite(OUTR_PIN, Vout + 128); +} + +void scanKeysTask(void *pvParameters) { + const TickType_t xFrequency = 50 / portTICK_PERIOD_MS; + TickType_t xLastWakeTime = xTaskGetTickCount(); + while (1) { + vTaskDelayUntil(&xLastWakeTime, xFrequency); + for (uint8_t i = 0; i < 3; i++) { + setRow(i); + delayMicroseconds(3); + keyArray[i] = readCols(); + } + currentStepSize = notes[getTopKey()].stepSize; // Atomic Store + } +} + +void displayUpdateTask(void *pvParameters) { + const TickType_t xFrequency = 100 / portTICK_PERIOD_MS; + TickType_t xLastWakeTime = xTaskGetTickCount(); + while (1) { + vTaskDelayUntil(&xLastWakeTime, xFrequency); + u8g2.clearBuffer(); // clear the internal memory + u8g2.setFont(u8g2_font_profont12_mf); // choose a suitable font + u8g2.drawStr(2, 10, notes[getTopKey()].note.c_str()); // Print the current key + digitalToggle(LED_BUILTIN); + u8g2.setCursor(2, 20); + for (uint8_t i = 0; i < 7; i++) { + u8g2.print(keyArray[i], HEX); + } + u8g2.drawXBM(118, 0, 10, 10, icon_bits); + u8g2.sendBuffer(); // transfer internal memory to the display + } +} + void setup() { #pragma region Pin Setup pinMode(RA0_PIN, OUTPUT); @@ -119,33 +159,32 @@ void setup() { // Initialise UART Serial.begin(115200); Serial.println("Hello World"); + + TIM_TypeDef *Instance = TIM1; + HardwareTimer *sampleTimer = new HardwareTimer(Instance); + sampleTimer->setOverflow(samplingRate, HERTZ_FORMAT); + sampleTimer->attachInterrupt(sampleISR); + sampleTimer->resume(); + + TaskHandle_t scanKeysHandle = NULL; + TaskHandle_t displayUpdateHandle = NULL; + xTaskCreate( + scanKeysTask, // Function that implements the task + "scanKeys", // Text name for the task + 64, // Stack size in words, not bytes + NULL, // Parameter passed into the task + 2, // Task priority + &scanKeysHandle // Pointer to store the task handle + ); + xTaskCreate( + displayUpdateTask, // Function that implements the task + "displayUpdate", // Text name for the task + 256, // Stack size in words, not bytes + NULL, // Parameter passed into the task + 1, // Task priority + &displayUpdateHandle // Pointer to store the task handle + ); + vTaskStartScheduler(); } -void loop() { - static uint32_t next = millis(); - static uint8_t keyArray[7]; - for (uint8_t i = 0; i < 3; i++) { - setRow(i); - delayMicroseconds(3); - keyArray[i] = readCols(); - } - for (uint8_t i = 3; i < 7; i++) { - setRow(i); - delayMicroseconds(3); - keyArray[i] = readCols(); - } - - if (millis() > next) { - next += interval; - u8g2.clearBuffer(); // clear the internal memory - u8g2.setFont(u8g2_font_profont12_mf); // choose a suitable font - u8g2.setCursor(2, 10); // set the cursor position - u8g2.print(stepSizes[getTopKey(keyArray)]); // Print the current frequency - digitalToggle(LED_BUILTIN); - u8g2.setCursor(2, 20); - for (uint8_t i = 0; i < 7; i++) { - u8g2.print(keyArray[i], HEX); - } - u8g2.sendBuffer(); // transfer internal memory to the display - } -} \ No newline at end of file +void loop() {} \ No newline at end of file