v0.4.0

closes #32
closes #33

Author: japaric

.cargo/config

@@ -1,31 +1,13 @@
 [target.thumbv6m-none-eabi]
-runner = 'arm-none-eabi-gdb'
-rustflags = [
-  "-C", "link-arg=-Tlink.x",
-  "-C", "linker=true",
-  "-Z", "linker-flavor=ld",
-]
+runner = "qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel"
 
 [target.thumbv7m-none-eabi]
-runner = 'arm-none-eabi-gdb'
-rustflags = [
-  "-C", "link-arg=-Tlink.x",
-  "-C", "linker=arm-none-eabi-ld",
-  "-Z", "linker-flavor=ld",
-]
+runner = "qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel"
 
-[target.thumbv7em-none-eabi]
-runner = 'arm-none-eabi-gdb'
+[target.'cfg(all(target_arch = "arm", target_os = "none"))']
 rustflags = [
   "-C", "link-arg=-Tlink.x",
-  "-C", "linker=arm-none-eabi-ld",
-  "-Z", "linker-flavor=ld",
 ]
 
-[target.thumbv7em-none-eabihf]
-runner = 'arm-none-eabi-gdb'
-rustflags = [
-  "-C", "link-arg=-Tlink.x",
-  "-C", "linker=arm-none-eabi-ld",
-  "-Z", "linker-flavor=ld",
-]
+[build]
+target = "thumbv7m-none-eabi"

.gdbinit

@@ -1,3 +1,4 @@
+delete_merged_branches = true
 status = [
   "continuous-integration/travis-ci/push",
 ]

.github/bors.toml

@@ -1,6 +1,6 @@
 **/*.rs.bk
-*.org
 .#*
 .gdb_history
+/book/book
+/target
 Cargo.lock
-target/

.gitignore

@@ -2,38 +2,48 @@ language: rust
 
 matrix:
   include:
+    # NOTE used to build docs on successful merges to master
     - env: TARGET=x86_64-unknown-linux-gnu
-      rust: nightly
+      rust: beta
 
     - env: TARGET=thumbv6m-none-eabi
-      rust: nightly
-      if: branch != master
+      rust: beta
+      if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
 
     - env: TARGET=thumbv7m-none-eabi
+      rust: beta
+      if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
+
+    - env: TARGET=x86_64-unknown-linux-gnu
       rust: nightly
-      if: branch != master
+      if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
 
-    - env: TARGET=thumbv7em-none-eabi
+    - env: TARGET=thumbv6m-none-eabi
       rust: nightly
-      if: branch != master
+      if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
 
-    - env: TARGET=thumbv7em-none-eabihf
+    - env: TARGET=thumbv7m-none-eabi
       rust: nightly
-      if: branch != master
+      if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
 
 before_install: set -e
 
 install:
   - bash ci/install.sh
-  - export PATH="$PATH:$PWD/gcc/bin"
+  - export PATH="$PATH:$PWD/qemu"
 
 script:
   - bash ci/script.sh
 
+after_script: set +e
+
 after_success:
   - bash ci/after-success.sh
 
-after_script: set +e
+cache: cache
+
+before_cache:
+  - chmod -R a+r $HOME/.cargo;
 
 branches:
   only:

.travis.yml

@@ -4,33 +4,62 @@ authors = [
   "Per Lindgren <[email protected]>",
 ]
 categories = ["concurrency", "embedded", "no-std"]
-description = "Real Time For the Masses (RTFM) framework for ARM Cortex-M microcontrollers"
-documentation = "https://japaric.github.io/cortex-m-rtfm/cortex_m_rtfm/"
+description = "Real Time For the Masses (RTFM): a concurrency framework for building real time systems"
+documentation = "https://japaric.github.io/cortex-m-rtfm/book/"
+edition = "2018"
 keywords = ["arm", "cortex-m"]
 license = "MIT OR Apache-2.0"
 name = "cortex-m-rtfm"
+readme = "README.md"
 repository = "https://github.com/japaric/cortex-m-rtfm"
-version = "0.3.4"
+version = "0.4.0-beta.1"
 
-[dependencies]
-cortex-m = "0.4.0"
-cortex-m-rtfm-macros = { path = "macros", version = "0.3.2" }
-rtfm-core = "0.2.0"
-untagged-option = "0.1.1"
+[lib]
+name = "rtfm"
+
+[[example]]
+name = "baseline"
+required-features = ["timer-queue"]
+
+[[example]]
+name = "periodic"
+required-features = ["timer-queue"]
+
+[[example]]
+name = "schedule"
+required-features = ["timer-queue"]
 
-[target.'cfg(target_arch = "x86_64")'.dev-dependencies]
-compiletest_rs = "0.3.5"
+[[example]]
+name = "types"
+required-features = ["timer-queue"]
 
-[dev-dependencies.cortex-m-rt]
-features = ["abort-on-panic"]
-version = "0.3.9"
+[dependencies]
+cortex-m = "0.5.8"
+cortex-m-rt = "0.6.5"
+cortex-m-rtfm-macros = { path = "macros", version = "0.4.0-beta.1" }
+heapless = "0.4.0"
+owned-singleton = "0.1.0"
+
+[dev-dependencies]
+alloc-singleton = "0.1.0"
+cortex-m-semihosting = "0.3.1"
+lm3s6965 = "0.1.3"
+panic-halt = "0.2.0"
 
-[dev-dependencies.stm32f103xx]
-features = ["rt"]
-version = "0.8.0"
+[dev-dependencies.panic-semihosting]
+features = ["exit"]
+version = "0.5.1"
 
 [features]
-cm7-r0p1 = ["cortex-m/cm7-r0p1"]
+timer-queue = ["cortex-m-rtfm-macros/timer-queue"]
+
+[target.x86_64-unknown-linux-gnu.dev-dependencies]
+compiletest_rs = "0.3.16"
+tempdir = "0.3.7"
 
 [profile.release]
+codegen-units = 1
 lto = true
+
+[workspace]
+members = ["macros"]