[O] Class refactor

firmware/src/config.h

@@ -1,6 +1,8 @@
 #ifndef FIRMWARE_CONFIG_H
 #define FIRMWARE_CONFIG_H
 
+#include "utils.h"
+
 // ========================================
 // Main Keyboard Pin Configuration
 // ========================================

firmware/src/macros.h

@@ -1,16 +0,0 @@
-#ifndef FIRMWARE_MACROS_H
-#define FIRMWARE_MACROS_H
-
-#define u8 uint8_t
-#define u16 uint16_t
-#define u32 uint32_t
-#define u64 uint64_t
-#define timeMillis() std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count()
-//#define timeMillis() HAL_GetTick()
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#define max(a, b) ((a) > (b) ? (a) : (b))
-#define abs(a) ((a) < 0 ? -(a) : (a))
-#define let auto
-//#define val const auto
-
-#endif //FIRMWARE_MACROS_H

firmware/src/main.cpp

@@ -1,19 +1,9 @@
 #include <Arduino.h>
-#include <chrono>
-#include "macros.h"
 #include "config.h"
 #include "Adafruit_NeoPixel.h"
-#include "Encoder.h"
 #include "main.h"
-#include <FreeRTOS.h>
+#include "utils.h"
-#include <task.h>
+#include "panel.cpp"
-
-// ========================================
-// Code
-// ========================================
-
-u64 start_time = 0;
-u64 last_refresh_time = 0;
 
 u32 lasts[NUM_NOTES];  // variable to store the value coming from the sensor
 u64 last_hit_times[NUM_NOTES];
@@ -24,32 +14,9 @@ let active_threshold = 100;  // Minimum value to be considered as a hit
 
 let led_refresh_on = false;
 
-void pinModeSafe(int pin, int mode)
-{
-    if (pin == -1) return;
-    pinMode(pin, mode);
-}
-
-Adafruit_NeoPixel p_led_key(4, P_LED_KEY, NEO_GRB + NEO_KHZ800);
-Adafruit_NeoPixel p_led_knob(9, P_LED_KNOB, NEO_GRB + NEO_KHZ800);
-Adafruit_NeoPixel p_led_rotary(9, P_LED_ROTARY, NEO_GRB + NEO_KHZ800);
 Adafruit_NeoPixel lk(LK_NUM_LIGHTS, LK_PIN, NEO_GRB + NEO_KHZ800);
 
