prremote 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8eeb5a287e2d90f2c3fdab1324a778be063eee3bb8eeb5577803113478f7afe
-  data.tar.gz: f58b759474589038e3c4f5b4fc5c0504543fa2c03f4fde9957a30fe2d6f198f1
+  metadata.gz: a272e63d0fd00f66c93a868352e963daca972681cc4bb8498cf7fb4a52c23b74
+  data.tar.gz: 7fdb1514c2c8d017fd0263b72a802e1ba49b088f6d4df411d8e69f90200d26ca
 SHA512:
-  metadata.gz: bec989326521193f9abcdd90794d79d2acefe8f9d41721507188cd267dc9fbb085c75bc953e7c14960f6ccdb6106da8f5cc276f4a8a7b861038092beeb74af57
-  data.tar.gz: f5087a5ab44764509e10b7c70b4b1214223cebdf3ff8f72adee7740297a8deeb7b37c8729a27511484630521ba8da20c55102174e8333728ffd36c39fbd37b12
+  metadata.gz: aae5795b1205b04d59ee588bb157f23118ab57ce38fbd7a568a19780c68a479f2426db891f37333b689c96e6f6d20ea91e00818b1d5377cf5e997e982194c670
+  data.tar.gz: fee308552c72746fb69306510a4f5639fac4a7f040c3237d72587028f70d8c3ec88aec35a838cf24557ed0951fe022eb6eb8a64bd3a209ba34552e7a48c70dd4

data/README.md

@@ -77,7 +77,7 @@ prremote install -b picow --version 0.1.1 # specify a runtime version
 
 The firmware is downloaded from GitHub Releases on first use and cached in `~/.prremote/runtime/`. Subsequent installs use the cache.
 
-Pico boards: put the device into BOOTSEL mode (hold BOOTSEL, connect USB, release) when prompted. The drive appears as `RPI-RP2` on Pico / Pico W and as `RP2350` on Pico 2.
+Pico boards: if the board is already running the prremote runtime, `install` reboots it into BOOTSEL mode by itself (a 1200 bps touch on its serial port). Otherwise — a fresh board, or one running something else — put it into BOOTSEL mode (hold BOOTSEL, connect USB, release) when prompted. The drive appears as `RPI-RP2` on Pico / Pico W and as `RP2350` on Pico 2.
 
 ESP32 (classic): no button dance and no extra tools needed — the firmware is written over the serial port by prremote's pure-Ruby implementation of the Espressif bootloader protocol (the chip is reset into its boot ROM automatically, and the write is verified with an on-chip MD5).
 
@@ -183,8 +183,8 @@ Show the gem version, mrbc version, and the connected device's runtime version.
 
 ```bash
 prremote version
-# prremote: 0.4.2
-# runtime:  0.4.2 board=picow (/dev/tty.usbmodem101)
+# prremote: 0.4.4
+# runtime:  0.4.4 board=picow (/dev/tty.usbmodem101)
 # mrbc: mruby 4.0.0 (2026-04-20) (/opt/homebrew/bin/mrbc)
 ```
 

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.4

data/lib/prremote/commands/install.rb

@@ -14,6 +14,15 @@ module Prremote
       # The UF2 bootloader exposes this file on the BOOTSEL volume.
       BOOTSEL_MARKER = 'INFO_UF2.TXT'.freeze
 
+      # pico-sdk's stdio_usb reboots into the BOOTSEL boot ROM when the host
+      # sets this baud rate (PICO_STDIO_USB_RESET_MAGIC_BAUD_RATE), so a board
+      # already running the runtime can be flashed without the button.
+      RESET_BAUD = 1200
+
+      # How long to wait for the BOOTSEL drive after the 1200 bps touch before
+      # falling back to the manual instructions.
+      AUTO_BOOTSEL_TIMEOUT = 10
+
       # Boards whose install path has not been run on real hardware yet.
       UNVERIFIED_BOARDS = %w[pico2].freeze
 
@@ -38,14 +47,7 @@ module Prremote
         uf2_path = RuntimeManager.fetch(@version, @board)
 
         warn_unverified
