aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2023-05-31 18:06:25 +0000
committerGitHub <[email protected]>2023-05-31 18:06:25 +0000
commite8527bac6940868f50ae87ca206e8e131f20bdb8 (patch)
tree41861a4c23c3545cf470b992275e7e1d133c1874
parentc7e6c7ed183282b4a2cb2c679a8f5f51a2dc04c1 (diff)
parent25f367432d6065bbcdf25cba80f2734237c432e4 (diff)
Merge pull request #1522 from embassy-rs/ci-doc
Add embsasy-stm32 docs build.
-rwxr-xr-x.github/ci/doc.sh41
-rwxr-xr-xci.sh1
-rw-r--r--embassy-stm32/src/rtc/v3.rs7
3 files changed, 23 insertions, 26 deletions
diff --git a/.github/ci/doc.sh b/.github/ci/doc.sh
index eabde742b..7f7dfaa03 100755
--- a/.github/ci/doc.sh
+++ b/.github/ci/doc.sh
@@ -7,27 +7,28 @@ export RUSTUP_HOME=/ci/cache/rustup
7export CARGO_HOME=/ci/cache/cargo 7export CARGO_HOME=/ci/cache/cargo
8export CARGO_TARGET_DIR=/ci/cache/target 8export CARGO_TARGET_DIR=/ci/cache/target
9export BUILDER_THREADS=6 9export BUILDER_THREADS=6
10export BUILDER_COMPRESS=true
10 11
11docserver-builder ./embassy-boot/boot crates/embassy-boot/git.zup 12docserver-builder -i ./embassy-stm32 -o crates/embassy-stm32/git.zup
12docserver-builder ./embassy-boot/nrf crates/embassy-boot-nrf/git.zup 13docserver-builder -i ./embassy-boot/boot -o crates/embassy-boot/git.zup
13docserver-builder ./embassy-boot/rp crates/embassy-boot-rp/git.zup 14docserver-builder -i ./embassy-boot/nrf -o crates/embassy-boot-nrf/git.zup
14docserver-builder ./embassy-boot/stm32 crates/embassy-boot-stm32/git.zup 15docserver-builder -i ./embassy-boot/rp -o crates/embassy-boot-rp/git.zup
15docserver-builder ./embassy-cortex-m crates/embassy-cortex-m/git.zup 16docserver-builder -i ./embassy-boot/stm32 -o crates/embassy-boot-stm32/git.zup
16docserver-builder ./embassy-embedded-hal crates/embassy-embedded-hal/git.zup 17docserver-builder -i ./embassy-cortex-m -o crates/embassy-cortex-m/git.zup
17docserver-builder ./embassy-executor crates/embassy-executor/git.zup 18docserver-builder -i ./embassy-embedded-hal -o crates/embassy-embedded-hal/git.zup
18docserver-builder ./embassy-futures crates/embassy-futures/git.zup 19docserver-builder -i ./embassy-executor -o crates/embassy-executor/git.zup
19docserver-builder ./embassy-lora crates/embassy-lora/git.zup 20docserver-builder -i ./embassy-futures -o crates/embassy-futures/git.zup
20docserver-builder ./embassy-net crates/embassy-net/git.zup 21docserver-builder -i ./embassy-lora -o crates/embassy-lora/git.zup
21docserver-builder ./embassy-net-driver crates/embassy-net-driver/git.zup 22docserver-builder -i ./embassy-net -o crates/embassy-net/git.zup
22docserver-builder ./embassy-net-driver-channel crates/embassy-net-driver-channel/git.zup 23docserver-builder -i ./embassy-net-driver -o crates/embassy-net-driver/git.zup
23docserver-builder ./embassy-nrf crates/embassy-nrf/git.zup 24docserver-builder -i ./embassy-net-driver-channel -o crates/embassy-net-driver-channel/git.zup
24docserver-builder ./embassy-rp crates/embassy-rp/git.zup 25docserver-builder -i ./embassy-nrf -o crates/embassy-nrf/git.zup
25docserver-builder ./embassy-sync crates/embassy-sync/git.zup 26docserver-builder -i ./embassy-rp -o crates/embassy-rp/git.zup
26docserver-builder ./embassy-time crates/embassy-time/git.zup 27docserver-builder -i ./embassy-sync -o crates/embassy-sync/git.zup
27docserver-builder ./embassy-usb crates/embassy-usb/git.zup 28docserver-builder -i ./embassy-time -o crates/embassy-time/git.zup
28docserver-builder ./embassy-usb-driver crates/embassy-usb-driver/git.zup 29docserver-builder -i ./embassy-usb -o crates/embassy-usb/git.zup
29docserver-builder ./embassy-usb-logger crates/embassy-usb-logger/git.zup 30docserver-builder -i ./embassy-usb-driver -o crates/embassy-usb-driver/git.zup
30#docserver-builder ./embassy-stm32 crates/embassy-stm32/git.zup 31docserver-builder -i ./embassy-usb-logger -o crates/embassy-usb-logger/git.zup
31 32
32export KUBECONFIG=/ci/secrets/kubeconfig.yml 33export KUBECONFIG=/ci/secrets/kubeconfig.yml
33POD=$(kubectl -n embassy get po -l app=docserver -o jsonpath={.items[0].metadata.name}) 34POD=$(kubectl -n embassy get po -l app=docserver -o jsonpath={.items[0].metadata.name})
diff --git a/ci.sh b/ci.sh
index 8a3669f07..3d6e28796 100755
--- a/ci.sh
+++ b/ci.sh
@@ -71,6 +71,7 @@ cargo batch \
71 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32h755zi-cm7,defmt,exti,time-driver-any,unstable-traits \ 71 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32h755zi-cm7,defmt,exti,time-driver-any,unstable-traits \
72 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32h7b3ai,defmt,exti,time-driver-any,unstable-traits \ 72 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32h7b3ai,defmt,exti,time-driver-any,unstable-traits \
73 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32l476vg,defmt,exti,time-driver-any,unstable-traits \ 73 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32l476vg,defmt,exti,time-driver-any,unstable-traits \
74 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32l422cb,defmt,exti,time-driver-any,unstable-traits \
74 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32wb15cc,defmt,exti,time-driver-any,unstable-traits \ 75 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv7em-none-eabi --features nightly,stm32wb15cc,defmt,exti,time-driver-any,unstable-traits \
75 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32l072cz,defmt,exti,time-driver-any,unstable-traits \ 76 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32l072cz,defmt,exti,time-driver-any,unstable-traits \
76 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32l041f6,defmt,exti,time-driver-any,unstable-traits \ 77 --- build --release --manifest-path embassy-stm32/Cargo.toml --target thumbv6m-none-eabi --features nightly,stm32l041f6,defmt,exti,time-driver-any,unstable-traits \
diff --git a/embassy-stm32/src/rtc/v3.rs b/embassy-stm32/src/rtc/v3.rs
index 546fe88c7..24f6496a6 100644
--- a/embassy-stm32/src/rtc/v3.rs
+++ b/embassy-stm32/src/rtc/v3.rs
@@ -9,11 +9,6 @@ impl<'d, T: Instance> super::Rtc<'d, T> {
9 pub(super) fn apply_config(&mut self, rtc_config: RtcConfig) { 9 pub(super) fn apply_config(&mut self, rtc_config: RtcConfig) {
10 // Unlock the backup domain 10 // Unlock the backup domain
11 unsafe { 11 unsafe {
12 #[cfg(any(rtc_v3u5, rcc_g0, rcc_g4))]
13 use crate::pac::rcc::vals::Rtcsel;
14 #[cfg(not(any(rtc_v3u5, rcc_g0, rcc_g4, rcc_wl5, rcc_wle)))]
15 use crate::pac::rtc::vals::Rtcsel;
16
17 #[cfg(not(any(rtc_v3u5, rcc_wl5, rcc_wle)))] 12 #[cfg(not(any(rtc_v3u5, rcc_wl5, rcc_wle)))]
18 { 13 {
19 crate::pac::PWR.cr1().modify(|w| w.set_dbp(true)); 14 crate::pac::PWR.cr1().modify(|w| w.set_dbp(true));
@@ -32,7 +27,7 @@ impl<'d, T: Instance> super::Rtc<'d, T> {
32 27
33 let config_rtcsel = rtc_config.clock_config as u8; 28 let config_rtcsel = rtc_config.clock_config as u8;
34 #[cfg(not(any(rcc_wl5, rcc_wle)))] 29 #[cfg(not(any(rcc_wl5, rcc_wle)))]
35 let config_rtcsel = Rtcsel(config_rtcsel); 30 let config_rtcsel = crate::pac::rcc::vals::Rtcsel(config_rtcsel);
36 31
37 if !reg.rtcen() || reg.rtcsel() != config_rtcsel { 32 if !reg.rtcen() || reg.rtcsel() != config_rtcsel {
38 crate::pac::RCC.bdcr().modify(|w| w.set_bdrst(true)); 33 crate::pac::RCC.bdcr().modify(|w| w.set_bdrst(true));