mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2025-02-17 13:58:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'v0.4.x' into v0.4.x-gh184

Browse source
This commit is contained in:
Emil Fresk 2019-10-23 22:22:41 +02:00 committed by GitHub
commit 15005f45e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -49,6 +49,8 @@ branches:
- master - master
- staging - staging
- trying - trying
# to build docs
- v0.4.x
notifications: notifications:
email: email:

2
ci/after-success.sh
View file

@ -37,6 +37,6 @@ if [ -z ${TRAVIS_PULL_REQUEST-} ]; then
TRAVIS_PULL_REQUEST=false TRAVIS_PULL_REQUEST=false
fi fi
if [ $TRAVIS_BRANCH = master ] && [ $TRAVIS_PULL_REQUEST = false ]; then if { [ $TRAVIS_BRANCH = master ] || [ $TRAVIS_BRANCH = v0.4.x ]; } && [ $TRAVIS_PULL_REQUEST = false ]; then
main main
fi fi

2
ci/script.sh
View file

@ -224,6 +224,6 @@ if [ -z ${TARGET-} ]; then
TARGET=$(rustc -Vv | grep host | cut -d ' ' -f2) TARGET=$(rustc -Vv | grep host | cut -d ' ' -f2)
fi fi
if [ $TRAVIS_BRANCH != master ] || [ $TRAVIS_PULL_REQUEST != false ]; then if { [ $TRAVIS_BRANCH != master ] && [ $TRAVIS_BRANCH != v0.4.x ]; } || [ $TRAVIS_PULL_REQUEST != false ]; then
main main
fi fi

4
macros/src/codegen.rs
View file

@ -507,7 +507,6 @@ fn post_init(ctxt: &Context, app: &App, analysis: &Analysis) -> proc_macro2::Tok
// Enable cycle counter // Enable cycle counter
if cfg!(feature = "timer-queue") { if cfg!(feature = "timer-queue") {
exprs.push(quote!(p.DCB.enable_trace()));
exprs.push(quote!(p.DWT.enable_cycle_counter())); exprs.push(quote!(p.DWT.enable_cycle_counter()));
} }
@ -2033,6 +2032,9 @@ fn pre_init(ctxt: &Context, app: &App, analysis: &Analysis) -> proc_macro2::Toke
p.DWT.lar.write(0xC5ACCE55); p.DWT.lar.write(0xC5ACCE55);
} }
)); ));
// We need to explicitly enable the trace block to set CYCCNT.
exprs.push(quote!(p.DCB.enable_trace();));
exprs.push(quote!(p.DWT.ctrl.modify(|r| r & !1);)); exprs.push(quote!(p.DWT.ctrl.modify(|r| r & !1);));
exprs.push(quote!(p.DWT.cyccnt.write(0);)); exprs.push(quote!(p.DWT.cyccnt.write(0);));
} }