Skip to content

Commit

Permalink
merge upstream (#75)
Browse files Browse the repository at this point in the history
* Tweak testing cargo-binutils

While following the instructions for cargo-binutils in 03-setup
the `cargo size -- -version` caused an error when following the
instructions:

``` console
$ cargo size -- -version
error: Error during execution of `cargo metadata`: error: could not find `Cargo.toml` in `C:\Users\wink` or any parent directory
```

The cause of the error is that you're not told to  be in a rust project
directory.

The solution I've chosen is to create a rust bin project, cd into the
project, run it and then do the `cargo size -- -version`.

* Fix installing dateutil since it is now a dependency of the GHP import script

* New-06-hello-world

Converted lib.rs, Cargo.toml to use stm32f3_discovery.

.cargo/config:
 I also, found that I would forget to to use `--target` when
 building and running using cargo so set the default build target
 to thumbv7em-none-eabihf

openocd.cfg:
 Since the monitor lines are quite long and also easy to mistype or
 forget to do I enhanced the file with the new lines and commented
 on each of the lines.

README.md
 Update to reflect the above changes.

* Tweak panic.md

As suggested by @eldruin add backticks around ~/.gdbinit.

* add two notes flagging lsm303agr

* fix typo, link

Fix typo, link.

* Tweak 05-led-roulette

After doing 06-hello-world I felt some tweaks and cleanup
were needed in debug-it.md and the-led-and-delay-abstractions.md.

* New 07 Registers

Modified to run using `stm32f3-discovery` instead of `f3` and updated
the `.md` files appropriately.

* Updates from eldruin first review

Thanks

* Fix broken ci build

This is the solution @eldurin had suggested.

* Update-03-setting-up-a-dev-env

Update `*.md` files so that copy-to-clipboard button in code blocks
works so that commands can be copied and pasted into terminal windows.

Some reorganization of the text for clarity.

* Update 05 led-roulette

Cargo.toml to use stm32f3-discovery v0.6.0 crate.

Update `.md` files with additional information and to make console
commands amenable to copy/paste operations.

* Use nano as the editor

As suggested by reviewers @eldruin and @therealprof, txs!

* Add Update .cargo/config sub-section

Also, added a note that .cargo/config may need to be modified
in every chapter.

* temporary fix for CI until we rewrite this chapter

* Increase Travis no-output waiting time

* Add shareable instances of config.toml and openocd.gdb

Instead of every chapter having its own copy of the cargo configuration
and openocd.gdb files this change creates a shared set. This will make it
much easier for the user of the discovery book to handle the situation
where their Arm gdb is NOT arm-none-eabi-gdb. As only the shared copy
of .cargo/config.toml will have to be modified.

Also src/05-led-roulette is updated to take advantage of this and I
will go through each of the other chapters changing them to use
the shared set.

I also needed to comment out the rustflags variable in all of the config
files as I'd get an error executing ci/script.sh:

  ry.x:5: region 'FLASH' already defined
          >>>   FLASH : ORIGIN = 0x08000000, LENGTH = 256K
          >>>

* Update 06-hello-world to use shared cargo config

 - Updated `*.md` files.
 - Deleted the local .cargo/config and openocd.gdb files.

* Swap to GHA.

* Swap to GHA.

(cherry picked from commit 681b95a)

* Adapt to rewrite

* Update send-a-string.md

* Remove several chapters as decided with @eldruin

* Remove LEDs again since its only really a deeper look into LEDs on
  register level which we don't need in the discovery book

* Remove Clock and Timers basically for the same reason as LEDs again
* Remove the two bluetooth chapters since the NRF51 chip has onboard
  bluetooth, however using it in a beginner scenario is presumably not a
  good idea until rubble has matured more.

* remove removed chapters from Cargo.toml

* Change the introduction of I2C to match the micro:bit

* Modify the LSM303AGR section of the I2C chapter for micro:bit

* move 14-i2c to 08-i2c

* Fix the CI for I2C

* Update flash-it.md

fixed typo
"First thing we need ~is~ to do is launch OpenOCD."

* Fix small typo in Linux setup

My device has identical `idProduct` and `idVendor` values to the one used for the documentation.

`lsusb | grep STM` outputs:
```
Bus 003 Device 033: ID 0483:374b STMicroelectronics ST-LINK/V2.1
```

The verbose version, `lsusb -v`, outputs
```
  ...
  idVendor           0x0483 STMicroelectronics
  idProduct          0x374b ST-LINK/V2.1
  ...
```

Which leads me to the belief that the first value in the short output is the vendor and the latter is the product.

* the rest of I2C without my solution

* Fix breaking change in  cortex-m 0.5.11.

Fix it by sticking with cortex-m 0.5.6.

* Cleanup from review comments -- use cortex-m 0.5.6 in chapters 14 & 15

* Apply suggestions from code review

Co-authored-by: Diego Barrios Romero <eldruin@gmail.com>

* Fixes and I2C challenge solution

* Update src/08-i2c/using-a-driver.md

Co-authored-by: Diego Barrios Romero <eldruin@gmail.com>

* Attempt to fix the build

* change bors.toml to match the new chapters

* Fixed typos regarding `.cargo/config.toml`

The file keeps on being referred to as either `cargo/config.toml` or `.cargo/config.toml`. This PR corrects all of them to `.cargo/config.toml`

* fix typo

* Update README.md

fix typo.

* Fix compile error

fix(09-clocks-and-timers): Compile failed in release mode

docs: Update putting-it-all-together.md

fix: compile error in chapter 11

fix: compile error in chapter 14

fix: compile error in chapter 15

fix: compile error in chapter 16

chore: handle `Result` with unwrap rather than ok

chore: remove useless dependencies

fix: restore main.rs

* Clean up warning on unused result

* Remove unused panic handlers (panic-halt)

Declaring panic-halt as a depencency works fine for building the example
code. But it makes 'cargo doc' fail due to the duplicate lang item
'panic_impl'.

* Check building docs with CI too

eldruin suggested to add doc generation to CI
(rust-embedded#322 (comment))
which seems a great idea to me.

* Remove exemption for print.html from link checking

This is a remake of rust-embedded#255
for the actual GitHub Actions.

* Clean up warning from linkchecker

Linkchecker warned about this link to a directory without a trailing
slash. Seen while working on
rust-embedded#346.

* Update README.md: about the SB10 on old version

* Update src/06-hello-world/README.md

Co-authored-by: Diego Barrios Romero <eldruin@gmail.com>

* fix typos in openocd.gdb comments

* fix bsrr in rtrm.md

* Fix typo

* Clean up writing to USART TDR which is safe is again

This issue got fixed with stm32f3 0.13.1 and writing to TDR is safe
again. This prepares updating the dependencies to actually use this
release.

* Update PAC and GPIO usage for upcomming PAC/HAL

* Update using Serial to upcoming changes from more-tests

* Add local MonoTimer replacement

MonoTimer is used by 11-usart's aux11 module and the buffer-overrun
solution. It got deprecated after stm32f3xx-hal release 0.6.1. This is a
copy of
https://github.com/stm32-rs/stm32f3xx-hal/blob/c68c36c03e0e33699b3b0c9acc3f8d80f5a25cd4/src/time.rs#L91
minus the time units which can be used from embedded-time.

* Bump BSP to latest release fixing TDR access

* Bump other dependencies of 11-usart

* Factor out 11-usart example code to included files

When running 'mdbook test' on the book the example code checking fails
to handle for example macros like '#[entry]' and the local auxiliary
crates. Having most code examples included from 'examples/' allows to
check them at least with 'cargo build --target thumbv7em-none-eabihf
--examples'.

* Make 11-usart example code safe again

Updating stm32f3xx-hal makes accessing these registers safe as it should
be.

* Clean up warnings about unused variables

* Bump heapless to latest release

* Mention newer Rust version required by 11-usart

* Build examples in CI as well

* Factor out 05-led-roulette examples

* Bump dependencies of 05-led-roulette

* Fix debug example to actually show led-roulette

* Fix some flaws in the "LED roulette" section

* Use an en dash instead of a simple hyphen

* Guide to disussions and issues in README.md

Several questions have ended up in the issues recently. So what about
pointing the discussions section out more prominently?

* Wording changes to new discussions section in README

* Fix instructions for installting GDB on Fedora

Issue rust-embedded#364 reports that
the package arm-none-eabi-gdb has been dropped from Fedora (30-ish).
Their Bugzilla issue
https://bugzilla.redhat.com/show_bug.cgi?id=1859627#c23 recommends
installing the toolchain provided by arm and that is what the section
'Other distros' in the book does as well.

A gdb-multiarch package does not seem available at a first glance.

* Rewrite of chapter 2 for microbit v2

* Fix broken links

* Chapter 3 rewrite for micro:bit v2

* Fix typo in 05-led-roulette/the-challenge

The text said to modify `../.cargo/config.toml`, but the command was given to modify `../openocd.gdb`.

* Chapter 4 micro bit v2 rewrite

* Update Fedora and Linux verification steps

* 8.3: Use `write` instead of `modify`

Since the read value is ignored, using `modify` seems redundant. 
Also, `modify` isn't mentioned in the text prior this chapter, while `write` is explained.

* Precise version specification of the v1 microbit

* Add a terminology explanation section to ch4

* Apply suggestions from code review

Co-authored-by: Diego Barrios Romero <eldruin@gmail.com>

* Attempt to split the sentence up a bit

* ch05 ch06 rewrite for micro:bit v2

- Ported all the code to the microbit BSP
- Tested all the code commands etc. on v1.5 and v2
- ch06 doesn't need to be touched I think
- currently relying on the git version of microbit since it
  introduces quite a few nice new APIs we want to use,
  microbit is (hopefully) going to make a release before
  this rewrite actually gets published
- the solution to the ch05 challenge is arguably the most stupid
  way you could come up with to generate the matrix, at the
  same time this makes it simple enough to be understood by everyone
  though, which is certainly more important in this case

* Fix CI for rewrite

* Install the proper toolchain for older variants

* I just shouldn't have touched toolchains...

* Apply suggestions from code review

Co-authored-by: Diego Barrios Romero <eldruin@gmail.com>

* Update src/05-led-roulette/flash-it.md

Co-authored-by: Diego Barrios Romero <eldruin@gmail.com>

* Adopt bors to the new CI

* Fix typo in openocd.gdb

* serial chapter first steps

* Initial subchapter of ch07

* Rest of ch07

* Restore the old main

* Unsafe is fine since we need it for statics

* Flush

* Build ch07 the right way in CI

* Initial ch08 code and documentation

* First micro:bit v2 version of ch08

* Unsafe code for the v2 wrapper

* Fix the CI for ch08

* Fix the ci for ch07

* WIP ch09

* Add a ton of new links to what's left to explore

* Update the troubleshooting section for micro:bit

* Add remark about Awesome Rust Embedded

* Update microbit to upstream git version

* Update to upstream git version of microbit

* Next compass attempt

* Fix the CI

* Fix i2c link

* This note is wrong

* Update src/appendix/1-general-troubleshooting/README.md

* Update the-general-protocol.md

fix grammar

* Chapter 10

* Apply suggestions from code review

Co-authored-by: Diego Barrios Romero <eldruin@gmail.com>

* Apply suggestions from code review

Co-authored-by: Diego Barrios Romero <eldruin@gmail.com>

* Apply suggestions from code review

Co-authored-by: Diego Barrios Romero <eldruin@gmail.com>

* Apply suggestions from code review

Co-authored-by: Diego Barrios Romero <eldruin@gmail.com>

* Apply suggestions from code review

Co-authored-by: Diego Barrios Romero <eldruin@gmail.com>

* Add link to the twim module

* Use `cargo embed` instead of `cargo-embed`

Replaces dash with whitespace since the version if the dash is not working.

* Add rustup target add to verification step and modify c5 slightly

* Typos and grammar changes

* Make terminology parts sub-sections

This allows us to deep link to them from other parts of the discovery
book.

* Calibration implementation and the rest of ch09

* Update src/09-led-compass/magnitude.md

Co-authored-by: Diego Barrios Romero <eldruin@gmail.com>

* Add note about libm sqrtf function.

* Fix minor typo in Ch 6 documentation

* Fix typo in Chapter 8 text

* Clarify the units

* update the git microbit versions to 0.11

* Update the lsm303agr version

* Update dependencies and remove unused ones

* Update versions of links

* Quote all modules

* Fix the ls command in 03-setup/verify.md

* Uniform delay types

* fixing dependency changes

* Move existing discovery book into f3discovery subfolder.

* Move new microbit book into its own directory

* Strip some README cruft from new front page.

* Fix GHA

* Copy missing image assets to microbit from f3discovery

* Fix cargo-doc run for micro:bit

* Death to all typos

Co-authored-by: Emil Gardström <emil.gardstrom@gmail.com>

* Death to the rest of the typos

* Clarify README.md

* Clarify how to search for HAL crates

* Direct HAL list link

* Link to an RTOS list

* Look!

* Only use one panic implementation at a time in led roulette.

* Fix bors CI status names

* Add build-doc CI runs to bors too

* fix typos in background(README.md)

* Fix broken link to c3

Change absolute link to relative

* Update debug-it.md

Try a / at the end

* Fix Readme/index issue for link

* Use specific chip for micro:bit v1 board.

probe-rs 0.12 changed from accepting generic chip description ("nrf51822")
to requiring specific chip description (e.g. "nrf51822_xxAA").

According to dirbaio on probe-rs matrix "there's three nrf51822 variants
with different flash/ram sizes, AA/AB/AC.
AA is 256k flash, 16k ram, afaik all microbit v1's are AA"

Without this change, when I attempted the `cargo embed` step I got
`Error... Found multiple chips matching 'nrf51822', unable to select a single chip.`

* Fix typo in verify.md: nrf51822-xxAA -> nrf51822_xxAA

* Fix micro:bit V1 chip specification everywhere

* Update micro:bit chip descriptions in the book

* In serial communication chapter, point to location of serial device for MacOS (info from https://makecode.microbit.org/device/serial).

* Use more specific chip spec for micro:bit v2

* Run cargo-doc on relevant target instead of native

* Fixed "cargo size" argument

Fixed error: unknown argument '-version', did you mean '--version' when executing 'cargo size -- -version'.

* Added a screenshot for PuTTY

The screenshot shows how to configure Session / Connection type = Serial.

* Improved PuTTY configuration

Added new screenshot showing how to set up PuTTY "Session" screen.

* Show changed PuTTY setting

Changed screenshot of the PuTTY "Connection / Serial" screen showing how it should be filled.

* Update reverse-a-string.md

Update `heapless::vec` to use const generics

Co-authored-by: Wink Saville <wink@saville.com>
Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Co-authored-by: Diego Barrios Romero <eldruin@gmail.com>
Co-authored-by: waalge <waalgy@gmail.com>
Co-authored-by: Jesse Parsons <59420931+leetie@users.noreply.github.com>
Co-authored-by: Henrik Böving <hargonix@gmail.com>
Co-authored-by: Adam Greig <adam@adamgreig.com>
Co-authored-by: NisarAbbasi1978 <66704815+NisarAbbasi1978@users.noreply.github.com>
Co-authored-by: D4ntin <9372835+D4ntin@users.noreply.github.com>
Co-authored-by: Jonathan Arnett <jonarnett90@gmail.com>
Co-authored-by: Patrick Doyle <wpdster@gmail.com>
Co-authored-by: Ricardo Delfin <me@rdelfin.com>
Co-authored-by: Dezhi Wu <wu543065657@163.com>
Co-authored-by: Christian Meusel <christian.meusel@posteo.de>
Co-authored-by: chirping78 <chirping78@hotmail.com>
Co-authored-by: Jonah Stiennon <jonahss@gmail.com>
Co-authored-by: Nitin Saxena <Nitin.Saxena@knoldus.com>
Co-authored-by: Danny Moesch <danny.moesch@icloud.com>
Co-authored-by: Waffle Lapkin <waffle.lapkin@gmail.com>
Co-authored-by: Anthony J. Martinez <anthony@ajmartinez.com>
Co-authored-by: Devon Kerkhove <devon@skyon.be>
Co-authored-by: Jeff Shen <22137276+al-jshen@users.noreply.github.com>
Co-authored-by: Chris <11088935+caemor@users.noreply.github.com>
Co-authored-by: Christoph <christoph.gross@student.uni-tuebingen.de>
Co-authored-by: Rob Young <rob@robyoung.digital>
Co-authored-by: Stephen Kaiser <freesol29@gmail.com>
Co-authored-by: Emil Gardström <emil.gardstrom@gmail.com>
Co-authored-by: Gary Capell <gary.capell@gmail.com>
Co-authored-by: Viacheslav Dobromyslov <viacheslav@dobromyslov.ru>
Co-authored-by: Daniel Hayes <59458913+dkhayes117@users.noreply.github.com>
  • Loading branch information
1 parent 690ce95 commit d2c8e38
Show file tree
Hide file tree
Showing 334 changed files with 7,011 additions and 1,122 deletions.
20 changes: 19 additions & 1 deletion .github/bors.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
block_labels = ["needs-decision"]
delete_merged_branches = true
required_approvals = 1
status = ["continuous-integration/travis-ci/push"]
status = [
"build-book",
"build-f3discovery-doc",
"build-f3discovery-chapter (05-led-roulette)",
"build-f3discovery-chapter (06-hello-world)",
"build-f3discovery-chapter (07-registers)",
"build-f3discovery-chapter (08-leds-again)",
"build-f3discovery-chapter (09-clocks-and-timers)",
"build-f3discovery-chapter (11-usart)",
"build-f3discovery-chapter (14-i2c)",
"build-f3discovery-chapter (15-led-compass)",
"build-f3discovery-chapter (16-punch-o-meter)",
"build-microbit-doc",
"build-microbit-chapter (05-led-roulette)",
"build-microbit-chapter (07-uart)",
"build-microbit-chapter (08-i2c)",
"build-microbit-chapter (09-led-compass)",
"build-microbit-chapter (10-punch-o-meter)",
]
164 changes: 164 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
name: CI

on:
push:
branches: [ staging, trying, master ]
pull_request:

jobs:
# Check build succeeds for each f3discovery chapter containing example code.
build-f3discovery-chapter:
runs-on: ubuntu-20.04
strategy:
matrix:
chapter:
- 05-led-roulette
- 06-hello-world
- 07-registers
- 08-leds-again
- 09-clocks-and-timers
- 11-usart
- 14-i2c
- 15-led-compass
- 16-punch-o-meter
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
target: thumbv7em-none-eabihf
- name: Build chapter
working-directory: f3discovery/src/${{ matrix.chapter }}
run: cargo build --target thumbv7em-none-eabihf
- name: Build chapter examples
working-directory: f3discovery/src/${{ matrix.chapter }}
run: cargo build --target thumbv7em-none-eabihf --examples

# Check build succeeds for f3discovery docs.
build-f3discovery-doc:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
target: thumbv7em-none-eabihf
- name: Build docs
run: cargo doc --target thumbv7em-none-eabihf
working-directory: f3discovery

# Check a build succeeds for each microbit chapter that contains example code.
build-microbit-chapter:
runs-on: ubuntu-20.04
strategy:
matrix:
chapter:
- 05-led-roulette
- 07-uart
- 08-i2c
- 09-led-compass
- 10-punch-o-meter
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
target: thumbv6m-none-eabi
- run: rustup target add thumbv7em-none-eabihf
- name: Build chapter micro:bit v1
working-directory: microbit/src/${{ matrix.chapter }}
run: cargo build --features v1 --target thumbv6m-none-eabi
- name: Build chapter micro:bit v2
working-directory: microbit/src/${{ matrix.chapter }}
run: cargo build --features v2 --target thumbv7em-none-eabihf

# Check build succeeds for microbit docs.
build-microbit-doc:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
target: thumbv6m-none-eabi
- run: rustup target add thumbv7em-none-eabihf
- name: Build docs for micro:bit v1
run: cargo doc --features v1 --target thumbv6m-none-eabi
working-directory: microbit
- name: Build docs for micro:bit v2
run: cargo doc --features v2 --target thumbv7em-none-eabihf
working-directory: microbit

# Build the book HTML itself and optionally publish it.
build-book:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
target: thumbv7em-none-eabihf
- run: rustup target add thumbv6m-none-eabi

- name: Install Python dependencies
run: |
pip3 install --user python-dateutil linkchecker
- name: Put pip binary directory into path
run: echo "~/.local/bin" >> $GITHUB_PATH

- name: Cache Cargo installed binaries
uses: actions/cache@v1
id: cache-cargo
with:
path: ~/cargo-bin
key: cache-cargo
- name: Install mdbook
if: steps.cache-cargo.outputs.cache-hit != 'true'
uses: actions-rs/install@v0.1
with:
crate: mdbook
version: latest
- name: Copy mdbook to cache directory
if: steps.cache-cargo.outputs.cache-hit != 'true'
run: |
mkdir ~/cargo-bin
cp ~/.cargo/bin/mdbook ~/cargo-bin
- name: Put new cargo binary directory into path
run: echo "~/cargo-bin" >> $GITHUB_PATH

- name: Build f3discovery book
working-directory: f3discovery
run: mkdir target && mdbook build
- name: Check microbit links
working-directory: f3discovery
run: linkchecker --ignore-url "print.html" book

- name: Build microbit book
working-directory: microbit
run: mkdir target && mdbook build
- name: Check microbit links
working-directory: microbit
run: linkchecker --ignore-url "print.html" book

- name: Build front page
run: mdbook build
- name: Check links
run: linkchecker book

- name: Collect books
run: |
mv f3discovery/book book/f3discovery
mv microbit/book book/microbit
- name: Deploy book
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
uses: peaceiris/actions-gh-pages@v3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: book
force_orphan: true
27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

25 changes: 25 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,31 @@
# `Discovery`

> Discover the world of microcontrollers through Rust
Discover the world of microcontrollers through [Rust](https://www.rust-lang.org/)!

There are currently two versions of this book. Both of them provide an
introduction to microcontrollers and how to use Rust with them.
The first is older and uses an F3 Discovery circuit board, while
the second is newer and uses a micro:bit circuit board instead.

- Read the newer book, using a micro:bit:
https://docs.rust-embedded.org/discovery/microbit
- Read the older book, using an F3 discovery board:
https://docs.rust-embedded.org/discovery/f3discovery
- Start working on the examples from this repository
- You've got questions?
- Have a look at our [discussions section on
GitHub](https://github.com/rust-embedded/discovery/discussions)
- Maybe it has already been answered
- If not, start a new discussion
- You've found an issue?
- Have a look at our [issues on
GitHub](https://github.com/rust-embedded/discovery/issues)
- Maybe there is already a workaround
- If not, please open a new one - or even better - a [pull
request](https://github.com/rust-embedded/discovery/pulls) for solving
it
- Have fun and enjoy!

This project is developed and maintained by the [Resources team][team].

Expand Down
21 changes: 0 additions & 21 deletions ci/after-success.sh

This file was deleted.

23 changes: 0 additions & 23 deletions ci/install.sh

This file was deleted.

69 changes: 0 additions & 69 deletions ci/script.sh

This file was deleted.

File renamed without changes.
9 changes: 9 additions & 0 deletions f3discovery/book.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[book]
title = "Discovery"
description = "Discover the world of microcontrollers through Rust"
author = "Rust Embedded Resources Team"
language = "en"

[output.html]
additional-css = ["custom.css"]
git-repository-url = "https://github.com/rust-embedded/discovery/"
6 changes: 6 additions & 0 deletions f3discovery/custom.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/* Add this style to the image if it's unreadable
when the dark theme is applied */
img.white_bg {
background-color: white;
padding: 1em;
}
11 changes: 11 additions & 0 deletions f3discovery/src/.cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[target.thumbv7em-none-eabihf]
runner = "arm-none-eabi-gdb -q"
# runner = "gdb-multiarch -q"
# runner = "gdb -q"
rustflags = [
"-C", "link-arg=-Tlink.x",
]

[build]
target = "thumbv7em-none-eabihf"

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -190,4 +190,4 @@ better off starting with the [quickstart] project template.

異なる開発ボードを持っていたり、自分を初心者とは考えていない場合は、[quickstart]プロジェクトテンプレートから始めた方が良いでしょう。

[quickstart]: https://docs.rs/cortex-m-quickstart
[quickstart]: https://rust-embedded.github.io/cortex-m-quickstart/cortex_m_quickstart/
Loading

0 comments on commit d2c8e38

Please sign in to comment.