Compare commits

..

19 Commits

Author SHA1 Message Date
d81395fab3 Update embedded-hal to 1.0.0-rc.3 2023-12-14 16:19:32 +01:00
2c3d399220 Merge pull request #2285 from plaes/boot-partition-formatting-docs-rs
embassy-boot: Fix formatting for tables
2023-12-14 07:44:07 +00:00
b17f16f0af embassy-boot: Fix formatting for tables
Tables describing the a-b flashing were all garbled up in the
cargo doc output, so fix up the syntax.
2023-12-14 09:12:54 +02:00
1279a1b7f6 Merge pull request #2283 from embassy-rs/clarify-boot-requirements
docs: more docs in embassy-boot crate documentation
2023-12-13 18:04:56 +00:00
876faa5685 docs: more docs in embassy-boot crate documentation 2023-12-13 19:00:26 +01:00
915423fc63 Merge pull request #2280 from plaes/embassy-boot-partition-docs
embassy-boot: Add explanation to dfu vs active size assertion
2023-12-13 09:50:42 +00:00
6782fb1efa embassy-boot: Add explanation to dfu vs active size assertion 2023-12-13 11:44:16 +02:00
14f41a71b6 Merge pull request #2276 from cschuhen/stm32f1-can-example
Add example for using CAN with STM32F103 (BluePill) with a real CAN
2023-12-11 11:36:47 +00:00
3626deecaa More formatting. 2023-12-11 21:26:23 +10:00
b34c8e3eb1 Update formatting. 2023-12-11 21:25:05 +10:00
13af76af88 Add example for using CAN with STM32F103 (BluePill) with a real CAN 2023-12-11 21:08:58 +10:00
2d2bd679ee Merge pull request #2275 from lights0123/stm32-usart-invert
stm32: usart pin inversion
2023-12-10 23:48:26 +00:00
dfba51d3f2 stm32: usart pin inversion 2023-12-10 18:39:45 -05:00
343be37f39 Merge pull request #2272 from cbruiz/feature/more-gp-timer-driver-candidates
Add GP TIM9 and TIM11 to be used as time_driver candidates
2023-12-09 18:45:51 +00:00
78f709a362 * Add GP TIM9 and TIM11 to be used as time_driver 2023-12-09 14:14:34 +01:00
e99649e37d Merge pull request #2271 from embassy-rs/update-metapac4
stm32: update stm32-metapac. Fixes USB on STM32WB.
2023-12-08 23:01:26 +00:00
e0e5f66c4b Merge pull request #2270 from Redrield/fix/wb55-usb
Assert CR2.USV on stm32wb55, wb35 series chips
2023-12-08 22:25:51 +00:00
5973e69244 Conditionally compile line for all stm32wb chips 2023-12-08 17:20:23 -05:00
4d3fcd8d2d Assert CR2.USV on stm32wb55, wb35 series chips
ref RM0434 p. 175
2023-12-08 17:06:37 -05:00
49 changed files with 389 additions and 233 deletions

View File

@ -23,7 +23,7 @@ cortex-m = "0.7.6"
cortex-m-rt = "0.7.0" cortex-m-rt = "0.7.0"
futures = { version = "0.3.17", default-features = false, features = ["async-await", "cfg-target-has-atomic", "unstable"] } futures = { version = "0.3.17", default-features = false, features = ["async-await", "cfg-target-has-atomic", "unstable"] }
embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-rc.2" } embedded-hal-1 = { package = "embedded-hal", version = "1.0.0-rc.3" }
num_enum = { version = "0.5.7", default-features = false } num_enum = { version = "0.5.7", default-features = false }
[package.metadata.embassy_docs] [package.metadata.embassy_docs]

View File

