merge upstream #75
Merged
merge upstream #75
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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`.
297: Tweak testing cargo-binutils r=eldruin a=winksaville 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`. Co-authored-by: Wink Saville <[email protected]>
298: Fix installing dateutil since it is now a dependency of the GHP import script r=adamgreig a=eldruin This would at least make our publication step work again even though still on Travis CI. See rust-embedded#289 Co-authored-by: Diego Barrios Romero <[email protected]>
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.
As suggested by @eldruin add backticks around ~/.gdbinit.
299: New-06-hello-world r=eldruin a=winksaville 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. Co-authored-by: Wink Saville <[email protected]>
300: add two notes flagging lsm303agr r=eldruin a=waalge In response to rust-embedded#274 (comment) Please edit at leisure / suggest anything Co-authored-by: waalge <[email protected]>
Fix typo, link.
301: fix typo, link r=eldruin a=leetie Fix typo, link. Co-authored-by: Jesse Parsons <[email protected]>
After doing 06-hello-world I felt some tweaks and cleanup were needed in debug-it.md and the-led-and-delay-abstractions.md.
302: Tweak 05-led-roulette r=therealprof a=winksaville After doing 06-hello-world I felt some tweaks and cleanup were needed in debug-it.md and the-led-and-delay-abstractions.md. Co-authored-by: Wink Saville <[email protected]>
Modified to run using `stm32f3-discovery` instead of `f3` and updated the `.md` files appropriately.
This is the solution @eldurin had suggested.
303: New 07 Registers r=eldruin a=winksaville Modified to run using `stm32f3-discovery` instead of `f3` and updated the `.md` files appropriately. Co-authored-by: Wink Saville <[email protected]>
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.
304: Update-03-setting-up-a-dev-env r=adamgreig a=winksaville 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. Co-authored-by: Wink Saville <[email protected]>
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.
As suggested by reviewers @eldruin and @therealprof, txs!
Also, added a note that .cargo/config may need to be modified in every chapter.
305: Update 05 led-roulette r=therealprof a=winksaville 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. Co-authored-by: Wink Saville <[email protected]>
277: Rewrite serial r=hargoniX a=hargoniX This PR: * gets rid off the old chapters explaining how registers etc. work since a person starting out with embedded rust doesn't have to know that anymore * moves the UART and serial communication chapters a little forward since they seemed like the most simple of hardware peripherals to me (after LEDs that is). * changes the UART code from register level code to nrf51-hal code Everything is rewritten now. Co-authored-by: Henrik Böving <[email protected]>
310: Increase Travis no-output waiting time r=therealprof a=eldruin Hopefully this will allow us to merge rust-embedded#308 Co-authored-by: Diego Barrios Romero <[email protected]>
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
>>>
308: Add shareable instances of config.toml and openocd.gdb r=eldruin a=winksaville
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
>>>
Co-authored-by: Wink Saville <[email protected]>
- Updated `*.md` files. - Deleted the local .cargo/config and openocd.gdb files.
417: fix typos in background(README.md) r=eldruin a=NitinSaxenait # What do these changes do? These changes solve some typos errors in the background file README.md This will improve the readability of the file. Co-authored-by: Nitin Saxena <[email protected]>
Change absolute link to relative
Try a / at the end
418: Fix broken link to c3 r=eldruin a=caemor Change absolute link to relative since the current link is broken since it starts from the root level which is one above where it should be with the new structure. Co-authored-by: Chris <[email protected]> Co-authored-by: Christoph <[email protected]>
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.`
422: Use specific chip for micro:bit v1 board. r=eldruin a=gcapell
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.`
Co-authored-by: Gary Capell <[email protected]>
423: Fix micro:bit V1 chip specification everywhere r=adamgreig a=eldruin This is the fix from rust-embedded#422 propagated to all chapters. Co-authored-by: Diego Barrios Romero <[email protected]>
424: Update micro:bit chip descriptions in the book r=adamgreig a=eldruin I forgot editing the book as well in rust-embedded#423. BTW, I put the chip instructions in one line each so that people are not confused and uncomment also the "v2" comment. I saw somebody asking in the chat about this. Co-authored-by: Diego Barrios Romero <[email protected]>
426: In serial communication chapter, point to location of serial device f… r=eldruin a=gcapell …or MacOS (info from https://makecode.microbit.org/device/serial). Co-authored-by: Gary Capell <[email protected]>
428: Run cargo-doc on relevant target instead of native r=eldruin a=adamgreig Hopefully fixes CI build failure see in rust-embedded#427. Co-authored-by: Adam Greig <[email protected]>
427: Use more specific chip spec for micro:bit v2 r=adamgreig a=eldruin Happy new year! Fixes rust-embedded#425 Co-authored-by: Diego Barrios Romero <[email protected]>
Fixed error: unknown argument '-version', did you mean '--version' when executing 'cargo size -- -version'.
430: Fixed "cargo size" argument r=adamgreig a=dobromyslov Fixed error: unknown argument '-version', did you mean '--version' when executing 'cargo size -- -version'. Co-authored-by: Viacheslav Dobromyslov <[email protected]>
The screenshot shows how to configure Session / Connection type = Serial.
Added new screenshot showing how to set up PuTTY "Session" screen.
Changed screenshot of the PuTTY "Connection / Serial" screen showing how it should be filled.
431: Clarified 10.2 PuTTY configuration r=eldruin a=dobromyslov Added new screenshow with PuTTY main screen and changed "Connection / Serial" screen from "As-is" to "To-be". Co-authored-by: Viacheslav Dobromyslov <[email protected]>
Update `heapless::vec` to use const generics
432: Update reverse-a-string.md r=adamgreig a=dkhayes117 Update `heapless::vec` to use const generics. Co-authored-by: Daniel Hayes <[email protected]>
tomoyuki-nakabayashi
force-pushed
the
upstream/merge
branch
from
a9866f9 to
19f189b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.