-u64 fps_last_update = 0;
+Panel panel;
-u32 fps_updates = 0;
-u32 fps_interval_ms = 1000;
-
-u16 last_hue = 0;
-u8 brightness = 40;
-
-bool key_states[P_PINS_PER_MUX];
-bool btn_states[P_PINS_PER_MUX];
-u32 pot_states[P_PINS_PER_MUX];
-
-Encoder *encoders[P_NUM_ROTARY];
-int encoder_states[P_NUM_ROTARY];
-
-TaskHandle_t thread2;
 
 void setup()
 {
@@ -58,34 +25,14 @@ void setup()
     pinModeSafe(LK_PIN, OUTPUT);
     for (int pin: MUX_IN) pinModeSafe(pin, INPUT);
     for (int pin: MUX_SEL_OUT) pinModeSafe(pin, OUTPUT);
-    for (int pin: P_MUX_SEL_OUT) pinModeSafe(pin, OUTPUT);
-    for (int pin: P_ROTARY_A) pinModeSafe(pin, INPUT);
-    for (int pin: P_ROTARY_B) pinModeSafe(pin, INPUT);
-    pinModeSafe(P_BUTTON_MUX_IN, INPUT);
-    pinModeSafe(P_KEY_MUX_IN, INPUT);
-    pinModeSafe(P_KNOB_MUX_IN, INPUT);
-    pinModeSafe(P_LED_KEY, OUTPUT);
-    pinModeSafe(P_LED_KNOB, OUTPUT);
-    pinModeSafe(P_LED_ROTARY, OUTPUT);
 
-    // Initialize encoders
+    lk.begin();
-    for (int i = 0; i < P_NUM_ROTARY; i++)
-    {
-        encoders[i] = new Encoder(P_ROTARY_A[i], P_ROTARY_B[i]);
-    }
 
     // Initialize serial
-    Serial.begin(9600);
+    Serial.begin(115200);
     Serial.printf("Initialized\r\n");
 
-    start_time = timeMillis();
+    panel.begin();
-
-    p_led_key.begin();
-    p_led_knob.begin();
-    p_led_rotary.begin();
-
-//    xTaskCreate(loopKeyboard, "loopKeyboard", 4096, nullptr, 1, &thread1);
-    xTaskCreate(loopPanel, "loopPanel", 4096, nullptr, 1, &thread2);
 }
 
 /**
@@ -116,139 +63,9 @@ void on_sensor_update(int id, u64 time, u32 last, u32 current)
     }
 }
 
-void onKey(int id, bool state)
+u64 fps_last_update = 0;
-{
+u32 fps_updates = 0;
-    // Check if it's one of the larger keys (the first 4)
+const u32 fps_interval_ms = 1000;
-    if (id < 4)
-    {
-        if (state)
-        {
-            // Set a random color for the key's LED
-            p_led_key.setPixelColor(id, Adafruit_NeoPixel::ColorHSV(random(0, 65535), 255, brightness));
-            p_led_key.show();
-        }
-        else
-        {
-            // Clear the key's LED
-            p_led_key.setPixelColor(id, 0);
-            p_led_key.show();
-        }
-    }
-
-    // Key 5 = clear
-    if (id == 4 && state)
-    {
-        p_led_key.clear();
-        p_led_key.show();
-    }
-
-    Serial.printf("Key changed - id: %d, state: %d\r\n", id, state);
-}
-
-void onBtn(int id, bool state)
-{
-    Serial.printf("Button changed - id: %d, state: %d\r\n", id, state);
-}
-
-void onPotRead(int id, u8 value)
-{
-    // Set LED
-    p_led_knob.setPixelColor(id, Adafruit_NeoPixel::ColorHSV(last_hue, 255, value));
-    p_led_knob.show();
-}
-
-void onPotChange(int id, u8 value)
-{
-    Serial.printf("Potentiometer changed - id: %d, value: %d\r\n", id, value);
-}
-
-int multisampleRead(int pin, int samples)
-{
-    int sum = 0;
-    for (int i = 0; i < samples; ++i)
-    {
-        sum += analogRead(pin);
-    }
-    return (int) round(((double) sum) / samples);
-}
-
-void readPanel()
-{
-    const auto hue_interval = 512;
-    last_hue += hue_interval;
-
-    // Read rotary encoders
-    for (int i = 0; i < P_NUM_ROTARY; ++i)
-    {
-        int state = encoders[i]->read();
-        if (encoder_states[i] != state)
-        {
-            encoder_states[i] = state;
-            Serial.printf("Rotary changed - id: %d, value: %d\r\n", i, state);
-            p_led_rotary.setPixelColor(i, Adafruit_NeoPixel::ColorHSV(last_hue, 255, brightness));
-            p_led_rotary.show();
-        }
-    }
-
-    // Read buttons
-    for (int i = 0; i < P_PINS_PER_MUX; ++i)
-    {
-        // Set select pins
-        for (int j = 0; j < P_NUM_MUX_SEL; ++j)
-        {
-            // i >> j is the jth bit of i
-            digitalWrite(P_MUX_SEL_OUT[j], (i >> j) & 1);
-        }
-        vTaskDelay(1);
-
-        // Read button
-        int key = !digitalRead(P_KEY_MUX_IN);
-        int btn = !digitalRead(P_BUTTON_MUX_IN);
-
-        // If the state is changed, call button callback
-        if (key_states[i] != key)
-        {
-            key_states[i] = key;
-            onKey(i, key);
-        }
-
-        if (btn_states[i] != btn)
-        {
-            btn_states[i] = btn;
-            onBtn(i, btn);
-        }
-
-        // Read potentiometer
-        int pot = (int) round(multisampleRead(P_KNOB_MUX_IN, 2) / 16.0);
-        onPotRead(i, pot);
-
-        // If the state is changed, call potentiometer callback
-        if (abs(pot_states[i] - pot) > 4)
-        {
-            pot_states[i] = pot;
-            onPotChange(i, pot);
-        }
-    }
-
-    for (int i = 0; i < LK_NUM_LIGHTS; i++)
-    {
-        lk.setPixelColor(i, Adafruit_NeoPixel::ColorHSV(last_hue + i * hue_interval, 255, brightness));
-    }
-
-    delay(10);
-    p_led_key.show();
-    p_led_knob.show();
-    p_led_rotary.show();
-    lk.show();
-}
-
-[[noreturn]] void loopPanel(void* pvParameters)
-{
-    while (true)
-    {
-        readPanel();
-    }
-}
 
 void countFps(u64 time)
 {
@@ -265,7 +82,7 @@ void countFps(u64 time)
 
 void readKeyboard()
 {
-    u64 time = timeMillis();
+    u64 time = millis();
     countFps(time);
 
     // Toggle LED refresh indicator
@@ -302,4 +119,9 @@ void readKeyboard()
 void loop()
 {
     readKeyboard();
+
+//    for (int i = 0; i < LK_NUM_LIGHTS; i++)
+//    {
+//        lk.setPixelColor(i, Adafruit_NeoPixel::ColorHSV(last_hue + i * hue_interval, 255, brightness));
+//    }
 }

firmware/src/main.h

@@ -5,13 +5,6 @@
 #ifndef FIRMWARE_MAIN_H
 #define FIRMWARE_MAIN_H
 
-#include <Arduino.h>
-#include <chrono>
-#include "macros.h"
-#include "config.h"
-#include "Adafruit_NeoPixel.h"
-#include "Encoder.h"
-
 /**
  * Called when the sensor value changes
  *
@@ -19,13 +12,4 @@
  */
 void on_sensor_update(int id, u64 time, u32 last, u32 current);
 