@ -9,7 +9,7 @@ use {defmt_rtt as _, panic_probe as _};
fn main() -> ! { fn main() -> ! {
let p = embassy_stm32::init(Default::default()); let p = embassy_stm32::init(Default::default());
let mut led = Output::new(p.PB14, Level::High, Speed::VeryHigh); let mut led = Output::new(p.PB14, Level::High, Speed::VeryHigh);
let button = Input::new(p.PC13, Pull::Up); let mut button = Input::new(p.PC13, Pull::Up);
loop { loop {
if button.is_low() { if button.is_low() {

View File

@ -45,6 +45,8 @@ The BOOTLOADER_STATE partition must be big enough to store one word per page in
The bootloader has a platform-agnostic part, which implements the power fail safe swapping algorithm given the boundaries set by the partitions. The platform-specific part is a minimal shim that provides additional functionality such as watchdogs or supporting the nRF52 softdevice. The bootloader has a platform-agnostic part, which implements the power fail safe swapping algorithm given the boundaries set by the partitions. The platform-specific part is a minimal shim that provides additional functionality such as watchdogs or supporting the nRF52 softdevice.
NOTE: The linker scripts for the application and bootloader look similar, but the FLASH region must point to the BOOTLOADER partition for the bootloader, and the ACTIVE partition for the application.
=== FirmwareUpdater === FirmwareUpdater
The `FirmwareUpdater` is an object for conveniently flashing firmware to the DFU partition and subsequently marking it as being ready for swapping with the active partition on the next reset. Its principle methods are `write_firmware`, which is called once per the size of the flash "write block" (typically 4KiB), and `mark_updated`, which is the final call. The `FirmwareUpdater` is an object for conveniently flashing firmware to the DFU partition and subsequently marking it as being ready for swapping with the active partition on the next reset. Its principle methods are `write_firmware`, which is called once per the size of the flash "write block" (typically 4KiB), and `mark_updated`, which is the final call.
@ -91,4 +93,4 @@ cp $FIRMWARE_DIR/myfirmware $FIRMWARE_DIR/myfirmware+signed
tail -n1 $SECRETS_DIR/message.txt.sig | base64 -d -i - | dd ibs=10 skip=1 >> $FIRMWARE_DIR/myfirmware+signed tail -n1 $SECRETS_DIR/message.txt.sig | base64 -d -i - | dd ibs=10 skip=1 >> $FIRMWARE_DIR/myfirmware+signed
---- ----
Remember, guard the `$SECRETS_DIR/key.sec` key as compromising it means that another party can sign your firmware. Remember, guard the `$SECRETS_DIR/key.sec` key as compromising it means that another party can sign your firmware.

View File

@ -8,6 +8,24 @@ The bootloader can be used either as a library or be flashed directly with the d
By design, the bootloader does not provide any network capabilities. Networking capabilities for fetching new firmware can be provided by the user application, using the bootloader as a library for updating the firmware, or by using the bootloader as a library and adding this capability yourself. By design, the bootloader does not provide any network capabilities. Networking capabilities for fetching new firmware can be provided by the user application, using the bootloader as a library for updating the firmware, or by using the bootloader as a library and adding this capability yourself.
## Overview
The bootloader divides the storage into 4 main partitions, configurable when creating the bootloader instance or via linker scripts:
* BOOTLOADER - Where the bootloader is placed. The bootloader itself consumes about 8kB of flash, but if you need to debug it and have space available, increasing this to 24kB will allow you to run the bootloader with probe-rs.
* ACTIVE - Where the main application is placed. The bootloader will attempt to load the application at the start of this partition. The minimum size required for this partition is the size of your application.
* DFU - Where the application-to-be-swapped is placed. This partition is written to by the application. This partition must be at least 1 page bigger than the ACTIVE partition.
* BOOTLOADER STATE - Where the bootloader stores the current state describing if the active and dfu partitions need to be swapped.
For any partition, the following preconditions are required:
* Partitions must be aligned on the page size.
* Partitions must be a multiple of the page size.
The linker scripts for the application and bootloader look similar, but the FLASH region must point to the BOOTLOADER partition for the bootloader, and the ACTIVE partition for the application.
For more details on the bootloader, see [the documentation](https://embassy.dev/book/dev/bootloader.html).
## Hardware support ## Hardware support
The bootloader supports different hardware in separate crates: The bootloader supports different hardware in separate crates:
@ -16,6 +34,7 @@ The bootloader supports different hardware in separate crates:
* `embassy-boot-rp` - for the RP2040 microcontrollers. * `embassy-boot-rp` - for the RP2040 microcontrollers.
* `embassy-boot-stm32` - for the STM32 microcontrollers. * `embassy-boot-stm32` - for the STM32 microcontrollers.
## Minimum supported Rust version (MSRV) ## Minimum supported Rust version (MSRV)
`embassy-boot` is guaranteed to compile on the latest stable Rust version at the time of release. It might compile with older versions but that may change in any new patch release. `embassy-boot` is guaranteed to compile on the latest stable Rust version at the time of release. It might compile with older versions but that may change in any new patch release.

View File

@ -135,51 +135,44 @@ impl<ACTIVE: NorFlash, DFU: NorFlash, STATE: NorFlash> BootLoader<ACTIVE, DFU, S
/// The provided aligned_buf argument must satisfy any alignment requirements /// The provided aligned_buf argument must satisfy any alignment requirements
/// given by the partition flashes. All flash operations will use this buffer. /// given by the partition flashes. All flash operations will use this buffer.
/// ///
/// SWAPPING /// ## SWAPPING
/// ///
/// Assume a flash size of 3 pages for the active partition, and 4 pages for the DFU partition. /// Assume a flash size of 3 pages for the active partition, and 4 pages for the DFU partition.
/// The swap index contains the copy progress, as to allow continuation of the copy process on /// The swap index contains the copy progress, as to allow continuation of the copy process on
/// power failure. The index counter is represented within 1 or more pages (depending on total /// power failure. The index counter is represented within 1 or more pages (depending on total
/// flash size), where a page X is considered swapped if index at location (X + WRITE_SIZE) /// flash size), where a page X is considered swapped if index at location (`X + WRITE_SIZE`)
/// contains a zero value. This ensures that index updates can be performed atomically and /// contains a zero value. This ensures that index updates can be performed atomically and
/// avoid a situation where the wrong index value is set (page write size is "atomic"). /// avoid a situation where the wrong index value is set (page write size is "atomic").
/// ///
/// +-----------+------------+--------+--------+--------+--------+ ///
/// | Partition | Swap Index | Page 0 | Page 1 | Page 3 | Page 4 | /// | Partition | Swap Index | Page 0 | Page 1 | Page 3 | Page 4 |
/// +-----------+------------+--------+--------+--------+--------+ /// |-----------|------------|--------|--------|--------|--------|
/// | Active | 0 | 1 | 2 | 3 | - | /// | Active | 0 | 1 | 2 | 3 | - |
/// | DFU | 0 | 3 | 2 | 1 | X | /// | DFU | 0 | 3 | 2 | 1 | X |
/// +-----------+------------+--------+--------+--------+--------+
/// ///
/// The algorithm starts by copying 'backwards', and after the first step, the layout is /// The algorithm starts by copying 'backwards', and after the first step, the layout is
/// as follows: /// as follows:
/// ///
/// +-----------+------------+--------+--------+--------+--------+
/// | Partition | Swap Index | Page 0 | Page 1 | Page 3 | Page 4 | /// | Partition | Swap Index | Page 0 | Page 1 | Page 3 | Page 4 |
/// +-----------+------------+--------+--------+--------+--------+ /// |-----------|------------|--------|--------|--------|--------|
/// | Active | 1 | 1 | 2 | 1 | - | /// | Active | 1 | 1 | 2 | 1 | - |
/// | DFU | 1 | 3 | 2 | 1 | 3 | /// | DFU | 1 | 3 | 2 | 1 | 3 |
/// +-----------+------------+--------+--------+--------+--------+
/// ///
/// The next iteration performs the same steps /// The next iteration performs the same steps
/// ///
/// +-----------+------------+--------+--------+--------+--------+
/// | Partition | Swap Index | Page 0 | Page 1 | Page 3 | Page 4 | /// | Partition | Swap Index | Page 0 | Page 1 | Page 3 | Page 4 |
/// +-----------+------------+--------+--------+--------+--------+ /// |-----------|------------|--------|--------|--------|--------|
/// | Active | 2 | 1 | 2 | 1 | - | /// | Active | 2 | 1 | 2 | 1 | - |
/// | DFU | 2 | 3 | 2 | 2 | 3 | /// | DFU | 2 | 3 | 2 | 2 | 3 |
/// +-----------+------------+--------+--------+--------+--------+
/// ///
/// And again until we're done /// And again until we're done
/// ///
/// +-----------+------------+--------+--------+--------+--------+
/// | Partition | Swap Index | Page 0 | Page 1 | Page 3 | Page 4 | /// | Partition | Swap Index | Page 0 | Page 1 | Page 3 | Page 4 |
/// +-----------+------------+--------+--------+--------+--------+ /// |-----------|------------|--------|--------|--------|--------|
/// | Active | 3 | 3 | 2 | 1 | - | /// | Active | 3 | 3 | 2 | 1 | - |
/// | DFU | 3 | 3 | 1 | 2 | 3 | /// | DFU | 3 | 3 | 1 | 2 | 3 |
/// +-----------+------------+--------+--------+--------+--------+
/// ///
/// REVERTING /// ## REVERTING
/// ///
/// The reverting algorithm uses the swap index to discover that images were swapped, but that /// The reverting algorithm uses the swap index to discover that images were swapped, but that
/// the application failed to mark the boot successful. In this case, the revert algorithm will /// the application failed to mark the boot successful. In this case, the revert algorithm will
@ -190,28 +183,21 @@ impl<ACTIVE: NorFlash, DFU: NorFlash, STATE: NorFlash> BootLoader<ACTIVE, DFU, S
/// ///
/// The revert algorithm works forwards, by starting copying into the 'unused' DFU page at the start. /// The revert algorithm works forwards, by starting copying into the 'unused' DFU page at the start.
/// ///
/// +-----------+--------------+--------+--------+--------+--------+
/// | Partition | Revert Index | Page 0 | Page 1 | Page 3 | Page 4 | /// | Partition | Revert Index | Page 0 | Page 1 | Page 3 | Page 4 |
//*/ /// |-----------|--------------|--------|--------|--------|--------|
/// +-----------+--------------+--------+--------+--------+--------+
/// | Active | 3 | 1 | 2 | 1 | - | /// | Active | 3 | 1 | 2 | 1 | - |
/// | DFU | 3 | 3 | 1 | 2 | 3 | /// | DFU | 3 | 3 | 1 | 2 | 3 |
/// +-----------+--------------+--------+--------+--------+--------+
/// ///
/// ///
/// +-----------+--------------+--------+--------+--------+--------+
/// | Partition | Revert Index | Page 0 | Page 1 | Page 3 | Page 4 | /// | Partition | Revert Index | Page 0 | Page 1 | Page 3 | Page 4 |
/// +-----------+--------------+--------+--------+--------+--------+ /// |-----------|--------------|--------|--------|--------|--------|
/// | Active | 3 | 1 | 2 | 1 | - | /// | Active | 3 | 1 | 2 | 1 | - |
/// | DFU | 3 | 3 | 2 | 2 | 3 | /// | DFU | 3 | 3 | 2 | 2 | 3 |
/// +-----------+--------------+--------+--------+--------+--------+
/// ///
/// +-----------+--------------+--------+--------+--------+--------+
/// | Partition | Revert Index | Page 0 | Page 1 | Page 3 | Page 4 | /// | Partition | Revert Index | Page 0 | Page 1 | Page 3 | Page 4 |
/// +-----------+--------------+--------+--------+--------+--------+ /// |-----------|--------------|--------|--------|--------|--------|
/// | Active | 3 | 1 | 2 | 3 | - | /// | Active | 3 | 1 | 2 | 3 | - |
/// | DFU | 3 | 3 | 2 | 1 | 3 | /// | DFU | 3 | 3 | 2 | 1 | 3 |
/// +-----------+--------------+--------+--------+--------+--------+
/// ///
pub fn prepare_boot(&mut self, aligned_buf: &mut [u8]) -> Result<State, BootError> { pub fn prepare_boot(&mut self, aligned_buf: &mut [u8]) -> Result<State, BootError> {
// Ensure we have enough progress pages to store copy progress // Ensure we have enough progress pages to store copy progress
@ -224,6 +210,7 @@ impl<ACTIVE: NorFlash, DFU: NorFlash, STATE: NorFlash> BootLoader<ACTIVE, DFU, S
assert_eq!(0, aligned_buf.len() % ACTIVE::WRITE_SIZE); assert_eq!(0, aligned_buf.len() % ACTIVE::WRITE_SIZE);
assert_eq!(0, aligned_buf.len() % DFU::WRITE_SIZE); assert_eq!(0, aligned_buf.len() % DFU::WRITE_SIZE);
// Ensure our partitions are able to handle boot operations
assert_partitions(&self.active, &self.dfu, &self.state, Self::PAGE_SIZE); assert_partitions(&self.active, &self.dfu, &self.state, Self::PAGE_SIZE);
// Copy contents from partition N to active // Copy contents from partition N to active
@ -398,6 +385,7 @@ fn assert_partitions<ACTIVE: NorFlash, DFU: NorFlash, STATE: NorFlash>(
) { ) {
assert_eq!(active.capacity() as u32 % page_size, 0); assert_eq!(active.capacity() as u32 % page_size, 0);
assert_eq!(dfu.capacity() as u32 % page_size, 0); assert_eq!(dfu.capacity() as u32 % page_size, 0);
// DFU partition has to be bigger than ACTIVE partition to handle swap algorithm
assert!(dfu.capacity() as u32 - active.capacity() as u32 >= page_size); assert!(dfu.capacity() as u32 - active.capacity() as u32 >= page_size);
assert!(2 + 2 * (active.capacity() as u32 / page_size) <= state.capacity() as u32 / STATE::WRITE_SIZE as u32); assert!(2 + 2 * (active.capacity() as u32 / page_size) <= state.capacity() as u32 / STATE::WRITE_SIZE as u32);
} }

View File

@ -23,8 +23,8 @@ embassy-time = { version = "0.2", 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",
] } ] }
embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.2" } embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.3" }
embedded-hal-async = { version = "=1.0.0-rc.2" } embedded-hal-async = { version = "=1.0.0-rc.3" }
embedded-storage = "0.3.1" embedded-storage = "0.3.1"
embedded-storage-async = { version = "0.4.1" } embedded-storage-async = { version = "0.4.1" }
nb = "1.0.0" nb = "1.0.0"

View File

@ -13,16 +13,16 @@ edition = "2021"
heapless = "0.8" heapless = "0.8"
defmt = { version = "0.3", optional = true } defmt = { version = "0.3", optional = true }
log = { version = "0.4", default-features = false, optional = true } log = { version = "0.4", default-features = false, optional = true }
embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.2" } embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.3" }
embedded-hal-async = { version = "=1.0.0-rc.2" } embedded-hal-async = { version = "=1.0.0-rc.3" }
embedded-hal-bus = { version = "=0.1.0-rc.2", features = ["async"] } embedded-hal-bus = { version = "=0.1.0-rc.3", features = ["async"] }
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-time = { version = "0.2", path = "../embassy-time" } embassy-time = { version = "0.2", path = "../embassy-time" }
embassy-futures = { version = "0.1.0", path = "../embassy-futures" } embassy-futures = { version = "0.1.0", path = "../embassy-futures" }
bitfield = "0.14.0" bitfield = "0.14.0"
[dev-dependencies] [dev-dependencies]
embedded-hal-mock = { git = "https://github.com/Dirbaio/embedded-hal-mock", rev = "c5c4dca18e043e6386aee02173f61a65fea3981e", features = ["embedded-hal-async", "eh1"] } embedded-hal-mock = { git = "https://github.com/Dirbaio/embedded-hal-mock", rev = "b5a2274759a8c484f4fae71a22f8a083fdd9d5da", 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"] }

View File

@ -8,8 +8,8 @@ license = "MIT OR Apache-2.0"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
embedded-hal = { version = "1.0.0-rc.2" } embedded-hal = { version = "1.0.0-rc.3" }
embedded-hal-async = { version = "=1.0.0-rc.2" } embedded-hal-async = { version = "=1.0.0-rc.3" }
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.2", path = "../embassy-time" } embassy-time = { version = "0.2", path = "../embassy-time" }
embassy-futures = { version = "0.1.0", path = "../embassy-futures" } embassy-futures = { version = "0.1.0", path = "../embassy-futures" }

View File

@ -12,8 +12,8 @@ embassy-sync = { version = "0.5.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"}
embedded-hal = { version = "1.0.0-rc.2" } embedded-hal = { version = "1.0.0-rc.3" }
embedded-hal-async = { version = "=1.0.0-rc.2" } embedded-hal-async = { version = "=1.0.0-rc.3" }
noproto = { git="https://github.com/embassy-rs/noproto", rev = "f5e6d1f325b6ad4e344f60452b09576e24671f62", default-features = false, features = ["derive"] } noproto = { git="https://github.com/embassy-rs/noproto", rev = "f5e6d1f325b6ad4e344f60452b09576e24671f62", default-features = false, features = ["derive"] }
#noproto = { version = "0.1", path = "/home/dirbaio/noproto", default-features = false, features = ["derive"] } #noproto = { version = "0.1", path = "/home/dirbaio/noproto", default-features = false, features = ["derive"] }

View File

@ -8,8 +8,8 @@ license = "MIT OR Apache-2.0"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
embedded-hal = { version = "1.0.0-rc.2" } embedded-hal = { version = "1.0.0-rc.3" }
embedded-hal-async = { version = "=1.0.0-rc.2" } embedded-hal-async = { version = "=1.0.0-rc.3" }
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-time = { version = "0.2", path = "../embassy-time" } embassy-time = { version = "0.2", path = "../embassy-time" }
embassy-futures = { version = "0.1.0", path = "../embassy-futures" } embassy-futures = { version = "0.1.0", path = "../embassy-futures" }

View File

@ -94,8 +94,8 @@ embassy-embedded-hal = {version = "0.1.0", path = "../embassy-embedded-hal" }
embassy-usb-driver = {version = "0.1.0", path = "../embassy-usb-driver" } embassy-usb-driver = {version = "0.1.0", path = "../embassy-usb-driver" }
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.2" } embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.3" }
embedded-hal-async = { version = "=1.0.0-rc.2" } embedded-hal-async = { version = "=1.0.0-rc.3" }
embedded-io = { version = "0.6.0" } embedded-io = { version = "0.6.0" }
embedded-io-async = { version = "0.6.1" } embedded-io-async = { version = "0.6.1" }
@ -120,4 +120,3 @@ nrf52840-pac = { version = "0.12.0", optional = true }
nrf5340-app-pac = { version = "0.12.0", optional = true } nrf5340-app-pac = { version = "0.12.0", optional = true }
nrf5340-net-pac = { version = "0.12.0", optional = true } nrf5340-net-pac = { version = "0.12.0", optional = true }
nrf9160-pac = { version = "0.12.0", optional = true } nrf9160-pac = { version = "0.12.0", optional = true }

View File

@ -52,19 +52,19 @@ impl<'d, T: Pin> Input<'d, T> {
/// Test if current pin level is high. /// Test if current pin level is high.
#[inline] #[inline]
pub fn is_high(&self) -> bool { pub fn is_high(&mut self) -> bool {
self.pin.is_high() self.pin.is_high()
} }
/// Test if current pin level is low. /// Test if current pin level is low.
#[inline] #[inline]
pub fn is_low(&self) -> bool { pub fn is_low(&mut self) -> bool {
self.pin.is_low() self.pin.is_low()
} }
/// Returns current pin level /// Returns current pin level
#[inline] #[inline]
pub fn get_level(&self) -> Level { pub fn get_level(&mut self) -> Level {
self.pin.get_level() self.pin.get_level()
} }
} }
@ -160,19 +160,19 @@ impl<'d, T: Pin> Output<'d, T> {
/// Is the output pin set as high? /// Is the output pin set as high?
#[inline] #[inline]
pub fn is_set_high(&self) -> bool { pub fn is_set_high(&mut self) -> bool {
self.pin.is_set_high() self.pin.is_set_high()
} }
/// Is the output pin set as low? /// Is the output pin set as low?
#[inline] #[inline]
pub fn is_set_low(&self) -> bool { pub fn is_set_low(&mut self) -> bool {
self.pin.is_set_low() self.pin.is_set_low()
} }
/// What level output is set to /// What level output is set to
#[inline] #[inline]
pub fn get_output_level(&self) -> Level { pub fn get_output_level(&mut self) -> Level {
self.pin.get_output_level() self.pin.get_output_level()
} }
} }
@ -277,19 +277,24 @@ impl<'d, T: Pin> Flex<'d, T> {
/// Test if current pin level is high. /// Test if current pin level is high.
#[inline] #[inline]
pub fn is_high(&self) -> bool { pub fn is_high(&mut self) -> bool {
!self.is_low() !self.is_low()
} }
/// Test if current pin level is low. /// Test if current pin level is low.
#[inline] #[inline]
pub fn is_low(&self) -> bool { pub fn is_low(&mut self) -> bool {
self.ref_is_low()
}
#[inline]
pub(crate) fn ref_is_low(&self) -> bool {
self.pin.block().in_.read().bits() & (1 << self.pin.pin()) == 0 self.pin.block().in_.read().bits() & (1 << self.pin.pin()) == 0
} }
/// Returns current pin level /// Returns current pin level
#[inline] #[inline]
pub fn get_level(&self) -> Level { pub fn get_level(&mut self) -> Level {
self.is_high().into() self.is_high().into()
} }
@ -316,19 +321,25 @@ impl<'d, T: Pin> Flex<'d, T> {
/// Is the output pin set as high? /// Is the output pin set as high?
#[inline] #[inline]
pub fn is_set_high(&self) -> bool { pub fn is_set_high(&mut self) -> bool {
!self.is_set_low() !self.is_set_low()
} }
/// Is the output pin set as low? /// Is the output pin set as low?
#[inline] #[inline]
pub fn is_set_low(&self) -> bool { pub fn is_set_low(&mut self) -> bool {
self.ref_is_set_low()
}
/// Is the output pin set as low?
#[inline]
pub(crate) fn ref_is_set_low(&self) -> bool {
self.pin.block().out.read().bits() & (1 << self.pin.pin()) == 0 self.pin.block().out.read().bits() & (1 << self.pin.pin()) == 0
} }
/// What level output is set to /// What level output is set to
#[inline] #[inline]
pub fn get_output_level(&self) -> Level { pub fn get_output_level(&mut self) -> Level {
self.is_set_high().into() self.is_set_high().into()
} }
} }
@ -498,11 +509,11 @@ mod eh02 {
type Error = Infallible; type Error = Infallible;
fn is_high(&self) -> Result<bool, Self::Error> { fn is_high(&self) -> Result<bool, Self::Error> {
Ok(self.is_high()) Ok(!self.pin.ref_is_low())
} }
fn is_low(&self) -> Result<bool, Self::Error> { fn is_low(&self) -> Result<bool, Self::Error> {
Ok(self.is_low()) Ok(self.pin.ref_is_low())
} }
} }
@ -520,11 +531,11 @@ mod eh02 {
impl<'d, T: Pin> embedded_hal_02::digital::v2::StatefulOutputPin for Output<'d, T> { impl<'d, T: Pin> embedded_hal_02::digital::v2::StatefulOutputPin for Output<'d, T> {
fn is_set_high(&self) -> Result<bool, Self::Error> { fn is_set_high(&self) -> Result<bool, Self::Error> {
Ok(self.is_set_high()) Ok(!self.pin.ref_is_set_low())
} }
fn is_set_low(&self) -> Result<bool, Self::Error> { fn is_set_low(&self) -> Result<bool, Self::Error> {
Ok(self.is_set_low()) Ok(self.pin.ref_is_set_low())
} }
} }
@ -535,11 +546,11 @@ mod eh02 {
type Error = Infallible; type Error = Infallible;
fn is_high(&self) -> Result<bool, Self::Error> { fn is_high(&self) -> Result<bool, Self::Error> {
Ok(self.is_high()) Ok(!self.ref_is_low())
} }
fn is_low(&self) -> Result<bool, Self::Error> { fn is_low(&self) -> Result<bool, Self::Error> {
Ok(self.is_low()) Ok(self.ref_is_low())
} }
} }
@ -557,11 +568,11 @@ mod eh02 {
impl<'d, T: Pin> embedded_hal_02::digital::v2::StatefulOutputPin for Flex<'d, T> { impl<'d, T: Pin> embedded_hal_02::digital::v2::StatefulOutputPin for Flex<'d, T> {
fn is_set_high(&self) -> Result<bool, Self::Error> { fn is_set_high(&self) -> Result<bool, Self::Error> {
Ok(self.is_set_high()) Ok(!self.ref_is_set_low())
} }
fn is_set_low(&self) -> Result<bool, Self::Error> { fn is_set_low(&self) -> Result<bool, Self::Error> {
Ok(self.is_set_low()) Ok(self.ref_is_set_low())
} }
} }
} }
@ -571,11 +582,11 @@ impl<'d, T: Pin> embedded_hal_1::digital::ErrorType for Input<'d, T> {
} }
impl<'d, T: Pin> embedded_hal_1::digital::InputPin for Input<'d, T> { impl<'d, T: Pin> embedded_hal_1::digital::InputPin for Input<'d, T> {
fn is_high(&self) -> Result<bool, Self::Error> { fn is_high(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_high()) Ok(self.is_high())
} }
fn is_low(&self) -> Result<bool, Self::Error> { fn is_low(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_low()) Ok(self.is_low())
} }
} }
@ -595,11 +606,11 @@ impl<'d, T: Pin> embedded_hal_1::digital::OutputPin for Output<'d, T> {
} }
impl<'d, T: Pin> embedded_hal_1::digital::StatefulOutputPin for Output<'d, T> { impl<'d, T: Pin> embedded_hal_1::digital::StatefulOutputPin for Output<'d, T> {
fn is_set_high(&self) -> Result<bool, Self::Error> { fn is_set_high(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_set_high()) Ok(self.is_set_high())
} }
fn is_set_low(&self) -> Result<bool, Self::Error> { fn is_set_low(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_set_low()) Ok(self.is_set_low())
} }
} }
@ -612,11 +623,11 @@ impl<'d, T: Pin> embedded_hal_1::digital::ErrorType for Flex<'d, T> {
/// ///
/// If the pin is not in input mode the result is unspecified. /// If the pin is not in input mode the result is unspecified.
impl<'d, T: Pin> embedded_hal_1::digital::InputPin for Flex<'d, T> { impl<'d, T: Pin> embedded_hal_1::digital::InputPin for Flex<'d, T> {
fn is_high(&self) -> Result<bool, Self::Error> { fn is_high(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_high()) Ok(self.is_high())
} }
fn is_low(&self) -> Result<bool, Self::Error> { fn is_low(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_low()) Ok(self.is_low())
} }
} }
@ -632,11 +643,11 @@ impl<'d, T: Pin> embedded_hal_1::digital::OutputPin for Flex<'d, T> {
} }
impl<'d, T: Pin> embedded_hal_1::digital::StatefulOutputPin for Flex<'d, T> { impl<'d, T: Pin> embedded_hal_1::digital::StatefulOutputPin for Flex<'d, T> {
fn is_set_high(&self) -> Result<bool, Self::Error> { fn is_set_high(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_set_high()) Ok(self.is_set_high())
} }
fn is_set_low(&self) -> Result<bool, Self::Error> { fn is_set_low(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_set_low()) Ok(self.is_set_low())
} }
} }

