add turn off for gpio pulses

CMakeLists.txt

@@ -35,6 +35,7 @@ target_sources(drumkit PUBLIC
     src/lcd.c
     src/led.c
     src/main.c
+    src/pulse.c
     src/sequence.c
     src/ui.c
 

README.md

@@ -19,7 +19,7 @@ Then you can build new binaries like this:
 
     make -Cbuild -j4
 
-Flash as usual using the mass storage bootloader of RP2040.
+Flash as usual using the mass storage bootloader (hold BOOTSEL while pluggin in the Pico).
 
 ## Hardware Connections
 
@@ -49,7 +49,7 @@ Flash as usual using the mass storage bootloader of RP2040.
 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.
+The code in `src/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

include/encoder.h

@@ -1,7 +1,19 @@
 /*
  * encoder.h
  *
- * Based on https://github.com/mathertel/RotaryEncoder/blob/master/src/RotaryEncoder.cpp
+ * Copyright (c) 2024 Thomas Buck (thomas@xythobuz.de)
+ *
+ * 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/>.
  */
 
 #ifndef __ENCODER_H__

include/led.h

@@ -22,6 +22,8 @@
 #include <stdint.h>
 #include <stdbool.h>
 
+#define LED_COUNT 4
+
 void led_init(void);
 void led_set(uint32_t i, bool v);
 void ch_set(uint32_t i, bool v);

include/pulse.h

@@ -0,0 +1,28 @@
+/*
+ * pulse.h
+ *
+ * Copyright (c) 2024 Thomas Buck (thomas@xythobuz.de)
+ *
+ * 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/>.
+ */
+
+#ifndef __PULSE_H__
+#define __PULSE_H__
+
+#include <stdint.h>
+
+void pulse_trigger_out(uint32_t i, uint32_t t_ms);
+void pulse_trigger_led(uint32_t i, uint32_t t_ms);
+void pulse_run(void);
+
+#endif // __PULSE_H__

include/sequence.h

@@ -24,17 +24,18 @@
 
 enum channels {
     CH1 = (1 << 0),
-    CH_KICK = CH1,
-
     CH2 = (1 << 1),
-    CH_SNARE = CH2,
-
     CH3 = (1 << 2),
+
+    CH_KICK = CH1,
+    CH_SNARE = CH2,
     CH_HIHAT = CH3,
 
     NUM_CHANNELS = 3
 };
 
+#define CH_GPIO_TIMINGS { 42, 42, 42 } // in milliseconds
+
 void sequence_init(void);
 void sequence_set_bpm(uint32_t new_bpm);
 void sequence_set_beats(uint32_t new_beats);

include/ui.h

@@ -24,8 +24,8 @@
 enum ui_modes {
     UI_BPM = 0,
     UI_MODE,
-    UI_LENGTH,
     UI_BANK,
+    UI_LENGTH,
 
     UI_NUM_MODES
 };

src/encoder.c

@@ -2,6 +2,12 @@
  * encoder.c
  *
  * Based on https://github.com/mathertel/RotaryEncoder/blob/master/src/RotaryEncoder.cpp
+ *
+ * Copyright (c) 2024 Thomas Buck (thomas@xythobuz.de)
+ *
+ * Copyright (c) by Matthias Hertel, http://www.mathertel.de
+ * This work is licensed under a BSD 3-Clause style license
+ * https://www.mathertel.de/License.aspx.
  */
 
 #include <stdio.h>

src/led.c

@@ -21,8 +21,6 @@
 #include "sequence.h"
 #include "led.h"
 
-#define LED_COUNT 4
-
 static const uint led_gpio_num[LED_COUNT] = {
     12, 13, 14, 15,
 };

src/main.c

@@ -24,6 +24,7 @@
 #include "encoder.h"
 #include "lcd.h"
 #include "led.h"
+#include "pulse.h"
 #include "sequence.h"
 #include "ui.h"
 #include "main.h"
@@ -48,6 +49,7 @@ int main(void) {
         buttons_run();
         encoder_run();
         sequence_run();
+        pulse_run();
 
         int32_t epos = encoder_pos();
         if (epos != last_epos) {

src/pulse.c

@@ -0,0 +1,78 @@
+/*
+ * pulse.c
+ *
+ * Copyright (c) 2024 Thomas Buck (thomas@xythobuz.de)
+ *
+ * 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 <stdio.h>
+#include <inttypes.h>
+#include "pico/stdlib.h"
+
+#include "led.h"
+#include "sequence.h"
+#include "pulse.h"
+
+static uint32_t out_time[NUM_CHANNELS] = {0};
+static uint32_t led_time[LED_COUNT] = {0};
+
+static void pulse_trigger(uint32_t i, uint32_t t_ms, bool out) {
+    uint32_t off_t = t_ms + to_ms_since_boot(get_absolute_time());
+
+    if (out) {
+        ch_set(i, true);
+        if (out_time[i % NUM_CHANNELS] == 0) {
+            out_time[i % NUM_CHANNELS] = off_t;
+        } else {
+            printf("%s: skip retrigger out %"PRIu32"\n", __func__, i);
+        }
+    } else {
+        led_set(i, true);
+        if (led_time[i % LED_COUNT] == 0) {
+            led_time[i % LED_COUNT] = off_t;
+        } else {
+            printf("%s: skip retrigger led %"PRIu32"\n", __func__, i);
+        }
+    }
+}
+
+void pulse_trigger_out(uint32_t i, uint32_t t_ms) {
+    pulse_trigger(i, t_ms, true);
+}
+
+void pulse_trigger_led(uint32_t i, uint32_t t_ms) {
+    pulse_trigger(i, t_ms, false);
+}
+
+void pulse_run(void) {
+    uint32_t now = to_ms_since_boot(get_absolute_time());
+
+    for (uint i = 0; i < NUM_CHANNELS; i++) {
+        if (out_time[i] != 0) {
+            if (out_time[i] <= now) {
+                ch_set(i, false);
+                out_time[i] = 0;
+            }
+        }
+    }
+
+    for (uint i = 0; i < LED_COUNT; i++) {
+        if (led_time[i] != 0) {
+            if (led_time[i] <= now) {
+                led_set(i, false);
+                led_time[i] = 0;
+            }
+        }
+    }
+}

src/sequence.c

@@ -20,9 +20,11 @@
 #include "pico/stdlib.h"
 
 #include "led.h"
+#include "pulse.h"
 #include "sequence.h"
 
 #define MAX_BEATS 32
+static const uint32_t channel_times[NUM_CHANNELS] = CH_GPIO_TIMINGS;
 
 static uint32_t ms_per_beat = 500;
 static uint32_t beats = 16;
@@ -68,17 +70,20 @@ 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 for output and led
+            pulse_trigger_out(0, channel_times[0]);
+            pulse_trigger_led(0, channel_times[0]);
             break;
         }
 
         case BTN_B: {
-            // TODO trigger gpio impulse for output and led
+            pulse_trigger_out(1, channel_times[1]);
+            pulse_trigger_led(1, channel_times[1]);
             break;
         }
 
         case BTN_C: {
-            // TODO trigger gpio impulse for output and led
+            pulse_trigger_out(2, channel_times[2]);
+            pulse_trigger_led(2, channel_times[2]);
             break;
         }
 
@@ -151,8 +156,10 @@ void sequence_run(void) {
         led_set(last_i, false);
         led_set(i, true);
 
-        if (sequence[i]) {
-            // TODO trigger GPIO impulse
+        for (uint ch = 0; ch < NUM_CHANNELS; ch++) {
+            if (sequence[i] & (1 << ch)) {
+                pulse_trigger_out(i, channel_times[ch]);
+            }
         }
 
         last_t = now;