mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-23 20:22:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge #236 #238 #243

Browse source 
236: link to older docs from the book r=korken89 a=japaric



238: Updated links in README for rtfm.rs r=japaric a=korken89



243: fix install script r=korken89 a=japaric



Co-authored-by: Jorge Aparicio <jorge@japaric.io>
Co-authored-by: Emil Fresk <emil.fresk@gmail.com>
This commit is contained in:
bors[bot] 2019-09-15 20:29:56 +00:00 committed by GitHub
commit 9a974585d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -5,7 +5,7 @@ authors = [
] ]
categories = ["concurrency", "embedded", "no-std"] categories = ["concurrency", "embedded", "no-std"]
description = "Real Time For the Masses (RTFM): a concurrency framework for building real time systems" description = "Real Time For the Masses (RTFM): a concurrency framework for building real time systems"
documentation = "https://rtfm-rs.github.io/cortex-m-rtfm/book/en" documentation = "https://rtfm.rs/"
edition = "2018" edition = "2018"
keywords = ["arm", "cortex-m"] keywords = ["arm", "cortex-m"]
license = "MIT OR Apache-2.0" license = "MIT OR Apache-2.0"

4
README.md
View file

@ -43,9 +43,9 @@ A concurrency framework for building real time systems.
- Applications must be written using the 2018 edition. - Applications must be written using the 2018 edition.
## [User documentation](https://japaric.github.io/rtfm5/book/en) ## [User documentation](https://rtfm.rs)
## [API reference](https://japaric.github.io/rtfm5/api/rtfm/index.html) ## [API reference](https://rtfm.rs/api/rtfm/index.html)
## Acknowledgments ## Acknowledgments

5
book/en/src/preface.md
View file

@ -11,7 +11,10 @@ There is a translation of this book in [Russian].
[Russian]: ../ru/index.html [Russian]: ../ru/index.html
**HEADS UP** This is an **alpha** pre-release; there may be breaking changes in This is the documentation of v0.5.x of RTFM; for the documentation of version
v0.4.x go [here](../../0.4/book/en).
**HEADS UP** This is a **beta** pre-release; there may be breaking changes in
the API and semantics before a proper release is made. the API and semantics before a proper release is made.
{{#include ../../../README.md:5:44}} {{#include ../../../README.md:5:44}}

2
ci/install.sh
View file

@ -4,7 +4,7 @@ main() {
# these are not needed for doc builds # these are not needed for doc builds
if [ $TRAVIS_BRANCH != master ] || [ $TRAVIS_PULL_REQUEST != false ]; then if [ $TRAVIS_BRANCH != master ] || [ $TRAVIS_PULL_REQUEST != false ]; then
if [ $TARGET = x86_64-unknown-linux-gnu ]; then if [ $TARGET = x86_64-unknown-linux-gnu ]; then
( cd .. && cargo install microamp-tools --version 0.1.0-alpha.3 -f ) ( cd .. && cargo install microamp-tools --version 0.1.0-alpha.2 -f )
rustup target add thumbv6m-none-eabi thumbv7m-none-eabi rustup target add thumbv6m-none-eabi thumbv7m-none-eabi
fi fi