more firmware

debug.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# ----------------------------------------------------------------------------
+# 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/>.
+# ----------------------------------------------------------------------------
+
+set -euo pipefail
+
+SERIAL=/dev/serial/by-id/usb-Raspberry_Pi_Pico_*
+
+echo -n Waiting for serial port to appear
+until [ -e $SERIAL ]
+do
+    echo -n .
+    sleep 1
+done
+echo
+
+echo Opening picocom terminal
+echo "[C-a] [C-x] to exit"
+echo
+
+picocom -q --omap crcrlf --imap lfcrlf $SERIAL

flash.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# ----------------------------------------------------------------------------
+# 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/>.
+# ----------------------------------------------------------------------------
+
+set -euo pipefail
+
+SERIAL=/dev/serial/by-id/usb-Raspberry_Pi_Pico_*
+DISK=/dev/disk/by-label/RPI-RP2
+MOUNT=/mnt/tmp
+
+if [ ! -e $DISK ]
+then
+    echo Resetting Raspberry Pi Pico
+    echo -n -e "\\x18" > $SERIAL
+fi
+
+echo -n Waiting for disk to appear
+until [ -e $DISK ]
+do
+    echo -n .
+    sleep 1
+done
+echo
+
+echo Mounting bootloader disk
+sudo mount $DISK $MOUNT
+
+echo Copying binary
+sudo cp $1 $MOUNT
+
+echo Done

src/buttons.c

@@ -66,7 +66,7 @@ void buttons_run(void) {
 
         if ((now - buttons[i].last_time) > DEBOUNCE_DELAY_MS) {
             if (state != buttons[i].current_state) {
-                printf("btn %d now %s\n", i, state ? "pressed" : "released");
+                //printf("btn %d now %s\n", i, state ? "pressed" : "released");
 
                 buttons[i].current_state = state;
                 if (callback) {

src/led.c

@@ -16,6 +16,8 @@
  * See <http://www.gnu.org/licenses/>.
  */
 
+#include <stdio.h>
+#include <inttypes.h>
 #include "pico/stdlib.h"
 
 #include "sequence.h"
@@ -42,10 +44,12 @@ void led_init(void) {
 
 void led_set(uint32_t i, bool v) {
     i %= LED_COUNT;
-    gpio_put(i, v);
+    gpio_put(led_gpio_num[i], v);
+    //printf("led %"PRIu32" now %d\n", i, v);
 }
 
 void ch_set(uint32_t i, bool v) {
     i %= NUM_CHANNELS;
-    gpio_put(i, v);
+    gpio_put(ch_gpio_num[i], v);
+    //printf("ch %"PRIu32" now %d\n", i, v);
 }

src/main.c

@@ -18,6 +18,7 @@
 
 #include <stdio.h>
 #include "pico/stdlib.h"
+#include "pico/bootrom.h"
 #include "hardware/watchdog.h"
 
 #include "adc.h"
@@ -32,8 +33,16 @@
 
 #define WATCHDOG_PERIOD_MS 100
 
+static void reset_to_bootloader(void) {
+#ifdef PICO_DEFAULT_LED_PIN
+    reset_usb_boot(1 << PICO_DEFAULT_LED_PIN, 0);
+#else // ! PICO_DEFAULT_LED_PIN
+    reset_usb_boot(0, 0);
+#endif // PICO_DEFAULT_LED_PIN
+}
+
 int main(void) {
-    watchdog_enable(WATCHDOG_PERIOD_MS, 1);
+    //watchdog_enable(WATCHDOG_PERIOD_MS, 1);
     stdio_init_all();
     bat_init();
     buttons_init();
@@ -59,6 +68,13 @@ int main(void) {
             ui_encoder(epos - last_epos);
             last_epos = epos;
         }
+
+        int c = getchar_timeout_us(0);
+        if (c == 0x18) {
+            reset_to_bootloader();
+        } else if (c != PICO_ERROR_TIMEOUT) {
+            printf("%c", c);
+        }
     }
 
     return 0;

src/sequence.c

@@ -172,6 +172,7 @@ void sequence_handle_button_drummachine(enum buttons btn) {
 }
 
 void sequence_run(void) {
+    /*
     uint32_t now = to_ms_since_boot(get_absolute_time());
 
     if ((last_t + ms_per_beat) >= now) {
@@ -190,4 +191,5 @@ void sequence_run(void) {
         last_t = now;
         last_i = i;
     }
+    */
 }