pass encoder moves to ui

README.md

@@ -43,3 +43,22 @@ Flash as usual using the mass storage bootloader of RP2040.
     Pin 17   GP13   LED 2
     Pin 19   GP14   LED 3
     Pin 20   GP15   LED 4
+
+## License
+
+This firmware is licensed as GPLv3.
+It uses the [Pi Pico SDK](https://github.com/raspberrypi/pico-sdk), licensed as BSD 3-clause, and therefore also [TinyUSB](https://github.com/hathach/tinyusb), licensed under the MIT license.
+
+The code in `encoder.c` is derived from [mathertel/RotaryEncoder](https://github.com/mathertel/RotaryEncoder) and therefore licensed as BSD 3-clause.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    See <http://www.gnu.org/licenses/>.

include/led.h

@@ -24,5 +24,6 @@
 
 void led_init(void);
 void led_set(uint32_t i, bool v);
+void ch_set(uint32_t i, bool v);
 
 #endif // __LED_H__

include/sequence.h

@@ -31,6 +31,8 @@ enum channels {
 
     CH3 = (1 << 2),
     CH_HIHAT = CH3,
+
+    NUM_CHANNELS = 3
 };
 
 void sequence_init(void);

include/ui.h

@@ -19,6 +19,8 @@
 #ifndef __UI_H__
 #define __UI_H__
 
+#include <stdint.h>
+
 enum ui_modes {
     UI_BPM = 0,
     UI_MODE,
@@ -36,5 +38,6 @@ enum machine_modes {
 };
 
 void ui_init(void);
+void ui_encoder(int32_t val);
 
 #endif // __UI_H__

src/led.c

@@ -18,18 +18,27 @@
 
 #include "pico/stdlib.h"
 
+#include "sequence.h"
 #include "led.h"
 
 #define LED_COUNT 4
 
-static const uint gpio_num[LED_COUNT] = {
+static const uint led_gpio_num[LED_COUNT] = {
     12, 13, 14, 15,
 };
 
+static const uint ch_gpio_num[NUM_CHANNELS] = {
+    2, 3, 4,
+};
+
 void led_init(void) {
     for (uint i = 0; i < LED_COUNT; i++) {
-        gpio_init(gpio_num[i]);
-        gpio_set_dir(gpio_num[i], GPIO_IN);
+        gpio_init(led_gpio_num[i]);
+        gpio_set_dir(led_gpio_num[i], GPIO_OUT);
+    }
+    for (uint i = 0; i < NUM_CHANNELS; i++) {
+        gpio_init(ch_gpio_num[i]);
+        gpio_set_dir(ch_gpio_num[i], GPIO_OUT);
     }
 }
 
@@ -37,3 +46,8 @@ void led_set(uint32_t i, bool v) {
     i %= LED_COUNT;
     gpio_put(i, v);
 }
+
+void ch_set(uint32_t i, bool v) {
+    i %= NUM_CHANNELS;
+    gpio_put(i, v);
+}

src/main.c

@@ -23,6 +23,7 @@
 #include "buttons.h"
 #include "encoder.h"
 #include "lcd.h"
+#include "led.h"
 #include "sequence.h"
 #include "ui.h"
 #include "main.h"
@@ -33,16 +34,26 @@ int main(void) {
     watchdog_enable(WATCHDOG_PERIOD_MS, 1);
     stdio_init_all();
     buttons_init();
+    encoder_init();
     lcd_init();
+    led_init();
     sequence_init();
     ui_init();
     printf("init done\n");
 
+    int32_t last_epos = 0;
+
     while (1) {
         watchdog_update();
         buttons_run();
         encoder_run();
         sequence_run();
+
+        int32_t epos = encoder_pos();
+        if (epos != last_epos) {
+            ui_encoder(epos - last_epos);
+            last_epos = epos;
+        }
     }
 
     return 0;

src/sequence.c

@@ -34,6 +34,10 @@ static enum channels sequence[MAX_BEATS] = {0};
 void sequence_init(void) {
     last_t = to_ms_since_boot(get_absolute_time());
     last_i = 0;
+
+    for (uint i = 0; i < MAX_BEATS; i++) {
+        sequence[i] = 0;
+    }
 }
 
 void sequence_set_bpm(uint32_t new_bpm) {
@@ -63,40 +67,48 @@ 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:
-        // TODO trigger gpio impulse
-        break;
+        case BTN_A: {
+            // TODO trigger gpio impulse for output and led
+            break;
+        }
 
-    case BTN_B:
-        // TODO trigger gpio impulse
-        break;
+        case BTN_B: {
+            // TODO trigger gpio impulse for output and led
+            break;
+        }
 
-    case BTN_C:
-        // TODO trigger gpio impulse
-        break;
+        case BTN_C: {
+            // TODO trigger gpio impulse for output and led
+            break;
+        }
 
-    default:
-        break;
+        default: {
+            break;
+        }
     }
 
     if (rec) {
         uint32_t beat = 42; // TODO!!
 
         switch (btn) {
-        case BTN_A:
-            sequence_set(beat, CH_KICK, true);
-            break;
-
-        case BTN_B:
-            sequence_set(beat, CH_SNARE, true);
-            break;
-
-        case BTN_C:
-            sequence_set(beat, CH_HIHAT, true);
-            break;
-
-        default:
-            break;
+            case BTN_A: {
+                sequence_set(beat, CH_KICK, true);
+                break;
+            }
+
+            case BTN_B: {
+                sequence_set(beat, CH_SNARE, true);
+                break;
+            }
+
+            case BTN_C: {
+                sequence_set(beat, CH_HIHAT, true);
+                break;
+            }
+
+            default: {
+                break;
+            }
         }
     }
 }
@@ -105,20 +117,27 @@ void sequence_handle_button_drummachine(enum buttons btn) {
     uint32_t beat = 42; // TODO!!
 
     switch (btn) {
-    case BTN_A:
-        sequence_set(beat, CH_KICK, !sequence_get(beat, CH_KICK));
-        break;
+        case BTN_A: {
+            bool val = !sequence_get(beat, CH_KICK);
+            sequence_set(beat, CH_KICK, val);
+            break;
+        }
 
-    case BTN_B:
-        sequence_set(beat, CH_SNARE, !sequence_get(beat, CH_SNARE));
-        break;
+        case BTN_B: {
+            bool val = !sequence_get(beat, CH_SNARE);
+            sequence_set(beat, CH_SNARE, val);
+            break;
+        }
 
-    case BTN_C:
-        sequence_set(beat, CH_HIHAT, !sequence_get(beat, CH_HIHAT));
-        break;
+        case BTN_C: {
+            bool val = !sequence_get(beat, CH_HIHAT);
+            sequence_set(beat, CH_HIHAT, val);
+            break;
+        }
 
-    default:
-        break;
+        default: {
+            break;
+        }
     }
 }
 

src/ui.c

@@ -30,18 +30,22 @@ static enum machine_modes machine_mode = 0;
 static void ui_redraw(void) {
     switch (ui_mode) {
         case UI_BPM: {
+            // TODO
             break;
         }
 
         case UI_MODE: {
+            // TODO
             break;
         }
 
         case UI_LENGTH: {
+            // TODO
             break;
         }
 
         case UI_BANK: {
+            // TODO
             break;
         }
 
@@ -128,6 +132,41 @@ static void ui_buttons(enum buttons btn, bool val) {
     }
 }
 
+void ui_encoder(int32_t val) {
+    if (val == 0) {
+        return;
+    }
+
+    switch (ui_mode) {
+        case UI_BPM: {
+            // TODO
+            break;
+        }
+
+        case UI_MODE: {
+            // TODO
+            break;
+        }
+
+        case UI_LENGTH: {
+            // TODO
+            break;
+        }
+
+        case UI_BANK: {
+            // TODO
+            break;
+        }
+
+        default: {
+            printf("%s: invalid mode: %d\n", __func__, ui_mode);
+            ui_mode = 0;
+            ui_encoder(val);
+            break;
+        }
+    }
+}
+
 void ui_init(void) {
     buttons_callback(ui_buttons);
     ui_redraw();