View File

@ -243,7 +243,7 @@ impl<'d, C: Channel, T: GpioPin> Drop for OutputChannel<'d, C, T> {
impl<'d, C: Channel, T: GpioPin> OutputChannel<'d, C, T> { impl<'d, C: Channel, T: GpioPin> OutputChannel<'d, C, T> {
/// Create a new GPIOTE output channel driver. /// Create a new GPIOTE output channel driver.
pub fn new(ch: impl Peripheral<P = C> + 'd, pin: Output<'d, T>, polarity: OutputChannelPolarity) -> Self { pub fn new(ch: impl Peripheral<P = C> + 'd, mut pin: Output<'d, T>, polarity: OutputChannelPolarity) -> Self {
into_ref!(ch); into_ref!(ch);
let g = regs(); let g = regs();
let num = ch.number(); let num = ch.number();
@ -481,11 +481,11 @@ mod eh02 {
type Error = Infallible; type Error = Infallible;
fn is_high(&self) -> Result<bool, Self::Error> { fn is_high(&self) -> Result<bool, Self::Error> {
Ok(self.pin.is_high()) Ok(!self.pin.pin.ref_is_low())
} }
fn is_low(&self) -> Result<bool, Self::Error> { fn is_low(&self) -> Result<bool, Self::Error> {
Ok(self.pin.is_low()) Ok(self.pin.pin.ref_is_low())
} }
} }
} }
@ -495,11 +495,11 @@ impl<'d, C: Channel, T: GpioPin> embedded_hal_1::digital::ErrorType for InputCha
} }
impl<'d, C: Channel, T: GpioPin> embedded_hal_1::digital::InputPin for InputChannel<'d, C, T> { impl<'d, C: Channel, T: GpioPin> embedded_hal_1::digital::InputPin for InputChannel<'d, C, T> {
fn is_high(&self) -> Result<bool, Self::Error> { fn is_high(&mut self) -> Result<bool, Self::Error> {
Ok(self.pin.is_high()) Ok(self.pin.is_high())
} }
fn is_low(&self) -> Result<bool, Self::Error> { fn is_low(&mut self) -> Result<bool, Self::Error> {
Ok(self.pin.is_low()) Ok(self.pin.is_low())
} }
} }

View File

@ -78,9 +78,9 @@ fixed = "1.23.1"
rp-pac = { version = "6" } rp-pac = { version = "6" }
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.2" } embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.3" }
embedded-hal-async = { version = "=1.0.0-rc.2" } embedded-hal-async = { version = "=1.0.0-rc.3" }
embedded-hal-nb = { version = "=1.0.0-rc.2" } embedded-hal-nb = { version = "=1.0.0-rc.3" }
pio-proc = {version= "0.2" } pio-proc = {version= "0.2" }
pio = {version= "0.2.1" } pio = {version= "0.2.1" }

View File

