Compare commits
	
		
			1 Commits
		
	
	
		
			static-cel
			...
			test-ci
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 0bae4629fd | 
							
								
								
									
										1
									
								
								.github/ci/build.sh
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.github/ci/build.sh
									
									
									
									
										vendored
									
									
								
							| @@ -12,6 +12,7 @@ if [ -f /ci/secrets/teleprobe-token.txt ]; then | |||||||
|     export TELEPROBE_HOST=https://teleprobe.embassy.dev |     export TELEPROBE_HOST=https://teleprobe.embassy.dev | ||||||
|     export TELEPROBE_TOKEN=$(cat /ci/secrets/teleprobe-token.txt) |     export TELEPROBE_TOKEN=$(cat /ci/secrets/teleprobe-token.txt) | ||||||
|     export TELEPROBE_CACHE=/ci/cache/teleprobe_cache.json |     export TELEPROBE_CACHE=/ci/cache/teleprobe_cache.json | ||||||
|  |     rm -f $TELEPROBE_CACHE | ||||||
| fi | fi | ||||||
|  |  | ||||||
| # needed for "dumb HTTP" transport support | # needed for "dumb HTTP" transport support | ||||||
|   | |||||||
							
								
								
									
										3
									
								
								ci.sh
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								ci.sh
									
									
									
									
									
								
							| @@ -218,9 +218,6 @@ cargo batch  \ | |||||||
