RubyGems - rpremote - Versions diffs - 0.4.0 → 0.6.0 - Mend

rpremote 0.4.0 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (23) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +17 -5
data/README.ja.md +31 -45
data/README.md +31 -46
data/RELEASING.md +6 -5
data/lib/rpremote/bootsel_command.rb +8 -6
data/lib/rpremote/builder.rb +1 -1
data/lib/rpremote/deploy_command.rb +14 -11
data/lib/rpremote/help.rb +8 -6
data/lib/rpremote/language_source.rb +19 -2
data/lib/rpremote/mrbgems.rb +37 -17
data/lib/rpremote/picoruby_compiler.rb +28 -0
data/lib/rpremote/picoruby_source_patch.rb +2 -4
data/lib/rpremote/target.rb +1 -1
data/lib/rpremote/terminal.rb +0 -2
data/lib/rpremote/version.rb +1 -1
data/lib/rpremote.rb +1 -0
data/patches/picoruby-4.0.3-pwm-sleep-clock.patch +22 -0
data/sig/rpremote.rbs +11 -0
data/tasks/firmware_build.rb +10 -2
metadata +3 -3
data/patches/picoruby-3.4.5-bootsel.patch +0 -71
data/patches/picoruby-4.0.3-bootsel.patch +0 -71

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21b188c13268efadddce4c649dae65a26465b0f2b5a680013015d0c9dfb1ea14
-  data.tar.gz: f964e2a4c148a33841e596d570229a33112f5ba6c5dcdd4254f4758241175360
+  metadata.gz: b30b1f27c4bdbb212d69bc30f79342bf2caa6ae5c6787125a9627e53f15a714a
+  data.tar.gz: a7ab212fa48b5f58aa11357ffdf52c2f5c8dbf47c2b00c6d3b7279c38a1431d3
 SHA512:
-  metadata.gz: 5a15b170f1432c80970158a7b41d2902c1765fb5ba8b6d369350b8dab366b605d8e72baf54ceeb2830977b517ef135508b702af701be7f21b6d36f9edbe10e5a
-  data.tar.gz: 6cf0ba03b2aabf0c94dc2ab7d82856a832ddf2a98e18f3f9d21ad4f061d162b60a86d4217e01f60686d75afc5cb0ef00dfa0617fdd3d4eab356137815734f724
+  metadata.gz: 6086af03b4459d2c96102e7f884cd888276735ae77d30132189a4191c66892366a7deb51676613966751d343d79d5b53519242ac5171cee9d60044d81a4f7225
+  data.tar.gz: dc2851099a3a6a3c019a3cbb8936b4b111f9359d964208163d688d4afb4b4cf27135286949304954f7ea685a215f6373f27e23a3c20c3aa4fb5382e93bec6620

data/CHANGELOG.md CHANGED Viewed

@@ -1,10 +1,24 @@
 # Changelog
-All notable changes to this project will be documented in this file.
+Notable changes to the `rpremote` RubyGem will be documented in this file. Repository-level examples, local mrbgems, and support files are documented in the [repository changelog](../../CHANGELOG.md).
+## Unreleased
+## 0.6.0 - 2026-09-20
+- Change the default PicoRuby version to `latest`, backed by the current `master` branch, while retaining `--language-version` for selecting a release tag.
+- Replace the patched R2P2 `bootsel` executable with a temporary PicoModem script that calls `Machine.enter_bootsel` from the embedded `picoruby-bootsel` mrbgem.
+- Support both the legacy `build/host/bin/mrbc` layout and the PicoRuby 4.0.4 `build/mrbc/default/bin/mrbc` layout when building custom firmware.
+- Expand the human-readable executable specifications and validate bilingual documentation structure, links, command coverage, and safety warnings.
+## 0.5.0 - 2026-09-12
+- Make `deploy PATH` flash the existing UF2 by default, and add `deploy PATH --build` for the previous build-and-deploy workflow.
+- Keep the RP2350 PWM clock running during scheduler sleep after PWM initialization, preventing buzzer and other PWM output from pausing between scheduler ticks on PicoRuby 4.0.3.
+- Add `auto_require: false` to `Mrbgems` entries so a gem can remain embedded in firmware without being prepended to every `run`, `exec`, and `deploy` source.
 ## 0.4.0 - 2026-08-31
-- Add the Daisen Kofun PicoRuby project, with 32 WS2812 illumination patterns, a firmware-embedded local mrbgem, LED layout and setlist definitions, bilingual documentation, and host-side regression tests.
 - Check R2P2 filesystem connectivity before non-recursive `fs cp` transfers, and report Shell synchronization timeouts as filesystem connection failures.
 ## 0.3.0 - 2026-08-28
@@ -20,13 +34,11 @@ All notable changes to this project will be documented in this file.
 - Read mrbgem `require_name` values from `Mrbgems.lock` and automatically prepend the corresponding `require` calls to `run`, `exec`, and `deploy`; allow `Mrbgems` entries to specify `require:` explicitly.
 - Change `flash` to accept an explicit UF2 only through `--firmware FILE`; positional UF2 arguments are no longer supported.
 - Improve RP2350 BOOTSEL flashing on macOS by accepting the expected `ENXIO` volume-detach race after a successful copy.
-- Add PicoRuby mrbgem examples for BMI270, HC-SR04 temperature, MAX30102, MPU6050, and WS2812 SPI, plus oximeter and Processing project examples.
 ## 0.2.0 - 2026-08-26
 - Make `run` and `exec` exit nonzero when compatible R2P2 firmware reports a Ruby exception, while preserving real-time program output.
 - Increase the default command timeout from 10 to 20 seconds.
-- Add a bilingual education example for practical PicoModem DFU application updates, startup confirmation, and A/B-slot rollback.
 ## 0.1.0 - 2026-08-24
@@ -36,7 +48,7 @@ All notable changes to this project will be documented in this file.
 - Add PicoModem DFU staging, status, compatible bytecode compilation, and A/B-slot rollback support for Ruby and `.mrb` applications.
 - Add binary-safe file transfer and remote filesystem commands, plus `run`, `exec`, `monitor`, `repl`, and reset with reconnect waiting.
 - Add macOS R2P2 serial-port detection for Raspberry Pi Pico 2 and Pico 2 W.
-- Add bilingual repository, package, configuration, firmware, mrbgem, DFU, and electronic-craft example documentation.
+- Add bilingual package, configuration, firmware, mrbgem, and DFU documentation.
 - Add RBS signatures, automated tests, macOS CI, and release validation with isolated gem installation and CLI smoke testing.
 ### Limitations

data/README.ja.md CHANGED Viewed

@@ -1,4 +1,4 @@
-# rpremote CLIリファレンス
+# rpremote
 [English](README.md)
@@ -26,19 +26,20 @@ gem install rpremote
 ```sh
 rpremote setup
 rpremote build
-rpremote flash --mount /Volumes/RP2350
+rpremote flash
 rpremote run main.rb
 ```
 `setup`はRaspberry Pi公式のリセット用`nuke_universal.uf2`も`firmware/`へダウンロードします。
-再利用するRubyコードを`lib/NAME`へ置くプロジェクトでは、`deploy`がファームウェアをビルドして書き込み、そのディレクトリをR2P2へコピーしてからエントリーファイルを実行します。
+再利用するRubyコードを`lib/NAME`へ置くプロジェクトでは、`deploy`が既存ファームウェアを書き込み、そのディレクトリをR2P2へコピーしてからエントリーファイルを一時実行します。`--build`を付けると、同じ処理の前にファームウェアをビルドします。
 ```sh
 rpremote deploy path/to/project
+rpremote deploy path/to/project --build
 ```