-void onKey(int id, bool state);
-void onBtn(int id, bool state);
-void onPotRead(int id, u8 value);
-void onPotChange(int id, u8 value);
-
-int multisampleRead(int pin, int samples);
-
-[[noreturn]] void loopPanel(void* pvParameters);
-
 #endif //FIRMWARE_MAIN_H

firmware/src/panel.cpp

@@ -0,0 +1,191 @@
+//
+// Created by Hykilpikonna on 4/21/23.
+//
+
+#include <Arduino.h>
+
+#include "config.h"
+#include "Adafruit_NeoPixel.h"
+#include "Encoder.h"
+
+/**
+ * Class controlling the MIDI panel
+ */
+class Panel {
+private:
+    Adafruit_NeoPixel led_key;
+    Adafruit_NeoPixel led_knob;
+    Adafruit_NeoPixel led_rotary;
+
+    u16 last_hue = 0;
+    u8 brightness = 40;
+
+    bool key_states[P_PINS_PER_MUX]{};
+    bool btn_states[P_PINS_PER_MUX]{};
+    u32 pot_states[P_PINS_PER_MUX]{};
+
+    Encoder *encoders[P_NUM_ROTARY]{};
+    int encoder_states[P_NUM_ROTARY]{};
+
+    TaskHandle_t panelThread{};
+
+public:
+    Panel() :
+        led_key(4, P_LED_KEY, NEO_GRB + NEO_KHZ800),
+        led_knob(9, P_LED_KNOB, NEO_GRB + NEO_KHZ800),
+        led_rotary(9, P_LED_ROTARY, NEO_GRB + NEO_KHZ800)
+    {}
+
+    void begin()
+    {
+        for (int pin: P_MUX_SEL_OUT) pinModeSafe(pin, OUTPUT);
+        for (int pin: P_ROTARY_A) pinModeSafe(pin, INPUT);
+        for (int pin: P_ROTARY_B) pinModeSafe(pin, INPUT);
+        pinModeSafe(P_BUTTON_MUX_IN, INPUT);
+        pinModeSafe(P_KEY_MUX_IN, INPUT);
+        pinModeSafe(P_KNOB_MUX_IN, INPUT);
+        pinModeSafe(P_LED_KEY, OUTPUT);
+        pinModeSafe(P_LED_KNOB, OUTPUT);
+        pinModeSafe(P_LED_ROTARY, OUTPUT);
+
+        led_key.begin();
+        led_knob.begin();
+        led_rotary.begin();
+
+        // Initialize encoders
+        for (int i = 0; i < P_NUM_ROTARY; i++)
+        {
+            encoders[i] = new Encoder(P_ROTARY_A[i], P_ROTARY_B[i]);
+        }
+
+        xTaskCreate(loopPanel, "loopPanel", 4096, this, 1, &panelThread);
+    }
+
+private:
+    /**
+     * Initialize panel pins, encoders, and start the panel thread
+     */
+    void setupPanel()
+    {
+    }
+
+    void readPanel()
+    {
+        const auto hue_interval = 512;
+        last_hue += hue_interval;
+
+        // Read rotary encoders
+        for (int i = 0; i < P_NUM_ROTARY; ++i)
+        {
+            int state = encoders[i]->read();
+            if (encoder_states[i] != state)
+            {
+                encoder_states[i] = state;
+                Serial.printf("Rotary changed - id: %d, value: %d\r\n", i, state);
+                led_rotary.setPixelColor(i, Adafruit_NeoPixel::ColorHSV(last_hue, 255, brightness));
+                led_rotary.show();
+            }
+        }
+
+        // Read buttons
+        for (int i = 0; i < P_PINS_PER_MUX; ++i)
+        {
+            // Set select pins
+            for (int j = 0; j < P_NUM_MUX_SEL; ++j)
+            {
+                // i >> j is the jth bit of i
+                digitalWrite(P_MUX_SEL_OUT[j], (i >> j) & 1);
+            }
+            vTaskDelay(1);
+
+            // Read button
+            int key = !digitalRead(P_KEY_MUX_IN);
+            int btn = !digitalRead(P_BUTTON_MUX_IN);
+
+            // If the state is changed, call button callback
+            if (key_states[i] != key)
+            {
+                key_states[i] = key;
+                onKey(i, key);
+            }
+
+            if (btn_states[i] != btn)
+            {
+                btn_states[i] = btn;
+                onBtn(i, btn);
+            }
+
+            // Read potentiometer
+            int pot = (int) round(analogRead(P_KNOB_MUX_IN) / 16.0);
+            onPotRead(i, pot);
+
+            // If the state is changed, call potentiometer callback
+            if (abs(pot_states[i] - pot) > 4)
+            {
+                pot_states[i] = pot;
+                onPotChange(i, pot);
+            }
+        }
+
+        delay(10);
+        led_key.show();
+        led_knob.show();
+        led_rotary.show();
+    }
+
+    void onKey(int id, bool state)
+    {
+        // Check if it's one of the larger keys (the first 4)
+        if (id < 4)
+        {
+            if (state)
+            {
+                // Set a random color for the key's LED
+                led_key.setPixelColor(id, Adafruit_NeoPixel::ColorHSV(random(0, 65535), 255, brightness));
+                led_key.show();
+            }
+            else
+            {
+                // Clear the key's LED
+                led_key.setPixelColor(id, 0);
+                led_key.show();
+            }
+        }
+
+        // Key 5 = clear
+        if (id == 4 && state)
+        {
+            led_key.clear();
+            led_key.show();
+        }
+
+        Serial.printf("Key changed - id: %d, state: %d\r\n", id, state);
+    }
+
+    void onBtn(int id, bool state)
+    {
+        Serial.printf("Button changed - id: %d, state: %d\r\n", id, state);
+    }
+
+    void onPotRead(int id, u8 value)
+    {
+        // Set LED
+        led_knob.setPixelColor(id, Adafruit_NeoPixel::ColorHSV(last_hue, 255, value));
+        led_knob.show();
+    }
+
+    void onPotChange(int id, u8 value)
+    {
+        Serial.printf("Potentiometer changed - id: %d, value: %d\r\n", id, value);
+    }
+
+    [[noreturn]] static void loopPanel(void* pvParameters)
+    {
+        auto* panel = (Panel*) pvParameters;
+        while (true)
+        {
+            panel->readPanel();
+        }
+    }
+};
+

firmware/src/utils.cpp

@@ -0,0 +1,3 @@
+
+#include "utils.h"
+

firmware/src/utils.h

@@ -0,0 +1,15 @@
+#ifndef FIRMWARE_UTILS_H
+#define FIRMWARE_UTILS_H
+
+#define u8 uint8_t
+#define u16 uint16_t
+#define u32 uint32_t
+#define u64 uint64_t
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#define max(a, b) ((a) > (b) ? (a) : (b))
+#define abs(a) ((a) < 0 ? -(a) : (a))
+#define let auto
+
+#define pinModeSafe(pin, mode) do { if (pin != -1) pinMode(pin, mode); } while (false)
+
+#endif //FIRMWARE_UTILS_H

src/main.rs

@@ -32,7 +32,7 @@ fn start() -> Result<()> {
     let port = &ports[choice];
 
     // Open serial port
-    let serial_port = serialport::new(port.port_name.as_str(), 9600)
+    let serial_port = serialport::new(port.port_name.as_str(), 115200)
         .timeout(std::time::Duration::from_millis(10))
         .open()?;
     let mut reader = BufReader::new(serial_port);