| rm out/tests/stm32wb55rg/wpan_mac | rm out/tests/stm32wb55rg/wpan_mac | ||||||
| rm out/tests/stm32wb55rg/wpan_ble | rm out/tests/stm32wb55rg/wpan_ble | ||||||
|  |  | ||||||
| # unstable |  | ||||||
| rm out/tests/stm32f429zi/stop |  | ||||||
|  |  | ||||||
| # unstable, I think it's running out of RAM? | # unstable, I think it's running out of RAM? | ||||||
| rm out/tests/stm32f207zg/eth | rm out/tests/stm32f207zg/eth | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| #![no_std] | #![no_std] | ||||||
|  | #![allow(incomplete_features)] | ||||||
| #![feature(async_fn_in_trait)] | #![feature(async_fn_in_trait)] | ||||||
| #![allow(stable_features, unknown_lints, async_fn_in_trait)] |  | ||||||
|  |  | ||||||
| use core::slice; | use core::slice; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ firmware-logs = [] | |||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-time = { version = "0.1.5", path = "../embassy-time"} | embassy-time = { version = "0.1.5", path = "../embassy-time"} | ||||||
| embassy-sync = { version = "0.4.0", path = "../embassy-sync"} | embassy-sync = { version = "0.3.0", path = "../embassy-sync"} | ||||||
| embassy-futures = { version = "0.1.0", path = "../embassy-futures"} | embassy-futures = { version = "0.1.0", path = "../embassy-futures"} | ||||||
| embassy-net-driver-channel = { version = "0.2.0", path = "../embassy-net-driver-channel"} | embassy-net-driver-channel = { version = "0.2.0", path = "../embassy-net-driver-channel"} | ||||||
|  |  | ||||||
|   | |||||||
| @@ -4,6 +4,7 @@ use embassy_net_driver_channel as ch; | |||||||
| use embassy_net_driver_channel::driver::{HardwareAddress, LinkState}; | use embassy_net_driver_channel::driver::{HardwareAddress, LinkState}; | ||||||
| use embassy_time::Timer; | use embassy_time::Timer; | ||||||
|  |  | ||||||
|  | pub use crate::bus::SpiBusCyw43; | ||||||
| use crate::consts::*; | use crate::consts::*; | ||||||
| use crate::events::{Event, EventSubscriber, Events}; | use crate::events::{Event, EventSubscriber, Events}; | ||||||
| use crate::fmt::Bytes; | use crate::fmt::Bytes; | ||||||
|   | |||||||
| @@ -1,7 +1,7 @@ | |||||||
| #![no_std] | #![no_std] | ||||||
| #![no_main] | #![no_main] | ||||||
|  | #![allow(incomplete_features)] | ||||||
| #![feature(async_fn_in_trait, type_alias_impl_trait, concat_bytes)] | #![feature(async_fn_in_trait, type_alias_impl_trait, concat_bytes)] | ||||||
| #![allow(stable_features, unknown_lints, async_fn_in_trait)] |  | ||||||
| #![deny(unused_must_use)] | #![deny(unused_must_use)] | ||||||
|  |  | ||||||
| // This mod MUST go first, so that the others see its macros. | // This mod MUST go first, so that the others see its macros. | ||||||
|   | |||||||
| @@ -28,7 +28,7 @@ digest = "0.10" | |||||||
| log = { version = "0.4", optional = true  } | log = { version = "0.4", optional = true  } | ||||||
| ed25519-dalek = { version = "1.0.1", default_features = false, features = ["u32_backend"], optional = true } | ed25519-dalek = { version = "1.0.1", default_features = false, features = ["u32_backend"], optional = true } | ||||||
| embassy-embedded-hal = { version = "0.1.0", path = "../../embassy-embedded-hal" } | embassy-embedded-hal = { version = "0.1.0", path = "../../embassy-embedded-hal" } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync" } | ||||||
| embedded-storage = "0.3.0" | embedded-storage = "0.3.0" | ||||||
| embedded-storage-async = { version = "0.4.0", optional = true } | embedded-storage-async = { version = "0.4.0", optional = true } | ||||||
| salty = { git = "https://github.com/ycrypto/salty.git", rev = "a9f17911a5024698406b75c0fac56ab5ccf6a8c7", optional = true } | salty = { git = "https://github.com/ycrypto/salty.git", rev = "a9f17911a5024698406b75c0fac56ab5ccf6a8c7", optional = true } | ||||||
|   | |||||||
| @@ -1,5 +1,4 @@ | |||||||
| #![cfg_attr(feature = "nightly", feature(async_fn_in_trait))] | #![cfg_attr(feature = "nightly", feature(async_fn_in_trait))] | ||||||
| #![cfg_attr(feature = "nightly", allow(stable_features, unknown_lints, async_fn_in_trait))] |  | ||||||
| #![no_std] | #![no_std] | ||||||
| #![warn(missing_docs)] | #![warn(missing_docs)] | ||||||
| #![doc = include_str!("../README.md")] | #![doc = include_str!("../README.md")] | ||||||
|   | |||||||
| @@ -16,7 +16,7 @@ target = "thumbv7em-none-eabi" | |||||||
| [dependencies] | [dependencies] | ||||||
| defmt = { version = "0.3", optional = true } | defmt = { version = "0.3", optional = true } | ||||||
|  |  | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync" } | embassy-sync = { path = "../../embassy-sync" } | ||||||
| embassy-nrf = { path = "../../embassy-nrf" } | embassy-nrf = { path = "../../embassy-nrf" } | ||||||
| embassy-boot = { path = "../boot", default-features = false } | embassy-boot = { path = "../boot", default-features = false } | ||||||
| cortex-m = { version = "0.7.6" } | cortex-m = { version = "0.7.6" } | ||||||
|   | |||||||
| @@ -17,7 +17,7 @@ defmt = { version = "0.3", optional = true } | |||||||
| defmt-rtt = { version = "0.4", optional = true } | defmt-rtt = { version = "0.4", optional = true } | ||||||
| log = { version = "0.4", optional = true } | log = { version = "0.4", optional = true } | ||||||
|  |  | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync" } | embassy-sync = { path = "../../embassy-sync" } | ||||||
| embassy-rp = { path = "../../embassy-rp", default-features = false } | embassy-rp = { path = "../../embassy-rp", default-features = false } | ||||||
| embassy-boot = { path = "../boot", default-features = false } | embassy-boot = { path = "../boot", default-features = false } | ||||||
| embassy-time = { path = "../../embassy-time" } | embassy-time = { path = "../../embassy-time" } | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ defmt = { version = "0.3", optional = true } | |||||||
| defmt-rtt = { version = "0.4", optional = true } | defmt-rtt = { version = "0.4", optional = true } | ||||||
| log = { version = "0.4", optional = true } | log = { version = "0.4", optional = true } | ||||||
|  |  | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync" } | embassy-sync = { path = "../../embassy-sync" } | ||||||
| embassy-stm32 = { path = "../../embassy-stm32", default-features = false } | embassy-stm32 = { path = "../../embassy-stm32", default-features = false } | ||||||
| embassy-boot = { path = "../boot", default-features = false } | embassy-boot = { path = "../boot", default-features = false } | ||||||
| cortex-m = { version = "0.7.6" } | cortex-m = { version = "0.7.6" } | ||||||
|   | |||||||
| @@ -20,7 +20,7 @@ default = ["time"] | |||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-futures = { version = "0.1.0", path = "../embassy-futures", optional = true } | embassy-futures = { version = "0.1.0", path = "../embassy-futures", optional = true } | ||||||
| embassy-sync = { version = "0.4.0", path = "../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../embassy-sync" } | ||||||
| embassy-time = { version = "0.1.5", path = "../embassy-time", optional = true } | embassy-time = { version = "0.1.5", path = "../embassy-time", optional = true } | ||||||
| embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = [ | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = [ | ||||||
|     "unproven", |     "unproven", | ||||||
|   | |||||||
| @@ -1,6 +1,5 @@ | |||||||
| #![cfg_attr(not(feature = "std"), no_std)] | #![cfg_attr(not(feature = "std"), no_std)] | ||||||
| #![cfg_attr(feature = "nightly", feature(async_fn_in_trait, impl_trait_projections, try_blocks))] | #![cfg_attr(feature = "nightly", feature(async_fn_in_trait, try_blocks))] | ||||||
| #![cfg_attr(feature = "nightly", allow(stable_features, unknown_lints, async_fn_in_trait))] |  | ||||||
| #![warn(missing_docs)] | #![warn(missing_docs)] | ||||||
|  |  | ||||||
| //! Utilities to use `embedded-hal` traits with Embassy. | //! Utilities to use `embedded-hal` traits with Embassy. | ||||||
|   | |||||||
| @@ -5,10 +5,6 @@ All notable changes to this project will be documented in this file. | |||||||
| The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | ||||||
| and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). | and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). | ||||||
|  |  | ||||||
| ## 0.3.1 - 2023-11-01 |  | ||||||
|  |  | ||||||
| - Fix spurious "Found waker not created by the Embassy executor" error in recent nightlies. |  | ||||||
|  |  | ||||||
| ## 0.3.0 - 2023-08-25 | ## 0.3.0 - 2023-08-25 | ||||||
|  |  | ||||||
| - Replaced Pender. Implementations now must define an extern function called `__pender`. | - Replaced Pender. Implementations now must define an extern function called `__pender`. | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| [package] | [package] | ||||||
| name = "embassy-executor" | name = "embassy-executor" | ||||||
| version = "0.3.1" | version = "0.3.0" | ||||||
| edition = "2021" | edition = "2021" | ||||||
| license = "MIT OR Apache-2.0" | license = "MIT OR Apache-2.0" | ||||||
| description = "async/await executor designed for embedded usage" | description = "async/await executor designed for embedded usage" | ||||||
| @@ -62,6 +62,7 @@ embassy-macros = { version = "0.2.1", path = "../embassy-macros" } | |||||||
| embassy-time = { version = "0.1.5", path = "../embassy-time", optional = true} | embassy-time = { version = "0.1.5", path = "../embassy-time", optional = true} | ||||||
| atomic-polyfill = "1.0.1" | atomic-polyfill = "1.0.1" | ||||||
| critical-section = "1.1" | critical-section = "1.1" | ||||||
|  | static_cell = "1.1" | ||||||
|  |  | ||||||
| # arch-cortex-m dependencies | # arch-cortex-m dependencies | ||||||
| cortex-m = { version = "0.7.6", optional = true } | cortex-m = { version = "0.7.6", optional = true } | ||||||
|   | |||||||
| @@ -33,7 +33,6 @@ check_at_most_one!("arch-cortex-m", "arch-riscv32", "arch-xtensa", "arch-std", " | |||||||
| mod arch; | mod arch; | ||||||
|  |  | ||||||
| #[cfg(feature = "_arch")] | #[cfg(feature = "_arch")] | ||||||
| #[allow(unused_imports)] // don't warn if the module is empty. |  | ||||||
| pub use arch::*; | pub use arch::*; | ||||||
|  |  | ||||||
| pub mod raw; | pub mod raw; | ||||||
| @@ -47,6 +46,7 @@ pub use spawner::*; | |||||||
| pub mod _export { | pub mod _export { | ||||||
|     #[cfg(feature = "rtos-trace")] |     #[cfg(feature = "rtos-trace")] | ||||||
|     pub use rtos_trace::trace; |     pub use rtos_trace::trace; | ||||||
|  |     pub use static_cell::StaticCell; | ||||||
|  |  | ||||||
|     /// Expands the given block of code when `embassy-executor` is compiled with |     /// Expands the given block of code when `embassy-executor` is compiled with | ||||||
|     /// the `rtos-trace-interrupt` feature. |     /// the `rtos-trace-interrupt` feature. | ||||||
|   | |||||||
| @@ -21,7 +21,7 @@ defmt = { version = "0.3", optional = true } | |||||||
| log = { version = "0.4.14", optional = true } | log = { version = "0.4.14", optional = true } | ||||||
|  |  | ||||||
| embassy-time = { version = "0.1.5", path = "../embassy-time", optional = true } | embassy-time = { version = "0.1.5", path = "../embassy-time", optional = true } | ||||||
| embassy-sync = { version = "0.4.0", path = "../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../embassy-sync" } | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../embassy-stm32", default-features = false, optional = true } | embassy-stm32 = { version = "0.1.0", path = "../embassy-stm32", default-features = false, optional = true } | ||||||
| embedded-hal-async = { version = "=1.0.0-rc.1" } | embedded-hal-async = { version = "=1.0.0-rc.1" } | ||||||
| embedded-hal = { version = "0.2", features = ["unproven"] } | embedded-hal = { version = "0.2", features = ["unproven"] } | ||||||
|   | |||||||
| @@ -1,6 +1,5 @@ | |||||||
| #![no_std] | #![no_std] | ||||||
| #![feature(async_fn_in_trait, impl_trait_projections)] | #![feature(async_fn_in_trait)] | ||||||
| #![allow(stable_features, unknown_lints, async_fn_in_trait)] |  | ||||||
| //! embassy-lora holds LoRa-specific functionality. | //! embassy-lora holds LoRa-specific functionality. | ||||||
|  |  | ||||||
| pub(crate) mod fmt; | pub(crate) mod fmt; | ||||||
|   | |||||||
| @@ -53,7 +53,8 @@ pub fn wasm() -> TokenStream { | |||||||
|     quote! { |     quote! { | ||||||
|         #[wasm_bindgen::prelude::wasm_bindgen(start)] |         #[wasm_bindgen::prelude::wasm_bindgen(start)] | ||||||
|         pub fn main() -> Result<(), wasm_bindgen::JsValue> { |         pub fn main() -> Result<(), wasm_bindgen::JsValue> { | ||||||
|             let executor = ::std::boxed::Box::leak(::std::boxed::Box::new(::embassy_executor::Executor::new())); |             static EXECUTOR: ::embassy_executor::_export::StaticCell<::embassy_executor::Executor> = ::embassy_executor::_export::StaticCell::new(); | ||||||
|  |             let executor = EXECUTOR.init(::embassy_executor::Executor::new()); | ||||||
|  |  | ||||||
|             executor.start(|spawner| { |             executor.start(|spawner| { | ||||||
|                 spawner.spawn(__embassy_main(spawner)).unwrap(); |                 spawner.spawn(__embassy_main(spawner)).unwrap(); | ||||||
|   | |||||||
| @@ -22,7 +22,9 @@ embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | |||||||
| bitfield = "0.14.0" | bitfield = "0.14.0" | ||||||
|  |  | ||||||
| [dev-dependencies] | [dev-dependencies] | ||||||
| embedded-hal-mock = { version = "=0.10.0-rc.1", features = ["embedded-hal-async", "eh1"] } | # reenable when https://github.com/dbrgn/embedded-hal-mock/pull/86 is merged. | ||||||
|  | #embedded-hal-mock = { git = "https://github.com/dbrgn/embedded-hal-mock", branch = "1-alpha", features = ["embedded-hal-async", "eh1"] }] } | ||||||
|  | embedded-hal-mock = { git = "https://github.com/newAM/embedded-hal-mock", branch = "eh1-rc.1", features = ["embedded-hal-async", "eh1"] } | ||||||
| crc = "3.0.1" | crc = "3.0.1" | ||||||
| env_logger = "0.10" | env_logger = "0.10" | ||||||
| critical-section = { version = "1.1.2", features = ["std"] } | critical-section = { version = "1.1.2", features = ["std"] } | ||||||
|   | |||||||
| @@ -1,6 +1,5 @@ | |||||||
| #![deny(clippy::pedantic)] | #![deny(clippy::pedantic)] | ||||||
| #![feature(async_fn_in_trait)] | #![feature(async_fn_in_trait)] | ||||||
| #![allow(stable_features, unknown_lints, async_fn_in_trait)] |  | ||||||
| #![cfg_attr(not(any(test, feature = "std")), no_std)] | #![cfg_attr(not(any(test, feature = "std")), no_std)] | ||||||
| #![allow(clippy::module_name_repetitions)] | #![allow(clippy::module_name_repetitions)] | ||||||
| #![allow(clippy::missing_errors_doc)] | #![allow(clippy::missing_errors_doc)] | ||||||
|   | |||||||
| @@ -24,6 +24,6 @@ features = ["defmt"] | |||||||
| defmt = { version = "0.3", optional = true } | defmt = { version = "0.3", optional = true } | ||||||
| log = { version = "0.4.14", optional = true } | log = { version = "0.4.14", optional = true } | ||||||
|  |  | ||||||
| embassy-sync = { version = "0.4.0", path = "../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../embassy-sync" } | ||||||
| embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | ||||||
| embassy-net-driver = { version = "0.2.0", path = "../embassy-net-driver" } | embassy-net-driver = { version = "0.2.0", path = "../embassy-net-driver" } | ||||||
|   | |||||||
| @@ -8,7 +8,7 @@ defmt = { version = "0.3", optional = true } | |||||||
| log = { version = "0.4.14", optional = true } | log = { version = "0.4.14", optional = true } | ||||||
|  |  | ||||||
| embassy-time = { version = "0.1.5", path = "../embassy-time" } | embassy-time = { version = "0.1.5", path = "../embassy-time" } | ||||||
| embassy-sync = { version = "0.4.0", path = "../embassy-sync"} | embassy-sync = { version = "0.3.0", path = "../embassy-sync"} | ||||||
| embassy-futures = { version = "0.1.0", path = "../embassy-futures"} | embassy-futures = { version = "0.1.0", path = "../embassy-futures"} | ||||||
| embassy-net-driver-channel = { version = "0.2.0", path = "../embassy-net-driver-channel"} | embassy-net-driver-channel = { version = "0.2.0", path = "../embassy-net-driver-channel"} | ||||||
|  |  | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ embedded-io-async = { version = "0.6.0" } | |||||||
| embassy-net-driver-channel = { version = "0.2.0", path = "../embassy-net-driver-channel" } | embassy-net-driver-channel = { version = "0.2.0", path = "../embassy-net-driver-channel" } | ||||||
| embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | ||||||
| ppproto = { version = "0.1.2"} | ppproto = { version = "0.1.2"} | ||||||
| embassy-sync = { version = "0.4.0", path = "../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../embassy-sync" } | ||||||
|  |  | ||||||
| [package.metadata.embassy_docs] | [package.metadata.embassy_docs] | ||||||
| src_base = "https://github.com/embassy-rs/embassy/blob/embassy-net-ppp-v$VERSION/embassy-net-ppp/src/" | src_base = "https://github.com/embassy-rs/embassy/blob/embassy-net-ppp-v$VERSION/embassy-net-ppp/src/" | ||||||
|   | |||||||
| @@ -1,6 +1,5 @@ | |||||||
| #![no_std] | #![no_std] | ||||||
| #![feature(async_fn_in_trait)] | #![feature(async_fn_in_trait)] | ||||||
| #![allow(stable_features, unknown_lints, async_fn_in_trait)] |  | ||||||
| #![doc = include_str!("../README.md")] | #![doc = include_str!("../README.md")] | ||||||
|  |  | ||||||
| pub mod chip; | pub mod chip; | ||||||
|   | |||||||
| @@ -5,11 +5,6 @@ All notable changes to this project will be documented in this file. | |||||||
| The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | ||||||
| and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). | and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). | ||||||
|  |  | ||||||
| ## 0.2.1 - 2023-10-31 |  | ||||||
|  |  | ||||||
| - Re-add impl_trait_projections |  | ||||||
| - Fix: Reset DHCP socket when the link up is detected  |  | ||||||
|  |  | ||||||
| ## 0.2.0 - 2023-10-18 | ## 0.2.0 - 2023-10-18 | ||||||
|  |  | ||||||
| - Re-export `smoltcp::wire::IpEndpoint` | - Re-export `smoltcp::wire::IpEndpoint` | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| [package] | [package] | ||||||
| name = "embassy-net" | name = "embassy-net" | ||||||
| version = "0.2.1" | version = "0.2.0" | ||||||
| edition = "2021" | edition = "2021" | ||||||
| license = "MIT OR Apache-2.0" | license = "MIT OR Apache-2.0" | ||||||
| description = "Async TCP/IP network stack for embedded systems" | description = "Async TCP/IP network stack for embedded systems" | ||||||
| @@ -53,7 +53,7 @@ smoltcp = { version = "0.10.0", default-features = false, features = [ | |||||||
|  |  | ||||||
| embassy-net-driver = { version = "0.2.0", path = "../embassy-net-driver" } | embassy-net-driver = { version = "0.2.0", path = "../embassy-net-driver" } | ||||||
| embassy-time = { version = "0.1.5", path = "../embassy-time" } | embassy-time = { version = "0.1.5", path = "../embassy-time" } | ||||||
| embassy-sync = { version = "0.4.0", path = "../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../embassy-sync" } | ||||||
| embedded-io-async = { version = "0.6.0", optional = true } | embedded-io-async = { version = "0.6.0", optional = true } | ||||||
|  |  | ||||||
| managed = { version = "0.8.0", default-features = false, features = [ "map" ] } | managed = { version = "0.8.0", default-features = false, features = [ "map" ] } | ||||||
|   | |||||||
| @@ -1,6 +1,5 @@ | |||||||
| #![cfg_attr(not(feature = "std"), no_std)] | #![cfg_attr(not(feature = "std"), no_std)] | ||||||
| #![cfg_attr(feature = "nightly", feature(async_fn_in_trait, impl_trait_projections))] | #![cfg_attr(feature = "nightly", feature(async_fn_in_trait))] | ||||||
| #![cfg_attr(feature = "nightly", allow(stable_features, unknown_lints, async_fn_in_trait))] |  | ||||||
| #![warn(missing_docs)] | #![warn(missing_docs)] | ||||||
| #![doc = include_str!("../README.md")] | #![doc = include_str!("../README.md")] | ||||||
|  |  | ||||||
|   | |||||||
| @@ -95,7 +95,7 @@ _nrf52832_anomaly_109 = [] | |||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-time = { version = "0.1.5", path = "../embassy-time", optional = true } | embassy-time = { version = "0.1.5", path = "../embassy-time", optional = true } | ||||||
| embassy-sync = { version = "0.4.0", path = "../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../embassy-sync" } | ||||||
| embassy-hal-internal = {version = "0.1.0", path = "../embassy-hal-internal", features = ["cortex-m", "prio-bits-3"] } | embassy-hal-internal = {version = "0.1.0", path = "../embassy-hal-internal", features = ["cortex-m", "prio-bits-3"] } | ||||||
| embassy-embedded-hal = {version = "0.1.0", path = "../embassy-embedded-hal" } | embassy-embedded-hal = {version = "0.1.0", path = "../embassy-embedded-hal" } | ||||||
| embassy-usb-driver = {version = "0.1.0", path = "../embassy-usb-driver", optional=true } | embassy-usb-driver = {version = "0.1.0", path = "../embassy-usb-driver", optional=true } | ||||||
| @@ -110,6 +110,7 @@ defmt = { version = "0.3", optional = true } | |||||||
| log = { version = "0.4.14", optional = true } | log = { version = "0.4.14", optional = true } | ||||||
| cortex-m-rt = ">=0.6.15,<0.8" | cortex-m-rt = ">=0.6.15,<0.8" | ||||||
| cortex-m = "0.7.6" | cortex-m = "0.7.6" | ||||||
|  | futures = { version = "0.3.17", default-features = false } | ||||||
| critical-section = "1.1" | critical-section = "1.1" | ||||||
| rand_core = "0.6.3" | rand_core = "0.6.3" | ||||||
| fixed = "1.10.0" | fixed = "1.10.0" | ||||||
|   | |||||||
| @@ -1,6 +1,5 @@ | |||||||
| #![no_std] | #![no_std] | ||||||
| #![cfg_attr(feature = "nightly", feature(async_fn_in_trait, impl_trait_projections))] | #![cfg_attr(feature = "nightly", feature(async_fn_in_trait))] | ||||||
| #![cfg_attr(feature = "nightly", allow(stable_features, unknown_lints, async_fn_in_trait))] |  | ||||||
| #![doc = include_str!("../README.md")] | #![doc = include_str!("../README.md")] | ||||||
| #![warn(missing_docs)] | #![warn(missing_docs)] | ||||||
|  |  | ||||||
|   | |||||||
| @@ -2,7 +2,6 @@ | |||||||
|  |  | ||||||
| #![macro_use] | #![macro_use] | ||||||
|  |  | ||||||
| use core::future::poll_fn; |  | ||||||
| use core::marker::PhantomData; | use core::marker::PhantomData; | ||||||
| use core::sync::atomic::{compiler_fence, Ordering}; | use core::sync::atomic::{compiler_fence, Ordering}; | ||||||
| use core::task::Poll; | use core::task::Poll; | ||||||
| @@ -10,6 +9,7 @@ use core::task::Poll; | |||||||
| use embassy_hal_internal::drop::OnDrop; | use embassy_hal_internal::drop::OnDrop; | ||||||
| use embassy_hal_internal::{into_ref, PeripheralRef}; | use embassy_hal_internal::{into_ref, PeripheralRef}; | ||||||
| use fixed::types::I7F1; | use fixed::types::I7F1; | ||||||
|  | use futures::future::poll_fn; | ||||||
|  |  | ||||||
| use crate::chip::EASY_DMA_SIZE; | use crate::chip::EASY_DMA_SIZE; | ||||||
| use crate::gpio::sealed::Pin; | use crate::gpio::sealed::Pin; | ||||||
|   | |||||||
| @@ -59,7 +59,7 @@ nightly = ["embedded-hal-1", "embedded-hal-async", "embedded-storage-async", "em | |||||||
| unstable-traits = ["embedded-hal-1", "embedded-hal-nb"] | unstable-traits = ["embedded-hal-1", "embedded-hal-nb"] | ||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-sync = { version = "0.4.0", path = "../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../embassy-sync" } | ||||||
| embassy-time = { version = "0.1.5", path = "../embassy-time", features = [ "tick-hz-1_000_000" ] } | embassy-time = { version = "0.1.5", path = "../embassy-time", features = [ "tick-hz-1_000_000" ] } | ||||||
| embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | ||||||
| embassy-hal-internal = {version = "0.1.0", path = "../embassy-hal-internal", features = ["cortex-m", "prio-bits-2"] } | embassy-hal-internal = {version = "0.1.0", path = "../embassy-hal-internal", features = ["cortex-m", "prio-bits-2"] } | ||||||
| @@ -94,5 +94,5 @@ pio = {version= "0.2.1" } | |||||||
| rp2040-boot2 = "0.3" | rp2040-boot2 = "0.3" | ||||||
|  |  | ||||||
| [dev-dependencies] | [dev-dependencies] | ||||||
| embassy-executor = { version = "0.3.1", path = "../embassy-executor", features = ["nightly", "arch-std", "executor-thread"] } | embassy-executor = { version = "0.3.0", path = "../embassy-executor", features = ["nightly", "arch-std", "executor-thread"] } | ||||||
| static_cell = { version = "2" } | static_cell = "1.1" | ||||||
|   | |||||||
| @@ -1,6 +1,5 @@ | |||||||
| #![no_std] | #![no_std] | ||||||
| #![cfg_attr(feature = "nightly", feature(async_fn_in_trait, impl_trait_projections))] | #![cfg_attr(feature = "nightly", feature(async_fn_in_trait))] | ||||||
| #![cfg_attr(feature = "nightly", allow(stable_features, unknown_lints, async_fn_in_trait))] |  | ||||||
|  |  | ||||||
| // This mod MUST go first, so that the others see its macros. | // This mod MUST go first, so that the others see its macros. | ||||||
| pub(crate) mod fmt; | pub(crate) mod fmt; | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ features = ["stm32wb55rg"] | |||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../embassy-stm32" } | embassy-stm32 = { version = "0.1.0", path = "../embassy-stm32" } | ||||||
| embassy-sync = { version = "0.4.0", path = "../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../embassy-sync" } | ||||||
| embassy-time = { version = "0.1.5", path = "../embassy-time", optional = true } | embassy-time = { version = "0.1.5", path = "../embassy-time", optional = true } | ||||||
| embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | ||||||
| embassy-hal-internal = { version = "0.1.0", path = "../embassy-hal-internal" } | embassy-hal-internal = { version = "0.1.0", path = "../embassy-hal-internal" } | ||||||
|   | |||||||
| @@ -1,9 +1,5 @@ | |||||||
| #![no_std] | #![no_std] | ||||||
| #![cfg_attr(any(feature = "ble", feature = "mac"), feature(async_fn_in_trait))] | #![cfg_attr(any(feature = "ble", feature = "mac"), feature(async_fn_in_trait))] | ||||||
| #![cfg_attr( |  | ||||||
|     any(feature = "ble", feature = "mac"), |  | ||||||
|     allow(stable_features, unknown_lints, async_fn_in_trait) |  | ||||||
| )] |  | ||||||
| #![cfg_attr(feature = "mac", feature(type_alias_impl_trait, concat_bytes))] | #![cfg_attr(feature = "mac", feature(type_alias_impl_trait, concat_bytes))] | ||||||
|  |  | ||||||
| // This must go FIRST so that all the other modules see its macros. | // This must go FIRST so that all the other modules see its macros. | ||||||
|   | |||||||
| @@ -1,3 +1,4 @@ | |||||||
|  | #![allow(incomplete_features)] | ||||||
| #![deny(unused_must_use)] | #![deny(unused_must_use)] | ||||||
|  |  | ||||||
| use core::task::Context; | use core::task::Context; | ||||||
|   | |||||||
| @@ -32,14 +32,14 @@ flavors = [ | |||||||
| ] | ] | ||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-sync = { version = "0.4.0", path = "../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../embassy-sync" } | ||||||
| embassy-time = { version = "0.1.5", path = "../embassy-time", optional = true } | embassy-time = { version = "0.1.5", path = "../embassy-time", optional = true } | ||||||
| embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | ||||||
| embassy-hal-internal = {version = "0.1.0", path = "../embassy-hal-internal", features = ["cortex-m", "prio-bits-4"] } | embassy-hal-internal = {version = "0.1.0", path = "../embassy-hal-internal", features = ["cortex-m", "prio-bits-4"] } | ||||||
| embassy-embedded-hal = {version = "0.1.0", path = "../embassy-embedded-hal" } | embassy-embedded-hal = {version = "0.1.0", path = "../embassy-embedded-hal" } | ||||||
| embassy-net-driver = { version = "0.2.0", path = "../embassy-net-driver" } | embassy-net-driver = { version = "0.2.0", path = "../embassy-net-driver" } | ||||||
| embassy-usb-driver = {version = "0.1.0", path = "../embassy-usb-driver", optional = true } | embassy-usb-driver = {version = "0.1.0", path = "../embassy-usb-driver", optional = true } | ||||||
| embassy-executor = { version = "0.3.1", path = "../embassy-executor", optional = true } | embassy-executor = { version = "0.3.0", path = "../embassy-executor", optional = true } | ||||||
|  |  | ||||||
| embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } | embedded-hal-02 = { package = "embedded-hal", version = "0.2.6", features = ["unproven"] } | ||||||
| embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1", optional = true} | embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.1", optional = true} | ||||||
| @@ -58,7 +58,7 @@ rand_core = "0.6.3" | |||||||
| sdio-host = "0.5.0" | sdio-host = "0.5.0" | ||||||
| embedded-sdmmc = { git = "https://github.com/embassy-rs/embedded-sdmmc-rs", rev = "a4f293d3a6f72158385f79c98634cb8a14d0d2fc", optional = true } | embedded-sdmmc = { git = "https://github.com/embassy-rs/embedded-sdmmc-rs", rev = "a4f293d3a6f72158385f79c98634cb8a14d0d2fc", optional = true } | ||||||
| critical-section = "1.1" | critical-section = "1.1" | ||||||
| stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-73b8c37ae74fc28b247188c989fd99400611bd6b" } | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-bcc9b6bf9fa195e91625849efc4ba473d9ace4e9" } | ||||||
| vcell = "0.1.3" | vcell = "0.1.3" | ||||||
| bxcan = "0.7.0" | bxcan = "0.7.0" | ||||||
| nb = "1.0.0" | nb = "1.0.0" | ||||||
| @@ -76,7 +76,7 @@ critical-section = { version = "1.1", features = ["std"] } | |||||||
| [build-dependencies] | [build-dependencies] | ||||||
| proc-macro2 = "1.0.36" | proc-macro2 = "1.0.36" | ||||||
| quote = "1.0.15" | quote = "1.0.15" | ||||||
| stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-73b8c37ae74fc28b247188c989fd99400611bd6b", default-features = false, features = ["metadata"]} | stm32-metapac = { git = "https://github.com/embassy-rs/stm32-data-generated", tag = "stm32-data-bcc9b6bf9fa195e91625849efc4ba473d9ace4e9", default-features = false, features = ["metadata"]} | ||||||
|  |  | ||||||
|  |  | ||||||
| [features] | [features] | ||||||
|   | |||||||
| @@ -47,9 +47,6 @@ pub unsafe fn on_irq() { | |||||||
|     #[cfg(any(exti_c0, exti_g0, exti_l5, exti_u5, exti_h5, exti_h50))] |     #[cfg(any(exti_c0, exti_g0, exti_l5, exti_u5, exti_h5, exti_h50))] | ||||||
|     let bits = EXTI.rpr(0).read().0 | EXTI.fpr(0).read().0; |     let bits = EXTI.rpr(0).read().0 | EXTI.fpr(0).read().0; | ||||||
|  |  | ||||||
|     // We don't handle or change any EXTI lines above 16. |  | ||||||
|     let bits = bits & 0x0000FFFF; |  | ||||||
|  |  | ||||||
|     // Mask all the channels that fired. |     // Mask all the channels that fired. | ||||||
|     cpu_regs().imr(0).modify(|w| w.0 &= !bits); |     cpu_regs().imr(0).modify(|w| w.0 &= !bits); | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1,6 +1,5 @@ | |||||||
| #![cfg_attr(not(test), no_std)] | #![cfg_attr(not(test), no_std)] | ||||||
| #![cfg_attr(feature = "nightly", feature(async_fn_in_trait, impl_trait_projections))] | #![cfg_attr(feature = "nightly", feature(async_fn_in_trait))] | ||||||
| #![cfg_attr(feature = "nightly", allow(stable_features, unknown_lints, async_fn_in_trait))] |  | ||||||
|  |  | ||||||
| //! ## Feature flags | //! ## Feature flags | ||||||
| #![doc = document_features::document_features!(feature_label = r#"<span class="stab portability"><code>{feature}</code></span>"#)] | #![doc = document_features::document_features!(feature_label = r#"<span class="stab portability"><code>{feature}</code></span>"#)] | ||||||
|   | |||||||
| @@ -61,7 +61,7 @@ pub struct Executor { | |||||||
| impl Executor { | impl Executor { | ||||||
|     /// Create a new Executor. |     /// Create a new Executor. | ||||||
|     pub fn take() -> &'static mut Self { |     pub fn take() -> &'static mut Self { | ||||||
|         critical_section::with(|_| unsafe { |         unsafe { | ||||||
|             assert!(EXECUTOR.is_none()); |             assert!(EXECUTOR.is_none()); | ||||||
|  |  | ||||||
|             EXECUTOR = Some(Self { |             EXECUTOR = Some(Self { | ||||||
| @@ -72,7 +72,7 @@ impl Executor { | |||||||
|             }); |             }); | ||||||
|  |  | ||||||
|             EXECUTOR.as_mut().unwrap() |             EXECUTOR.as_mut().unwrap() | ||||||
|         }) |         } | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     unsafe fn on_wakeup_irq(&mut self) { |     unsafe fn on_wakeup_irq(&mut self) { | ||||||
|   | |||||||
| @@ -152,9 +152,9 @@ pub(crate) unsafe fn init(config: Config) { | |||||||
|         source: config.pll_src, |         source: config.pll_src, | ||||||
|     }; |     }; | ||||||
|     let pll = init_pll(PllInstance::Pll, config.pll, &pll_input); |     let pll = init_pll(PllInstance::Pll, config.pll, &pll_input); | ||||||
|     #[cfg(any(all(stm32f4, not(stm32f410)), stm32f7))] |     #[cfg(any(all(stm32f4, not(any(stm32f410, stm32f429))), stm32f7))] | ||||||
|     let _plli2s = init_pll(PllInstance::Plli2s, config.plli2s, &pll_input); |     let _plli2s = init_pll(PllInstance::Plli2s, config.plli2s, &pll_input); | ||||||
|     #[cfg(any(stm32f446, stm32f427, stm32f437, stm32f4x9, stm32f7))] |     #[cfg(all(any(stm32f446, stm32f427, stm32f437, stm32f4x9, stm32f7), not(stm32f429)))] | ||||||
|     let _pllsai = init_pll(PllInstance::Pllsai, config.pllsai, &pll_input); |     let _pllsai = init_pll(PllInstance::Pllsai, config.pllsai, &pll_input); | ||||||
|  |  | ||||||
|     // Configure sysclk |     // Configure sysclk | ||||||
| @@ -197,15 +197,25 @@ pub(crate) unsafe fn init(config: Config) { | |||||||
|         pclk2_tim, |         pclk2_tim, | ||||||
|         rtc, |         rtc, | ||||||
|         pll1_q: pll.q, |         pll1_q: pll.q, | ||||||
|         #[cfg(all(rcc_f4, not(stm32f410)))] |         #[cfg(all(rcc_f4, not(any(stm32f410, stm32f429))))] | ||||||
|         plli2s1_q: _plli2s.q, |         plli2s1_q: _plli2s.q, | ||||||
|         #[cfg(all(rcc_f4, not(stm32f410)))] |         #[cfg(all(rcc_f4, not(any(stm32f410, stm32f429))))] | ||||||
|         plli2s1_r: _plli2s.r, |         plli2s1_r: _plli2s.r, | ||||||
|  |  | ||||||
|         #[cfg(any(stm32f427, stm32f429, stm32f437, stm32f439, stm32f446, stm32f469, stm32f479))] |         #[cfg(stm32f429)] | ||||||
|  |         plli2s1_q: None, | ||||||
|  |         #[cfg(stm32f429)] | ||||||
|  |         plli2s1_r: None, | ||||||
|  |  | ||||||
|  |         #[cfg(any(stm32f427, stm32f437, stm32f439, stm32f446, stm32f469, stm32f479))] | ||||||
|         pllsai1_q: _pllsai.q, |         pllsai1_q: _pllsai.q, | ||||||
|         #[cfg(any(stm32f427, stm32f429, stm32f437, stm32f439, stm32f446, stm32f469, stm32f479))] |         #[cfg(any(stm32f427, stm32f437, stm32f439, stm32f446, stm32f469, stm32f479))] | ||||||
|         pllsai1_r: _pllsai.r, |         pllsai1_r: _pllsai.r, | ||||||
|  |  | ||||||
|  |         #[cfg(stm32f429)] | ||||||
|  |         pllsai1_q: None, | ||||||
|  |         #[cfg(stm32f429)] | ||||||
|  |         pllsai1_r: None, | ||||||
|     }); |     }); | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -223,6 +233,7 @@ struct PllOutput { | |||||||
|     r: Option<Hertz>, |     r: Option<Hertz>, | ||||||
| } | } | ||||||
|  |  | ||||||
|  | #[allow(dead_code)] | ||||||
| #[derive(PartialEq, Eq, Clone, Copy)] | #[derive(PartialEq, Eq, Clone, Copy)] | ||||||
| enum PllInstance { | enum PllInstance { | ||||||
|     Pll, |     Pll, | ||||||
|   | |||||||
| @@ -4,8 +4,8 @@ pub use crate::pac::rcc::vals::Clk48sel as Clk48Src; | |||||||
| #[cfg(any(stm32wb, stm32wl))] | #[cfg(any(stm32wb, stm32wl))] | ||||||
| pub use crate::pac::rcc::vals::Hsepre as HsePrescaler; | pub use crate::pac::rcc::vals::Hsepre as HsePrescaler; | ||||||
| pub use crate::pac::rcc::vals::{ | pub use crate::pac::rcc::vals::{ | ||||||
|     Adcsel as AdcClockSource, Hpre as AHBPrescaler, Msirange as MSIRange, Pllm as PllPreDiv, Plln as PllMul, |     Hpre as AHBPrescaler, Msirange as MSIRange, Pllm as PllPreDiv, Plln as PllMul, Pllp as PllPDiv, Pllq as PllQDiv, | ||||||
|     Pllp as PllPDiv, Pllq as PllQDiv, Pllr as PllRDiv, Pllsrc as PLLSource, Ppre as APBPrescaler, Sw as ClockSrc, |     Pllr as PllRDiv, Pllsrc as PLLSource, Ppre as APBPrescaler, Sw as ClockSrc, | ||||||
| }; | }; | ||||||
| use crate::pac::{FLASH, RCC}; | use crate::pac::{FLASH, RCC}; | ||||||
| use crate::rcc::{set_freqs, Clocks}; | use crate::rcc::{set_freqs, Clocks}; | ||||||
| @@ -52,7 +52,7 @@ pub struct Pll { | |||||||
|     pub divr: Option<PllRDiv>, |     pub divr: Option<PllRDiv>, | ||||||
| } | } | ||||||
|  |  | ||||||
| /// Clocks configuration | /// Clocks configutation | ||||||
| pub struct Config { | pub struct Config { | ||||||
|     // base clock sources |     // base clock sources | ||||||
|     pub msi: Option<MSIRange>, |     pub msi: Option<MSIRange>, | ||||||
| @@ -84,8 +84,6 @@ pub struct Config { | |||||||
|  |  | ||||||
|     // low speed LSI/LSE/RTC |     // low speed LSI/LSE/RTC | ||||||
|     pub ls: super::LsConfig, |     pub ls: super::LsConfig, | ||||||
|  |  | ||||||
|     pub adc_clock_source: AdcClockSource, |  | ||||||
| } | } | ||||||
|  |  | ||||||
| impl Default for Config { | impl Default for Config { | ||||||
| @@ -113,7 +111,6 @@ impl Default for Config { | |||||||
|             #[cfg(any(stm32l4, stm32l5, stm32wb))] |             #[cfg(any(stm32l4, stm32l5, stm32wb))] | ||||||
|             clk48_src: Clk48Src::HSI48, |             clk48_src: Clk48Src::HSI48, | ||||||
|             ls: Default::default(), |             ls: Default::default(), | ||||||
|             adc_clock_source: AdcClockSource::SYS, |  | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @@ -148,7 +145,6 @@ pub const WPAN_DEFAULT: Config = Config { | |||||||
|     shared_ahb_pre: AHBPrescaler::DIV1, |     shared_ahb_pre: AHBPrescaler::DIV1, | ||||||
|     apb1_pre: APBPrescaler::DIV1, |     apb1_pre: APBPrescaler::DIV1, | ||||||
|     apb2_pre: APBPrescaler::DIV1, |     apb2_pre: APBPrescaler::DIV1, | ||||||
|     adc_clock_source: AdcClockSource::SYS, |  | ||||||
| }; | }; | ||||||
|  |  | ||||||
| pub(crate) unsafe fn init(config: Config) { | pub(crate) unsafe fn init(config: Config) { | ||||||
| @@ -348,11 +344,6 @@ pub(crate) unsafe fn init(config: Config) { | |||||||
|     }); |     }); | ||||||
|     while RCC.cfgr().read().sws() != config.mux {} |     while RCC.cfgr().read().sws() != config.mux {} | ||||||
|  |  | ||||||
|     #[cfg(stm32l5)] |  | ||||||
|     RCC.ccipr1().modify(|w| w.set_adcsel(config.adc_clock_source)); |  | ||||||
|     #[cfg(not(stm32l5))] |  | ||||||
|     RCC.ccipr().modify(|w| w.set_adcsel(config.adc_clock_source)); |  | ||||||
|  |  | ||||||
|     #[cfg(any(stm32wl, stm32wb))] |     #[cfg(any(stm32wl, stm32wb))] | ||||||
|     { |     { | ||||||
|         RCC.extcfgr().modify(|w| { |         RCC.extcfgr().modify(|w| { | ||||||
|   | |||||||
| @@ -18,13 +18,9 @@ pub struct RtcInstant { | |||||||
| } | } | ||||||
|  |  | ||||||
| impl RtcInstant { | impl RtcInstant { | ||||||
|     #[cfg(not(rtc_v2f2))] |     #[allow(dead_code)] | ||||||
|     pub(super) const fn from(second: u8, subsecond: u16) -> Result<Self, Error> { |     pub(super) fn from(second: u8, subsecond: u16) -> Result<Self, super::RtcError> { | ||||||
|         if second > 59 { |         Ok(Self { second, subsecond }) | ||||||
|             Err(Error::InvalidSecond) |  | ||||||
|         } else { |  | ||||||
|             Ok(Self { second, subsecond }) |  | ||||||
|         } |  | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -199,13 +195,13 @@ impl From<DateTime> for chrono::NaiveDateTime { | |||||||
| #[derive(Copy, Clone, Debug, PartialEq, Eq, Ord, PartialOrd, Hash)] | #[derive(Copy, Clone, Debug, PartialEq, Eq, Ord, PartialOrd, Hash)] | ||||||
| #[allow(missing_docs)] | #[allow(missing_docs)] | ||||||
| pub enum DayOfWeek { | pub enum DayOfWeek { | ||||||
|     Monday = 1, |     Monday = 0, | ||||||
|     Tuesday = 2, |     Tuesday = 1, | ||||||
|     Wednesday = 3, |     Wednesday = 2, | ||||||
|     Thursday = 4, |     Thursday = 3, | ||||||
|     Friday = 5, |     Friday = 4, | ||||||
|     Saturday = 6, |     Saturday = 5, | ||||||
|     Sunday = 7, |     Sunday = 6, | ||||||
| } | } | ||||||
|  |  | ||||||
| #[cfg(feature = "chrono")] | #[cfg(feature = "chrono")] | ||||||
| @@ -230,19 +226,37 @@ impl From<DayOfWeek> for chrono::Weekday { | |||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| pub(super) const fn day_of_week_from_u8(v: u8) -> Result<DayOfWeek, Error> { | fn day_of_week_from_u8(v: u8) -> Result<DayOfWeek, Error> { | ||||||
|     Ok(match v { |     Ok(match v { | ||||||
|         1 => DayOfWeek::Monday, |         0 => DayOfWeek::Monday, | ||||||
|         2 => DayOfWeek::Tuesday, |         1 => DayOfWeek::Tuesday, | ||||||
|         3 => DayOfWeek::Wednesday, |         2 => DayOfWeek::Wednesday, | ||||||
|         4 => DayOfWeek::Thursday, |         3 => DayOfWeek::Thursday, | ||||||
|         5 => DayOfWeek::Friday, |         4 => DayOfWeek::Friday, | ||||||
|         6 => DayOfWeek::Saturday, |         5 => DayOfWeek::Saturday, | ||||||
|         7 => DayOfWeek::Sunday, |         6 => DayOfWeek::Sunday, | ||||||
|         x => return Err(Error::InvalidDayOfWeek(x)), |         x => return Err(Error::InvalidDayOfWeek(x)), | ||||||
|     }) |     }) | ||||||
| } | } | ||||||
|  |  | ||||||
| pub(super) const fn day_of_week_to_u8(dotw: DayOfWeek) -> u8 { | pub(super) fn day_of_week_to_u8(dotw: DayOfWeek) -> u8 { | ||||||
|     dotw as u8 |     dotw as u8 | ||||||
| } | } | ||||||
|  |  | ||||||
|  | pub(super) fn validate_datetime(dt: &DateTime) -> Result<(), Error> { | ||||||
|  |     if dt.year > 4095 { | ||||||
|  |         Err(Error::InvalidYear) | ||||||
|  |     } else if dt.month < 1 || dt.month > 12 { | ||||||
|  |         Err(Error::InvalidMonth) | ||||||
|  |     } else if dt.day < 1 || dt.day > 31 { | ||||||
|  |         Err(Error::InvalidDay) | ||||||
|  |     } else if dt.hour > 23 { | ||||||
|  |         Err(Error::InvalidHour) | ||||||
|  |     } else if dt.minute > 59 { | ||||||
|  |         Err(Error::InvalidMinute) | ||||||
|  |     } else if dt.second > 59 { | ||||||
|  |         Err(Error::InvalidSecond) | ||||||
|  |     } else { | ||||||
|  |         Ok(()) | ||||||
|  |     } | ||||||
|  | } | ||||||
|   | |||||||
| @@ -9,11 +9,8 @@ use embassy_sync::blocking_mutex::raw::CriticalSectionRawMutex; | |||||||
| #[cfg(feature = "low-power")] | #[cfg(feature = "low-power")] | ||||||
| use embassy_sync::blocking_mutex::Mutex; | use embassy_sync::blocking_mutex::Mutex; | ||||||
|  |  | ||||||
| use self::datetime::day_of_week_to_u8; | pub use self::datetime::{DateTime, DayOfWeek, Error as DateTimeError, RtcInstant}; | ||||||
| #[cfg(not(rtc_v2f2))] | use crate::rtc::datetime::day_of_week_to_u8; | ||||||
| use self::datetime::RtcInstant; |  | ||||||
| pub use self::datetime::{DateTime, DayOfWeek, Error as DateTimeError}; |  | ||||||
| use crate::pac::rtc::regs::{Dr, Tr}; |  | ||||||
| use crate::time::Hertz; | use crate::time::Hertz; | ||||||
|  |  | ||||||
| /// refer to AN4759 to compare features of RTC2 and RTC3 | /// refer to AN4759 to compare features of RTC2 and RTC3 | ||||||
| @@ -34,15 +31,11 @@ use crate::peripherals::RTC; | |||||||
| use crate::rtc::sealed::Instance; | use crate::rtc::sealed::Instance; | ||||||
|  |  | ||||||
| /// Errors that can occur on methods on [RtcClock] | /// Errors that can occur on methods on [RtcClock] | ||||||
| #[non_exhaustive] |  | ||||||
| #[derive(Clone, Debug, PartialEq, Eq)] | #[derive(Clone, Debug, PartialEq, Eq)] | ||||||
| pub enum RtcError { | pub enum RtcError { | ||||||
|     /// An invalid DateTime was given or stored on the hardware. |     /// An invalid DateTime was given or stored on the hardware. | ||||||
|     InvalidDateTime(DateTimeError), |     InvalidDateTime(DateTimeError), | ||||||
|  |  | ||||||
|     /// The current time could not be read |  | ||||||
|     ReadFailure, |  | ||||||
|  |  | ||||||
|     /// The RTC clock is not running |     /// The RTC clock is not running | ||||||
|     NotRunning, |     NotRunning, | ||||||
| } | } | ||||||
| @@ -52,25 +45,48 @@ pub struct RtcTimeProvider { | |||||||
| } | } | ||||||
|  |  | ||||||
| impl RtcTimeProvider { | impl RtcTimeProvider { | ||||||
|     #[cfg(not(rtc_v2f2))] |  | ||||||
|     pub(crate) fn instant(&self) -> Result<RtcInstant, RtcError> { |  | ||||||
|         self.read(|_, tr, ss| { |  | ||||||
|             let second = bcd2_to_byte((tr.st(), tr.su())); |  | ||||||
|  |  | ||||||
|             RtcInstant::from(second, ss).map_err(RtcError::InvalidDateTime) |  | ||||||
|         }) |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     /// Return the current datetime. |     /// Return the current datetime. | ||||||
|     /// |     /// | ||||||
|     /// # Errors |     /// # Errors | ||||||
|     /// |     /// | ||||||
|     /// Will return an `RtcError::InvalidDateTime` if the stored value in the system is not a valid [`DayOfWeek`]. |     /// Will return an `RtcError::InvalidDateTime` if the stored value in the system is not a valid [`DayOfWeek`]. | ||||||
|     pub fn now(&self) -> Result<DateTime, RtcError> { |     pub fn now(&self) -> Result<DateTime, RtcError> { | ||||||
|         self.read(|dr, tr, _| { |         // For RM0433 we use BYPSHAD=1 to work around errata ES0392 2.19.1 | ||||||
|  |         #[cfg(rcc_h7rm0433)] | ||||||
|  |         loop { | ||||||
|  |             let r = RTC::regs(); | ||||||
|  |             let ss = r.ssr().read().ss(); | ||||||
|  |             let dr = r.dr().read(); | ||||||
|  |             let tr = r.tr().read(); | ||||||
|  |  | ||||||
|  |             // If an RTCCLK edge occurs during read we may see inconsistent values | ||||||
|  |             // so read ssr again and see if it has changed. (see RM0433 Rev 7 46.3.9) | ||||||
|  |             let ss_after = r.ssr().read().ss(); | ||||||
|  |             if ss == ss_after { | ||||||
|  |                 let second = bcd2_to_byte((tr.st(), tr.su())); | ||||||
|  |                 let minute = bcd2_to_byte((tr.mnt(), tr.mnu())); | ||||||
|  |                 let hour = bcd2_to_byte((tr.ht(), tr.hu())); | ||||||
|  |  | ||||||
|  |                 let weekday = dr.wdu(); | ||||||
|  |                 let day = bcd2_to_byte((dr.dt(), dr.du())); | ||||||
|  |                 let month = bcd2_to_byte((dr.mt() as u8, dr.mu())); | ||||||
|  |                 let year = bcd2_to_byte((dr.yt(), dr.yu())) as u16 + 1970_u16; | ||||||
|  |  | ||||||
|  |                 return DateTime::from(year, month, day, weekday, hour, minute, second) | ||||||
|  |                     .map_err(RtcError::InvalidDateTime); | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         #[cfg(not(rcc_h7rm0433))] | ||||||
|  |         { | ||||||
|  |             let r = RTC::regs(); | ||||||
|  |             let tr = r.tr().read(); | ||||||
|             let second = bcd2_to_byte((tr.st(), tr.su())); |             let second = bcd2_to_byte((tr.st(), tr.su())); | ||||||
|             let minute = bcd2_to_byte((tr.mnt(), tr.mnu())); |             let minute = bcd2_to_byte((tr.mnt(), tr.mnu())); | ||||||
|             let hour = bcd2_to_byte((tr.ht(), tr.hu())); |             let hour = bcd2_to_byte((tr.ht(), tr.hu())); | ||||||
|  |             // Reading either RTC_SSR or RTC_TR locks the values in the higher-order | ||||||
|  |             // calendar shadow registers until RTC_DR is read. | ||||||
|  |             let dr = r.dr().read(); | ||||||
|  |  | ||||||
|             let weekday = dr.wdu(); |             let weekday = dr.wdu(); | ||||||
|             let day = bcd2_to_byte((dr.dt(), dr.du())); |             let day = bcd2_to_byte((dr.dt(), dr.du())); | ||||||
| @@ -78,33 +94,7 @@ impl RtcTimeProvider { | |||||||
|             let year = bcd2_to_byte((dr.yt(), dr.yu())) as u16 + 1970_u16; |             let year = bcd2_to_byte((dr.yt(), dr.yu())) as u16 + 1970_u16; | ||||||
|  |  | ||||||
|             DateTime::from(year, month, day, weekday, hour, minute, second).map_err(RtcError::InvalidDateTime) |             DateTime::from(year, month, day, weekday, hour, minute, second).map_err(RtcError::InvalidDateTime) | ||||||
|         }) |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     fn read<R>(&self, mut f: impl FnMut(Dr, Tr, u16) -> Result<R, RtcError>) -> Result<R, RtcError> { |  | ||||||
|         let r = RTC::regs(); |  | ||||||
|  |  | ||||||
|         #[cfg(not(rtc_v2f2))] |  | ||||||
|         let read_ss = || r.ssr().read().ss(); |  | ||||||
|         #[cfg(rtc_v2f2)] |  | ||||||
|         let read_ss = || 0; |  | ||||||
|  |  | ||||||
|         let mut ss = read_ss(); |  | ||||||
|         for _ in 0..5 { |  | ||||||
|             let tr = r.tr().read(); |  | ||||||
|             let dr = r.dr().read(); |  | ||||||
|             let ss_after = read_ss(); |  | ||||||
|  |  | ||||||
|             // If an RTCCLK edge occurs during read we may see inconsistent values |  | ||||||
|             // so read ssr again and see if it has changed. (see RM0433 Rev 7 46.3.9) |  | ||||||
|             if ss == ss_after { |  | ||||||
|                 return f(dr, tr, ss.try_into().unwrap()); |  | ||||||
|             } else { |  | ||||||
|                 ss = ss_after |  | ||||||
|             } |  | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         return Err(RtcError::ReadFailure); |  | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -155,7 +145,6 @@ impl Rtc { | |||||||
|         #[cfg(not(any(stm32l0, stm32f3, stm32l1, stm32f0, stm32f2)))] |         #[cfg(not(any(stm32l0, stm32f3, stm32l1, stm32f0, stm32f2)))] | ||||||
|         critical_section::with(|cs| { |         critical_section::with(|cs| { | ||||||
|             <RTC as crate::rcc::sealed::RccPeripheral>::enable_and_reset_with_cs(cs); |             <RTC as crate::rcc::sealed::RccPeripheral>::enable_and_reset_with_cs(cs); | ||||||
|  |  | ||||||
|             #[cfg(feature = "low-power")] |             #[cfg(feature = "low-power")] | ||||||
|             unsafe { |             unsafe { | ||||||
|                 crate::rcc::REFCOUNT_STOP2 -= 1 |                 crate::rcc::REFCOUNT_STOP2 -= 1 | ||||||
| @@ -175,14 +164,6 @@ impl Rtc { | |||||||
|  |  | ||||||
|         this.configure(async_psc, sync_psc); |         this.configure(async_psc, sync_psc); | ||||||
|  |  | ||||||
|         // Wait for the clock to update after initialization |  | ||||||
|         #[cfg(not(rtc_v2f2))] |  | ||||||
|         { |  | ||||||
|             let now = this.instant().unwrap(); |  | ||||||
|  |  | ||||||
|             while this.instant().unwrap().subsecond == now.subsecond {} |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         this |         this | ||||||
|     } |     } | ||||||
|  |  | ||||||
| @@ -202,6 +183,7 @@ impl Rtc { | |||||||
|     /// |     /// | ||||||
|     /// Will return `RtcError::InvalidDateTime` if the datetime is not a valid range. |     /// Will return `RtcError::InvalidDateTime` if the datetime is not a valid range. | ||||||
|     pub fn set_datetime(&mut self, t: DateTime) -> Result<(), RtcError> { |     pub fn set_datetime(&mut self, t: DateTime) -> Result<(), RtcError> { | ||||||
|  |         self::datetime::validate_datetime(&t).map_err(RtcError::InvalidDateTime)?; | ||||||
|         self.write(true, |rtc| { |         self.write(true, |rtc| { | ||||||
|             let (ht, hu) = byte_to_bcd2(t.hour() as u8); |             let (ht, hu) = byte_to_bcd2(t.hour() as u8); | ||||||
|             let (mnt, mnu) = byte_to_bcd2(t.minute() as u8); |             let (mnt, mnu) = byte_to_bcd2(t.minute() as u8); | ||||||
| @@ -241,8 +223,16 @@ impl Rtc { | |||||||
|  |  | ||||||
|     #[cfg(not(rtc_v2f2))] |     #[cfg(not(rtc_v2f2))] | ||||||
|     /// Return the current instant. |     /// Return the current instant. | ||||||
|     fn instant(&self) -> Result<RtcInstant, RtcError> { |     pub fn instant(&self) -> Result<RtcInstant, RtcError> { | ||||||
|         self.time_provider().instant() |         let r = RTC::regs(); | ||||||
|  |         let tr = r.tr().read(); | ||||||
|  |         let subsecond = r.ssr().read().ss(); | ||||||
|  |         let second = bcd2_to_byte((tr.st(), tr.su())); | ||||||
|  |  | ||||||
|  |         // Unlock the registers | ||||||
|  |         r.dr().read(); | ||||||
|  |  | ||||||
|  |         RtcInstant::from(second, subsecond.try_into().unwrap()) | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     /// Return the current datetime. |     /// Return the current datetime. | ||||||
|   | |||||||
| @@ -150,14 +150,14 @@ impl super::Rtc { | |||||||
|     pub(super) fn configure(&mut self, async_psc: u8, sync_psc: u16) { |     pub(super) fn configure(&mut self, async_psc: u8, sync_psc: u16) { | ||||||
|         self.write(true, |rtc| { |         self.write(true, |rtc| { | ||||||
|             rtc.cr().modify(|w| { |             rtc.cr().modify(|w| { | ||||||
|                 #[cfg(not(rtc_v2f2))] |  | ||||||
|                 w.set_bypshad(true); |  | ||||||
|                 #[cfg(rtc_v2f2)] |                 #[cfg(rtc_v2f2)] | ||||||
|                 w.set_fmt(false); |                 w.set_fmt(false); | ||||||
|                 #[cfg(not(rtc_v2f2))] |                 #[cfg(not(rtc_v2f2))] | ||||||
|                 w.set_fmt(stm32_metapac::rtc::vals::Fmt::TWENTY_FOUR_HOUR); |                 w.set_fmt(stm32_metapac::rtc::vals::Fmt::TWENTY_FOUR_HOUR); | ||||||
|                 w.set_osel(Osel::DISABLED); |                 w.set_osel(Osel::DISABLED); | ||||||
|                 w.set_pol(Pol::HIGH); |                 w.set_pol(Pol::HIGH); | ||||||
|  |                 #[cfg(rcc_h7rm0433)] | ||||||
|  |                 w.set_bypshad(true); | ||||||
|             }); |             }); | ||||||
|  |  | ||||||
|             rtc.prer().modify(|w| { |             rtc.prer().modify(|w| { | ||||||
|   | |||||||
| @@ -11,7 +11,6 @@ impl super::Rtc { | |||||||
|     pub(super) fn configure(&mut self, async_psc: u8, sync_psc: u16) { |     pub(super) fn configure(&mut self, async_psc: u8, sync_psc: u16) { | ||||||
|         self.write(true, |rtc| { |         self.write(true, |rtc| { | ||||||
|             rtc.cr().modify(|w| { |             rtc.cr().modify(|w| { | ||||||
|                 w.set_bypshad(true); |  | ||||||
|                 w.set_fmt(Fmt::TWENTYFOURHOUR); |                 w.set_fmt(Fmt::TWENTYFOURHOUR); | ||||||
|                 w.set_osel(Osel::DISABLED); |                 w.set_osel(Osel::DISABLED); | ||||||
|                 w.set_pol(Pol::HIGH); |                 w.set_pol(Pol::HIGH); | ||||||
|   | |||||||
| @@ -5,14 +5,9 @@ All notable changes to this project will be documented in this file. | |||||||
| The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), | ||||||
| and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). | and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). | ||||||
|  |  | ||||||
| ## 0.4.0 - 2023-10-31 |  | ||||||
|  |  | ||||||
| - Re-add impl_trait_projections |  | ||||||
| - switch to `embedded-io 0.6` |  | ||||||
|  |  | ||||||
| ## 0.3.0 - 2023-09-14 | ## 0.3.0 - 2023-09-14 | ||||||
|  |  | ||||||
| - switch to `embedded-io 0.5` | - switch to embedded-io 0.5 | ||||||
| - add api for polling channels with context | - add api for polling channels with context | ||||||
| - standardise fn names on channels | - standardise fn names on channels | ||||||
| - add zero-copy channel | - add zero-copy channel | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| [package] | [package] | ||||||
| name = "embassy-sync" | name = "embassy-sync" | ||||||
| version = "0.4.0" | version = "0.3.0" | ||||||
| edition = "2021" | edition = "2021" | ||||||
| description = "no-std, no-alloc synchronization primitives with async support" | description = "no-std, no-alloc synchronization primitives with async support" | ||||||
| repository = "https://github.com/embassy-rs/embassy" | repository = "https://github.com/embassy-rs/embassy" | ||||||
| @@ -45,4 +45,4 @@ futures-util = { version = "0.3.17", features = [ "channel" ] } | |||||||
|  |  | ||||||
| # Enable critical-section implementation for std, for tests | # Enable critical-section implementation for std, for tests | ||||||
| critical-section = { version = "1.1", features = ["std"] } | critical-section = { version = "1.1", features = ["std"] } | ||||||
| static_cell = { version = "2" } | static_cell = "1.1" | ||||||
|   | |||||||
| @@ -1,6 +1,5 @@ | |||||||
| #![cfg_attr(not(any(feature = "std", feature = "wasm")), no_std)] | #![cfg_attr(not(any(feature = "std", feature = "wasm")), no_std)] | ||||||
| #![cfg_attr(feature = "nightly", feature(async_fn_in_trait, impl_trait_projections))] | #![cfg_attr(feature = "nightly", feature(async_fn_in_trait))] | ||||||
| #![cfg_attr(feature = "nightly", allow(stable_features, unknown_lints, async_fn_in_trait))] |  | ||||||
| #![allow(clippy::new_without_default)] | #![allow(clippy::new_without_default)] | ||||||
| #![doc = include_str!("../README.md")] | #![doc = include_str!("../README.md")] | ||||||
| #![warn(missing_docs)] | #![warn(missing_docs)] | ||||||
|   | |||||||
| @@ -59,9 +59,6 @@ generic-queue-32 = ["generic-queue"] | |||||||
| generic-queue-64 = ["generic-queue"] | generic-queue-64 = ["generic-queue"] | ||||||
| generic-queue-128 = ["generic-queue"] | generic-queue-128 = ["generic-queue"] | ||||||
|  |  | ||||||
| # Create a `MockDriver` that can be manually advanced for testing purposes. |  | ||||||
| mock-driver = ["tick-hz-1_000_000"] |  | ||||||
|  |  | ||||||
| # Set the `embassy_time` tick rate. | # Set the `embassy_time` tick rate. | ||||||
| # | # | ||||||
| # At most 1 `tick-*` feature can be enabled. If none is enabled, a default of 1MHz is used. | # At most 1 `tick-*` feature can be enabled. If none is enabled, a default of 1MHz is used. | ||||||
| @@ -258,4 +255,4 @@ wasm-timer = { version = "0.2.5", optional = true } | |||||||
| [dev-dependencies] | [dev-dependencies] | ||||||
| serial_test = "0.9" | serial_test = "0.9" | ||||||
| critical-section = { version = "1.1", features = ["std"] } | critical-section = { version = "1.1", features = ["std"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../embassy-executor", features = ["nightly"] } | embassy-executor = { version = "0.3.0", path = "../embassy-executor", features = ["nightly"] } | ||||||
|   | |||||||
| @@ -1,68 +0,0 @@ | |||||||
| use core::cell::Cell; |  | ||||||
|  |  | ||||||
| use critical_section::Mutex as CsMutex; |  | ||||||
|  |  | ||||||
| use crate::driver::{AlarmHandle, Driver}; |  | ||||||
| use crate::{Duration, Instant}; |  | ||||||
|  |  | ||||||
| /// A mock driver that can be manually advanced. |  | ||||||
| /// This is useful for testing code that works with [`Instant`] and [`Duration`]. |  | ||||||
| /// |  | ||||||
| /// This driver cannot currently be used to test runtime functionality, such as |  | ||||||
| /// timers, delays, etc. |  | ||||||
| /// |  | ||||||
| /// # Example |  | ||||||
| /// |  | ||||||
| /// ```ignore |  | ||||||
| /// fn has_a_second_passed(reference: Instant) -> bool { |  | ||||||
| ///     Instant::now().duration_since(reference) >= Duration::from_secs(1) |  | ||||||
| /// } |  | ||||||
| /// |  | ||||||
| /// fn test_second_passed() { |  | ||||||
| ///     let driver = embassy_time::MockDriver::get(); |  | ||||||
| ///     let reference = Instant::now(); |  | ||||||
| ///     assert_eq!(false, has_a_second_passed(reference)); |  | ||||||
| ///     driver.advance(Duration::from_secs(1)); |  | ||||||
| ///     assert_eq!(true, has_a_second_passed(reference)); |  | ||||||
| /// } |  | ||||||
| /// ``` |  | ||||||
| pub struct MockDriver { |  | ||||||
|     now: CsMutex<Cell<Instant>>, |  | ||||||
| } |  | ||||||
|  |  | ||||||
| crate::time_driver_impl!(static DRIVER: MockDriver = MockDriver { |  | ||||||
|     now: CsMutex::new(Cell::new(Instant::from_ticks(0))), |  | ||||||
| }); |  | ||||||
|  |  | ||||||
| impl MockDriver { |  | ||||||
|     /// Gets a reference to the global mock driver. |  | ||||||
|     pub fn get() -> &'static MockDriver { |  | ||||||
|         &DRIVER |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     /// Advances the time by the specified [`Duration`]. |  | ||||||
|     pub fn advance(&self, duration: Duration) { |  | ||||||
|         critical_section::with(|cs| { |  | ||||||
|             let now = self.now.borrow(cs).get().as_ticks(); |  | ||||||
|             self.now.borrow(cs).set(Instant::from_ticks(now + duration.as_ticks())); |  | ||||||
|         }); |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| impl Driver for MockDriver { |  | ||||||
|     fn now(&self) -> u64 { |  | ||||||
|         critical_section::with(|cs| self.now.borrow(cs).get().as_ticks() as u64) |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     unsafe fn allocate_alarm(&self) -> Option<AlarmHandle> { |  | ||||||
|         unimplemented!("MockDriver does not support runtime features that require an executor"); |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     fn set_alarm_callback(&self, _alarm: AlarmHandle, _callback: fn(*mut ()), _ctx: *mut ()) { |  | ||||||
|         unimplemented!("MockDriver does not support runtime features that require an executor"); |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     fn set_alarm(&self, _alarm: AlarmHandle, _timestamp: u64) -> bool { |  | ||||||
|         unimplemented!("MockDriver does not support runtime features that require an executor"); |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @@ -1,6 +1,5 @@ | |||||||
| #![cfg_attr(not(any(feature = "std", feature = "wasm", test)), no_std)] | #![cfg_attr(not(any(feature = "std", feature = "wasm", test)), no_std)] | ||||||
| #![cfg_attr(feature = "nightly", feature(async_fn_in_trait))] | #![cfg_attr(feature = "nightly", feature(async_fn_in_trait))] | ||||||
| #![cfg_attr(feature = "nightly", allow(stable_features, unknown_lints, async_fn_in_trait))] |  | ||||||
| #![doc = include_str!("../README.md")] | #![doc = include_str!("../README.md")] | ||||||
| #![allow(clippy::new_without_default)] | #![allow(clippy::new_without_default)] | ||||||
| #![warn(missing_docs)] | #![warn(missing_docs)] | ||||||
| @@ -16,12 +15,6 @@ pub mod queue; | |||||||
| mod tick; | mod tick; | ||||||
| mod timer; | mod timer; | ||||||
|  |  | ||||||
| #[cfg(feature = "mock-driver")] |  | ||||||
| mod driver_mock; |  | ||||||
|  |  | ||||||
| #[cfg(feature = "mock-driver")] |  | ||||||
| pub use driver_mock::MockDriver; |  | ||||||
|  |  | ||||||
| #[cfg(feature = "std")] | #[cfg(feature = "std")] | ||||||
| mod driver_std; | mod driver_std; | ||||||
| #[cfg(feature = "wasm")] | #[cfg(feature = "wasm")] | ||||||
|   | |||||||
| @@ -1,6 +1,5 @@ | |||||||
| #![no_std] | #![no_std] | ||||||
| #![feature(async_fn_in_trait)] | #![feature(async_fn_in_trait)] | ||||||
| #![allow(stable_features, unknown_lints, async_fn_in_trait)] |  | ||||||
| #![doc = include_str!("../README.md")] | #![doc = include_str!("../README.md")] | ||||||
| #![warn(missing_docs)] | #![warn(missing_docs)] | ||||||
|  |  | ||||||
|   | |||||||
| @@ -10,9 +10,9 @@ target = "thumbv7em-none-eabi" | |||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-usb = { version = "0.1.0", path = "../embassy-usb" } | embassy-usb = { version = "0.1.0", path = "../embassy-usb" } | ||||||
| embassy-sync = { version = "0.4.0", path = "../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../embassy-sync" } | ||||||
| embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | ||||||
| futures = { version = "0.3", default-features = false } | futures = { version = "0.3", default-features = false } | ||||||
| static_cell = { version = "2" } | static_cell = "1" | ||||||
| usbd-hid = "0.6.0" | usbd-hid = "0.6.0" | ||||||
| log = "0.4" | log = "0.4" | ||||||
|   | |||||||
| @@ -41,7 +41,7 @@ max-handler-count-8 = [] | |||||||
| [dependencies] | [dependencies] | ||||||
| embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | embassy-futures = { version = "0.1.0", path = "../embassy-futures" } | ||||||
| embassy-usb-driver = { version = "0.1.0", path = "../embassy-usb-driver" } | embassy-usb-driver = { version = "0.1.0", path = "../embassy-usb-driver" } | ||||||
| embassy-sync = { version = "0.4.0", path = "../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../embassy-sync" } | ||||||
| embassy-net-driver-channel = { version = "0.2.0", path = "../embassy-net-driver-channel" } | embassy-net-driver-channel = { version = "0.2.0", path = "../embassy-net-driver-channel" } | ||||||
|  |  | ||||||
| defmt = { version = "0.3", optional = true } | defmt = { version = "0.3", optional = true } | ||||||
|   | |||||||
| @@ -5,8 +5,8 @@ version = "0.1.0" | |||||||
| license = "MIT OR Apache-2.0" | license = "MIT OR Apache-2.0" | ||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-sync = { version = "0.4.0", path = "../../../../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../../../../embassy-sync" } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers", "arch-cortex-m", "executor-thread"] } | embassy-executor = { version = "0.3.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers", "arch-cortex-m", "executor-thread"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly"] } | embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly"] } | ||||||
| embassy-nrf = { version = "0.1.0", path = "../../../../embassy-nrf", features = ["time-driver-rtc1", "gpiote", "nightly"] } | embassy-nrf = { version = "0.1.0", path = "../../../../embassy-nrf", features = ["time-driver-rtc1", "gpiote", "nightly"] } | ||||||
| embassy-boot = { version = "0.1.0", path = "../../../../embassy-boot/boot", features = ["nightly"] } | embassy-boot = { version = "0.1.0", path = "../../../../embassy-boot/boot", features = ["nightly"] } | ||||||
|   | |||||||
| @@ -5,8 +5,8 @@ version = "0.1.0" | |||||||
| license = "MIT OR Apache-2.0" | license = "MIT OR Apache-2.0" | ||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-sync = { version = "0.4.0", path = "../../../../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../../../../embassy-sync" } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers", "arch-cortex-m", "executor-thread"] } | embassy-executor = { version = "0.3.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers", "arch-cortex-m", "executor-thread"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly"] } | embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly"] } | ||||||
| embassy-rp = { version = "0.1.0", path = "../../../../embassy-rp", features = ["time-driver", "unstable-traits", "nightly"] } | embassy-rp = { version = "0.1.0", path = "../../../../embassy-rp", features = ["time-driver", "unstable-traits", "nightly"] } | ||||||
| embassy-boot-rp = { version = "0.1.0", path = "../../../../embassy-boot/rp", features = ["nightly"] } | embassy-boot-rp = { version = "0.1.0", path = "../../../../embassy-boot/rp", features = ["nightly"] } | ||||||
|   | |||||||
| @@ -5,8 +5,8 @@ version = "0.1.0" | |||||||
| license = "MIT OR Apache-2.0" | license = "MIT OR Apache-2.0" | ||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-sync = { version = "0.4.0", path = "../../../../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../../../../embassy-sync" } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32f303re", "time-driver-any", "exti"]  } | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32f303re", "time-driver-any", "exti"]  } | ||||||
| embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | ||||||
|   | |||||||
| @@ -5,8 +5,8 @@ version = "0.1.0" | |||||||
| license = "MIT OR Apache-2.0" | license = "MIT OR Apache-2.0" | ||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-sync = { version = "0.4.0", path = "../../../../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../../../../embassy-sync" } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32f767zi", "time-driver-any", "exti"]  } | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32f767zi", "time-driver-any", "exti"]  } | ||||||
| embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | ||||||
|   | |||||||
| @@ -5,8 +5,8 @@ version = "0.1.0" | |||||||
| license = "MIT OR Apache-2.0" | license = "MIT OR Apache-2.0" | ||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-sync = { version = "0.4.0", path = "../../../../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../../../../embassy-sync" } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32h743zi", "time-driver-any", "exti"]  } | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32h743zi", "time-driver-any", "exti"]  } | ||||||
| embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | ||||||
|   | |||||||
| @@ -5,8 +5,8 @@ version = "0.1.0" | |||||||
| license = "MIT OR Apache-2.0" | license = "MIT OR Apache-2.0" | ||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-sync = { version = "0.4.0", path = "../../../../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../../../../embassy-sync" } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l072cz", "time-driver-any", "exti", "memory-x"]  } | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l072cz", "time-driver-any", "exti", "memory-x"]  } | ||||||
| embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | ||||||
|   | |||||||
| @@ -5,8 +5,8 @@ version = "0.1.0" | |||||||
| license = "MIT OR Apache-2.0" | license = "MIT OR Apache-2.0" | ||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-sync = { version = "0.4.0", path = "../../../../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../../../../embassy-sync" } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l151cb-a", "time-driver-any", "exti"]  } | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l151cb-a", "time-driver-any", "exti"]  } | ||||||
| embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | ||||||
|   | |||||||
| @@ -5,8 +5,8 @@ version = "0.1.0" | |||||||
| license = "MIT OR Apache-2.0" | license = "MIT OR Apache-2.0" | ||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-sync = { version = "0.4.0", path = "../../../../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../../../../embassy-sync" } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l475vg", "time-driver-any", "exti"]  } | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32l475vg", "time-driver-any", "exti"]  } | ||||||
| embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | ||||||
|   | |||||||
| @@ -5,8 +5,8 @@ version = "0.1.0" | |||||||
| license = "MIT OR Apache-2.0" | license = "MIT OR Apache-2.0" | ||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-sync = { version = "0.4.0", path = "../../../../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../../../../embassy-sync" } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "nightly", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../../../embassy-time", features = ["nightly", "tick-hz-32_768"] } | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32wl55jc-cm4", "time-driver-any", "exti"]  } | embassy-stm32 = { version = "0.1.0", path = "../../../../embassy-stm32", features = ["unstable-traits", "nightly", "stm32wl55jc-cm4", "time-driver-any", "exti"]  } | ||||||
| embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | embassy-boot-stm32 = { version = "0.1.0", path = "../../../../embassy-boot/stm32", features = ["nightly"] } | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ defmt-rtt = { version = "0.4", optional = true } | |||||||
| embassy-nrf = { path = "../../../../embassy-nrf", features = ["nightly"] } | embassy-nrf = { path = "../../../../embassy-nrf", features = ["nightly"] } | ||||||
| embassy-boot-nrf = { path = "../../../../embassy-boot/nrf" } | embassy-boot-nrf = { path = "../../../../embassy-boot/nrf" } | ||||||
| cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } | cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../../../embassy-sync" } | embassy-sync = { path = "../../../../embassy-sync" } | ||||||
| cortex-m-rt = { version = "0.7" } | cortex-m-rt = { version = "0.7" } | ||||||
| cfg-if = "1.0.0" | cfg-if = "1.0.0" | ||||||
|  |  | ||||||
|   | |||||||
| @@ -11,7 +11,7 @@ defmt-rtt = { version = "0.4", optional = true } | |||||||
|  |  | ||||||
| embassy-rp = { path = "../../../../embassy-rp", features = ["nightly"] } | embassy-rp = { path = "../../../../embassy-rp", features = ["nightly"] } | ||||||
| embassy-boot-rp = { path = "../../../../embassy-boot/rp" } | embassy-boot-rp = { path = "../../../../embassy-boot/rp" } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../../../embassy-sync" } | embassy-sync = { path = "../../../../embassy-sync" } | ||||||
| embassy-time = { path = "../../../../embassy-time", features = ["nightly"] } | embassy-time = { path = "../../../../embassy-time", features = ["nightly"] } | ||||||
|  |  | ||||||
| cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } | cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ defmt-rtt = { version = "0.4", optional = true } | |||||||
| embassy-stm32 = { path = "../../../../embassy-stm32", features = ["nightly"] } | embassy-stm32 = { path = "../../../../embassy-stm32", features = ["nightly"] } | ||||||
| embassy-boot-stm32 = { path = "../../../../embassy-boot/stm32" } | embassy-boot-stm32 = { path = "../../../../embassy-boot/stm32" } | ||||||
| cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } | cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../../../embassy-sync" } | embassy-sync = { path = "../../../../embassy-sync" } | ||||||
| cortex-m-rt = { version = "0.7" } | cortex-m-rt = { version = "0.7" } | ||||||
| embedded-storage = "0.3.0" | embedded-storage = "0.3.0" | ||||||
| embedded-storage-async = "0.4.0" | embedded-storage-async = "0.4.0" | ||||||
|   | |||||||
| @@ -16,8 +16,8 @@ log = [ | |||||||
| ] | ] | ||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync" } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync" } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "rtos-trace", "rtos-trace-interrupt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "rtos-trace", "rtos-trace-interrupt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time" } | embassy-time = { version = "0.1.5", path = "../../embassy-time" } | ||||||
| embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac"] } | embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac"] } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0" | |||||||
| rtic = { version = "2", features = ["thumbv7-backend"] } | rtic = { version = "2", features = ["thumbv7-backend"] } | ||||||
|  |  | ||||||
| embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } | embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["nightly", "unstable-traits", "defmt", "defmt-timestamp-uptime", "generic-queue"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["nightly", "unstable-traits", "defmt", "defmt-timestamp-uptime", "generic-queue"] } | ||||||
| embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["nightly", "unstable-traits", "defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] } | embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["nightly", "unstable-traits", "defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -29,8 +29,8 @@ nightly = [ | |||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } | embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime"] } | ||||||
| embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] } | embassy-nrf = { version = "0.1.0", path = "../../embassy-nrf", features = ["defmt", "nrf52840", "time-driver-rtc1", "gpiote", "unstable-pac", "time"] } | ||||||
| embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet"], optional = true } | embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet"], optional = true } | ||||||
| @@ -48,7 +48,7 @@ defmt = "0.3" | |||||||
| defmt-rtt = "0.4" | defmt-rtt = "0.4" | ||||||
|  |  | ||||||
| fixed = "1.10.0" | fixed = "1.10.0" | ||||||
| static_cell = { version = "2" } | static_cell = "1.1" | ||||||
| cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } | cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } | ||||||
| cortex-m-rt = "0.7.0" | cortex-m-rt = "0.7.0" | ||||||
| panic-probe = { version = "0.3", features = ["print-defmt"] } | panic-probe = { version = "0.3", features = ["print-defmt"] } | ||||||
|   | |||||||
| @@ -6,10 +6,10 @@ license = "MIT OR Apache-2.0" | |||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } | embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = [ | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = [ | ||||||
|     "defmt", |     "defmt", | ||||||
| ] } | ] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread",  | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread",  | ||||||
|     "nightly", |     "nightly", | ||||||
|     "defmt", |     "defmt", | ||||||
|     "integrated-timers", |     "integrated-timers", | ||||||
| @@ -42,7 +42,7 @@ embedded-io-async = { version = "0.6.0" } | |||||||
| defmt = "0.3" | defmt = "0.3" | ||||||
| defmt-rtt = "0.4" | defmt-rtt = "0.4" | ||||||
|  |  | ||||||
| static_cell = { version = "2", features = ["nightly"]} | static_cell = { version = "1.1", features = ["nightly"]} | ||||||
| cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } | cortex-m = { version = "0.7.6", features = ["inline-asm", "critical-section-single-core"] } | ||||||
| cortex-m-rt = "0.7.0" | cortex-m-rt = "0.7.0" | ||||||
| panic-probe = { version = "0.3", features = ["print-defmt"] } | panic-probe = { version = "0.3", features = ["print-defmt"] } | ||||||
|   | |||||||
| @@ -7,8 +7,8 @@ license = "MIT OR Apache-2.0" | |||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-embedded-hal = { version = "0.1.0", path = "../../embassy-embedded-hal", features = ["defmt"] } | embassy-embedded-hal = { version = "0.1.0", path = "../../embassy-embedded-hal", features = ["defmt"] } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["nightly", "unstable-traits", "defmt", "defmt-timestamp-uptime"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["nightly", "unstable-traits", "defmt", "defmt-timestamp-uptime"] } | ||||||
| embassy-rp = { version = "0.1.0", path = "../../embassy-rp", features = ["defmt", "unstable-traits", "nightly", "unstable-pac", "time-driver", "critical-section-impl"] } | embassy-rp = { version = "0.1.0", path = "../../embassy-rp", features = ["defmt", "unstable-traits", "nightly", "unstable-pac", "time-driver", "critical-section-impl"] } | ||||||
| embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | ||||||
| @@ -47,8 +47,7 @@ embedded-hal-async = "1.0.0-rc.1" | |||||||
| embedded-hal-bus = { version = "0.1.0-rc.1", features = ["async"] } | embedded-hal-bus = { version = "0.1.0-rc.1", features = ["async"] } | ||||||
| embedded-io-async = { version = "0.6.0", features = ["defmt-03"] } | embedded-io-async = { version = "0.6.0", features = ["defmt-03"] } | ||||||
| embedded-storage = { version = "0.3" } | embedded-storage = { version = "0.3" } | ||||||
| static_cell = { version = "2", features = ["nightly"]} | static_cell = { version = "1.1", features = ["nightly"]} | ||||||
| portable-atomic = { version = "1.5", features = ["critical-section"] } |  | ||||||
| log = "0.4" | log = "0.4" | ||||||
| pio-proc = "0.2" | pio-proc = "0.2" | ||||||
| pio = "0.2.1" | pio = "0.2.1" | ||||||
|   | |||||||
| @@ -1,169 +0,0 @@ | |||||||
| //! This example shows how to use the PIO module in the RP2040 to implement a stepper motor driver |  | ||||||
| //! for a 5-wire stepper such as the 28BYJ-48. You can halt an ongoing rotation by dropping the future. |  | ||||||
|  |  | ||||||
| #![no_std] |  | ||||||
| #![no_main] |  | ||||||
| #![feature(type_alias_impl_trait)] |  | ||||||
| use core::mem::{self, MaybeUninit}; |  | ||||||
|  |  | ||||||
| use defmt::info; |  | ||||||
| use embassy_executor::Spawner; |  | ||||||
| use embassy_rp::bind_interrupts; |  | ||||||
| use embassy_rp::peripherals::PIO0; |  | ||||||
| use embassy_rp::pio::{Common, Config, Direction, Instance, InterruptHandler, Irq, Pio, PioPin, StateMachine}; |  | ||||||
| use embassy_time::{with_timeout, Duration, Timer}; |  | ||||||
| use fixed::traits::ToFixed; |  | ||||||
| use fixed::types::extra::U8; |  | ||||||
| use fixed::FixedU32; |  | ||||||
| use {defmt_rtt as _, panic_probe as _}; |  | ||||||
|  |  | ||||||
| bind_interrupts!(struct Irqs { |  | ||||||
|     PIO0_IRQ_0 => InterruptHandler<PIO0>; |  | ||||||
| }); |  | ||||||
|  |  | ||||||
| pub struct PioStepper<'d, T: Instance, const SM: usize> { |  | ||||||
|     irq: Irq<'d, T, SM>, |  | ||||||
|     sm: StateMachine<'d, T, SM>, |  | ||||||
| } |  | ||||||
|  |  | ||||||
| impl<'d, T: Instance, const SM: usize> PioStepper<'d, T, SM> { |  | ||||||
|     pub fn new( |  | ||||||
|         pio: &mut Common<'d, T>, |  | ||||||
|         mut sm: StateMachine<'d, T, SM>, |  | ||||||
|         irq: Irq<'d, T, SM>, |  | ||||||
|         pin0: impl PioPin, |  | ||||||
|         pin1: impl PioPin, |  | ||||||
|         pin2: impl PioPin, |  | ||||||
|         pin3: impl PioPin, |  | ||||||
|     ) -> Self { |  | ||||||
|         let prg = pio_proc::pio_asm!( |  | ||||||
|             "pull block", |  | ||||||
|             "mov x, osr", |  | ||||||
|             "pull block", |  | ||||||
|             "mov y, osr", |  | ||||||
|             "jmp !x end", |  | ||||||
|             "loop:", |  | ||||||
|             "jmp !osre step", |  | ||||||
|             "mov osr, y", |  | ||||||
|             "step:", |  | ||||||
|             "out pins, 4 [31]" |  | ||||||
|             "jmp x-- loop", |  | ||||||
|             "end:", |  | ||||||
|             "irq 0 rel" |  | ||||||
|         ); |  | ||||||
|         let pin0 = pio.make_pio_pin(pin0); |  | ||||||
|         let pin1 = pio.make_pio_pin(pin1); |  | ||||||
|         let pin2 = pio.make_pio_pin(pin2); |  | ||||||
|         let pin3 = pio.make_pio_pin(pin3); |  | ||||||
|         sm.set_pin_dirs(Direction::Out, &[&pin0, &pin1, &pin2, &pin3]); |  | ||||||
|         let mut cfg = Config::default(); |  | ||||||
|         cfg.set_out_pins(&[&pin0, &pin1, &pin2, &pin3]); |  | ||||||
|         cfg.clock_divider = (125_000_000 / (100 * 136)).to_fixed(); |  | ||||||
|         cfg.use_program(&pio.load_program(&prg.program), &[]); |  | ||||||
|         sm.set_config(&cfg); |  | ||||||
|         sm.set_enable(true); |  | ||||||
|         Self { irq, sm } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     // Set pulse frequency |  | ||||||
|     pub fn set_frequency(&mut self, freq: u32) { |  | ||||||
|         let clock_divider: FixedU32<U8> = (125_000_000 / (freq * 136)).to_fixed(); |  | ||||||
|         assert!(clock_divider <= 65536, "clkdiv must be <= 65536"); |  | ||||||
|         assert!(clock_divider >= 1, "clkdiv must be >= 1"); |  | ||||||
|         T::PIO.sm(SM).clkdiv().write(|w| w.0 = clock_divider.to_bits() << 8); |  | ||||||
|         self.sm.clkdiv_restart(); |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     // Full step, one phase |  | ||||||
|     pub async fn step(&mut self, steps: i32) { |  | ||||||
|         if steps > 0 { |  | ||||||
|             self.run(steps, 0b1000_0100_0010_0001_1000_0100_0010_0001).await |  | ||||||
|         } else { |  | ||||||
|             self.run(-steps, 0b0001_0010_0100_1000_0001_0010_0100_1000).await |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     // Full step, two phase |  | ||||||
|     pub async fn step2(&mut self, steps: i32) { |  | ||||||
|         if steps > 0 { |  | ||||||
|             self.run(steps, 0b1001_1100_0110_0011_1001_1100_0110_0011).await |  | ||||||
|         } else { |  | ||||||
|             self.run(-steps, 0b0011_0110_1100_1001_0011_0110_1100_1001).await |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     // Half step |  | ||||||
|     pub async fn step_half(&mut self, steps: i32) { |  | ||||||
|         if steps > 0 { |  | ||||||
|             self.run(steps, 0b1001_1000_1100_0100_0110_0010_0011_0001).await |  | ||||||
|         } else { |  | ||||||
|             self.run(-steps, 0b0001_0011_0010_0110_0100_1100_1000_1001).await |  | ||||||
|         } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     async fn run(&mut self, steps: i32, pattern: u32) { |  | ||||||
|         self.sm.tx().wait_push(steps as u32).await; |  | ||||||
|         self.sm.tx().wait_push(pattern).await; |  | ||||||
|         let drop = OnDrop::new(|| { |  | ||||||
|             self.sm.clear_fifos(); |  | ||||||
|             unsafe { |  | ||||||
|                 self.sm.exec_instr( |  | ||||||
|                     pio::InstructionOperands::JMP { |  | ||||||
|                         address: 0, |  | ||||||
|                         condition: pio::JmpCondition::Always, |  | ||||||
|                     } |  | ||||||
|                     .encode(), |  | ||||||
|                 ); |  | ||||||
|             } |  | ||||||
|         }); |  | ||||||
|         self.irq.wait().await; |  | ||||||
|         drop.defuse(); |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| struct OnDrop<F: FnOnce()> { |  | ||||||
|     f: MaybeUninit<F>, |  | ||||||
| } |  | ||||||
|  |  | ||||||
| impl<F: FnOnce()> OnDrop<F> { |  | ||||||
|     pub fn new(f: F) -> Self { |  | ||||||
|         Self { f: MaybeUninit::new(f) } |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     pub fn defuse(self) { |  | ||||||
|         mem::forget(self) |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| impl<F: FnOnce()> Drop for OnDrop<F> { |  | ||||||
|     fn drop(&mut self) { |  | ||||||
|         unsafe { self.f.as_ptr().read()() } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| #[embassy_executor::main] |  | ||||||
| async fn main(_spawner: Spawner) { |  | ||||||
|     let p = embassy_rp::init(Default::default()); |  | ||||||
|     let Pio { |  | ||||||
|         mut common, irq0, sm0, .. |  | ||||||
|     } = Pio::new(p.PIO0, Irqs); |  | ||||||
|  |  | ||||||
|     let mut stepper = PioStepper::new(&mut common, sm0, irq0, p.PIN_4, p.PIN_5, p.PIN_6, p.PIN_7); |  | ||||||
|     stepper.set_frequency(120); |  | ||||||
|     loop { |  | ||||||
|         info!("CW full steps"); |  | ||||||
|         stepper.step(1000).await; |  | ||||||
|  |  | ||||||
|         info!("CCW full steps, drop after 1 sec"); |  | ||||||
|         if let Err(_) = with_timeout(Duration::from_secs(1), stepper.step(i32::MIN)).await { |  | ||||||
|             info!("Time's up!"); |  | ||||||
|             Timer::after(Duration::from_secs(1)).await; |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         info!("CW half steps"); |  | ||||||
|         stepper.step_half(1000).await; |  | ||||||
|  |  | ||||||
|         info!("CCW half steps"); |  | ||||||
|         stepper.step_half(-1000).await; |  | ||||||
|     } |  | ||||||
| } |  | ||||||
| @@ -10,7 +10,6 @@ | |||||||
| #![no_main] | #![no_main] | ||||||
| #![feature(type_alias_impl_trait)] | #![feature(type_alias_impl_trait)] | ||||||
| #![feature(async_fn_in_trait)] | #![feature(async_fn_in_trait)] | ||||||
| #![allow(stable_features, unknown_lints, async_fn_in_trait)] |  | ||||||
|  |  | ||||||
| use defmt::{info, panic, trace}; | use defmt::{info, panic, trace}; | ||||||
| use embassy_executor::Spawner; | use embassy_executor::Spawner; | ||||||
|   | |||||||
| @@ -5,7 +5,7 @@ | |||||||
| #![no_main] | #![no_main] | ||||||
| #![feature(type_alias_impl_trait)] | #![feature(type_alias_impl_trait)] | ||||||
| #![feature(async_fn_in_trait)] | #![feature(async_fn_in_trait)] | ||||||
| #![allow(stable_features, unknown_lints, async_fn_in_trait)] | #![allow(incomplete_features)] | ||||||
|  |  | ||||||
| use core::str::from_utf8; | use core::str::from_utf8; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -5,7 +5,7 @@ | |||||||
| #![no_main] | #![no_main] | ||||||
| #![feature(type_alias_impl_trait)] | #![feature(type_alias_impl_trait)] | ||||||
| #![feature(async_fn_in_trait)] | #![feature(async_fn_in_trait)] | ||||||
| #![allow(stable_features, unknown_lints, async_fn_in_trait)] | #![allow(incomplete_features)] | ||||||
|  |  | ||||||
| use core::str; | use core::str; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -5,7 +5,7 @@ | |||||||
| #![no_main] | #![no_main] | ||||||
| #![feature(type_alias_impl_trait)] | #![feature(type_alias_impl_trait)] | ||||||
| #![feature(async_fn_in_trait)] | #![feature(async_fn_in_trait)] | ||||||
| #![allow(stable_features, unknown_lints, async_fn_in_trait)] | #![allow(incomplete_features)] | ||||||
|  |  | ||||||
| use core::str::from_utf8; | use core::str::from_utf8; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -5,8 +5,8 @@ version = "0.1.0" | |||||||
| license = "MIT OR Apache-2.0" | license = "MIT OR Apache-2.0" | ||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["log"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["log"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["arch-std", "executor-thread", "log", "nightly", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["arch-std", "executor-thread", "log", "nightly", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["log", "std", "nightly"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["log", "std", "nightly"] } | ||||||
| embassy-net = { version = "0.2.0", path = "../../embassy-net", features=[ "std", "nightly", "log", "medium-ethernet", "medium-ip", "tcp", "udp", "dns", "dhcpv4", "proto-ipv6"] } | embassy-net = { version = "0.2.0", path = "../../embassy-net", features=[ "std", "nightly", "log", "medium-ethernet", "medium-ip", "tcp", "udp", "dns", "dhcpv4", "proto-ipv6"] } | ||||||
| embassy-net-tuntap = { version = "0.1.0", path = "../../embassy-net-tuntap" } | embassy-net-tuntap = { version = "0.1.0", path = "../../embassy-net-tuntap" } | ||||||
| @@ -24,7 +24,7 @@ nix = "0.26.2" | |||||||
| clap = { version = "3.0.0-beta.5", features = ["derive"] } | clap = { version = "3.0.0-beta.5", features = ["derive"] } | ||||||
| rand_core = { version = "0.6.3", features = ["std"] } | rand_core = { version = "0.6.3", features = ["std"] } | ||||||
| heapless = { version = "0.7.5", default-features = false } | heapless = { version = "0.7.5", default-features = false } | ||||||
| static_cell = { version = "2", features = ["nightly"]} | static_cell = { version = "1.1", features = ["nightly"]} | ||||||
|  |  | ||||||
| [profile.release] | [profile.release] | ||||||
| debug = 2 | debug = 2 | ||||||
|   | |||||||
| @@ -8,8 +8,7 @@ | |||||||
| //!     nc 192.168.7.10 1234 | //!     nc 192.168.7.10 1234 | ||||||
|  |  | ||||||
| #![feature(type_alias_impl_trait)] | #![feature(type_alias_impl_trait)] | ||||||
| #![feature(async_fn_in_trait, impl_trait_projections)] | #![feature(async_fn_in_trait)] | ||||||
| #![allow(stable_features, unknown_lints, async_fn_in_trait)] |  | ||||||
|  |  | ||||||
| #[path = "../serial_port.rs"] | #[path = "../serial_port.rs"] | ||||||
| mod serial_port; | mod serial_port; | ||||||
|   | |||||||
| @@ -7,8 +7,8 @@ license = "MIT OR Apache-2.0" | |||||||
| [dependencies] | [dependencies] | ||||||
| # Change stm32c031c6 to your chip name, if necessary. | # Change stm32c031c6 to your chip name, if necessary. | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "time-driver-any", "stm32c031c6", "memory-x", "unstable-pac", "exti"]  } | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "time-driver-any", "stm32c031c6", "memory-x", "unstable-pac", "exti"]  } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | ||||||
|  |  | ||||||
| defmt = "0.3" | defmt = "0.3" | ||||||
|   | |||||||
| @@ -14,11 +14,10 @@ cortex-m-rt = "0.7.0" | |||||||
| defmt = "0.3" | defmt = "0.3" | ||||||
| defmt-rtt = "0.4" | defmt-rtt = "0.4" | ||||||
| panic-probe = "0.3" | panic-probe = "0.3" | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | ||||||
| static_cell = { version = "2", features = ["nightly"]} | static_cell = { version = "1.1", features = ["nightly"]} | ||||||
| portable-atomic = { version = "1.5", features = ["unsafe-assume-single-core"] } |  | ||||||
|  |  | ||||||
| [profile.release] | [profile.release] | ||||||
| debug = 2 | debug = 2 | ||||||
|   | |||||||
| @@ -7,8 +7,8 @@ license = "MIT OR Apache-2.0" | |||||||
| [dependencies] | [dependencies] | ||||||
| # Change stm32f103c8 to your chip name, if necessary. | # Change stm32f103c8 to your chip name, if necessary. | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f103c8", "unstable-pac", "memory-x", "time-driver-any", "unstable-traits" ]  } | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f103c8", "unstable-pac", "memory-x", "time-driver-any", "unstable-traits" ]  } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | ||||||
| embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | ||||||
| embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } | embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } | ||||||
|   | |||||||
| @@ -7,8 +7,8 @@ license = "MIT OR Apache-2.0" | |||||||
| [dependencies] | [dependencies] | ||||||
| # Change stm32f207zg to your chip name, if necessary. | # Change stm32f207zg to your chip name, if necessary. | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f207zg", "unstable-pac", "memory-x", "time-driver-any", "exti"]  } | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f207zg", "unstable-pac", "memory-x", "time-driver-any", "exti"]  } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | ||||||
|  |  | ||||||
| defmt = "0.3" | defmt = "0.3" | ||||||
|   | |||||||
| @@ -7,8 +7,8 @@ license = "MIT OR Apache-2.0" | |||||||
| [dependencies] | [dependencies] | ||||||
| # Change stm32f303ze to your chip name, if necessary. | # Change stm32f303ze to your chip name, if necessary. | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f303ze", "unstable-pac", "memory-x", "time-driver-any", "exti"]  } | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f303ze", "unstable-pac", "memory-x", "time-driver-any", "exti"]  } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | ||||||
| embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | ||||||
| embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } | embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } | ||||||
| @@ -24,7 +24,7 @@ futures = { version = "0.3.17", default-features = false, features = ["async-awa | |||||||
| heapless = { version = "0.7.5", default-features = false } | heapless = { version = "0.7.5", default-features = false } | ||||||
| nb = "1.0.0" | nb = "1.0.0" | ||||||
| embedded-storage = "0.3.0" | embedded-storage = "0.3.0" | ||||||
| static_cell = { version = "2", features = ["nightly"]} | static_cell = { version = "1.1", features = ["nightly"]} | ||||||
|  |  | ||||||
| [profile.release] | [profile.release] | ||||||
| debug = 2 | debug = 2 | ||||||
|   | |||||||
| @@ -5,8 +5,8 @@ version = "0.1.0" | |||||||
| license = "MIT OR Apache-2.0" | license = "MIT OR Apache-2.0" | ||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | embassy-time = { version = "0.1.0", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f334r8", "unstable-pac", "memory-x", "time-driver-any", "exti"]  } | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f334r8", "unstable-pac", "memory-x", "time-driver-any", "exti"]  } | ||||||
| embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | ||||||
| @@ -23,4 +23,4 @@ futures = { version = "0.3.17", default-features = false, features = ["async-awa | |||||||
| heapless = { version = "0.7.5", default-features = false } | heapless = { version = "0.7.5", default-features = false } | ||||||
| nb = "1.0.0" | nb = "1.0.0" | ||||||
| embedded-storage = "0.3.0" | embedded-storage = "0.3.0" | ||||||
| static_cell = { version = "2", features = ["nightly"]} | static_cell = { version = "1.1", features = ["nightly"]} | ||||||
|   | |||||||
| @@ -7,8 +7,8 @@ license = "MIT OR Apache-2.0" | |||||||
| [dependencies] | [dependencies] | ||||||
| # Change stm32f429zi to your chip name, if necessary. | # Change stm32f429zi to your chip name, if necessary. | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "unstable-traits", "defmt", "stm32f429zi", "unstable-pac", "memory-x", "time-driver-any", "exti", "embedded-sdmmc", "chrono"]  } | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "unstable-traits", "defmt", "stm32f429zi", "unstable-pac", "memory-x", "time-driver-any", "exti", "embedded-sdmmc", "chrono"]  } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "executor-interrupt", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits", "tick-hz-32_768"] } | ||||||
| embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | ||||||
| embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet", "nightly"] } | embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet", "nightly"] } | ||||||
| @@ -27,7 +27,7 @@ heapless = { version = "0.7.5", default-features = false } | |||||||
| nb = "1.0.0" | nb = "1.0.0" | ||||||
| embedded-storage = "0.3.0" | embedded-storage = "0.3.0" | ||||||
| micromath = "2.0.0" | micromath = "2.0.0" | ||||||
| static_cell = { version = "2", features = ["nightly"]} | static_cell = { version = "1.1", features = ["nightly"]} | ||||||
| chrono = { version = "^0.4", default-features = false} | chrono = { version = "^0.4", default-features = false} | ||||||
|  |  | ||||||
| [profile.release] | [profile.release] | ||||||
|   | |||||||
| @@ -7,8 +7,8 @@ license = "MIT OR Apache-2.0" | |||||||
| [dependencies] | [dependencies] | ||||||
| # Change stm32f767zi to your chip name, if necessary. | # Change stm32f767zi to your chip name, if necessary. | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f767zi", "memory-x", "unstable-pac", "time-driver-any", "exti"]  } | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f767zi", "memory-x", "unstable-pac", "time-driver-any", "exti"]  } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | ||||||
| embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet"] } | embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet"] } | ||||||
| embedded-io-async = { version = "0.6.0" } | embedded-io-async = { version = "0.6.0" } | ||||||
| @@ -27,7 +27,7 @@ nb = "1.0.0" | |||||||
| rand_core = "0.6.3" | rand_core = "0.6.3" | ||||||
| critical-section = "1.1" | critical-section = "1.1" | ||||||
| embedded-storage = "0.3.0" | embedded-storage = "0.3.0" | ||||||
| static_cell = { version = "2", features = ["nightly"]} | static_cell = { version = "1.1", features = ["nightly"]} | ||||||
|  |  | ||||||
| [profile.release] | [profile.release] | ||||||
| debug = 2 | debug = 2 | ||||||
|   | |||||||
| @@ -7,8 +7,8 @@ license = "MIT OR Apache-2.0" | |||||||
| [dependencies] | [dependencies] | ||||||
| # Change stm32g071rb to your chip name, if necessary. | # Change stm32g071rb to your chip name, if necessary. | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "time-driver-any", "stm32g071rb", "memory-x", "unstable-pac", "exti"]  } | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "time-driver-any", "stm32g071rb", "memory-x", "unstable-pac", "exti"]  } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | ||||||
|  |  | ||||||
| defmt = "0.3" | defmt = "0.3" | ||||||
| @@ -20,7 +20,6 @@ embedded-hal = "0.2.6" | |||||||
| panic-probe = { version = "0.3", features = ["print-defmt"] } | panic-probe = { version = "0.3", features = ["print-defmt"] } | ||||||
| futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | ||||||
| heapless = { version = "0.7.5", default-features = false } | heapless = { version = "0.7.5", default-features = false } | ||||||
| portable-atomic = { version = "1.5", features = ["unsafe-assume-single-core"] } |  | ||||||
|  |  | ||||||
| [profile.release] | [profile.release] | ||||||
| debug = 2 | debug = 2 | ||||||
|   | |||||||
| @@ -7,8 +7,8 @@ license = "MIT OR Apache-2.0" | |||||||
| [dependencies] | [dependencies] | ||||||
| # Change stm32g491re to your chip name, if necessary. | # Change stm32g491re to your chip name, if necessary. | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "time-driver-any", "stm32g491re", "memory-x", "unstable-pac", "exti"]  } | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "time-driver-any", "stm32g491re", "memory-x", "unstable-pac", "exti"]  } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | ||||||
| embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | ||||||
| embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } | embassy-futures = { version = "0.1.0", path = "../../embassy-futures" } | ||||||
|   | |||||||
| @@ -7,8 +7,8 @@ license = "MIT OR Apache-2.0" | |||||||
| [dependencies] | [dependencies] | ||||||
| # Change stm32h563zi to your chip name, if necessary. | # Change stm32h563zi to your chip name, if necessary. | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32h563zi", "memory-x", "time-driver-any", "exti", "unstable-pac", "unstable-traits"] } | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32h563zi", "memory-x", "time-driver-any", "exti", "unstable-pac", "unstable-traits"] } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits", "tick-hz-32_768"] } | ||||||
| embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet", "proto-ipv6"] } | embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet", "proto-ipv6"] } | ||||||
| embedded-io-async = { version = "0.6.0" } | embedded-io-async = { version = "0.6.0" } | ||||||
| @@ -31,7 +31,7 @@ critical-section = "1.1" | |||||||
| micromath = "2.0.0" | micromath = "2.0.0" | ||||||
| stm32-fmc = "0.3.0" | stm32-fmc = "0.3.0" | ||||||
| embedded-storage = "0.3.0" | embedded-storage = "0.3.0" | ||||||
| static_cell = { version = "2", features = ["nightly"]} | static_cell = { version = "1.1", features = ["nightly"]} | ||||||
|  |  | ||||||
| # cargo build/run | # cargo build/run | ||||||
| [profile.dev] | [profile.dev] | ||||||
|   | |||||||
| @@ -7,8 +7,8 @@ license = "MIT OR Apache-2.0" | |||||||
| [dependencies] | [dependencies] | ||||||
| # Change stm32h743bi to your chip name, if necessary. | # Change stm32h743bi to your chip name, if necessary. | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32h743bi", "time-driver-any", "exti", "memory-x", "unstable-pac", "unstable-traits", "chrono"] } | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32h743bi", "time-driver-any", "exti", "memory-x", "unstable-pac", "unstable-traits", "chrono"] } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits", "tick-hz-32_768"] } | ||||||
| embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet", "proto-ipv6"] } | embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet", "proto-ipv6"] } | ||||||
| embedded-io-async = { version = "0.6.0" } | embedded-io-async = { version = "0.6.0" } | ||||||
| @@ -31,7 +31,7 @@ critical-section = "1.1" | |||||||
| micromath = "2.0.0" | micromath = "2.0.0" | ||||||
| stm32-fmc = "0.3.0" | stm32-fmc = "0.3.0" | ||||||
| embedded-storage = "0.3.0" | embedded-storage = "0.3.0" | ||||||
| static_cell = { version = "2", features = ["nightly"]} | static_cell = { version = "1.1", features = ["nightly"]} | ||||||
| chrono = { version = "^0.4", default-features = false } | chrono = { version = "^0.4", default-features = false } | ||||||
|  |  | ||||||
| # cargo build/run | # cargo build/run | ||||||
|   | |||||||
| @@ -12,8 +12,8 @@ nightly = ["embassy-stm32/nightly", "embassy-time/nightly", "embassy-time/unstab | |||||||
| [dependencies] | [dependencies] | ||||||
| # Change stm32l072cz to your chip name, if necessary. | # Change stm32l072cz to your chip name, if necessary. | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32l072cz", "time-driver-any", "exti", "unstable-traits", "memory-x"]  } | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["defmt", "stm32l072cz", "time-driver-any", "exti", "unstable-traits", "memory-x"]  } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | ||||||
| embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["time", "defmt"], optional = true } | embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["time", "defmt"], optional = true } | ||||||
| lora-phy = { version = "2", optional = true } | lora-phy = { version = "2", optional = true } | ||||||
| @@ -33,8 +33,7 @@ panic-probe = { version = "0.3", features = ["print-defmt"] } | |||||||
| futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | ||||||
| heapless = { version = "0.7.5", default-features = false } | heapless = { version = "0.7.5", default-features = false } | ||||||
| embedded-hal = "0.2.6" | embedded-hal = "0.2.6" | ||||||
| static_cell = { version = "2" } | static_cell = "1.1" | ||||||
| portable-atomic = { version = "1.5", features = ["unsafe-assume-single-core"] } |  | ||||||
|  |  | ||||||
| [profile.release] | [profile.release] | ||||||
| debug = 2 | debug = 2 | ||||||
|   | |||||||
| @@ -5,8 +5,8 @@ version = "0.1.0" | |||||||
| license = "MIT OR Apache-2.0" | license = "MIT OR Apache-2.0" | ||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32l151cb-a", "time-driver-any", "memory-x"]  } | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32l151cb-a", "time-driver-any", "memory-x"]  } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -7,8 +7,8 @@ license = "MIT OR Apache-2.0" | |||||||
| [dependencies] | [dependencies] | ||||||
| # Change stm32l4s5vi to your chip name, if necessary. | # Change stm32l4s5vi to your chip name, if necessary. | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "unstable-pac", "stm32l4s5qi", "memory-x", "time-driver-any", "exti", "unstable-traits", "chrono"]  } | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "unstable-pac", "stm32l4s5qi", "memory-x", "time-driver-any", "exti", "unstable-traits", "chrono"]  } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768", "unstable-traits", "nightly"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768", "unstable-traits", "nightly"] } | ||||||
| embassy-embedded-hal = { version = "0.1.0", path = "../../embassy-embedded-hal" } | embassy-embedded-hal = { version = "0.1.0", path = "../../embassy-embedded-hal" } | ||||||
| embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | ||||||
| @@ -32,7 +32,7 @@ futures = { version = "0.3.17", default-features = false, features = ["async-awa | |||||||
| heapless = { version = "0.7.5", default-features = false } | heapless = { version = "0.7.5", default-features = false } | ||||||
| chrono = { version = "^0.4", default-features = false } | chrono = { version = "^0.4", default-features = false } | ||||||
| rand = { version = "0.8.5", default-features = false } | rand = { version = "0.8.5", default-features = false } | ||||||
| static_cell = { version = "2", features = ["nightly"]} | static_cell = {version = "1.1", features = ["nightly"]} | ||||||
|  |  | ||||||
| micromath = "2.0.0" | micromath = "2.0.0" | ||||||
|  |  | ||||||
|   | |||||||
| @@ -7,8 +7,8 @@ license = "MIT OR Apache-2.0" | |||||||
| [dependencies] | [dependencies] | ||||||
| # Change stm32l552ze to your chip name, if necessary. | # Change stm32l552ze to your chip name, if necessary. | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "unstable-pac", "stm32l552ze", "time-driver-any", "exti", "unstable-traits", "memory-x"]  } | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "unstable-pac", "stm32l552ze", "time-driver-any", "exti", "unstable-traits", "memory-x"]  } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | ||||||
| embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | ||||||
| embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet"] } | embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet"] } | ||||||
| @@ -26,7 +26,7 @@ futures = { version = "0.3.17", default-features = false, features = ["async-awa | |||||||
| heapless = { version = "0.7.5", default-features = false } | heapless = { version = "0.7.5", default-features = false } | ||||||
| rand_core = { version = "0.6.3", default-features = false } | rand_core = { version = "0.6.3", default-features = false } | ||||||
| embedded-io-async = { version = "0.6.0" } | embedded-io-async = { version = "0.6.0" } | ||||||
| static_cell = { version = "2", features = ["nightly"]} | static_cell = { version = "1.1", features = ["nightly"]} | ||||||
|  |  | ||||||
| [profile.release] | [profile.release] | ||||||
| debug = 2 | debug = 2 | ||||||
|   | |||||||
| @@ -7,8 +7,8 @@ license = "MIT OR Apache-2.0" | |||||||
| [dependencies] | [dependencies] | ||||||
| # Change stm32u585ai to your chip name, if necessary. | # Change stm32u585ai to your chip name, if necessary. | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "unstable-pac", "stm32u585ai", "time-driver-any", "memory-x" ]  } | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "unstable-pac", "stm32u585ai", "time-driver-any", "memory-x" ]  } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | ||||||
| embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -8,8 +8,8 @@ license = "MIT OR Apache-2.0" | |||||||
| # Change stm32wb55rg to your chip name in both dependencies, if necessary. | # Change stm32wb55rg to your chip name in both dependencies, if necessary. | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32wb55rg", "time-driver-any", "memory-x", "exti"]  } | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32wb55rg", "time-driver-any", "memory-x", "exti"]  } | ||||||
| embassy-stm32-wpan = { version = "0.1.0", path = "../../embassy-stm32-wpan", features = ["defmt", "stm32wb55rg"] } | embassy-stm32-wpan = { version = "0.1.0", path = "../../embassy-stm32-wpan", features = ["defmt", "stm32wb55rg"] } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | ||||||
| embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "udp", "proto-ipv6", "medium-ieee802154", "nightly"], optional=true } | embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "udp", "proto-ipv6", "medium-ieee802154", "nightly"], optional=true } | ||||||
|  |  | ||||||
| @@ -22,7 +22,7 @@ embedded-hal = "0.2.6" | |||||||
| panic-probe = { version = "0.3", features = ["print-defmt"] } | panic-probe = { version = "0.3", features = ["print-defmt"] } | ||||||
| futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | ||||||
| heapless = { version = "0.7.5", default-features = false } | heapless = { version = "0.7.5", default-features = false } | ||||||
| static_cell = { version = "2", features = ["nightly"]} | static_cell = { version = "1.1", features = ["nightly"]} | ||||||
|  |  | ||||||
| [features] | [features] | ||||||
| default = ["ble", "mac"] | default = ["ble", "mac"] | ||||||
|   | |||||||
| @@ -6,8 +6,8 @@ license = "MIT OR Apache-2.0" | |||||||
|  |  | ||||||
| [dependencies] | [dependencies] | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32wba52cg", "time-driver-any", "memory-x", "exti"]  } | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32wba52cg", "time-driver-any", "memory-x", "exti"]  } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | ||||||
| embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "udp", "proto-ipv6", "medium-ieee802154", "nightly"], optional=true } | embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "udp", "proto-ipv6", "medium-ieee802154", "nightly"], optional=true } | ||||||
|  |  | ||||||
| @@ -20,7 +20,7 @@ embedded-hal = "0.2.6" | |||||||
| panic-probe = { version = "0.3", features = ["print-defmt"] } | panic-probe = { version = "0.3", features = ["print-defmt"] } | ||||||
| futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | futures = { version = "0.3.17", default-features = false, features = ["async-await"] } | ||||||
| heapless = { version = "0.7.5", default-features = false } | heapless = { version = "0.7.5", default-features = false } | ||||||
| static_cell = { version = "2", features = ["nightly"]} | static_cell = { version = "1.1", features = ["nightly"]} | ||||||
|  |  | ||||||
| [profile.release] | [profile.release] | ||||||
| debug = 2 | debug = 2 | ||||||
|   | |||||||
| @@ -7,8 +7,8 @@ license = "MIT OR Apache-2.0" | |||||||
| [dependencies] | [dependencies] | ||||||
| # Change stm32wl55jc-cm4 to your chip name, if necessary. | # Change stm32wl55jc-cm4 to your chip name, if necessary. | ||||||
| embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "unstable-traits", "defmt", "stm32wl55jc-cm4", "time-driver-any", "memory-x", "unstable-pac", "exti", "chrono"] } | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "unstable-traits", "defmt", "stm32wl55jc-cm4", "time-driver-any", "memory-x", "unstable-pac", "exti", "chrono"] } | ||||||
| embassy-sync = { version = "0.4.0", path = "../../embassy-sync", features = ["defmt"] } | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } | ||||||
| embassy-executor = { version = "0.3.1", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | ||||||
| embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["nightly", "unstable-traits", "defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | embassy-time = { version = "0.1.5", path = "../../embassy-time", features = ["nightly", "unstable-traits", "defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | ||||||
| embassy-embedded-hal = { version = "0.1.0", path = "../../embassy-embedded-hal" } | embassy-embedded-hal = { version = "0.1.0", path = "../../embassy-embedded-hal" } | ||||||
| embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["stm32wl", "time", "defmt"] } | embassy-lora = { version = "0.1.0", path = "../../embassy-lora", features = ["stm32wl", "time", "defmt"] } | ||||||
|   | |||||||
| @@ -4,7 +4,6 @@ | |||||||
| #![no_main] | #![no_main] | ||||||
| #![macro_use] | #![macro_use] | ||||||
| #![feature(type_alias_impl_trait, async_fn_in_trait)] | #![feature(type_alias_impl_trait, async_fn_in_trait)] | ||||||
| #![allow(stable_features, unknown_lints, async_fn_in_trait)] |  | ||||||
|  |  | ||||||
| use defmt::info; | use defmt::info; | ||||||
| use embassy_executor::Spawner; | use embassy_executor::Spawner; | ||||||
|   | |||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user