-既定では`firmware/picoruby-4.0.3/`にソースを準備し、`firmware/picoruby-4.0.3-pico2.uf2`を生成します。対象ボードを明示する必要がある場合は、`rpremote ports`でR2P2のCDC 0ポートを確認してください。
+既定では`firmware/picoruby-latest/`にソースを準備し、`firmware/picoruby-latest-pico2.uf2`を生成します。対象ボードを明示する必要がある場合は、`rpremote ports`でR2P2のCDC 0ポートを確認してください。
 ## mrbgemを追加する
@@ -60,63 +61,48 @@ rpremote build
 `Mrbgems.lock`はGitHubのコミットとローカルgemの内容ハッシュを固定します。`build`は既存のlockを再利用し、`rpremote mrbgems update`だけが新しいコミットを解決します。
+ファームウェアへ組み込む一方で、すべての`run`、`exec`、`deploy`に先行ロードしないgemには`auto_require: false`を指定できます。アプリケーション側から必要なgemを明示的に`require`してください。
 ## 対象を選択する
 ```sh
-rpremote setup --language picoruby --language-version 3.4.2
-rpremote build --language picoruby --language-version 3.4.2 --board pico2
-rpremote flash --language picoruby --language-version 3.4.2 --board pico2 --mount /Volumes/RP2350
+rpremote setup
+rpremote build
+rpremote flash
 ```
 コマンドラインオプションは`config/setting.json`より優先されます。現在実装されているのはPicoRubyです。将来のMicroPythonと追加Picoボード対応に備え、`language`と`board`はインターフェースに残しています。
-## コマンド
-| コマンド | 説明 |
-| --- | --- |
-| `rpremote setup` | 設定を作成し、言語ソースを準備します。 |
-| `rpremote build` | mrbgemを含むカスタムUF2をビルドします。 |
-| `rpremote build clean` | 中間ビルドファイルを削除します。 |
-| `rpremote bootsel` | 実行中のR2P2へBOOTSEL移行を要求し、USBボリュームの出現を待ちます。 |
-| `rpremote deploy PATH` | ファームウェアをビルドして書き込み、存在する場合は`PATH/lib/NAME`を`:/lib/NAME`へコピーしてから`PATH/main.rb`を実行します。ハードウェア出力は次のコマンドまで維持されます。 |
-| `rpremote dfu app FILE` | PicoModem DFUでRubyまたは版を照合したバイトコードのアプリを更新します。 |
-| `rpremote dfu compile FILE` | DFU用にPicoRuby版と一致する`.mrb`を生成します。 |
-| `rpremote dfu status` | DFUのアクティブおよび起動候補スロットを表示します。 |
-| `rpremote dfu remove` | DFU起動アプリを両スロットから削除します。実行中のアプリを停止するには別途リセットします。 |
-| `rpremote mrbgems …` | mrbgemを検査、表示、固定、更新します。 |
-| `rpremote flash` | 選択したUF2をBOOTSEL経由で書き込みます。 |
-| `rpremote bootsel --reset-flash-memory` | BOOTSELへ移行し、Pico 2の外部フラッシュメモリ全体を消去します。 |
-| `rpremote config show` | 設定ファイルとコマンドラインオプションを反映した実効設定を表示します。 |
-| `rpremote ports` | R2P2シリアルポートを表示します。 |
-| `rpremote run FILE` | Rubyファイルを転送して実行します。ディレクトリ指定時は`main.rb`を実行し、出力をリアルタイム表示します。タイムアウトは無出力の継続時間として扱い、Ruby例外時は非0で終了します。`--reset-on-timeout`を指定すると実行タイムアウト後にR2P2をリセットします。 |
-| `rpremote exec CODE` | 短いRubyコードを実行します。Ruby例外時は非0で終了します。 |
-| `rpremote monitor` / `repl` | 対話型シリアルセッションを開きます。 |
-| `rpremote reset` | R2P2を再起動して再接続まで待ちます。 |
-| `rpremote fs cp/push/cat/ls/rm/mkdir` | R2P2ファイルシステムを操作します。 |
-コマンド一覧は`rpremote --help`で確認できます。コマンド固有の構文、既定値、影響は`rpremote <command> --help`で確認できます。
+## 作業を選ぶ
+- `setup`でプロジェクトを準備し、`config show`で実効設定を確認します。最初のファームウェア導入には`build`と`flash`を使います。
+- プロジェクト開発では`deploy PATH`を使います。選択したファームウェアを書き込み、存在する場合は`PATH/lib/NAME`をコピーして`PATH/main.rb`を実行します。先にファームウェアを再ビルドする場合は`--build`を付けます。
+- Rubyを一時実行する場合は`run`または`exec`、対話型シリアル接続には`monitor`または`repl`を使います。`monitor`と`repl`は`Ctrl-]`で終了します。
+- R2P2上へファイルを保持する場合は`fs`、再起動後も実行するA/B起動アプリには`dfu`を使います。
+完全なコマンド一覧は`rpremote --help`で確認します。現在の構文、既定値、処理順、影響についてはコマンドヘルプが実行可能なリファレンスです。
 ```sh
-rpremote flash --help
+rpremote deploy --help
 rpremote dfu app --help
+rpremote fs cp --help
 ```