@ -105,18 +105,18 @@ impl<'d, T: Pin> Input<'d, T> {
} }
#[inline] #[inline]
pub fn is_high(&self) -> bool { pub fn is_high(&mut self) -> bool {
self.pin.is_high() self.pin.is_high()
} }
#[inline] #[inline]
pub fn is_low(&self) -> bool { pub fn is_low(&mut self) -> bool {
self.pin.is_low() self.pin.is_low()
} }
/// Returns current pin level /// Returns current pin level
#[inline] #[inline]
pub fn get_level(&self) -> Level { pub fn get_level(&mut self) -> Level {
self.pin.get_level() self.pin.get_level()
} }
@ -357,19 +357,19 @@ impl<'d, T: Pin> Output<'d, T> {
/// Is the output pin set as high? /// Is the output pin set as high?
#[inline] #[inline]
pub fn is_set_high(&self) -> bool { pub fn is_set_high(&mut self) -> bool {
self.pin.is_set_high() self.pin.is_set_high()
} }
/// Is the output pin set as low? /// Is the output pin set as low?
#[inline] #[inline]
pub fn is_set_low(&self) -> bool { pub fn is_set_low(&mut self) -> bool {
self.pin.is_set_low() self.pin.is_set_low()
} }
/// What level output is set to /// What level output is set to
#[inline] #[inline]
pub fn get_output_level(&self) -> Level { pub fn get_output_level(&mut self) -> Level {
self.pin.get_output_level() self.pin.get_output_level()
} }
@ -434,19 +434,19 @@ impl<'d, T: Pin> OutputOpenDrain<'d, T> {
/// Is the output level high? /// Is the output level high?
#[inline] #[inline]
pub fn is_set_high(&self) -> bool { pub fn is_set_high(&mut self) -> bool {
!self.is_set_low() !self.is_set_low()
} }
/// Is the output level low? /// Is the output level low?
#[inline] #[inline]
pub fn is_set_low(&self) -> bool { pub fn is_set_low(&mut self) -> bool {
self.pin.is_set_as_output() self.pin.is_set_as_output()
} }
/// What level output is set to /// What level output is set to
#[inline] #[inline]
pub fn get_output_level(&self) -> Level { pub fn get_output_level(&mut self) -> Level {
self.is_set_high().into() self.is_set_high().into()
} }
@ -457,18 +457,18 @@ impl<'d, T: Pin> OutputOpenDrain<'d, T> {
} }
#[inline] #[inline]
pub fn is_high(&self) -> bool { pub fn is_high(&mut self) -> bool {
self.pin.is_high() self.pin.is_high()
} }
#[inline] #[inline]
pub fn is_low(&self) -> bool { pub fn is_low(&mut self) -> bool {
self.pin.is_low() self.pin.is_low()
} }
/// Returns current pin level /// Returns current pin level
#[inline] #[inline]
pub fn get_level(&self) -> Level { pub fn get_level(&mut self) -> Level {
self.is_high().into() self.is_high().into()
} }
@ -590,7 +590,12 @@ impl<'d, T: Pin> Flex<'d, T> {
} }
#[inline] #[inline]
fn is_set_as_output(&self) -> bool { pub fn is_set_as_output(&mut self) -> bool {
self.ref_is_set_as_output()
}
#[inline]
pub(crate) fn ref_is_set_as_output(&self) -> bool {
(self.pin.sio_oe().value().read() & self.bit()) != 0 (self.pin.sio_oe().value().read() & self.bit()) != 0
} }
@ -600,18 +605,23 @@ impl<'d, T: Pin> Flex<'d, T> {
} }
#[inline] #[inline]
pub fn is_high(&self) -> bool { pub fn is_high(&mut self) -> bool {
!self.is_low() !self.is_low()
} }
#[inline] #[inline]
pub fn is_low(&self) -> bool { pub fn is_low(&mut self) -> bool {
self.ref_is_low()
}
#[inline]
pub(crate) fn ref_is_low(&self) -> bool {
self.pin.sio_in().read() & self.bit() == 0 self.pin.sio_in().read() & self.bit() == 0
} }
/// Returns current pin level /// Returns current pin level
#[inline] #[inline]
pub fn get_level(&self) -> Level { pub fn get_level(&mut self) -> Level {
self.is_high().into() self.is_high().into()
} }
@ -638,19 +648,24 @@ impl<'d, T: Pin> Flex<'d, T> {
/// Is the output level high? /// Is the output level high?
#[inline] #[inline]
pub fn is_set_high(&self) -> bool { pub fn is_set_high(&mut self) -> bool {
!self.is_set_low() !self.is_set_low()
} }
/// Is the output level low? /// Is the output level low?
#[inline] #[inline]
pub fn is_set_low(&self) -> bool { pub fn is_set_low(&mut self) -> bool {
self.ref_is_set_low()
}
#[inline]
pub(crate) fn ref_is_set_low(&self) -> bool {
(self.pin.sio_out().value().read() & self.bit()) == 0 (self.pin.sio_out().value().read() & self.bit()) == 0
} }
/// What level output is set to /// What level output is set to
#[inline] #[inline]
pub fn get_output_level(&self) -> Level { pub fn get_output_level(&mut self) -> Level {
self.is_set_high().into() self.is_set_high().into()
} }
@ -912,11 +927,11 @@ mod eh02 {
type Error = Infallible; type Error = Infallible;
fn is_high(&self) -> Result<bool, Self::Error> { fn is_high(&self) -> Result<bool, Self::Error> {
Ok(self.is_high()) Ok(!self.pin.ref_is_low())
} }
fn is_low(&self) -> Result<bool, Self::Error> { fn is_low(&self) -> Result<bool, Self::Error> {
Ok(self.is_low()) Ok(self.pin.ref_is_low())
} }
} }
@ -934,11 +949,11 @@ mod eh02 {
impl<'d, T: Pin> embedded_hal_02::digital::v2::StatefulOutputPin for Output<'d, T> { impl<'d, T: Pin> embedded_hal_02::digital::v2::StatefulOutputPin for Output<'d, T> {
fn is_set_high(&self) -> Result<bool, Self::Error> { fn is_set_high(&self) -> Result<bool, Self::Error> {
Ok(self.is_set_high()) Ok(!self.pin.ref_is_set_low())
} }
fn is_set_low(&self) -> Result<bool, Self::Error> { fn is_set_low(&self) -> Result<bool, Self::Error> {
Ok(self.is_set_low()) Ok(self.pin.ref_is_set_low())
} }
} }
@ -954,11 +969,11 @@ mod eh02 {
type Error = Infallible; type Error = Infallible;
fn is_high(&self) -> Result<bool, Self::Error> { fn is_high(&self) -> Result<bool, Self::Error> {
Ok(self.is_high()) Ok(!self.pin.ref_is_low())
} }
fn is_low(&self) -> Result<bool, Self::Error> { fn is_low(&self) -> Result<bool, Self::Error> {
Ok(self.is_low()) Ok(self.pin.ref_is_low())
} }
} }
@ -978,11 +993,11 @@ mod eh02 {
impl<'d, T: Pin> embedded_hal_02::digital::v2::StatefulOutputPin for OutputOpenDrain<'d, T> { impl<'d, T: Pin> embedded_hal_02::digital::v2::StatefulOutputPin for OutputOpenDrain<'d, T> {
fn is_set_high(&self) -> Result<bool, Self::Error> { fn is_set_high(&self) -> Result<bool, Self::Error> {
Ok(self.is_set_high()) Ok(!self.pin.ref_is_set_as_output())
} }
fn is_set_low(&self) -> Result<bool, Self::Error> { fn is_set_low(&self) -> Result<bool, Self::Error> {
Ok(self.is_set_low()) Ok(self.pin.ref_is_set_as_output())
} }
} }
@ -998,11 +1013,11 @@ mod eh02 {
type Error = Infallible; type Error = Infallible;
fn is_high(&self) -> Result<bool, Self::Error> { fn is_high(&self) -> Result<bool, Self::Error> {
Ok(self.is_high()) Ok(!self.ref_is_low())
} }
fn is_low(&self) -> Result<bool, Self::Error> { fn is_low(&self) -> Result<bool, Self::Error> {
Ok(self.is_low()) Ok(self.ref_is_low())
} }
} }
@ -1020,11 +1035,11 @@ mod eh02 {
impl<'d, T: Pin> embedded_hal_02::digital::v2::StatefulOutputPin for Flex<'d, T> { impl<'d, T: Pin> embedded_hal_02::digital::v2::StatefulOutputPin for Flex<'d, T> {
fn is_set_high(&self) -> Result<bool, Self::Error> { fn is_set_high(&self) -> Result<bool, Self::Error> {
Ok(self.is_set_high()) Ok(!self.ref_is_set_low())
} }
fn is_set_low(&self) -> Result<bool, Self::Error> { fn is_set_low(&self) -> Result<bool, Self::Error> {
Ok(self.is_set_low()) Ok(self.ref_is_set_low())
} }
} }
@ -1042,11 +1057,11 @@ impl<'d, T: Pin> embedded_hal_1::digital::ErrorType for Input<'d, T> {
} }
impl<'d, T: Pin> embedded_hal_1::digital::InputPin for Input<'d, T> { impl<'d, T: Pin> embedded_hal_1::digital::InputPin for Input<'d, T> {
fn is_high(&self) -> Result<bool, Self::Error> { fn is_high(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_high()) Ok(self.is_high())
} }
fn is_low(&self) -> Result<bool, Self::Error> { fn is_low(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_low()) Ok(self.is_low())
} }
} }
@ -1066,11 +1081,11 @@ impl<'d, T: Pin> embedded_hal_1::digital::OutputPin for Output<'d, T> {
} }
impl<'d, T: Pin> embedded_hal_1::digital::StatefulOutputPin for Output<'d, T> { impl<'d, T: Pin> embedded_hal_1::digital::StatefulOutputPin for Output<'d, T> {
fn is_set_high(&self) -> Result<bool, Self::Error> { fn is_set_high(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_set_high()) Ok(self.is_set_high())
} }
fn is_set_low(&self) -> Result<bool, Self::Error> { fn is_set_low(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_set_low()) Ok(self.is_set_low())
} }
} }
@ -1096,11 +1111,11 @@ impl<'d, T: Pin> embedded_hal_1::digital::OutputPin for OutputOpenDrain<'d, T> {
} }
impl<'d, T: Pin> embedded_hal_1::digital::StatefulOutputPin for OutputOpenDrain<'d, T> { impl<'d, T: Pin> embedded_hal_1::digital::StatefulOutputPin for OutputOpenDrain<'d, T> {
fn is_set_high(&self) -> Result<bool, Self::Error> { fn is_set_high(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_set_high()) Ok(self.is_set_high())
} }
fn is_set_low(&self) -> Result<bool, Self::Error> { fn is_set_low(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_set_low()) Ok(self.is_set_low())
} }
} }
@ -1112,11 +1127,11 @@ impl<'d, T: Pin> embedded_hal_1::digital::ToggleableOutputPin for OutputOpenDrai
} }
impl<'d, T: Pin> embedded_hal_1::digital::InputPin for OutputOpenDrain<'d, T> { impl<'d, T: Pin> embedded_hal_1::digital::InputPin for OutputOpenDrain<'d, T> {
fn is_high(&self) -> Result<bool, Self::Error> { fn is_high(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_high()) Ok(self.is_high())
} }
fn is_low(&self) -> Result<bool, Self::Error> { fn is_low(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_low()) Ok(self.is_low())
} }
} }
@ -1126,11 +1141,11 @@ impl<'d, T: Pin> embedded_hal_1::digital::ErrorType for Flex<'d, T> {
} }
impl<'d, T: Pin> embedded_hal_1::digital::InputPin for Flex<'d, T> { impl<'d, T: Pin> embedded_hal_1::digital::InputPin for Flex<'d, T> {
fn is_high(&self) -> Result<bool, Self::Error> { fn is_high(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_high()) Ok(self.is_high())
} }
fn is_low(&self) -> Result<bool, Self::Error> { fn is_low(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_low()) Ok(self.is_low())
} }
} }
@ -1146,11 +1161,11 @@ impl<'d, T: Pin> embedded_hal_1::digital::OutputPin for Flex<'d, T> {
} }
impl<'d, T: Pin> embedded_hal_1::digital::StatefulOutputPin for Flex<'d, T> { impl<'d, T: Pin> embedded_hal_1::digital::StatefulOutputPin for Flex<'d, T> {
fn is_set_high(&self) -> Result<bool, Self::Error> { fn is_set_high(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_set_high()) Ok(self.is_set_high())
} }
fn is_set_low(&self) -> Result<bool, Self::Error> { fn is_set_low(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_set_low()) Ok(self.is_set_low())
} }
} }