-        puts "Put the #{device_label} into BOOTSEL mode:"
-        puts '  1. Hold the BOOTSEL button'
-        puts '  2. Connect USB (or press RUN while holding BOOTSEL)'
-        puts "  3. Release BOOTSEL — #{volume_name} should appear as a USB drive"
-        puts
-        puts "Waiting for #{volume_name}..."
-
-        volume = wait_for_volume
+        volume = mounted_volume || auto_bootsel || manual_bootsel
         puts "Copying firmware to #{volume}..."
         FileUtils.cp(uf2_path, File.join(volume, File.basename(uf2_path)))
 
@@ -57,6 +59,55 @@ module Prremote
 
       private
 
+      # A board already sitting in BOOTSEL needs no reboot.
+      def mounted_volume
+        volume = volume_paths.find { |p| mounted?(p) }
+        puts "Found #{volume_name} at #{volume}." if volume
+        volume
+      end
+
+      # Reboots a board running the runtime into BOOTSEL with a 1200 bps
+      # touch. nil when there is no Pico port or the drive never shows up
+      # (no runtime on the board, a wedged runtime, or a WSL drive that still
+      # needs mounting), so the caller falls back to the button.
+      def auto_bootsel
+        port = @port || Detector.find_pico_port
+        return nil unless port
+
+        puts "Rebooting #{device_label} on #{port} into BOOTSEL mode..."
+        touch_reset_baud(port)
+        puts "Waiting for #{volume_name}..."
+        wait_for_volume(timeout: AUTO_BOOTSEL_TIMEOUT)
+      rescue RuntimeError
+        puts "#{volume_name} did not appear; falling back to manual BOOTSEL."
+        puts
+        nil
+      end
+
+      # Opening the port at the magic baud rate is the whole trigger. The board
+      # drops off USB right away, so errors while closing are expected.
+      def touch_reset_baud(port)
+        serial = Serial.new(port, RESET_BAUD)
+      rescue RubySerial::Error, SystemCallError => e
+        puts "Could not open #{port} at #{RESET_BAUD} bps: #{e.message}" if @verbose
+      ensure
+        begin
+          serial&.close
+        rescue RubySerial::Error, SystemCallError
+          nil
+        end
+      end
+
+      def manual_bootsel
+        puts "Put the #{device_label} into BOOTSEL mode:"
+        puts '  1. Hold the BOOTSEL button'
+        puts '  2. Connect USB (or press RUN while holding BOOTSEL)'
+        puts "  3. Release BOOTSEL — #{volume_name} should appear as a USB drive"
+        puts
+        puts "Waiting for #{volume_name}..."
+        wait_for_volume
+      end
+
       # No BOOTSEL dance on ESP32: the flasher toggles DTR/RTS to enter the
       # boot ROM by itself, so flashing works over the normal serial port.
       def install_esp32
@@ -155,10 +206,12 @@ module Prremote
         false
       end
 
+      # The marker, not the directory, is the test: macOS can leave an empty
+      # /Volumes/RPI-RP2 behind after the board reboots off a copy.
       def wait_for_volume(timeout: 60)
         deadline = Time.now + timeout
         loop do
-          path = volume_paths.find { |p| File.directory?(p) }
+          path = volume_paths.find { |p| mounted?(p) }
           return path if path
           raise "Timed out waiting for #{volume_name} volume (#{timeout}s)" if Time.now > deadline
 

data/lib/prremote/detector.rb

@@ -44,6 +44,17 @@ module Prremote
         '`usbipd list`, then `usbipd attach --wsl --busid <BUSID>`.'
     end
 
+    def self.find_pico_port
+      new.find_pico_port
+    end
+
+    # A port whose USB vendor is Raspberry Pi — the only kind the 1200 bps
+    # BOOTSEL touch applies to. nil when none (or the vendor can't be read).
+    def find_pico_port
+      label = KNOWN_VENDORS.dig(R2P2_VENDOR_IDS.first, :label)
+      serial_ports.find { |p| port_label(p) == label }
+    end
+
     def find_device
       candidates = serial_ports
       return candidates.first if candidates.size == 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: prremote
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - ITO Yosei