-`monitor`と`repl`は`Ctrl-]`で終了します。
-`run`と`exec`の例外終了コードには、Ruby例外ステータスに対応したR2P2ファームウェアが必要です。[GitHubリポジトリ](https://github.com/ogom/rpremote)のPicoRubyソースから`rpremote build`で生成したUF2が対応しています。
-## 操作モデル
+### 安全上の境界
-- `run`と`exec`はRubyコードを一時的に転送・実行して出力を表示し、一時リモートファイルを削除します。対応するR2P2ファームウェアがRuby例外を報告した場合は、非0で終了します。
-- `deploy PATH`はファームウェアをビルドし、BOOTSELへ移行して書き込んだ後、R2P2 Shellの起動完了を待ちます。存在する場合は`PATH/lib/NAME`を`:/lib/NAME`へコピーし、実行直前に読み込んだ`PATH/main.rb`を実行します。Shellジョブを保持するため、ハードウェア出力は次のコマンドまで維持されます。正常終了と出力バイト数を表示し、R2P2のRuby例外はコマンド失敗として扱います。ライブラリディレクトリがない場合、コピー処理はスキップします。PicoRuby 4系のファームウェアが必要です。
-- `flash`はUF2をRP2350 BOOTSELボリュームへコピーし、永続的なR2P2ファームウェアを置き換えます。
-- `dfu app`はRubyソースまたは対応するバイトコードのアプリを非アクティブDFUスロットへ登録します。R2P2を再起動して試行し、正常に起動したアプリは`DFU.confirm`を呼び出します。
-- `dfu remove`はDFUのA/B両アプリスロットを完全に空にします。RAM上ですでに動作しているアプリは`rpremote reset`を実行するまで継続するため、起動アプリのログを混ぜずに`rpremote run`を使う場合は両方のコマンドを実行します。その他の`/home`ファイルとR2P2ファームウェアは削除しません。
-- リモートパスには`:/REMOTE/PATH`を使います。`fs cp`はローカルパスとリモートパスの間で転送します。`fs push LOCAL_DIR :/REMOTE_DIR`は`fs cp --recursive`の別名で、不足しているリモートディレクトリを作成し、ローカルディレクトリの内容を一括転送します。リモートにだけ存在するファイルは削除しません。`fs rm`は指定したリモートパスを完全に削除します。
+- `flash`は永続的なR2P2ファームウェアを置き換えます。`bootsel --reset-flash-memory`はPico 2の外部フラッシュ全体を消去するため、実行後にR2P2を再度書き込む必要があります。
+- `dfu remove`はDFUのA/B両アプリスロットを完全に空にします。RAM上ですでに動作しているアプリを停止するには、別途リセットします。
+- `fs rm`は指定したリモートパスを完全に削除します。再帰転送ではボード上だけに存在するファイルを削除しません。
+- `run`と`exec`は一時リモートファイルを削除します。Ruby例外時の非0終了には対応するR2P2ファームウェアが必要で、このリポジトリからビルドしたUF2は対応しています。
 ## ドキュメントとサンプル
-[GitHubリポジトリ](https://github.com/ogom/rpremote)に、英語・日本語のガイド、設定リファレンス、Mrbgems.lockの解説、カスタムファームウェア手順、電子工作サンプルがあります。
+- [作業に応じてコマンドを選ぶ](https://github.com/ogom/rpremote/blob/main/docs/command.ja.md)
+- [プロジェクトを設定する](https://github.com/ogom/rpremote/blob/main/docs/config.ja.md)
+- [カスタムファームウェアをビルドする](https://github.com/ogom/rpremote/blob/main/docs/firmware.ja.md)
+- [MrbgemsとMrbgems.lockを管理する](https://github.com/ogom/rpremote/blob/main/docs/mrbgems.ja.md)
+- [PicoModem DFUで起動アプリを更新する](https://github.com/ogom/rpremote/blob/main/docs/dfu.ja.md)
+- [電子工作サンプルを見る](https://github.com/ogom/rpremote/tree/main/examples)
 ## 関連プロジェクト

data/README.md CHANGED Viewed

@@ -1,4 +1,4 @@
-# rpremote CLI reference
+# rpremote
 [日本語](README.ja.md)
@@ -26,19 +26,20 @@ Run these commands in a project directory:
 ```sh
 rpremote setup
 rpremote build
-rpremote flash --mount /Volumes/RP2350
+rpremote flash
 rpremote run main.rb
 ```
 `setup` also downloads the official Raspberry Pi `nuke_universal.uf2` reset firmware into `firmware/`.
-For a project that stores reusable Ruby code in `lib/NAME`, `deploy` builds and flashes the firmware, copies that directory to R2P2, and then runs its entry file:
+For a project that stores reusable Ruby code in `lib/NAME`, `deploy` flashes the existing firmware, copies that directory to R2P2, and then temporarily runs its entry file. Add `--build` to build the firmware first:
 ```sh
 rpremote deploy path/to/project
+rpremote deploy path/to/project --build
 ```
-The defaults prepare `firmware/picoruby-4.0.3/` and create `firmware/picoruby-4.0.3-pico2.uf2`. Use `rpremote ports` to locate the R2P2 CDC 0 port when a board must be selected explicitly.
+The defaults prepare `firmware/picoruby-latest/` and create `firmware/picoruby-latest-pico2.uf2`. Use `rpremote ports` to locate the R2P2 CDC 0 port when a board must be selected explicitly.
 ## Add mrbgems
@@ -60,64 +61,48 @@ rpremote build
 `Mrbgems.lock` pins GitHub commits and hashes local gem contents. Existing locks are reused by `build`; `rpremote mrbgems update` deliberately resolves new commits.
+Set `auto_require: false` for a gem that should remain embedded in firmware without being loaded before every `run`, `exec`, or `deploy`. Require that gem explicitly from the application when needed.
 ## Select a target
 ```sh
-rpremote setup --language picoruby --language-version 3.4.2
-rpremote build --language picoruby --language-version 3.4.2 --board pico2
-rpremote flash --language picoruby --language-version 3.4.2 --board pico2 --mount /Volumes/RP2350
+rpremote setup
+rpremote build
+rpremote flash
 ```
 Command-line options override `config/setting.json`. PicoRuby is implemented today; `language` and `board` are retained for planned MicroPython and additional Pico board support.
-## Commands
-| Command | Description |
-| --- | --- |
-| `rpremote setup` | Create configuration and prepare language sources. |
-| `rpremote build` | Build a custom UF2 with project mrbgems. |
-| `rpremote build clean` | Remove intermediate build files. |
-| `rpremote bootsel` | Ask the running R2P2 firmware to enter BOOTSEL and wait for its USB volume. |
-| `rpremote deploy PATH` | Build and flash firmware, copy `PATH/lib/NAME` to `:/lib/NAME` when present, then run `PATH/main.rb` while preserving its hardware output until the next command. |
-| `rpremote dfu app FILE` | Stage a Ruby or version-checked bytecode app through PicoModem DFU. |
-| `rpremote dfu compile FILE` | Compile `.rb` to matching PicoRuby bytecode for DFU. |
-| `rpremote dfu status` | Show the active and candidate DFU slots. |
-| `rpremote dfu remove` | Remove both DFU boot applications; reset separately to stop one already running. |
-| `rpremote mrbgems …` | Check, list, lock, or update mrbgems. |
-| `rpremote flash` | Flash the selected UF2 through BOOTSEL. |
-| `rpremote bootsel --reset-flash-memory` | Enter BOOTSEL and erase all Pico 2 external flash memory. |
-| `rpremote config show` | Show the effective configuration after file and command-line options are resolved. |
-| `rpremote ports` | List detected R2P2 serial ports. |
-| `rpremote run FILE` | Upload and run a Ruby file, or `main.rb` when FILE is a directory, with real-time output; exit nonzero on a Ruby exception. The timeout measures idle time without output. Use `--reset-on-timeout` to reset R2P2 after a run timeout. |
-| `rpremote exec CODE` | Run short Ruby code and exit nonzero on a Ruby exception. |
-| `rpremote monitor` / `repl` | Open an interactive serial session. |
-| `rpremote reset` | Reboot R2P2 and wait for reconnection. |
-| `rpremote fs cp/push/cat/ls/rm/mkdir` | Operate on the R2P2 filesystem. |
-Run `rpremote --help` for the complete command list. Run `rpremote <command> --help` for command-specific syntax, defaults, and effects.
+## Choose a workflow
+- Prepare a project with `setup`, inspect resolved settings with `config show`, then use `build` and `flash` for the first firmware installation.
+- Use `deploy PATH` during project development. It flashes the selected firmware, copies `PATH/lib/NAME` when present, and runs `PATH/main.rb`; add `--build` when the firmware must be rebuilt first.
+- Use `run` or `exec` for temporary Ruby execution, and `monitor` or `repl` for an interactive serial session. `monitor` and `repl` exit with `Ctrl-]`.
+- Use `fs` commands for persistent R2P2 files, and use `dfu` commands when an A/B boot application must survive a restart.
+Run `rpremote --help` for the complete command list. Command help is the executable reference for current syntax, defaults, processing order, and effects.
 ```sh
-rpremote flash --help
+rpremote deploy --help
 rpremote dfu app --help
+rpremote fs cp --help
 ```
-`monitor` and `repl` exit with `Ctrl-]`.
-Ruby-exception exit statuses for `run` and `exec` require R2P2 firmware with Ruby exception status support.
-UF2 files built with `rpremote build` from the [GitHub repository](https://github.com/ogom/rpremote) include that support.
-## Operation model
+### Safety boundaries
-- `run` and `exec` upload Ruby code temporarily, relay output, then remove the temporary remote file. A Ruby exception reported by compatible R2P2 firmware makes the command exit nonzero.
-- `deploy PATH` builds the selected firmware, enters BOOTSEL, flashes it, waits until the R2P2 Shell is ready, copies `PATH/lib/NAME` to `:/lib/NAME` when present, then runs the current contents of `PATH/main.rb`. Its Shell job is retained so hardware output remains active until the next command. It reports successful completion and the output byte count; an R2P2 Ruby exception remains a command failure. If the library directory is absent, the copy step is skipped. It requires PicoRuby 4.x firmware.
-- `flash` copies a UF2 to the RP2350 BOOTSEL volume and replaces persistent R2P2 firmware.
-- `dfu app` stages a Ruby source or matching bytecode app in the inactive DFU slot. Restart R2P2 to try it; a successful app must call `DFU.confirm`.
-- `dfu remove` permanently clears both DFU A/B application slots. The application already loaded in RAM continues until you run `rpremote reset`; use both commands before `rpremote run` when boot-app output would be unwanted. It does not remove other `/home` files or R2P2 firmware.
-- Remote paths use `:/REMOTE/PATH`. `fs cp` transfers between one local and one remote path. `fs push LOCAL_DIR :/REMOTE_DIR` is an alias of `fs cp --recursive`; it creates missing remote directories and uploads the local directory contents. It does not delete remote files. `fs rm` permanently deletes the selected remote path.
+- `flash` replaces persistent R2P2 firmware. `bootsel --reset-flash-memory` erases all Pico 2 external flash and requires R2P2 to be flashed again.
+- `dfu remove` permanently clears both DFU A/B application slots. Reset separately to stop an application already running in RAM.
+- `fs rm` permanently deletes the selected remote path. Recursive uploads do not delete files that exist only on the board.
+- `run` and `exec` remove their temporary remote file. Their nonzero Ruby-exception status requires compatible R2P2 firmware; UF2 files built from this repository include that support.
 ## Documentation and examples
-The [GitHub repository](https://github.com/ogom/rpremote) contains the full English and Japanese guides, configuration reference, Mrbgems.lock reference, custom firmware guide, and electronic-craft examples.
+- [Choose commands by workflow](https://github.com/ogom/rpremote/blob/main/docs/command.md)
+- [Configure a project](https://github.com/ogom/rpremote/blob/main/docs/config.md)
+- [Build custom firmware](https://github.com/ogom/rpremote/blob/main/docs/firmware.md)
+- [Manage Mrbgems and Mrbgems.lock](https://github.com/ogom/rpremote/blob/main/docs/mrbgems.md)
+- [Update a boot application with PicoModem DFU](https://github.com/ogom/rpremote/blob/main/docs/dfu.md)
+- [Browse electronic-craft examples](https://github.com/ogom/rpremote/tree/main/examples)
 ## Related projects

data/RELEASING.md CHANGED Viewed

@@ -5,9 +5,10 @@ This checklist prepares and publishes one immutable gem version. Run every comma
 ## 1. Prepare the version
 1. Update `Rpremote::VERSION` in `lib/rpremote/version.rb`.
-2. Add the same version and release date to `CHANGELOG.md`.
-3. Commit all intended files and verify that `git status --short` is empty.
-4. Run the non-publishing release check:
+2. Replace `Unreleased` in the package `CHANGELOG.md` with the same version and release date, then add a new empty `Unreleased` section.
+3. If repository-level examples, local mrbgems, or support files changed, finalize the corresponding `Unreleased` section in `../../CHANGELOG.md` with the same release version and date, then add a new empty `Unreleased` section.
+4. Commit all intended files and verify that `git status --short` is empty.
+5. Run the non-publishing release check:
 ```sh
 bundle exec rake release:check
@@ -48,7 +49,7 @@ bundle exec rake release
 After the tag exists on GitHub, create a GitHub Release and attach the exact gem that passed validation. `--verify-tag` prevents GitHub CLI from silently creating a tag at another commit:
 ```sh
-gh release create v0.4.0 rpremote-0.4.0.gem --verify-tag --generate-notes
+gh release create v0.5.0 rpremote-0.5.0.gem --verify-tag --generate-notes
 ```
-Replace `0.4.0` in both places for later versions. Finally, install from RubyGems.org in a fresh environment and run `rpremote --version`.
+Replace `0.5.0` in both places for later versions. Finally, install from RubyGems.org in a fresh environment and run `rpremote --version`.

data/lib/rpremote/bootsel_command.rb CHANGED Viewed

@@ -7,6 +7,8 @@ module Rpremote
     SHELL_READY_TIMEOUT = 2.0
     RETRY_INTERVAL = 0.25
     RESET_FLASH_FIRMWARE = File.join("firmware", "nuke_universal.uf2").freeze
+    REMOTE_SCRIPT_PATH = "/home/.rpremote-bootsel.rb"
+    REMOTE_SCRIPT = "require \"bootsel\"\nMachine.enter_bootsel\n".b.freeze
     class Error < Rpremote::Error; end
@@ -47,7 +49,8 @@ module Rpremote
       request_bootsel(
         port: port, baud: baud, deadline: deadline, output: output,
-        serial: serial, device: device, shell: shell, sleeper: sleeper, clock: clock
+        serial: serial, device: device, shell: shell, modem: services.fetch(:modem) { PicoModem },
+        sleeper: sleeper, clock: clock
       )
       remaining = deadline - clock.call
@@ -66,6 +69,7 @@ module Rpremote
       serial = context.fetch(:serial)
       device = context.fetch(:device)
       shell = context.fetch(:shell)
+      modem = context.fetch(:modem) { PicoModem }
       sleeper = context.fetch(:sleeper)
       clock = context.fetch(:clock)
       announced = false
@@ -84,11 +88,9 @@ module Rpremote
           remote_shell = shell.new(connection, timeout: [remaining, SHELL_READY_TIMEOUT].min)
           remote_shell.synchronize!
-          unless remote_shell.execute("type bootsel").include?("bootsel is")
-            raise Error, "connected R2P2 firmware does not support BOOTSEL reset; flash a current rpremote UF2 once while holding BOOTSEL"
-          end
-          remote_shell.send_command("bootsel")
+          modem.new(connection, timeout: remaining).upload(REMOTE_SCRIPT_PATH, REMOTE_SCRIPT)
+          remote_shell.synchronize!
+          remote_shell.send_command("./#{File.basename(REMOTE_SCRIPT_PATH)}")
           requested = true
         end
         break if requested

data/lib/rpremote/builder.rb CHANGED Viewed

@@ -97,7 +97,7 @@ module Rpremote
     def mrbgems_config_language(vm_name, language, version)
       return language unless vm_name
-      modern = Gem::Version.new(version) >= Gem::Version.new("4.0.0")
+      modern = version == "latest" || Gem::Version.new(version) >= Gem::Version.new("4.0.0")
       return modern ? "femtoruby" : "picoruby" if vm_name == :mrubyc
       modern ? "picoruby" : "microruby"

data/lib/rpremote/deploy_command.rb CHANGED Viewed

@@ -11,7 +11,6 @@ module Rpremote
     class Error < Rpremote::Error; end
-    # The command intentionally keeps the six deployment stages visible in execution order.
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def self.run(args, defaults:, output: $stdout, error: $stderr, services: {})
       options = parse_options(args, defaults)
@@ -21,7 +20,6 @@ module Rpremote
       library, remote_library, source = project_files(project)
       Language.validate!(options[:language])
-      builder = services.fetch(:builder) { Builder.new }
       flasher = services.fetch(:flasher, Flasher)
       serial = services.fetch(:serial, Serial)
       device = services.fetch(:device, Device)
@@ -29,13 +27,16 @@ module Rpremote
       target_options = options.slice(:language, :language_version, :board, :cache_dir, :firmware)
       firmware_path = Target.new(**target_options).firmware_path(root: Dir.pwd)
-      output.puts("deploy build: #{firmware_path}")
-      builder.build(
-        **target_options,
-        mrbgems: options[:mrbgems],
-        output: output,
-        error: error
-      )
+      if options[:build]
+        builder = services.fetch(:builder) { Builder.new }
+        output.puts("deploy build: #{firmware_path}")
+        builder.build(
+          **target_options,
+          mrbgems: options[:mrbgems],
+          output: output,
+          error: error
+        )
+      end
       flash_service = flasher.new(timeout: options[:timeout])
       bootsel_mount = resolve_bootsel_mount(options, flash_service, output, services)
@@ -48,7 +49,7 @@ module Rpremote
         port: options[:port]
       )
-      connection_options = options.merge(port: result.port)
+      connection_options = options.except(:build).merge(port: result.port)
       output.puts("deploy connect: waiting for R2P2 Shell on #{result.port}")
       wait_for_shell(
         port: result.port, baud: options[:baud], timeout: options[:timeout], serial: serial,
@@ -160,13 +161,15 @@ module Rpremote
         mount: defaults[:mount],
         port: defaults[:port],
         baud: defaults.fetch(:baud, Serial::BAUD_RATE),
-        timeout: defaults.fetch(:timeout, Flasher::DEFAULT_TIMEOUT)
+        timeout: defaults.fetch(:timeout, Flasher::DEFAULT_TIMEOUT),
+        build: false
       }
     end
     private_class_method :default_options
     def self.option_parser(options)
       OptionParser.new do |parser|
+        parser.on("--build") { options[:build] = true }
         parser.on("--language LANGUAGE") { |value| options[:language] = value }
         parser.on("--language-version VERSION") { |value| options[:language_version] = value }
         parser.on("--board BOARD") { |value| options[:board] = value }

data/lib/rpremote/help.rb CHANGED Viewed

@@ -10,7 +10,7 @@ module Rpremote
              "[--firmware FILE] [--cache DIR] [--mrbgems FILE|--no-mrbgems]",
       build_clean: "rpremote build clean",
       bootsel: "rpremote bootsel [--reset-flash-memory] [--mount DIR] [--port PORT] [--baud RATE] [--timeout SEC]",
-      deploy: "rpremote deploy PATH [--language LANGUAGE] [--language-version VERSION] [--board BOARD] " \
+      deploy: "rpremote deploy PATH [--build] [--language LANGUAGE] [--language-version VERSION] [--board BOARD] " \
               "[--firmware FILE] [--cache DIR] [--mrbgems FILE|--no-mrbgems] [--mount DIR] " \
               "[--port PORT] [--baud RATE] [--timeout SEC]",
       dfu_app: "rpremote dfu app FILE [--type ruby|rite] [--port PORT] [--baud RATE] [--timeout SEC]",
@@ -73,8 +73,9 @@ module Rpremote
       Options:
         --force           download the PicoRuby source again during setup
+        --build           build the selected firmware before deploy flashes it
         --language-version VERSION
-                          use R2P2/PicoRuby 4.0.3 or 3.4.2 (default: 4.0.3)
+                          use a PicoRuby tag or latest (default: latest)
         --cache DIR       use another project cache directory
         --mrbgems FILE    use an explicit Mrbgems definition during build or deploy
         --no-mrbgems      build or deploy without the automatically detected Mrbgems
@@ -125,7 +126,7 @@ module Rpremote
         Usage: #{COMMAND_USAGE.fetch(:setup)}
         Creates config/setting.json when it does not exist, then downloads and prepares PicoRuby source and the official Raspberry Pi nuke_universal.uf2 firmware.
-        Options: --language LANGUAGE (picoruby), --language-version VERSION (4.0.3), --cache DIR (firmware), --force.
+        Options: --language LANGUAGE (picoruby), --language-version VERSION (latest), --cache DIR (firmware), --force.
         This changes the project configuration and source cache but does not connect to a board.
       HELP
     end
@@ -152,10 +153,11 @@ module Rpremote
       <<~HELP
         Usage: #{COMMAND_USAGE.fetch(:deploy)}
-        Builds the selected custom UF2, enters BOOTSEL when needed, flashes the firmware, and waits for the R2P2 Shell to become ready.
+        Enters BOOTSEL when needed, flashes the existing selected UF2, and waits for the R2P2 Shell to become ready.
+        With --build, builds the selected custom UF2 before entering BOOTSEL and flashing it.
         If PATH/lib/NAME exists, it copies it to :/lib/NAME, where NAME is the final component of PATH. It then runs PATH/main.rb and preserves its Shell job, so hardware output remains active until the next command.
         The stages run in order and stop at the first failure. Flashing replaces persistent board firmware.
-        deploy requires PicoRuby 4.x firmware (currently 4.0.3).
+        deploy requires current PicoRuby 4.x firmware.
         Options combine build, BOOTSEL, flash, library-copy, and run settings. The first install of firmware with automatic BOOTSEL still requires holding BOOTSEL.
       HELP
     end
@@ -240,7 +242,7 @@ module Rpremote
         Usage: #{COMMAND_USAGE.fetch(:flash)}
         Copies the selected UF2 to an RP2350 BOOTSEL volume and waits for R2P2 to reconnect. It replaces persistent board firmware.
-        Defaults select pico2, firmware/picoruby-4.0.3-pico2.uf2, an automatic BOOTSEL mount and CDC 0 port, and 20 seconds.
+        Defaults select pico2, firmware/picoruby-latest-pico2.uf2, an automatic BOOTSEL mount and CDC 0 port, and 20 seconds.
       HELP
     end

data/lib/rpremote/language_source.rb CHANGED Viewed

@@ -36,6 +36,7 @@ module Rpremote
       unless File.directory?(source_dir) && !force
         FileUtils.rm_rf(source_dir) if force
         extractor.call(archive_path, cache_dir)
+        normalize_extracted_source
       end
       raise ExtractError, "PicoRuby source was not extracted: #{source_dir}" unless File.directory?(source_dir)
@@ -45,7 +46,7 @@ module Rpremote
     end
     def archive_url
-      "https://github.com/picoruby/picoruby/archive/refs/tags/#{version}.zip"
+      "https://github.com/picoruby/picoruby/archive/refs/#{source_ref}.zip"
     end
     def archive_path
@@ -60,6 +61,22 @@ module Rpremote
     attr_reader :fetcher, :extractor, :preparer, :patcher
+    def source_ref
+      version == "latest" ? "heads/master" : "tags/#{version}"
+    end
+    def extracted_source_dir
+      return source_dir unless version == "latest"
+      File.join(cache_dir, "picoruby-master")
+    end
+    def normalize_extracted_source
+      return if extracted_source_dir == source_dir || !File.directory?(extracted_source_dir)
+      FileUtils.mv(extracted_source_dir, source_dir)
+    end
     def fetch_archive
       temporary = "#{archive_path}.part"
       File.binwrite(temporary, fetcher.call(archive_url))
@@ -88,7 +105,7 @@ module Rpremote
         commands << ["git", "remote", "add", "origin", "https://github.com/picoruby/picoruby.git"]
       end
       commands.push(
-        ["git", "fetch", "--depth", "1", "origin", "refs/tags/#{version}"],
+        ["git", "fetch", "--depth", "1", "origin", source_ref],
         ["git", "checkout", "--force", "FETCH_HEAD"],
         ["git", "submodule", "update", "--init", "--recursive", "--depth", "1"]
       )

data/lib/rpremote/mrbgems.rb CHANGED Viewed

@@ -14,7 +14,7 @@ module Rpremote
     COMMIT_PATTERN = /\A[0-9a-f]{40,64}\z/i
     VMS = %i[mruby mrubyc].freeze
-    Dependency = Data.define(:type, :source, :branch, :commit, :path, :require_name)
+    Dependency = Data.define(:type, :source, :branch, :commit, :path, :require_name, :auto_require)
     Overlay = Data.define(:path, :fingerprint)
     class Error < Rpremote::Error; end
@@ -72,7 +72,9 @@ module Rpremote
       lock_data = read_lock(required: false)
       return [] unless lock_data
-      lock_data.fetch("gems").filter_map { |gem| gem["require_name"] }.uniq
+      lock_data.fetch("gems").filter_map do |gem|
+        gem["require_name"] if gem.fetch("auto_require", true)
+      end.uniq
     end
     def prepend_requires(source)
@@ -122,14 +124,19 @@ module Rpremote
         commit = dependency.commit || previous_commit(previous, dependency) || resolver.call(
           dependency.source, dependency.branch
         )
-        { "type" => "github", "source" => dependency.source,
-          "branch" => dependency.branch, "commit" => validate_commit!(commit),
-          "require_name" => dependency.require_name }.compact
+        entry = { "type" => "github", "source" => dependency.source,
+                  "branch" => dependency.branch, "commit" => validate_commit!(commit),
+                  "require_name" => dependency.require_name }.compact
       else
-        { "type" => "path", "source" => dependency.source,
-          "sha256" => digest_directory(dependency.path),
-          "require_name" => dependency.require_name || local_require_name(dependency.path) }.compact
+        entry = { "type" => "path", "source" => dependency.source,
+                  "sha256" => digest_directory(dependency.path),
+                  "require_name" => dependency.require_name || local_require_name(dependency.path) }.compact
       end
+      unless dependency.auto_require
+        entry.delete("require_name")
+        entry["auto_require"] = false
+      end
+      entry
     end
     def previous_commit(lock_data, dependency)
@@ -200,18 +207,24 @@ module Rpremote
     def valid_github_lock?(entry)
       GITHUB_PATTERN.match?(entry["source"].to_s) && !entry["branch"].to_s.empty? &&
-        COMMIT_PATTERN.match?(entry["commit"].to_s) && valid_require_name?(entry["require_name"])
+        COMMIT_PATTERN.match?(entry["commit"].to_s) && valid_require_name?(entry["require_name"]) &&
+        valid_auto_require?(entry)
     end
     def valid_path_lock?(entry)
       entry["type"] == "path" && !entry["source"].to_s.empty? &&
-        /\A[0-9a-f]{64}\z/.match?(entry["sha256"].to_s) && valid_require_name?(entry["require_name"])
+        /\A[0-9a-f]{64}\z/.match?(entry["sha256"].to_s) && valid_require_name?(entry["require_name"]) &&
+        valid_auto_require?(entry)
     end
     def valid_require_name?(name)
       name.nil? || (name.is_a?(String) && !name.empty? && !name.match?(/[\x00-\x1f\x7f]/))
     end
+    def valid_auto_require?(entry)
+      !entry.key?("auto_require") || entry["auto_require"] == true || entry["auto_require"] == false
+    end
     def local_require_name(directory)
       source = File.read(File.join(directory, "mrbgem.rake"))
       match = source.match(/^\s*spec\.require_name\s*=\s*["']([^"']+)["']\s*$/)
@@ -226,6 +239,8 @@ module Rpremote
     def overlay_source(base_config, target, locked_entries)
       lines = [
+        "# frozen_string_literal: true",
+        "",
         "# Generated by rpremote. Do not edit.",
         "load #{File.expand_path(base_config).inspect}",
         "conf = MRuby.targets.fetch(#{target.inspect})"
@@ -272,17 +287,20 @@ module Rpremote
         @vm_name = value
       end
-      def gem(github: nil, path: nil, branch: "main", commit: nil, require: nil)
+      def gem(github: nil, path: nil, branch: "main", commit: nil, require: nil, auto_require: true)
         sources = [github, path].compact
         raise DefinitionError, "gem requires exactly one of github or path" unless sources.length == 1
         unless require.nil? || (require.is_a?(String) && !require.empty? && !require.match?(/[\x00-\x1f\x7f]/))
           raise DefinitionError, "invalid mrbgem require name: #{require.inspect}"
         end
+        valid_auto_require = [true, false].include?(auto_require)
+        raise DefinitionError, "mrbgem auto_require must be true or false: #{auto_require.inspect}" unless valid_auto_require
         dependency = if github
-                       github_dependency(github, branch, commit, require)
+                       github_dependency(github, branch, commit, require, auto_require)
                      else
-                       path_dependency(path, branch, commit, require)
+                       path_dependency(path, branch, commit, require, auto_require)
                      end
         key = [dependency.type, dependency.source]
         raise DefinitionError, "duplicate mrbgem: #{dependency.source}" if dependencies.any? do |item|
@@ -296,21 +314,23 @@ module Rpremote
       attr_reader :directory
-      def github_dependency(source, branch, commit, require_name)
+      def github_dependency(source, branch, commit, require_name, auto_require)
         raise DefinitionError, "invalid GitHub mrbgem: #{source.inspect}" unless GITHUB_PATTERN.match?(source.to_s)
         raise DefinitionError, "GitHub mrbgem branch must not be empty" if branch.to_s.empty?
         raise DefinitionError, "invalid Git commit: #{commit.inspect}" if commit && !COMMIT_PATTERN.match?(commit.to_s)
         Dependency.new(type: :github, source: source, branch: branch,
-                       commit: commit&.downcase, path: nil, require_name: require_name)
+                       commit: commit&.downcase, path: nil, require_name: require_name,
+                       auto_require: auto_require)
       end
-      def path_dependency(source, branch, commit, require_name)
+      def path_dependency(source, branch, commit, require_name, auto_require)
         raise DefinitionError, "local mrbgem path must not be empty" if source.to_s.empty?
         raise DefinitionError, "local mrbgem does not accept branch or commit" if branch != "main" || commit
         Dependency.new(type: :path, source: source, branch: nil, commit: nil,
-                       path: File.expand_path(source, directory), require_name: require_name)
+                       path: File.expand_path(source, directory), require_name: require_name,
+                       auto_require: auto_require)
       end
     end
   end

data/lib/rpremote/picoruby_compiler.rb ADDED Viewed

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+require "fileutils"
+module Rpremote
+  class PicoRubyCompiler
+    class Error < StandardError; end
+    CANDIDATES = %w[
+      build/mrbc/default/bin/mrbc
+      build/host/bin/mrbc
+    ].freeze
+    def self.ensure_legacy_path!(root)
+      root = File.expand_path(root)
+      legacy_path = File.join(root, "bin/mrbc")
+      return legacy_path if File.executable?(legacy_path)
+      compiler = CANDIDATES.map { |path| File.join(root, path) }.find { |path| File.executable?(path) }
+      raise Error, "PicoRuby mrbc was not built under #{root}" unless compiler
+      FileUtils.mkdir_p(File.dirname(legacy_path))
+      relative = File.join("..", compiler.delete_prefix("#{root}/"))
+      FileUtils.ln_sf(relative, legacy_path)
+      legacy_path
+    end
+  end
+end

data/lib/rpremote/picoruby_source_patch.rb CHANGED Viewed

@@ -3,7 +3,7 @@
 module Rpremote
   class PicoRubySourcePatch
     JOB_PATH = "mrbgems/picoruby-shell/mrblib/job.rb"
-    BOOTSEL_PATH = "mrbgems/picoruby-machine/include/machine.h"
+    PWM_PATH = "mrbgems/picoruby-pwm/ports/rp2040/pwm.c"
     PATCH_ALIASES = { "3.4.2" => "3.4.5" }.freeze
     class Error < Rpremote::Error; end
@@ -20,8 +20,6 @@ module Rpremote
       patch_version = PATCH_ALIASES.fetch(version, version)
       patches(patch_version).each do |patch, prerequisite|
         next unless File.file?(patch) && File.file?(File.join(source, prerequisite))
-        next if prerequisite == BOOTSEL_PATH && File.read(File.join(source, prerequisite)).include?("Machine_bootsel")
         next if git_apply?(source, patch, "--reverse", "--check")
         raise Error, "cannot apply rpremote patch to PicoRuby #{version}" unless git_apply?(source, patch, "--check")
@@ -35,7 +33,7 @@ module Rpremote
     def patches(patch_version)
       definitions = {
         "ruby-exception-status" => JOB_PATH,
-        "bootsel" => BOOTSEL_PATH
+        "pwm-sleep-clock" => PWM_PATH
       }
       definitions.map do |name, prerequisite|
         [File.expand_path("../../patches/picoruby-#{patch_version}-#{name}.patch", __dir__), prerequisite]

data/lib/rpremote/target.rb CHANGED Viewed

@@ -3,7 +3,7 @@
 module Rpremote
   class Target
     DEFAULT_LANGUAGE = "picoruby"
-    DEFAULT_LANGUAGE_VERSION = "4.0.3"
+    DEFAULT_LANGUAGE_VERSION = "latest"
     DEFAULT_BOARD = "pico2"
     DEFAULT_CACHE_DIR = "firmware"
     IDENTIFIER_PATTERN = /\A[a-zA-Z0-9][a-zA-Z0-9._-]*\z/

data/lib/rpremote/terminal.rb CHANGED Viewed

@@ -75,8 +75,6 @@ module Rpremote
       true
     end
-    # input.raw disables the terminal's usual LF-to-CRLF output conversion.
-    # Preserve device CRLF while making a bare LF start at the left margin.
     def normalize_line_endings(data)
       normalized = +"".b
       data.each_byte do |byte|

data/lib/rpremote/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Rpremote
-  VERSION = "0.4.0"
+  VERSION = "0.6.0"
 end

data/lib/rpremote.rb CHANGED Viewed

@@ -21,6 +21,7 @@ require_relative "rpremote/runner"
 require_relative "rpremote/resetter"
 require_relative "rpremote/recursive_copy"
 require_relative "rpremote/picoruby_source_patch"
+require_relative "rpremote/picoruby_compiler"
 require_relative "rpremote/language_source"
 require_relative "rpremote/nuke_firmware"
 require_relative "rpremote/mrbgems"

data/patches/picoruby-4.0.3-pwm-sleep-clock.patch ADDED Viewed

@@ -0,0 +1,22 @@
+diff --git a/mrbgems/picoruby-pwm/ports/rp2040/pwm.c b/mrbgems/picoruby-pwm/ports/rp2040/pwm.c
+--- a/mrbgems/picoruby-pwm/ports/rp2040/pwm.c
++++ b/mrbgems/picoruby-pwm/ports/rp2040/pwm.c
+@@ -1,5 +1,6 @@
+ #include "pico/stdlib.h"
+ #include "hardware/pwm.h"
++#include "hardware/structs/clocks.h"
+ #include "../../include/pwm.h"
+@@ -9,6 +10,11 @@
+ void
+ PWM_init(uint32_t pin)
+ {
++  /* The scheduler enters WFI while sleep_ms waits. Keep autonomous PWM
++   * output clocked between scheduler ticks after a PWM pin is initialized. */
++  hw_set_bits(&clocks_hw->sleep_en0,
++              CLOCKS_SLEEP_EN0_CLK_SYS_PWM_BITS);
++
+   gpio_set_function(pin, GPIO_FUNC_PWM);
+   uint slice_num = pwm_gpio_to_slice_num(pin);
+   pwm_set_clkdiv(slice_num, CLK_DIV);

data/sig/rpremote.rbs CHANGED Viewed

@@ -188,6 +188,15 @@ module Rpremote
     def apply: (String source) -> void
   end
+  class PicoRubyCompiler
+    CANDIDATES: Array[String]
+    class Error < StandardError
+    end
+    def self.ensure_legacy_path!: (String root) -> String
+  end
   class Builder
     class Error < Rpremote::Error
     end
@@ -226,6 +235,8 @@ module Rpremote
       attr_reader branch: String?
       attr_reader commit: String?
       attr_reader path: String?
+      attr_reader require_name: String?
+      attr_reader auto_require: bool
     end
     class Overlay < Data

data/tasks/firmware_build.rb CHANGED Viewed

@@ -2,6 +2,7 @@
 # frozen_string_literal: true
 require "fileutils"
+require_relative "../lib/rpremote/picoruby_compiler"
 REPOSITORY_ROOT = File.expand_path(ENV.fetch("RPREMOTE_ROOT", File.expand_path("../..", __dir__)))
 DEFAULT_BOARD = "pico2"
@@ -14,7 +15,7 @@ def command!(*command, chdir:, env: {})
 end
 language = ENV.fetch("RPREMOTE_LANGUAGE", "picoruby")
-target_version = ENV.fetch("RPREMOTE_LANGUAGE_VERSION", "4.0.3")
+target_version = ENV.fetch("RPREMOTE_LANGUAGE_VERSION", "latest")
 board = ENV.fetch("RPREMOTE_BOARD", DEFAULT_BOARD)
 abort "Unsupported language: #{language}" unless language == "picoruby"
 abort "Unsupported board: #{board}" unless SUPPORTED_BOARDS.include?(board)
@@ -43,7 +44,8 @@ command!("rake", "r2p2:setup", chdir: picoruby_root) unless File.directory?(pico
 version_header = File.join(picoruby_root, "include/version.h")
 version = File.read(version_header)[/#define PICORUBY_VERSION "(.+?)"/, 1]
 abort "Could not determine PicoRuby version from #{version_header}" unless version
-abort "PicoRuby source is #{version}, but #{target_version} was requested." unless version == target_version
+abort "PicoRuby source is #{version}, but #{target_version} was requested." \
+  unless target_version == "latest" || version == target_version
 cache_file = File.join(output_dir, "CMakeCache.txt")
 if File.file?(cache_file) && !File.read(cache_file).include?("CMAKE_HOME_DIRECTORY:INTERNAL=#{cmake_source_dir}")
@@ -64,6 +66,12 @@ if fingerprint && File.directory?(mruby_build_dir)
   FileUtils.rm_rf(mruby_build_dir)
 end
 command!("rake", chdir: picoruby_root, env: build_env)
+begin
+  compiler = Rpremote::PicoRubyCompiler.ensure_legacy_path!(picoruby_root)
+  puts "Using PicoRuby compiler: #{compiler}"
+rescue Rpremote::PicoRubyCompiler::Error => e
+  abort e.message
+end
 cmake_definitions = [
   "-D", "PICORUBY_ROOT=#{picoruby_root}",

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rpremote
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - ogom
@@ -46,6 +46,7 @@ files:
 - lib/rpremote/mrbgems_command.rb
 - lib/rpremote/nuke_firmware.rb
 - lib/rpremote/picomodem.rb
+- lib/rpremote/picoruby_compiler.rb
 - lib/rpremote/picoruby_source_patch.rb
 - lib/rpremote/recursive_copy.rb
 - lib/rpremote/remote_path.rb
@@ -57,9 +58,8 @@ files:
 - lib/rpremote/target.rb
 - lib/rpremote/terminal.rb
 - lib/rpremote/version.rb
-- patches/picoruby-3.4.5-bootsel.patch
 - patches/picoruby-3.4.5-ruby-exception-status.patch
-- patches/picoruby-4.0.3-bootsel.patch
+- patches/picoruby-4.0.3-pwm-sleep-clock.patch
 - patches/picoruby-4.0.3-ruby-exception-status.patch
 - sig/rpremote.rbs
 - tasks/firmware_build.rb

data/patches/picoruby-3.4.5-bootsel.patch DELETED Viewed

@@ -1,71 +0,0 @@
-diff --git a/mrbgems/picoruby-machine/include/machine.h b/mrbgems/picoruby-machine/include/machine.h
---- a/mrbgems/picoruby-machine/include/machine.h
-+++ b/mrbgems/picoruby-machine/include/machine.h
-@@ -48,1 +48,2 @@
- void Machine_reboot(void);
-+void Machine_bootsel(void);
-diff --git a/mrbgems/picoruby-machine/mrblib/machine.rb b/mrbgems/picoruby-machine/mrblib/machine.rb
---- a/mrbgems/picoruby-machine/mrblib/machine.rb
-+++ b/mrbgems/picoruby-machine/mrblib/machine.rb
-@@ -22,0 +23,4 @@
-+  def self.bootsel
-+    self._bootsel
-+  end
-+
-diff --git a/mrbgems/picoruby-machine/ports/rp2040/machine.c b/mrbgems/picoruby-machine/ports/rp2040/machine.c
---- a/mrbgems/picoruby-machine/ports/rp2040/machine.c
-+++ b/mrbgems/picoruby-machine/ports/rp2040/machine.c
-@@ -12,0 +13,1 @@
-+#include "pico/bootrom.h"
-@@ -32,0 +34,6 @@
-+void
-+Machine_bootsel(void)
-+{
-+  rom_reset_usb_boot(0, 0);
-+}
-+
-diff --git a/mrbgems/picoruby-machine/src/mruby/machine.c b/mrbgems/picoruby-machine/src/mruby/machine.c
---- a/mrbgems/picoruby-machine/src/mruby/machine.c
-+++ b/mrbgems/picoruby-machine/src/mruby/machine.c
-@@ -417,0 +418,11 @@
-+static mrb_value
-+mrb_s__bootsel(mrb_state *mrb, mrb_value self)
-+{
-+#if !defined(PICORB_PLATFORM_POSIX)
-+  Machine_bootsel();
-+#else
-+  mrb_raise(mrb, E_NOTIMP_ERROR, "Machine._bootsel is not available on this platform");
-+#endif
-+  return mrb_nil_value();
-+}
-+
-@@ -443,0 +455,1 @@
-+  mrb_define_class_method_id(mrb, module_Machine, MRB_SYM(_bootsel), mrb_s__bootsel, MRB_ARGS_NONE());
-diff --git a/mrbgems/picoruby-machine/src/mrubyc/machine.c b/mrbgems/picoruby-machine/src/mrubyc/machine.c
---- a/mrbgems/picoruby-machine/src/mrubyc/machine.c
-+++ b/mrbgems/picoruby-machine/src/mrubyc/machine.c
-@@ -252,0 +253,11 @@
-+static void
-+c_Machine__bootsel(mrbc_vm *vm, mrbc_value *v, int argc)
-+{
-+#if !defined(PICORB_PLATFORM_POSIX)
-+  Machine_bootsel();
-+#else
-+  mrbc_raise(vm, MRBC_CLASS(RuntimeError), "Machine.bootsel is not available on this platform.");
-+#endif
-+  SET_NIL_RETURN();
-+}
-+
-@@ -439,0 +451,1 @@
-+  mrbc_define_method(vm, module_Machine, "_bootsel", c_Machine__bootsel);
-diff --git a/mrbgems/picoruby-shell/shell_executables/_path.txt b/mrbgems/picoruby-shell/shell_executables/_path.txt
---- a/mrbgems/picoruby-shell/shell_executables/_path.txt
-+++ b/mrbgems/picoruby-shell/shell_executables/_path.txt
-@@ -16,0 +17,1 @@
-+/bin/bootsel
-diff --git a/mrbgems/picoruby-shell/shell_executables/bootsel.rb b/mrbgems/picoruby-shell/shell_executables/bootsel.rb
-new file mode 100644
---- /dev/null
-+++ b/mrbgems/picoruby-shell/shell_executables/bootsel.rb
-@@ -0,0 +1 @@
-+Machine.bootsel

data/patches/picoruby-4.0.3-bootsel.patch DELETED Viewed

@@ -1,71 +0,0 @@
-diff --git a/mrbgems/picoruby-machine/include/machine.h b/mrbgems/picoruby-machine/include/machine.h
---- a/mrbgems/picoruby-machine/include/machine.h
-+++ b/mrbgems/picoruby-machine/include/machine.h
-@@ -68,1 +68,2 @@
- void Machine_reboot(void);
-+void Machine_bootsel(void);
-diff --git a/mrbgems/picoruby-machine/mrblib/machine.rb b/mrbgems/picoruby-machine/mrblib/machine.rb
---- a/mrbgems/picoruby-machine/mrblib/machine.rb
-+++ b/mrbgems/picoruby-machine/mrblib/machine.rb
-@@ -22,0 +23,4 @@
-+  def self.bootsel
-+    self._bootsel
-+  end
-+
-diff --git a/mrbgems/picoruby-machine/ports/rp2040/machine.c b/mrbgems/picoruby-machine/ports/rp2040/machine.c
---- a/mrbgems/picoruby-machine/ports/rp2040/machine.c
-+++ b/mrbgems/picoruby-machine/ports/rp2040/machine.c
-@@ -10,0 +11,1 @@
-+#include "pico/bootrom.h"
-@@ -42,0 +44,6 @@
-+void
-+Machine_bootsel(void)
-+{
-+  rom_reset_usb_boot(0, 0);
-+}
-+
-diff --git a/mrbgems/picoruby-machine/src/mruby/machine.c b/mrbgems/picoruby-machine/src/mruby/machine.c
---- a/mrbgems/picoruby-machine/src/mruby/machine.c
-+++ b/mrbgems/picoruby-machine/src/mruby/machine.c
-@@ -496,0 +497,11 @@
-+static mrb_value
-+mrb_s__bootsel(mrb_state *mrb, mrb_value self)
-+{
-+#if !defined(PICORB_PLATFORM_POSIX)
-+  Machine_bootsel();
-+#else
-+  mrb_raise(mrb, E_NOTIMP_ERROR, "Machine._bootsel is not available on this platform");
-+#endif
-+  return mrb_nil_value();
-+}
-+
-@@ -529,0 +541,1 @@
-+  mrb_define_class_method_id(mrb, module_Machine, MRB_SYM(_bootsel), mrb_s__bootsel, MRB_ARGS_NONE());
-diff --git a/mrbgems/picoruby-machine/src/mrubyc/machine.c b/mrbgems/picoruby-machine/src/mrubyc/machine.c
---- a/mrbgems/picoruby-machine/src/mrubyc/machine.c
-+++ b/mrbgems/picoruby-machine/src/mrubyc/machine.c
-@@ -316,0 +317,11 @@
-+static void
-+c_Machine__bootsel(mrbc_vm *vm, mrbc_value *v, int argc)
-+{
-+#if !defined(PICORB_PLATFORM_POSIX)
-+  Machine_bootsel();
-+#else
-+  mrbc_raise(vm, MRBC_CLASS(RuntimeError), "Machine.bootsel is not available on this platform.");
-+#endif
-+  SET_NIL_RETURN();
-+}
-+
-@@ -546,0 +558,1 @@
-+  mrbc_define_method(vm, module_Machine, "_bootsel", c_Machine__bootsel);
-diff --git a/mrbgems/picoruby-shell/shell_executables/_path.txt b/mrbgems/picoruby-shell/shell_executables/_path.txt
---- a/mrbgems/picoruby-shell/shell_executables/_path.txt
-+++ b/mrbgems/picoruby-shell/shell_executables/_path.txt
-@@ -17,0 +18,1 @@
-+/bin/bootsel
-diff --git a/mrbgems/picoruby-shell/shell_executables/bootsel.rb b/mrbgems/picoruby-shell/shell_executables/bootsel.rb
-new file mode 100644
---- /dev/null
-+++ b/mrbgems/picoruby-shell/shell_executables/bootsel.rb
-@@ -0,0 +1 @@
-+Machine.bootsel