View File

@ -42,9 +42,9 @@ embassy-usb-driver = {version = "0.1.0", path = "../embassy-usb-driver" }
embassy-executor = { version = "0.4.0", path = "../embassy-executor", optional = true } embassy-executor = { version = "0.4.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.2" } embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.3" }
embedded-hal-async = { version = "=1.0.0-rc.2" } embedded-hal-async = { version = "=1.0.0-rc.3" }
embedded-hal-nb = { version = "=1.0.0-rc.2" } embedded-hal-nb = { version = "=1.0.0-rc.3" }
embedded-storage = "0.3.1" embedded-storage = "0.3.1"
embedded-storage-async = { version = "0.4.1" } embedded-storage-async = { version = "0.4.1" }
@ -120,6 +120,10 @@ time-driver-tim3 = ["_time-driver"]
time-driver-tim4 = ["_time-driver"] time-driver-tim4 = ["_time-driver"]
## Use TIM5 as time driver ## Use TIM5 as time driver
time-driver-tim5 = ["_time-driver"] time-driver-tim5 = ["_time-driver"]
## Use TIM9 as time driver
time-driver-tim9 = ["_time-driver"]
## Use TIM11 as time driver
time-driver-tim11 = ["_time-driver"]
## Use TIM12 as time driver ## Use TIM12 as time driver
time-driver-tim12 = ["_time-driver"] time-driver-tim12 = ["_time-driver"]
## Use TIM15 as time driver ## Use TIM15 as time driver

View File

@ -187,6 +187,8 @@ fn main() {
Some("tim3") => "TIM3", Some("tim3") => "TIM3",
Some("tim4") => "TIM4", Some("tim4") => "TIM4",
Some("tim5") => "TIM5", Some("tim5") => "TIM5",
Some("tim9") => "TIM9",
Some("tim11") => "TIM11",
Some("tim12") => "TIM12", Some("tim12") => "TIM12",
Some("tim15") => "TIM15", Some("tim15") => "TIM15",
Some("any") => { Some("any") => {
@ -198,12 +200,16 @@ fn main() {
"TIM4" "TIM4"
} else if singletons.contains(&"TIM5".to_string()) { } else if singletons.contains(&"TIM5".to_string()) {
"TIM5" "TIM5"
} else if singletons.contains(&"TIM9".to_string()) {
"TIM9"
} else if singletons.contains(&"TIM11".to_string()) {
"TIM11"
} else if singletons.contains(&"TIM12".to_string()) { } else if singletons.contains(&"TIM12".to_string()) {
"TIM12" "TIM12"
} else if singletons.contains(&"TIM15".to_string()) { } else if singletons.contains(&"TIM15".to_string()) {
"TIM15" "TIM15"
} else { } else {
panic!("time-driver-any requested, but the chip doesn't have TIM2, TIM3, TIM4, TIM5, TIM12 or TIM15.") panic!("time-driver-any requested, but the chip doesn't have TIM2, TIM3, TIM4, TIM5, TIM9, TIM11, TIM12 or TIM15.")
} }
} }
_ => panic!("unknown time_driver {:?}", time_driver), _ => panic!("unknown time_driver {:?}", time_driver),

View File

@ -97,15 +97,15 @@ impl<'d, T: GpioPin> ExtiInput<'d, T> {
Self { pin } Self { pin }
} }
pub fn is_high(&self) -> bool { pub fn is_high(&mut self) -> bool {
self.pin.is_high() self.pin.is_high()
} }
pub fn is_low(&self) -> bool { pub fn is_low(&mut self) -> bool {
self.pin.is_low() self.pin.is_low()
} }
pub fn get_level(&self) -> Level { pub fn get_level(&mut self) -> Level {
self.pin.get_level() self.pin.get_level()
} }
@ -142,11 +142,11 @@ impl<'d, T: GpioPin> embedded_hal_02::digital::v2::InputPin for ExtiInput<'d, T>
type Error = Infallible; type Error = Infallible;
fn is_high(&self) -> Result<bool, Self::Error> { fn is_high(&self) -> Result<bool, Self::Error> {
Ok(self.is_high()) Ok(!self.pin.pin.ref_is_low())
} }
fn is_low(&self) -> Result<bool, Self::Error> { fn is_low(&self) -> Result<bool, Self::Error> {
Ok(self.is_low()) Ok(self.pin.pin.ref_is_low())
} }
} }
@ -155,11 +155,11 @@ impl<'d, T: GpioPin> embedded_hal_1::digital::ErrorType for ExtiInput<'d, T> {
} }
impl<'d, T: GpioPin> embedded_hal_1::digital::InputPin for ExtiInput<'d, T> { impl<'d, T: GpioPin> embedded_hal_1::digital::InputPin for ExtiInput<'d, T> {
fn is_high(&self) -> Result<bool, Self::Error> { fn is_high(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_high()) Ok(self.is_high())
} }
fn is_low(&self) -> Result<bool, Self::Error> { fn is_low(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_low()) Ok(self.is_low())
} }
} }

View File

