From d1b2d29528b7794b41e66fc2136e395a02f8529b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 May 2024 05:59:35 +0200 Subject: Merging upstream version 1.73.0+dfsg1. Signed-off-by: Daniel Baumann --- src/doc/embedded-book/.github/bors.toml | 4 ---- src/doc/embedded-book/.github/workflows/ci.yml | 8 +++++--- src/doc/embedded-book/src/start/qemu.md | 2 +- src/doc/embedded-book/src/unsorted/math.md | 1 + 4 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 src/doc/embedded-book/.github/bors.toml (limited to 'src/doc/embedded-book') diff --git a/src/doc/embedded-book/.github/bors.toml b/src/doc/embedded-book/.github/bors.toml deleted file mode 100644 index c3cfa378d..000000000 --- a/src/doc/embedded-book/.github/bors.toml +++ /dev/null @@ -1,4 +0,0 @@ -block_labels = ["needs-decision"] -delete_merged_branches = true -required_approvals = 1 -status = ["build"] diff --git a/src/doc/embedded-book/.github/workflows/ci.yml b/src/doc/embedded-book/.github/workflows/ci.yml index b1e3d552e..9018d1146 100644 --- a/src/doc/embedded-book/.github/workflows/ci.yml +++ b/src/doc/embedded-book/.github/workflows/ci.yml @@ -1,9 +1,11 @@ name: CI on: - push: - branches: [ staging, trying, master ] - pull_request: + push: # Run CI for all branches except GitHub merge queue tmp branches + branches-ignore: + - "gh-readonly-queue/**" + pull_request: # Run CI for PRs on any branch + merge_group: # Run CI for the GitHub merge queue jobs: build: diff --git a/src/doc/embedded-book/src/start/qemu.md b/src/doc/embedded-book/src/start/qemu.md index d4dfc361d..f7241b873 100644 --- a/src/doc/embedded-book/src/start/qemu.md +++ b/src/doc/embedded-book/src/start/qemu.md @@ -388,7 +388,7 @@ Let's break down that QEMU command: program compiled for the Cortex-M4F, which has a hardware FPU, will make QEMU error during its execution. -- `-machine lm3s6965evb`. This tells QEMU to emulate the LM3S6965EVB, a +- `-machine lm3s6965evb`. This tells QEMU to emulate the LM3S6965EVB, an evaluation board that contains a LM3S6965 microcontroller. - `-nographic`. This tells QEMU to not launch its GUI. diff --git a/src/doc/embedded-book/src/unsorted/math.md b/src/doc/embedded-book/src/unsorted/math.md index 91271710e..4367b867b 100644 --- a/src/doc/embedded-book/src/unsorted/math.md +++ b/src/doc/embedded-book/src/unsorted/math.md @@ -70,6 +70,7 @@ If you need to perform more complex operations like DSP signal processing or adv algebra on your MCU, the following crates might help you - [CMSIS DSP library binding](https://github.com/jacobrosenthal/cmsis-dsp-sys) +- [`constgebra`](https://crates.io/crates/constgebra) - [`micromath`](https://github.com/tarcieri/micromath) - [`microfft`](https://crates.io/crates/microfft) - [`nalgebra`](https://github.com/dimforge/nalgebra) -- cgit v1.2.3