implement button matrix reading

docs/src/pcb1.md

@@ -20,6 +20,7 @@ These are all the parts required to assemble the prototype.
 | U3, U5, U7 | Step-Up Converter Module | [Amazon.de](https://www.amazon.de/Converter-Spannungswandler-LAOMAO-Netzteil-Kompatibel/dp/B0B932BR7V) |
 | J2 | SSD1306 128x64 0.96" Display | [Amazon.de](https://www.amazon.de/AZDelivery-Display-Arduino-Raspberry-gratis/dp/B01L9GC470) |
 | S1 | ALPS EC12E24244 | [Reichelt.de](https://www.reichelt.de/drehimpulsegeber-24-impulse-24-rastungen-vertikal-stec12e08-p73923.html?&nbc=1) |
+| - | Cap for encoder knob | [Reichelt.de](https://www.reichelt.de/potentiometerknopf-fuer-achse-6-4-5-mm-schwarz-knopf-10-150e-p73960.html) |
 | D1 - D4 | LED 5mm | [Reichelt.de](https://www.reichelt.de/led-5mm-bedrahtet-rot-450-mcd-90--5603r1c-khb-a-p361958.html?&nbc=1) |
 | D5 - D8 | 1N5819 Schottky Diode | [Reichelt.de](https://www.reichelt.de/schottkydiode-40-v-1-a-do-41-1n-5819-p41850.html?&nbc=1) |
 | R1 - R4 | Resistor 1k Ohm | [Reichelt.de](https://www.reichelt.de/widerstand-metallschicht-1-00-kohm-0207-0-6-w-1--metall-1-00k-p11403.html?&nbc=1) |

docs/src/pcb2.md

@@ -22,6 +22,7 @@ These are all the parts required to assemble the V2 PCB.
 | BT1 | Keystone 1042 | [Reichelt.de](https://www.reichelt.de/batteriehalter-fuer-1-18650-keystone-1042-p213369.html?&nbc=1) |
 | S1 | APEM 5236AB | [Reichelt.de](https://www.reichelt.de/kippschalter-1a-250vac-1x-ein-ein-printanschluss-as-500apc-p4396.html?&nbc=1) |
 | SW1 | ALPS EC12E24244 | [Reichelt.de](https://www.reichelt.de/drehimpulsegeber-24-impulse-24-rastungen-vertikal-stec12e08-p73923.html?&nbc=1) |
+| - | Cap for encoder knob | [Reichelt.de](https://www.reichelt.de/potentiometerknopf-fuer-achse-6-4-5-mm-schwarz-knopf-10-150e-p73960.html) |
 | SW2 - SW10 | DIP 6x6mm push button | [Reichelt.de](https://www.reichelt.de/kurzhubtaster-printmontage-1-schliesser-6-x-6-x-5-mm-dip-dts-62k-v-p360043.html?&nbc=1) |
 | D1 - D4 | 1N5819 Schottky Diode | [Reichelt.de](https://www.reichelt.de/schottkydiode-40-v-1-a-do-41-1n-5819-p41850.html?&nbc=1) |
 | D5 - D12 | LED 5mm | [Reichelt.de](https://www.reichelt.de/led-5mm-bedrahtet-rot-450-mcd-90--5603r1c-khb-a-p361958.html?&nbc=1) |

include/buttons.h

@@ -21,6 +21,8 @@
 
 #include <stdbool.h>
 
+#define DEBOUNCE_DELAY_MS 50
+
 enum buttons {
     BTN_A = 0,
     BTN_B,

include/lcd.h

@@ -24,5 +24,8 @@
 
 void lcd_init(void);
 void lcd_draw(const char *mode, const char *val, const char *bat);
+void lcd_draw_bye(void);
+
+void lcd_debug_buttons(void);
 
 #endif // __LCD_H__

include/main.h

@@ -27,4 +27,6 @@ enum hw_versions {
 
 extern enum hw_versions hw_type;
 
+void handle_serial_input(void);
+
 #endif // __MAIN_H__

src/buttons.c

@@ -22,8 +22,6 @@
 #include "main.h"
 #include "buttons.h"
 
-#define DEBOUNCE_DELAY_MS 50
-
 static const uint gpio_num_proto[NUM_BTNS] = {
     8, // BTN_A
     9, // BTN_B
@@ -40,19 +38,32 @@ static const uint gpio_num_proto[NUM_BTNS] = {
     16, // BTN_CLICK
 };
 
+#define NUM_ROWS 3
+#define NUM_COLS 3
+
 static const uint gpio_num_v2[NUM_BTNS] = {
-    1, // BTN_A / COL 0
-    4, // BTN_B / COL 1
-    5, // BTN_C / COL 2
-    0, // BTN_D / ROW 0
-    2, // BTN_E / ROW 1
-    3, // BTN_F / ROW 2
+    // handled as matrix
+    0xFF, // BTN_A
+    0xFF, // BTN_B
+    0xFF, // BTN_C
+    0xFF, // BTN_D
+    0xFF, // BTN_E
+    0xFF, // BTN_F
     0xFF, // BTN_G
     0xFF, // BTN_H
     0xFF, // BTN_REC
+
     20, // BTN_CLICK
 };
 
+static const uint gpio_rows[NUM_ROWS] = {
+    0, 2, 3
+};
+
+static const uint gpio_cols[NUM_COLS] = {
+    1, 4, 5
+};
+
 struct button_state {
     uint32_t last_time;
     bool current_state, last_state;
@@ -60,6 +71,7 @@ struct button_state {
 
 static struct button_state buttons[NUM_BTNS];
 static void (*callback)(enum buttons, bool) = NULL;
+static int last_col = 0;
 
 void buttons_init(void) {
     for (uint i = 0; i < NUM_BTNS; i++) {
@@ -82,6 +94,24 @@ void buttons_init(void) {
         buttons[i].current_state = false;
         buttons[i].last_state = false;
     }
+
+    if (hw_type != HW_V2) {
+        return;
+    }
+
+    for (uint i = 0; i < NUM_ROWS; i++) {
+        uint n = gpio_rows[i];
+        gpio_init(n);
+        gpio_set_dir(n, GPIO_IN);
+        gpio_pull_up(n);
+    }
+
+    for (uint i = 0; i < NUM_COLS; i++) {
+        uint n = gpio_cols[i];
+        gpio_init(n);
+        gpio_set_dir(n, GPIO_IN);
+        gpio_disable_pulls(n);
+    }
 }
 
 void buttons_callback(void (*fp)(enum buttons, bool)) {
@@ -109,7 +139,7 @@ static void button_run_single(bool state, uint i) {
     buttons[i].last_state = state;
 }
 
-static void buttons_run_proto(void) {
+static void button_run_proto(void) {
     for (uint i = 0; i < NUM_BTNS; i++) {
         if (gpio_num_proto[i] >= 0xFF) {
             continue;
@@ -120,12 +150,22 @@ static void buttons_run_proto(void) {
     }
 }
 
+static void button_run_matrix(void) {
+    gpio_set_dir(gpio_cols[last_col], GPIO_IN);
+    last_col = (last_col + 1) % NUM_COLS;
+    gpio_set_dir(gpio_cols[last_col], GPIO_OUT);
+    gpio_put(gpio_cols[last_col], false);
+    sleep_us(2);
+    for (uint i = 0; i < NUM_ROWS; i++) {
+        button_run_single(!gpio_get(gpio_rows[i]), last_col * NUM_ROWS + i);
+    }
+}
+
 void buttons_run(void) {
     if (hw_type == HW_PROTOTYPE) {
-        buttons_run_proto();
+        button_run_proto();
     } else if (hw_type == HW_V2) {
-        // TODO read matrix
-
+        button_run_matrix();
         button_run_single(!gpio_get(gpio_num_v2[BTN_CLICK]), BTN_CLICK);
     }
 }

src/lcd.c

@@ -23,6 +23,8 @@
 #include "hardware/i2c.h"
 
 #include "ssd1306.h"
+
+#include "buttons.h"
 #include "logo.h"
 #include "main.h"
 #include "lcd.h"
@@ -36,6 +38,41 @@ static const uint gpio_num_v2[2] = { 16, 17 };
 #define LCD_ADDR 0x3C
 
 static ssd1306_t disp;
+static bool buttons[NUM_BTNS] = {0};
+static bool changed = true;
+
+static void lcd_debug_buttons_callback(enum buttons btn, bool v) {
+    buttons[btn] = v;
+    changed = true;
+}
+
+void lcd_debug_buttons(void) {
+    buttons_callback(lcd_debug_buttons_callback);
+    while (1) {
+        buttons_run();
+        handle_serial_input();
+        if (changed) {
+            changed = false;
+            ssd1306_clear(&disp);
+            ssd1306_draw_string(&disp, 0, 0, 3, "Buttons");
+            for (uint i = 0; i < NUM_BTNS; i++) {
+                ssd1306_draw_char(&disp,
+                                    i * 12, LCD_HEIGHT - 20 - 16 - 1,
+                                    2, '0' + i);
+                if (buttons[i]) {
+                    ssd1306_draw_square(&disp,
+                                        i * 12, LCD_HEIGHT - 20 - 1,
+                                        10, 20);
+                } else {
+                    ssd1306_draw_empty_square(&disp,
+                                                i * 12, LCD_HEIGHT - 20 - 1,
+                                                10, 20);
+                }
+            }
+            ssd1306_show(&disp);
+        }
+    }
+}
 
 void lcd_init(void) {
     if (hw_type == HW_PROTOTYPE) {
@@ -58,6 +95,7 @@ void lcd_init(void) {
         ssd1306_init(&disp, LCD_WIDTH, LCD_HEIGHT, LCD_ADDR, gpio_i2c_v2);
     }
 
+    // show logo
     ssd1306_clear(&disp);
     for (uint y = 0; y < LOGO_HEIGHT; y++) {
         for (uint x = 0; x < LOGO_WIDTH; x++) {
@@ -76,6 +114,12 @@ void lcd_draw(const char *mode, const char *val, const char *bat) {
     ssd1306_draw_string(&disp, 0, 0, 2, mode);
     ssd1306_draw_string(&disp, 0, 20, 4, val);
     ssd1306_draw_string(&disp, 0, LCD_HEIGHT - 1 - 10, 1, bat);
+    ssd1306_show(&disp);
+}
 
+void lcd_draw_bye(void) {
+    ssd1306_clear(&disp);
+    ssd1306_draw_string(&disp, 0, 0, 3, "Boot");
+    ssd1306_draw_string(&disp, 0, LCD_HEIGHT / 2, 3, "loader");
     ssd1306_show(&disp);
 }

src/main.c

@@ -35,9 +35,18 @@
 #define LOGO_INIT_MS 1500
 
 static const uint gpio_hw_detect = 21;
+
 enum hw_versions hw_type = HW_UNKNOWN;
 
+static bool debug_buttons[NUM_BTNS] = {0};
+
+static void debug_buttons_callback(enum buttons btn, bool v) {
+    debug_buttons[btn] = v;
+}
+
 static void reset_to_bootloader(void) {
+    lcd_draw_bye();
+
 #ifdef PICO_DEFAULT_LED_PIN
     reset_usb_boot(1 << PICO_DEFAULT_LED_PIN, 0);
 #else // ! PICO_DEFAULT_LED_PIN
@@ -45,6 +54,15 @@ static void reset_to_bootloader(void) {
 #endif // PICO_DEFAULT_LED_PIN
 }
 
+void handle_serial_input(void) {
+    int c = getchar_timeout_us(0);
+    if (c == 0x18) {
+        reset_to_bootloader();
+    } else if (c != PICO_ERROR_TIMEOUT) {
+        printf("%c", c);
+    }
+}
+
 int main(void) {
     stdio_init_all();
 
@@ -63,10 +81,23 @@ int main(void) {
     lcd_init();
     led_init();
 
-    // show splash for a bit and animate LEDs
-    for (uint i = 0; i < LED_COUNT; i++) {
-        led_set(i, true);
-        sleep_ms(LOGO_INIT_MS / LED_COUNT);
+    // read out button state for debug options
+    buttons_callback(debug_buttons_callback);
+    for (uint i = 0; i < (DEBOUNCE_DELAY_MS + 5); i++) {
+        buttons_run();
+        handle_serial_input();
+        sleep_ms(1);
+    }
+
+    if (debug_buttons[BTN_REC]) {
+        lcd_debug_buttons();
+    } else if (!debug_buttons[BTN_H]) {
+        // show splash for a bit and animate LEDs
+        for (uint i = 0; i < LED_COUNT; i++) {
+            handle_serial_input();
+            led_set(i, true);
+            sleep_ms(LOGO_INIT_MS / LED_COUNT);
+        }
     }
 
     // turn off LEDs at end of init
@@ -96,12 +127,7 @@ int main(void) {
             last_epos = epos;
         }
 
-        int c = getchar_timeout_us(0);
-        if (c == 0x18) {
-            reset_to_bootloader();
-        } else if (c != PICO_ERROR_TIMEOUT) {
-            printf("%c", c);
-        }
+        handle_serial_input();
     }
 
     return 0;

src/sequence.c

@@ -101,21 +101,27 @@ static bool sequence_get(uint32_t beat, enum channels ch) {
 
 void sequence_handle_button_loopstation(enum buttons btn, bool rec) {
     switch (btn) {
-        case BTN_A: {
+        case BTN_A:
+        case BTN_E: {
             pulse_trigger_out(0, channel_times[0]);
             pulse_trigger_led(0, channel_times[0]);
+            pulse_trigger_led(4, channel_times[0]);
             break;
         }
 
-        case BTN_B: {
+        case BTN_B:
+        case BTN_F: {
             pulse_trigger_out(1, channel_times[1]);
             pulse_trigger_led(1, channel_times[1]);
+            pulse_trigger_led(5, channel_times[1]);
             break;
         }
 
-        case BTN_C: {
+        case BTN_C:
+        case BTN_G: {
             pulse_trigger_out(2, channel_times[2]);
             pulse_trigger_led(2, channel_times[2]);
+            pulse_trigger_led(6, channel_times[2]);
             break;
         }
 
@@ -126,17 +132,20 @@ void sequence_handle_button_loopstation(enum buttons btn, bool rec) {
 
     if (rec) {
         switch (btn) {
-            case BTN_A: {
+            case BTN_A:
+            case BTN_E: {
                 sequence_set(last_i, CH_KICK, true);
                 break;
             }
 
-            case BTN_B: {
+            case BTN_B:
+            case BTN_F: {
                 sequence_set(last_i, CH_SNARE, true);
                 break;
             }
 
-            case BTN_C: {
+            case BTN_C:
+            case BTN_G: {
                 sequence_set(last_i, CH_HIHAT, true);
                 break;
             }

src/ui.c

@@ -23,6 +23,7 @@
 #include "adc.h"
 #include "buttons.h"
 #include "lcd.h"
+#include "led.h"
 #include "sequence.h"
 #include "ui.h"
 
@@ -104,14 +105,19 @@ static void ui_buttons_loopstation(enum buttons btn, bool val) {
     switch (btn) {
         case BTN_A:
         case BTN_B:
-        case BTN_C: {
+        case BTN_C:
+        case BTN_E:
+        case BTN_F:
+        case BTN_G: {
             if (val) {
                 sequence_handle_button_loopstation(btn, rec_held_down);
             }
             break;
         }
 
-        case BTN_REC: {
+        case BTN_REC:
+        case BTN_D:
+        case BTN_H: {
             rec_held_down = val;
             sequence_looptime(!val);
             break;
@@ -129,6 +135,11 @@ static void ui_buttons_drummachine(enum buttons btn, bool val) {
         case BTN_A:
         case BTN_B:
         case BTN_C:
+        case BTN_D:
+        case BTN_E:
+        case BTN_F:
+        case BTN_G:
+        case BTN_H:
         case BTN_REC: {
             if (val) {
                 sequence_handle_button_drummachine(btn);
@@ -143,27 +154,14 @@ static void ui_buttons_drummachine(enum buttons btn, bool val) {
     }
 }
 
-
-#include "pulse.h"
-
-
 static void ui_buttons(enum buttons btn, bool val) {
     switch (btn) {
         case BTN_CLICK: {
             if (val) {
-
-
-
-                pulse_trigger_out(0, 42);
-                pulse_trigger_led(0, 42);
-
-
-
                 ui_mode = (ui_mode + 1) % UI_NUM_MODES;
 
-                // allow other ui mdoes only in drumkit mode
-                if (machine_mode == MODE_LOOPSTATION)
-                {
+                // allow other ui modes only in drumkit mode
+                if (machine_mode == MODE_LOOPSTATION) {
                     ui_mode = 0;
                 }
 
@@ -215,12 +213,27 @@ void ui_encoder(int32_t val) {
             while (tmp >= MACHINE_NUM_MODES) {
                 tmp -= MACHINE_NUM_MODES;
             }
+
+            enum machine_modes prev_mode = machine_mode;
             machine_mode = tmp;
 
             printf("mode add %"PRIi32" now %d\n", val, machine_mode);
 
-            // reset sequence
-            sequence_init();
+            if (prev_mode != machine_mode) {
+                // reset sequence
+                sequence_init();
+
+                // turn off all LEDs
+                for (uint i = 0; i < LED_COUNT; i++) {
+                    led_set(i, false);
+                }
+
+                // enable static LEDs in loopstation mode
+                if (machine_mode == MODE_LOOPSTATION) {
+                    led_set(NUM_CHANNELS, true);
+                    led_set(NUM_CHANNELS + 4, true);
+                }
+            }
             break;
         }
 
@@ -247,6 +260,12 @@ void ui_encoder(int32_t val) {
 
 void ui_init(void) {
     buttons_callback(ui_buttons);
+
+    // enable static LEDs in loopstation mode
+    machine_mode = MODE_LOOPSTATION;
+    led_set(NUM_CHANNELS, true);
+    led_set(NUM_CHANNELS + 4, true);
+
     ui_redraw();
 }