@ -142,36 +142,46 @@ impl<'d, T: Pin> Flex<'d, T> {
} }
#[inline] #[inline]
pub fn is_high(&self) -> bool { pub fn is_high(&mut self) -> bool {
!self.is_low() !self.ref_is_low()
} }
#[inline] #[inline]
pub fn is_low(&self) -> bool { pub fn is_low(&mut self) -> bool {
self.ref_is_low()
}
#[inline]
pub(crate) fn ref_is_low(&self) -> bool {
let state = self.pin.block().idr().read().idr(self.pin.pin() as _); let state = self.pin.block().idr().read().idr(self.pin.pin() as _);
state == vals::Idr::LOW state == vals::Idr::LOW
} }
#[inline] #[inline]
pub fn get_level(&self) -> Level { pub fn get_level(&mut self) -> Level {
self.is_high().into() self.is_high().into()
} }
#[inline] #[inline]
pub fn is_set_high(&self) -> bool { pub fn is_set_high(&mut self) -> bool {
!self.is_set_low() !self.ref_is_set_low()
} }
/// Is the output pin set as low? /// Is the output pin set as low?
#[inline] #[inline]
pub fn is_set_low(&self) -> bool { pub fn is_set_low(&mut self) -> bool {
self.ref_is_set_low()
}
#[inline]
pub(crate) fn ref_is_set_low(&self) -> bool {
let state = self.pin.block().odr().read().odr(self.pin.pin() as _); let state = self.pin.block().odr().read().odr(self.pin.pin() as _);
state == vals::Odr::LOW state == vals::Odr::LOW
} }
/// What level output is set to /// What level output is set to
#[inline] #[inline]
pub fn get_output_level(&self) -> Level { pub fn get_output_level(&mut self) -> Level {
self.is_set_high().into() self.is_set_high().into()
} }
@ -310,17 +320,17 @@ impl<'d, T: Pin> Input<'d, T> {
} }
#[inline] #[inline]
pub fn is_high(&self) -> bool { pub fn is_high(&mut self) -> bool {
self.pin.is_high() self.pin.is_high()
} }
#[inline] #[inline]
pub fn is_low(&self) -> bool { pub fn is_low(&mut self) -> bool {
self.pin.is_low() self.pin.is_low()
} }
#[inline] #[inline]
pub fn get_level(&self) -> Level { pub fn get_level(&mut self) -> Level {
self.pin.get_level() self.pin.get_level()
} }
} }
@ -399,19 +409,19 @@ impl<'d, T: Pin> Output<'d, T> {
/// Is the output pin set as high? /// Is the output pin set as high?
#[inline] #[inline]
pub fn is_set_high(&self) -> bool { pub fn is_set_high(&mut self) -> bool {
self.pin.is_set_high() self.pin.is_set_high()
} }
/// Is the output pin set as low? /// Is the output pin set as low?
#[inline] #[inline]
pub fn is_set_low(&self) -> bool { pub fn is_set_low(&mut self) -> bool {
self.pin.is_set_low() self.pin.is_set_low()
} }
/// What level output is set to /// What level output is set to
#[inline] #[inline]
pub fn get_output_level(&self) -> Level { pub fn get_output_level(&mut self) -> Level {
self.pin.get_output_level() self.pin.get_output_level()
} }
@ -453,18 +463,18 @@ impl<'d, T: Pin> OutputOpenDrain<'d, T> {
} }
#[inline] #[inline]
pub fn is_high(&self) -> bool { pub fn is_high(&mut self) -> bool {
!self.pin.is_low() !self.pin.is_low()
} }
#[inline] #[inline]
pub fn is_low(&self) -> bool { pub fn is_low(&mut self) -> bool {
self.pin.is_low() self.pin.is_low()
} }
/// Returns current pin level /// Returns current pin level
#[inline] #[inline]
pub fn get_level(&self) -> Level { pub fn get_level(&mut self) -> Level {
self.pin.get_level() self.pin.get_level()
} }
@ -488,19 +498,19 @@ impl<'d, T: Pin> OutputOpenDrain<'d, T> {
/// Is the output pin set as high? /// Is the output pin set as high?
#[inline] #[inline]
pub fn is_set_high(&self) -> bool { pub fn is_set_high(&mut self) -> bool {
self.pin.is_set_high() self.pin.is_set_high()
} }
/// Is the output pin set as low? /// Is the output pin set as low?
#[inline] #[inline]
pub fn is_set_low(&self) -> bool { pub fn is_set_low(&mut self) -> bool {
self.pin.is_set_low() self.pin.is_set_low()
} }
/// What level output is set to /// What level output is set to
#[inline] #[inline]
pub fn get_output_level(&self) -> Level { pub fn get_output_level(&mut self) -> Level {
self.pin.get_output_level() self.pin.get_output_level()
} }
@ -777,12 +787,12 @@ impl<'d, T: Pin> embedded_hal_02::digital::v2::InputPin for Input<'d, T> {
#[inline] #[inline]
fn is_high(&self) -> Result<bool, Self::Error> { fn is_high(&self) -> Result<bool, Self::Error> {
Ok(self.is_high()) Ok(!self.pin.ref_is_low())
} }
#[inline] #[inline]
fn is_low(&self) -> Result<bool, Self::Error> { fn is_low(&self) -> Result<bool, Self::Error> {
Ok(self.is_low()) Ok(self.pin.ref_is_low())
} }
} }
@ -805,13 +815,13 @@ impl<'d, T: Pin> embedded_hal_02::digital::v2::OutputPin for Output<'d, T> {
impl<'d, T: Pin> embedded_hal_02::digital::v2::StatefulOutputPin for Output<'d, T> { impl<'d, T: Pin> embedded_hal_02::digital::v2::StatefulOutputPin for Output<'d, T> {
#[inline] #[inline]
fn is_set_high(&self) -> Result<bool, Self::Error> { fn is_set_high(&self) -> Result<bool, Self::Error> {
Ok(self.is_set_high()) Ok(!self.pin.ref_is_set_low())
} }
/// Is the output pin set as low? /// Is the output pin set as low?
#[inline] #[inline]
fn is_set_low(&self) -> Result<bool, Self::Error> { fn is_set_low(&self) -> Result<bool, Self::Error> {
Ok(self.is_set_low()) Ok(self.pin.ref_is_set_low())
} }
} }
@ -843,13 +853,13 @@ impl<'d, T: Pin> embedded_hal_02::digital::v2::OutputPin for OutputOpenDrain<'d,
impl<'d, T: Pin> embedded_hal_02::digital::v2::StatefulOutputPin for OutputOpenDrain<'d, T> { impl<'d, T: Pin> embedded_hal_02::digital::v2::StatefulOutputPin for OutputOpenDrain<'d, T> {
#[inline] #[inline]
fn is_set_high(&self) -> Result<bool, Self::Error> { fn is_set_high(&self) -> Result<bool, Self::Error> {
Ok(self.is_set_high()) Ok(!self.pin.ref_is_set_low())
} }
/// Is the output pin set as low? /// Is the output pin set as low?
#[inline] #[inline]
fn is_set_low(&self) -> Result<bool, Self::Error> { fn is_set_low(&self) -> Result<bool, Self::Error> {
Ok(self.is_set_low()) Ok(self.pin.ref_is_set_low())
} }
} }
@ -867,12 +877,12 @@ impl<'d, T: Pin> embedded_hal_02::digital::v2::InputPin for Flex<'d, T> {
#[inline] #[inline]
fn is_high(&self) -> Result<bool, Self::Error> { fn is_high(&self) -> Result<bool, Self::Error> {
Ok(self.is_high()) Ok(!self.ref_is_low())
} }
#[inline] #[inline]
fn is_low(&self) -> Result<bool, Self::Error> { fn is_low(&self) -> Result<bool, Self::Error> {
Ok(self.is_low()) Ok(self.ref_is_low())
} }
} }
@ -895,13 +905,13 @@ impl<'d, T: Pin> embedded_hal_02::digital::v2::OutputPin for Flex<'d, T> {
impl<'d, T: Pin> embedded_hal_02::digital::v2::StatefulOutputPin for Flex<'d, T> { impl<'d, T: Pin> embedded_hal_02::digital::v2::StatefulOutputPin for Flex<'d, T> {
#[inline] #[inline]
fn is_set_high(&self) -> Result<bool, Self::Error> { fn is_set_high(&self) -> Result<bool, Self::Error> {
Ok(self.is_set_high()) Ok(!self.ref_is_set_low())
} }
/// Is the output pin set as low? /// Is the output pin set as low?
#[inline] #[inline]
fn is_set_low(&self) -> Result<bool, Self::Error> { fn is_set_low(&self) -> Result<bool, Self::Error> {
Ok(self.is_set_low()) Ok(self.ref_is_set_low())
} }
} }
@ -920,12 +930,12 @@ impl<'d, T: Pin> embedded_hal_1::digital::ErrorType for Input<'d, T> {
impl<'d, T: Pin> embedded_hal_1::digital::InputPin for Input<'d, T> { impl<'d, T: Pin> embedded_hal_1::digital::InputPin for Input<'d, T> {
#[inline] #[inline]
fn is_high(&self) -> Result<bool, Self::Error> { fn is_high(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_high()) Ok(self.is_high())
} }
#[inline] #[inline]
fn is_low(&self) -> Result<bool, Self::Error> { fn is_low(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_low()) Ok(self.is_low())
} }
} }
@ -948,13 +958,13 @@ impl<'d, T: Pin> embedded_hal_1::digital::OutputPin for Output<'d, T> {
impl<'d, T: Pin> embedded_hal_1::digital::StatefulOutputPin for Output<'d, T> { impl<'d, T: Pin> embedded_hal_1::digital::StatefulOutputPin for Output<'d, T> {
#[inline] #[inline]
fn is_set_high(&self) -> Result<bool, Self::Error> { fn is_set_high(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_set_high()) Ok(self.is_set_high())
} }
/// Is the output pin set as low? /// Is the output pin set as low?
#[inline] #[inline]
fn is_set_low(&self) -> Result<bool, Self::Error> { fn is_set_low(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_set_low()) Ok(self.is_set_low())
} }
} }
@ -972,12 +982,12 @@ impl<'d, T: Pin> embedded_hal_1::digital::ErrorType for OutputOpenDrain<'d, T> {
impl<'d, T: Pin> embedded_hal_1::digital::InputPin for OutputOpenDrain<'d, T> { impl<'d, T: Pin> embedded_hal_1::digital::InputPin for OutputOpenDrain<'d, T> {
#[inline] #[inline]
fn is_high(&self) -> Result<bool, Self::Error> { fn is_high(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_high()) Ok(self.is_high())
} }
#[inline] #[inline]
fn is_low(&self) -> Result<bool, Self::Error> { fn is_low(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_low()) Ok(self.is_low())
} }
} }
@ -996,13 +1006,13 @@ impl<'d, T: Pin> embedded_hal_1::digital::OutputPin for OutputOpenDrain<'d, T> {
impl<'d, T: Pin> embedded_hal_1::digital::StatefulOutputPin for OutputOpenDrain<'d, T> { impl<'d, T: Pin> embedded_hal_1::digital::StatefulOutputPin for OutputOpenDrain<'d, T> {
#[inline] #[inline]
fn is_set_high(&self) -> Result<bool, Self::Error> { fn is_set_high(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_set_high()) Ok(self.is_set_high())
} }
/// Is the output pin set as low? /// Is the output pin set as low?
#[inline] #[inline]
fn is_set_low(&self) -> Result<bool, Self::Error> { fn is_set_low(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_set_low()) Ok(self.is_set_low())
} }
} }
@ -1016,12 +1026,12 @@ impl<'d, T: Pin> embedded_hal_1::digital::ToggleableOutputPin for OutputOpenDrai
impl<'d, T: Pin> embedded_hal_1::digital::InputPin for Flex<'d, T> { impl<'d, T: Pin> embedded_hal_1::digital::InputPin for Flex<'d, T> {
#[inline] #[inline]
fn is_high(&self) -> Result<bool, Self::Error> { fn is_high(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_high()) Ok(self.is_high())
} }
#[inline] #[inline]
fn is_low(&self) -> Result<bool, Self::Error> { fn is_low(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_low()) Ok(self.is_low())
} }
} }
@ -1051,13 +1061,13 @@ impl<'d, T: Pin> embedded_hal_1::digital::ErrorType for Flex<'d, T> {
impl<'d, T: Pin> embedded_hal_1::digital::StatefulOutputPin for Flex<'d, T> { impl<'d, T: Pin> embedded_hal_1::digital::StatefulOutputPin for Flex<'d, T> {
#[inline] #[inline]
fn is_set_high(&self) -> Result<bool, Self::Error> { fn is_set_high(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_set_high()) Ok(self.is_set_high())
} }
/// Is the output pin set as low? /// Is the output pin set as low?
#[inline] #[inline]
fn is_set_low(&self) -> Result<bool, Self::Error> { fn is_set_low(&mut self) -> Result<bool, Self::Error> {
Ok(self.is_set_low()) Ok(self.is_set_low())
} }
} }

View File

@ -43,7 +43,10 @@ type T = peripherals::TIM3;
type T = peripherals::TIM4; type T = peripherals::TIM4;
#[cfg(time_driver_tim5)] #[cfg(time_driver_tim5)]
type T = peripherals::TIM5; type T = peripherals::TIM5;
#[cfg(time_driver_tim9)]
type T = peripherals::TIM9;
#[cfg(time_driver_tim11)]
type T = peripherals::TIM11;
#[cfg(time_driver_tim12)] #[cfg(time_driver_tim12)]
type T = peripherals::TIM12; type T = peripherals::TIM12;
#[cfg(time_driver_tim15)] #[cfg(time_driver_tim15)]
@ -82,6 +85,22 @@ foreach_interrupt! {
DRIVER.on_interrupt() DRIVER.on_interrupt()
} }
}; };
(TIM9, timer, $block:ident, UP, $irq:ident) => {
#[cfg(time_driver_tim9)]
#[cfg(feature = "rt")]
#[interrupt]
fn $irq() {
DRIVER.on_interrupt()
}
};
(TIM11, timer, $block:ident, UP, $irq:ident) => {
#[cfg(time_driver_tim11)]
#[cfg(feature = "rt")]
#[interrupt]
fn $irq() {
DRIVER.on_interrupt()
}
};
(TIM12, timer, $block:ident, UP, $irq:ident) => { (TIM12, timer, $block:ident, UP, $irq:ident) => {
#[cfg(time_driver_tim12)] #[cfg(time_driver_tim12)]
#[cfg(feature = "rt")] #[cfg(feature = "rt")]

View File

@ -132,6 +132,14 @@ pub struct Config {
/// Set this to true to swap the RX and TX pins. /// Set this to true to swap the RX and TX pins.
#[cfg(any(usart_v3, usart_v4))] #[cfg(any(usart_v3, usart_v4))]
pub swap_rx_tx: bool, pub swap_rx_tx: bool,
/// Set this to true to invert TX pin signal values (V<sub>DD</sub> =0/mark, Gnd = 1/idle).
#[cfg(any(usart_v3, usart_v4))]
pub invert_tx: bool,
/// Set this to true to invert RX pin signal values (V<sub>DD</sub> =0/mark, Gnd = 1/idle).
#[cfg(any(usart_v3, usart_v4))]
pub invert_rx: bool,
} }
impl Default for Config { impl Default for Config {
@ -147,6 +155,10 @@ impl Default for Config {
assume_noise_free: false, assume_noise_free: false,
#[cfg(any(usart_v3, usart_v4))] #[cfg(any(usart_v3, usart_v4))]
swap_rx_tx: false, swap_rx_tx: false,
#[cfg(any(usart_v3, usart_v4))]
invert_tx: false,
#[cfg(any(usart_v3, usart_v4))]
invert_rx: false,
} }
} }
} }
@ -972,7 +984,11 @@ fn configure(
}); });
#[cfg(any(usart_v3, usart_v4))] #[cfg(any(usart_v3, usart_v4))]
w.set_swap(config.swap_rx_tx); {
w.set_txinv(config.invert_tx);
w.set_rxinv(config.invert_rx);
w.set_swap(config.swap_rx_tx);
}
}); });
#[cfg(not(usart_v1))] #[cfg(not(usart_v1))]

View File

@ -263,7 +263,7 @@ impl<'d, T: Instance> Driver<'d, T> {
let regs = T::regs(); let regs = T::regs();
#[cfg(stm32l5)] #[cfg(any(stm32l5, stm32wb))]
crate::pac::PWR.cr2().modify(|w| w.set_usv(true)); crate::pac::PWR.cr2().modify(|w| w.set_usv(true));
#[cfg(pwr_h5)] #[cfg(pwr_h5)]

View File

@ -24,8 +24,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## 0.1.3 - 2023-08-28 ## 0.1.3 - 2023-08-28
- Update `embedded-hal-async` to `1.0.0-rc.2` - Update `embedded-hal-async` to `1.0.0-rc.3`
- Update `embedded-hal v1` to `1.0.0-rc.2` - Update `embedded-hal v1` to `1.0.0-rc.3`
## 0.1.2 - 2023-07-05 ## 0.1.2 - 2023-07-05

View File

@ -235,8 +235,8 @@ defmt = { version = "0.3", optional = true }
log = { version = "0.4.14", optional = true } log = { version = "0.4.14", optional = true }
embedded-hal-02 = { package = "embedded-hal", version = "0.2.6" } embedded-hal-02 = { package = "embedded-hal", version = "0.2.6" }
embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.2" } embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.3" }
embedded-hal-async = { version = "=1.0.0-rc.2" } embedded-hal-async = { version = "=1.0.0-rc.3" }
futures-util = { version = "0.3.17", default-features = false } futures-util = { version = "0.3.17", default-features = false }
critical-section = "1.1" critical-section = "1.1"

