diff options
| author | Dario Nieuwenhuis <[email protected]> | 2022-06-27 00:43:18 +0200 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2022-06-27 02:10:01 +0200 |
| commit | a855889f7073ac6cfbc459e8ede95f7ad94bdfa5 (patch) | |
| tree | 8b6f598f62ab31dfe176a32a3a962841d42e515d | |
| parent | edb9eedb45bcf41aafae63979b58561e940c88c1 (diff) | |
Update stm32-data
| -rw-r--r-- | embassy-stm32/src/usb/usb.rs | 2 | ||||
| m--------- | stm32-data | 0 | ||||
| -rw-r--r-- | stm32-metapac-gen/src/lib.rs | 13 |
3 files changed, 7 insertions, 8 deletions
diff --git a/embassy-stm32/src/usb/usb.rs b/embassy-stm32/src/usb/usb.rs index 10eb94e6c..cadbb423c 100644 --- a/embassy-stm32/src/usb/usb.rs +++ b/embassy-stm32/src/usb/usb.rs | |||
| @@ -141,7 +141,7 @@ impl<'d, T: Instance> Driver<'d, T> { | |||
| 141 | unsafe { | 141 | unsafe { |
| 142 | crate::peripherals::PWR::enable(); | 142 | crate::peripherals::PWR::enable(); |
| 143 | 143 | ||
| 144 | pac::PWR.cr2().modify(|w| w.set_usv(pac::pwr::vals::Usv::VALID)); | 144 | pac::PWR.cr2().modify(|w| w.set_usv(true)); |
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | unsafe { | 147 | unsafe { |
diff --git a/stm32-data b/stm32-data | |||
| Subproject fa294eae79c0f33f4cde1e73b4e69db59f7429e | Subproject 56d5b8b2aee7026b4f9bcffc427bb8f9d48afeb | ||
diff --git a/stm32-metapac-gen/src/lib.rs b/stm32-metapac-gen/src/lib.rs index 0d761508f..9bd60cb79 100644 --- a/stm32-metapac-gen/src/lib.rs +++ b/stm32-metapac-gen/src/lib.rs | |||
| @@ -117,13 +117,12 @@ impl Gen { | |||
| 117 | write!(&mut extra, "pub const CORE_INDEX: usize = {};\n", core_index).unwrap(); | 117 | write!(&mut extra, "pub const CORE_INDEX: usize = {};\n", core_index).unwrap(); |
| 118 | 118 | ||
| 119 | let flash = chip.memory.iter().find(|r| r.name == "BANK_1").unwrap(); | 119 | let flash = chip.memory.iter().find(|r| r.name == "BANK_1").unwrap(); |
| 120 | write!(&mut extra, "pub const FLASH_BASE: usize = {};\n", flash.address,).unwrap(); | 120 | let settings = flash.settings.as_ref().unwrap(); |
| 121 | write!(&mut extra, "pub const FLASH_SIZE: usize = {};\n", flash.size,).unwrap(); | 121 | write!(&mut extra, "pub const FLASH_BASE: usize = {};\n", flash.address).unwrap(); |
| 122 | if let Some(settings) = &flash.settings { | 122 | write!(&mut extra, "pub const FLASH_SIZE: usize = {};\n", flash.size).unwrap(); |
| 123 | write!(&mut extra, "pub const ERASE_SIZE: usize = {};\n", settings.erase_size,).unwrap(); | 123 | write!(&mut extra, "pub const ERASE_SIZE: usize = {};\n", settings.erase_size).unwrap(); |
| 124 | write!(&mut extra, "pub const WRITE_SIZE: usize = {};\n", settings.write_size,).unwrap(); | 124 | write!(&mut extra, "pub const WRITE_SIZE: usize = {};\n", settings.write_size).unwrap(); |
| 125 | write!(&mut extra, "pub const ERASE_VALUE: u8 = {};\n", settings.erase_value,).unwrap(); | 125 | write!(&mut extra, "pub const ERASE_VALUE: u8 = {};\n", settings.erase_value).unwrap(); |
| 126 | } | ||
| 127 | 126 | ||
| 128 | // Cleanups! | 127 | // Cleanups! |
| 129 | transform::sort::Sort {}.run(&mut ir).unwrap(); | 128 | transform::sort::Sort {}.run(&mut ir).unwrap(); |
