max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1522 from embassy-rs/ci-doc

Browse Source 
Add embsasy-stm32 docs build.
This commit is contained in:
Dario Nieuwenhuis 2023-05-31 18:06:25 +00:00 committed by GitHub
commit e8527bac69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
.github/ci/doc.sh vendored
View File

@ -7,27 +7,28 @@ export RUSTUP_HOME=/ci/cache/rustup
export CARGO_HOME=/ci/cache/cargo export CARGO_HOME=/ci/cache/cargo
export CARGO_TARGET_DIR=/ci/cache/target export CARGO_TARGET_DIR=/ci/cache/target
export BUILDER_THREADS=6 export BUILDER_THREADS=6
export BUILDER_COMPRESS=true
docserver-builder ./embassy-boot/boot crates/embassy-boot/git.zup docserver-builder -i ./embassy-stm32 -o crates/embassy-stm32/git.zup
docserver-builder ./embassy-boot/nrf crates/embassy-boot-nrf/git.zup docserver-builder -i ./embassy-boot/boot -o crates/embassy-boot/git.zup
docserver-builder ./embassy-boot/rp crates/embassy-boot-rp/git.zup docserver-builder -i ./embassy-boot/nrf -o crates/embassy-boot-nrf/git.zup
docserver-builder ./embassy-boot/stm32 crates/embassy-boot-stm32/git.zup docserver-builder -i ./embassy-boot/rp -o crates/embassy-boot-rp/git.zup
docserver-builder ./embassy-cortex-m crates/embassy-cortex-m/git.zup docserver-builder -i ./embassy-boot/stm32 -o crates/embassy-boot-stm32/git.zup
docserver-builder ./embassy-embedded-hal crates/embassy-embedded-hal/git.zup docserver-builder -i ./embassy-cortex-m -o crates/embassy-cortex-m/git.zup
docserver-builder ./embassy-executor crates/embassy-executor/git.zup docserver-builder -i ./embassy-embedded-hal -o crates/embassy-embedded-hal/git.zup
docserver-builder ./embassy-futures crates/embassy-futures/git.zup docserver-builder -i ./embassy-executor -o crates/embassy-executor/git.zup
docserver-builder ./embassy-lora crates/embassy-lora/git.zup docserver-builder -i ./embassy-futures -o crates/embassy-futures/git.zup
docserver-builder ./embassy-net crates/embassy-net/git.zup docserver-builder -i ./embassy-lora -o crates/embassy-lora/git.zup
docserver-builder ./embassy-net-driver crates/embassy-net-driver/git.zup docserver-builder -i ./embassy-net -o crates/embassy-net/git.zup
docserver-builder ./embassy-net-driver-channel crates/embassy-net-driver-channel/git.zup docserver-builder -i ./embassy-net-driver -o crates/embassy-net-driver/git.zup
docserver-builder ./embassy-nrf crates/embassy-nrf/git.zup docserver-builder -i ./embassy-net-driver-channel -o crates/embassy-net-driver-channel/git.zup
docserver-builder ./embassy-rp crates/embassy-rp/git.zup docserver-builder -i ./embassy-nrf -o crates/embassy-nrf/git.zup
docserver-builder ./embassy-sync crates/embassy-sync/git.zup docserver-builder -i ./embassy-rp -o crates/embassy-rp/git.zup
docserver-builder ./embassy-time crates/embassy-time/git.zup docserver-builder -i ./embassy-sync -o crates/embassy-sync/git.zup
docserver-builder ./embassy-usb crates/embassy-usb/git.zup docserver-builder -i ./embassy-time -o crates/embassy-time/git.zup
docserver-builder ./embassy-usb-driver crates/embassy-usb-driver/git.zup docserver-builder -i ./embassy-usb -o crates/embassy-usb/git.zup
docserver-builder ./embassy-usb-logger crates/embassy-usb-logger/git.zup docserver-builder -i ./embassy-usb-driver -o crates/embassy-usb-driver/git.zup
#docserver-builder ./embassy-stm32 crates/embassy-stm32/git.zup docserver-builder -i ./embassy-usb-logger -o crates/embassy-usb-logger/git.zup
export KUBECONFIG=/ci/secrets/kubeconfig.yml export KUBECONFIG=/ci/secrets/kubeconfig.yml
POD=$(kubectl -n embassy get po -l app=docserver -o jsonpath={.items[0].metadata.name}) POD=$(kubectl -n embassy get po -l app=docserver -o jsonpath={.items[0].metadata.name})

1
ci.sh
View File

@ -71,6 +71,7 @@ cargo batch \
--- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32h755zi-cm7,defmt,exti,time-driver-any,unstable-traits \ --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32h755zi-cm7,defmt,exti,time-driver-any,unstable-traits \
--- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32h7b3ai,defmt,exti,time-driver-any,unstable-traits \ --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32h7b3ai,defmt,exti,time-driver-any,unstable-traits \
--- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32l476vg,defmt,exti,time-driver-any,unstable-traits \ --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32l476vg,defmt,exti,time-driver-any,unstable-traits \
--- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32l422cb,defmt,exti,time-driver-any,unstable-traits \
--- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32wb15cc,defmt,exti,time-driver-any,unstable-traits \ --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32wb15cc,defmt,exti,time-driver-any,unstable-traits \
--- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32l072cz,defmt,exti,time-driver-any,unstable-traits \ --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32l072cz,defmt,exti,time-driver-any,unstable-traits \
--- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32l041f6,defmt,exti,time-driver-any,unstable-traits \ --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32l041f6,defmt,exti,time-driver-any,unstable-traits \

7
embassy-stm32/src/rtc/v3.rs
View File

@ -9,11 +9,6 @@ impl<'d, T: Instance> super::Rtc<'d, T> {
pub(super) fn apply_config(&mut self, rtc_config: RtcConfig) { pub(super) fn apply_config(&mut self, rtc_config: RtcConfig) {
// Unlock the backup domain // Unlock the backup domain
unsafe { unsafe {
#[cfg(any(rtc_v3u5, rcc_g0, rcc_g4))]
use crate::pac::rcc::vals::Rtcsel;
#[cfg(not(any(rtc_v3u5, rcc_g0, rcc_g4, rcc_wl5, rcc_wle)))]
use crate::pac::rtc::vals::Rtcsel;
#[cfg(not(any(rtc_v3u5, rcc_wl5, rcc_wle)))] #[cfg(not(any(rtc_v3u5, rcc_wl5, rcc_wle)))]
{ {
crate::pac::PWR.cr1().modify(|w| w.set_dbp(true)); crate::pac::PWR.cr1().modify(|w| w.set_dbp(true));
@ -32,7 +27,7 @@ impl<'d, T: Instance> super::Rtc<'d, T> {
let config_rtcsel = rtc_config.clock_config as u8; let config_rtcsel = rtc_config.clock_config as u8;
#[cfg(not(any(rcc_wl5, rcc_wle)))] #[cfg(not(any(rcc_wl5, rcc_wle)))]
let config_rtcsel = Rtcsel(config_rtcsel); let config_rtcsel = crate::pac::rcc::vals::Rtcsel(config_rtcsel);
if !reg.rtcen() || reg.rtcsel() != config_rtcsel { if !reg.rtcen() || reg.rtcsel() != config_rtcsel {
crate::pac::RCC.bdcr().modify(|w| w.set_bdrst(true)); crate::pac::RCC.bdcr().modify(|w| w.set_bdrst(true));