View File

@ -36,9 +36,9 @@ rand = { version = "0.8.4", default-features = false }
embedded-storage = "0.3.1" embedded-storage = "0.3.1"
usbd-hid = "0.6.0" usbd-hid = "0.6.0"
serde = { version = "1.0.136", default-features = false } serde = { version = "1.0.136", default-features = false }
embedded-hal = { version = "1.0.0-rc.2" } embedded-hal = { version = "1.0.0-rc.3" }
embedded-hal-async = { version = "1.0.0-rc.2" } embedded-hal-async = { version = "1.0.0-rc.3" }
embedded-hal-bus = { version = "0.1.0-rc.2", features = ["async"] } embedded-hal-bus = { version = "0.1.0-rc.3", features = ["async"] }
num-integer = { version = "0.1.45", default-features = false } num-integer = { version = "0.1.45", default-features = false }
microfft = "0.5.0" microfft = "0.5.0"

View File

@ -38,9 +38,9 @@ smart-leds = "0.3.0"
heapless = "0.8" heapless = "0.8"
usbd-hid = "0.6.1" usbd-hid = "0.6.1"
embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.2" } embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.3" }
embedded-hal-async = "1.0.0-rc.2" embedded-hal-async = "1.0.0-rc.3"
embedded-hal-bus = { version = "0.1.0-rc.2", features = ["async"] } embedded-hal-bus = { version = "0.1.0-rc.3", features = ["async"] }
embedded-io-async = { version = "0.6.1", features = ["defmt-03"] } embedded-io-async = { version = "0.6.1", features = ["defmt-03"] }
embedded-storage = { version = "0.3" } embedded-storage = { version = "0.3" }
static_cell = { version = "2", features = ["nightly"]} static_cell = { version = "2", features = ["nightly"]}

View File

@ -17,7 +17,7 @@ async fn main(_spawner: Spawner) {
// Use PIN_28, Pin34 on J0 for RP Pico, as a input. // Use PIN_28, Pin34 on J0 for RP Pico, as a input.
// You need to add your own button. // You need to add your own button.
let button = Input::new(p.PIN_28, Pull::Up); let mut button = Input::new(p.PIN_28, Pull::Up);
loop { loop {
if button.is_high() { if button.is_high() {

View File

@ -13,7 +13,7 @@ fn main() -> ! {
let p = embassy_stm32::init(Default::default()); let p = embassy_stm32::init(Default::default());
let button = Input::new(p.PC13, Pull::Up); let mut button = Input::new(p.PC13, Pull::Up);
loop { loop {
if button.is_high() { if button.is_high() {

View File

@ -0,0 +1,67 @@
#![no_std]
#![no_main]
#![feature(type_alias_impl_trait)]
use defmt::*;
use embassy_executor::Spawner;
use embassy_stm32::can::bxcan::filter::Mask32;
use embassy_stm32::can::bxcan::{Fifo, Frame, Id, StandardId};
use embassy_stm32::can::{Can, Rx0InterruptHandler, Rx1InterruptHandler, SceInterruptHandler, TxInterruptHandler};
use embassy_stm32::peripherals::CAN;
use embassy_stm32::{bind_interrupts, Config};
use {defmt_rtt as _, panic_probe as _};
bind_interrupts!(struct Irqs {
USB_LP_CAN1_RX0 => Rx0InterruptHandler<CAN>;
CAN1_RX1 => Rx1InterruptHandler<CAN>;
CAN1_SCE => SceInterruptHandler<CAN>;
USB_HP_CAN1_TX => TxInterruptHandler<CAN>;
});
// This example is configured to work with real CAN transceivers on B8/B9.
// See other examples for loopback.
#[embassy_executor::main]
async fn main(_spawner: Spawner) {
let p = embassy_stm32::init(Config::default());
// Set alternate pin mapping to B8/B9
embassy_stm32::pac::AFIO.mapr().modify(|w| w.set_can1_remap(2));
let mut can = Can::new(p.CAN, p.PB8, p.PB9, Irqs);
can.as_mut()
.modify_filters()
.enable_bank(0, Fifo::Fifo0, Mask32::accept_all());
can.as_mut()
.modify_config()
.set_loopback(false)
.set_silent(false)
.leave_disabled();
can.set_bitrate(250_000);
can.enable().await;
let mut i: u8 = 0;
loop {
let tx_frame = Frame::new_data(unwrap!(StandardId::new(i as _)), [i]);
can.write(&tx_frame).await;
match can.read().await {
Ok(env) => match env.frame.id() {
Id::Extended(id) => {
defmt::println!("Extended Frame id={:x}", id.as_raw());
}
Id::Standard(id) => {
defmt::println!("Standard Frame id={:x}", id.as_raw());
}
},
Err(err) => {
defmt::println!("Error {}", err);
}
}
i += 1;
}
}

View File

@ -13,7 +13,7 @@ fn main() -> ! {
let p = embassy_stm32::init(Default::default()); let p = embassy_stm32::init(Default::default());
let button = Input::new(p.PA0, Pull::Down); let mut button = Input::new(p.PA0, Pull::Down);
let mut led1 = Output::new(p.PE9, Level::High, Speed::Low); let mut led1 = Output::new(p.PE9, Level::High, Speed::Low);
let mut led2 = Output::new(p.PE15, Level::High, Speed::Low); let mut led2 = Output::new(p.PE15, Level::High, Speed::Low);

View File

@ -13,7 +13,7 @@ fn main() -> ! {
let p = embassy_stm32::init(Default::default()); let p = embassy_stm32::init(Default::default());
let button = Input::new(p.PC13, Pull::Down); let mut button = Input::new(p.PC13, Pull::Down);
let mut led1 = Output::new(p.PB0, Level::High, Speed::Low); let mut led1 = Output::new(p.PB0, Level::High, Speed::Low);
let _led2 = Output::new(p.PB7, Level::High, Speed::Low); let _led2 = Output::new(p.PB7, Level::High, Speed::Low);
let mut led3 = Output::new(p.PB14, Level::High, Speed::Low); let mut led3 = Output::new(p.PB14, Level::High, Speed::Low);

View File

@ -13,7 +13,7 @@ fn main() -> ! {
let p = embassy_stm32::init(Default::default()); let p = embassy_stm32::init(Default::default());
let button = Input::new(p.PC13, Pull::Down); let mut button = Input::new(p.PC13, Pull::Down);
let mut led1 = Output::new(p.PB0, Level::High, Speed::Low); let mut led1 = Output::new(p.PB0, Level::High, Speed::Low);
let _led2 = Output::new(p.PB7, Level::High, Speed::Low); let _led2 = Output::new(p.PB7, Level::High, Speed::Low);
let mut led3 = Output::new(p.PB14, Level::High, Speed::Low); let mut led3 = Output::new(p.PB14, Level::High, Speed::Low);

View File

@ -13,7 +13,7 @@ fn main() -> ! {
let p = embassy_stm32::init(Default::default()); let p = embassy_stm32::init(Default::default());
let button = Input::new(p.PC13, Pull::Up); let mut button = Input::new(p.PC13, Pull::Up);
loop { loop {
if button.is_high() { if button.is_high() {

View File

@ -13,7 +13,7 @@ fn main() -> ! {
let p = embassy_stm32::init(Default::default()); let p = embassy_stm32::init(Default::default());
let button = Input::new(p.PC13, Pull::Down); let mut button = Input::new(p.PC13, Pull::Down);
loop { loop {
if button.is_high() { if button.is_high() {

View File

@ -19,8 +19,8 @@ defmt-rtt = "0.4"
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"
embedded-hal = "0.2.6" embedded-hal = "0.2.6"
embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.2" } embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.3" }
embedded-hal-async = { version = "=1.0.0-rc.2" } embedded-hal-async = { version = "=1.0.0-rc.3" }
embedded-io-async = { version = "0.6.1" } embedded-io-async = { version = "0.6.1" }
embedded-nal-async = { version = "0.7.1" } embedded-nal-async = { version = "0.7.1" }
panic-probe = { version = "0.3", features = ["print-defmt"] } panic-probe = { version = "0.3", features = ["print-defmt"] }

View File

@ -19,8 +19,8 @@ defmt-rtt = "0.4"
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"
embedded-hal = "0.2.6" embedded-hal = "0.2.6"
embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.2" } embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.3" }
embedded-hal-async = { version = "=1.0.0-rc.2" } embedded-hal-async = { version = "=1.0.0-rc.3" }
embedded-nal-async = { version = "0.7.1" } embedded-nal-async = { version = "0.7.1" }
embedded-io-async = { version = "0.6.1" } embedded-io-async = { version = "0.6.1" }
panic-probe = { version = "0.3", features = ["print-defmt"] } panic-probe = { version = "0.3", features = ["print-defmt"] }

View File

@ -12,7 +12,7 @@ async fn main(_spawner: Spawner) {
let p = embassy_stm32::init(Default::default()); let p = embassy_stm32::init(Default::default());
info!("Hello World!"); info!("Hello World!");
let button = Input::new(p.PB2, Pull::Up); let mut button = Input::new(p.PB2, Pull::Up);
let mut led1 = Output::new(p.PA5, Level::High, Speed::Low); let mut led1 = Output::new(p.PA5, Level::High, Speed::Low);
let mut led2 = Output::new(p.PB5, Level::High, Speed::Low); let mut led2 = Output::new(p.PB5, Level::High, Speed::Low);

View File

@ -24,9 +24,9 @@ defmt-rtt = "0.4"
cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] } cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] }
cortex-m-rt = "0.7.0" cortex-m-rt = "0.7.0"
embedded-hal = "0.2.6" embedded-hal = "0.2.6"
embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.2" } embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.3" }
embedded-hal-async = { version = "=1.0.0-rc.2" } embedded-hal-async = { version = "=1.0.0-rc.3" }
embedded-hal-bus = { version = "=0.1.0-rc.2", features = ["async"] } embedded-hal-bus = { version = "=0.1.0-rc.3", features = ["async"] }
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.8", default-features = false } heapless = { version = "0.8", default-features = false }

View File

@ -12,7 +12,7 @@ fn main() -> ! {
let p = embassy_stm32::init(Default::default()); let p = embassy_stm32::init(Default::default());
let button = Input::new(p.PC13, Pull::Up); let mut button = Input::new(p.PC13, Pull::Up);
loop { loop {
if button.is_high() { if button.is_high() {

View File

@ -114,8 +114,8 @@ async fn main(spawner: Spawner) {
let led_uc4_blue = Output::new(dp.PG15, Level::High, Speed::Low); let led_uc4_blue = Output::new(dp.PG15, Level::High, Speed::Low);
// Read the uc_cfg switches // Read the uc_cfg switches
let uc_cfg0 = Input::new(dp.PB2, Pull::None); let mut uc_cfg0 = Input::new(dp.PB2, Pull::None);
let uc_cfg1 = Input::new(dp.PF11, Pull::None); let mut uc_cfg1 = Input::new(dp.PF11, Pull::None);
let _uc_cfg2 = Input::new(dp.PG6, Pull::None); let _uc_cfg2 = Input::new(dp.PG6, Pull::None);
let _uc_cfg3 = Input::new(dp.PG11, Pull::None); let _uc_cfg3 = Input::new(dp.PG11, Pull::None);
@ -133,8 +133,8 @@ async fn main(spawner: Spawner) {
// Setup IO and SPI for the SPE chip // Setup IO and SPI for the SPE chip
let spe_reset_n = Output::new(dp.PC7, Level::Low, Speed::Low); let spe_reset_n = Output::new(dp.PC7, Level::Low, Speed::Low);
let spe_cfg0 = Input::new(dp.PC8, Pull::None); let mut spe_cfg0 = Input::new(dp.PC8, Pull::None);
let spe_cfg1 = Input::new(dp.PC9, Pull::None); let mut spe_cfg1 = Input::new(dp.PC9, Pull::None);
let _spe_ts_capt = Output::new(dp.PC6, Level::Low, Speed::Low); let _spe_ts_capt = Output::new(dp.PC6, Level::Low, Speed::Low);
let spe_int = Input::new(dp.PB11, Pull::None); let spe_int = Input::new(dp.PB11, Pull::None);

View File

@ -30,7 +30,7 @@ async fn main(_spawner: Spawner) {
let _wake = Output::new(p.PB13, Level::Low, Speed::VeryHigh); let _wake = Output::new(p.PB13, Level::Low, Speed::VeryHigh);
let mut reset = Output::new(p.PE8, Level::Low, Speed::VeryHigh); let mut reset = Output::new(p.PE8, Level::Low, Speed::VeryHigh);
let mut cs = Output::new(p.PE0, Level::High, Speed::VeryHigh); let mut cs = Output::new(p.PE0, Level::High, Speed::VeryHigh);
let ready = Input::new(p.PE1, Pull::Up); let mut ready = Input::new(p.PE1, Pull::Up);
cortex_m::asm::delay(100_000); cortex_m::asm::delay(100_000);
reset.set_high(); reset.set_high();

View File

@ -25,7 +25,7 @@ async fn main(_spawner: Spawner) {
let _wake = Output::new(p.PB13, Level::Low, Speed::VeryHigh); let _wake = Output::new(p.PB13, Level::Low, Speed::VeryHigh);
let mut reset = Output::new(p.PE8, Level::Low, Speed::VeryHigh); let mut reset = Output::new(p.PE8, Level::Low, Speed::VeryHigh);
let mut cs = Output::new(p.PE0, Level::High, Speed::VeryHigh); let mut cs = Output::new(p.PE0, Level::High, Speed::VeryHigh);
let ready = Input::new(p.PE1, Pull::Up); let mut ready = Input::new(p.PE1, Pull::Up);
cortex_m::asm::delay(100_000); cortex_m::asm::delay(100_000);
reset.set_high(); reset.set_high();

View File

@ -13,7 +13,7 @@ fn main() -> ! {
let p = embassy_stm32::init(Default::default()); let p = embassy_stm32::init(Default::default());
let button = Input::new(p.PA0, Pull::Up); let mut button = Input::new(p.PA0, Pull::Up);
let mut led1 = Output::new(p.PB15, Level::High, Speed::Low); let mut led1 = Output::new(p.PB15, Level::High, Speed::Low);
let mut led2 = Output::new(p.PB9, Level::High, Speed::Low); let mut led2 = Output::new(p.PB9, Level::High, Speed::Low);

View File

@ -16,8 +16,8 @@ embedded-io-async = { version = "0.6.1", features = ["defmt-03"] }
embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet", ] } embassy-net = { version = "0.2.0", path = "../../embassy-net", features = ["defmt", "tcp", "dhcpv4", "medium-ethernet", ] }
embassy-net-esp-hosted = { version = "0.1.0", path = "../../embassy-net-esp-hosted", features = ["defmt"] } embassy-net-esp-hosted = { version = "0.1.0", path = "../../embassy-net-esp-hosted", features = ["defmt"] }
embassy-net-enc28j60 = { version = "0.1.0", path = "../../embassy-net-enc28j60", features = ["defmt"] } embassy-net-enc28j60 = { version = "0.1.0", path = "../../embassy-net-enc28j60", features = ["defmt"] }
embedded-hal-async = { version = "1.0.0-rc.2" } embedded-hal-async = { version = "1.0.0-rc.3" }
embedded-hal-bus = { version = "0.1.0-rc.2", features = ["async"] } embedded-hal-bus = { version = "0.1.0-rc.3", features = ["async"] }
static_cell = { version = "2", features = [ "nightly" ] } static_cell = { version = "2", features = [ "nightly" ] }
perf-client = { path = "../perf-client" } perf-client = { path = "../perf-client" }

View File

@ -24,9 +24,9 @@ defmt-rtt = "0.4"
cortex-m = { version = "0.7.6" } cortex-m = { version = "0.7.6" }
cortex-m-rt = "0.7.0" cortex-m-rt = "0.7.0"
embedded-hal = "0.2.6" embedded-hal = "0.2.6"
embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.2" } embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.3" }
embedded-hal-async = { version = "=1.0.0-rc.2" } embedded-hal-async = { version = "=1.0.0-rc.3" }
embedded-hal-bus = { version = "=0.1.0-rc.2", features = ["async"] } embedded-hal-bus = { version = "=0.1.0-rc.3", features = ["async"] }
panic-probe = { version = "0.3.0", features = ["print-defmt"] } panic-probe = { version = "0.3.0", 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"] }
embedded-io-async = { version = "0.6.1" } embedded-io-async = { version = "0.6.1" }

View File

@ -16,10 +16,10 @@ async fn main(_spawner: Spawner) {
// Test initial output // Test initial output
{ {
let b = Input::new(&mut b, Pull::None); let mut b = Input::new(&mut b, Pull::None);
{ {
let a = Output::new(&mut a, Level::Low); let mut a = Output::new(&mut a, Level::Low);
delay(); delay();
assert!(b.is_low()); assert!(b.is_low());
assert!(!b.is_high()); assert!(!b.is_high());
@ -64,7 +64,7 @@ async fn main(_spawner: Spawner) {
// Test input no pull // Test input no pull
{ {
let b = Input::new(&mut b, Pull::None); let mut b = Input::new(&mut b, Pull::None);
// no pull, the status is undefined // no pull, the status is undefined
let mut a = Output::new(&mut a, Level::Low); let mut a = Output::new(&mut a, Level::Low);
@ -77,7 +77,7 @@ async fn main(_spawner: Spawner) {
// Test input pulldown // Test input pulldown
{ {
let b = Input::new(&mut b, Pull::Down); let mut b = Input::new(&mut b, Pull::Down);
delay(); delay();
assert!(b.is_low()); assert!(b.is_low());
@ -91,7 +91,7 @@ async fn main(_spawner: Spawner) {
// Test input pullup // Test input pullup
{ {
let b = Input::new(&mut b, Pull::Up); let mut b = Input::new(&mut b, Pull::Up);
delay(); delay();
assert!(b.is_high()); assert!(b.is_high());

View File

@ -45,7 +45,7 @@ async fn main(_spawner: Spawner) {
// Test output from A // Test output from A
{ {
let pin1 = Input::new(&mut p9, Pull::None); let mut pin1 = Input::new(&mut p9, Pull::None);
let _pwm = Pwm::new_output_a(&mut p.PWM_CH3, &mut p6, cfg.clone()); let _pwm = Pwm::new_output_a(&mut p.PWM_CH3, &mut p6, cfg.clone());
Timer::after_millis(1).await; Timer::after_millis(1).await;
assert_eq!(pin1.is_low(), invert_a); assert_eq!(pin1.is_low(), invert_a);
@ -59,7 +59,7 @@ async fn main(_spawner: Spawner) {
// Test output from B // Test output from B
{ {
let pin2 = Input::new(&mut p11, Pull::None); let mut pin2 = Input::new(&mut p11, Pull::None);
let _pwm = Pwm::new_output_b(&mut p.PWM_CH3, &mut p7, cfg.clone()); let _pwm = Pwm::new_output_b(&mut p.PWM_CH3, &mut p7, cfg.clone());
Timer::after_millis(1).await; Timer::after_millis(1).await;
assert_ne!(pin2.is_low(), invert_a); assert_ne!(pin2.is_low(), invert_a);
@ -73,8 +73,8 @@ async fn main(_spawner: Spawner) {
// Test output from A+B // Test output from A+B
{ {
let pin1 = Input::new(&mut p9, Pull::None); let mut pin1 = Input::new(&mut p9, Pull::None);
let pin2 = Input::new(&mut p11, Pull::None); let mut pin2 = Input::new(&mut p11, Pull::None);
let _pwm = Pwm::new_output_ab(&mut p.PWM_CH3, &mut p6, &mut p7, cfg.clone()); let _pwm = Pwm::new_output_ab(&mut p.PWM_CH3, &mut p6, &mut p7, cfg.clone());
Timer::after_millis(1).await; Timer::after_millis(1).await;
assert_eq!(pin1.is_low(), invert_a); assert_eq!(pin1.is_low(), invert_a);

View File

@ -63,8 +63,8 @@ defmt-rtt = "0.4"
cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] } cortex-m = { version = "0.7.6", features = ["critical-section-single-core"] }
cortex-m-rt = "0.7.0" cortex-m-rt = "0.7.0"
embedded-hal = "0.2.6" embedded-hal = "0.2.6"
embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.2" } embedded-hal-1 = { package = "embedded-hal", version = "=1.0.0-rc.3" }
embedded-hal-async = { version = "=1.0.0-rc.2" } embedded-hal-async = { version = "=1.0.0-rc.3" }
micromath = "2.0.0" micromath = "2.0.0"
panic-probe = { version = "0.3.0", features = ["print-defmt"] } panic-probe = { version = "0.3.0", features = ["print-defmt"] }
rand_core = { version = "0.6", default-features = false } rand_core = { version = "0.6", default-features = false }

View File

@ -20,10 +20,10 @@ async fn main(_spawner: Spawner) {
// Test initial output // Test initial output
{ {
let b = Input::new(&mut b, Pull::None); let mut b = Input::new(&mut b, Pull::None);
{ {
let a = Output::new(&mut a, Level::Low, Speed::Low); let mut a = Output::new(&mut a, Level::Low, Speed::Low);
delay(); delay();
assert!(b.is_low()); assert!(b.is_low());
assert!(!b.is_high()); assert!(!b.is_high());
@ -68,7 +68,7 @@ async fn main(_spawner: Spawner) {
// Test input no pull // Test input no pull
{ {
let b = Input::new(&mut b, Pull::None); let mut b = Input::new(&mut b, Pull::None);
// no pull, the status is undefined // no pull, the status is undefined
let mut a = Output::new(&mut a, Level::Low, Speed::Low); let mut a = Output::new(&mut a, Level::Low, Speed::Low);
@ -81,7 +81,7 @@ async fn main(_spawner: Spawner) {
// Test input pulldown // Test input pulldown
{ {
let b = Input::new(&mut b, Pull::Down); let mut b = Input::new(&mut b, Pull::Down);
delay(); delay();
assert!(b.is_low()); assert!(b.is_low());
@ -95,7 +95,7 @@ async fn main(_spawner: Spawner) {
// Test input pullup // Test input pullup
{ {
let b = Input::new(&mut b, Pull::Up); let mut b = Input::new(&mut b, Pull::Up);
delay(); delay();
assert!(b.is_high()); assert!(b.is_high());
@ -109,7 +109,7 @@ async fn main(_spawner: Spawner) {
// Test output open drain // Test output open drain
{ {
let b = Input::new(&mut b, Pull::Down); let mut b = Input::new(&mut b, Pull::Down);
// no pull, the status is undefined // no pull, the status is undefined
let mut a = OutputOpenDrain::new(&mut a, Level::Low, Speed::Low, Pull::None); let mut a = OutputOpenDrain::new(&mut a, Level::Low, Speed::Low, Pull::None);