diff options
Diffstat (limited to 'examples/stm32f7')
| -rw-r--r-- | examples/stm32f7/Cargo.toml | 4 | ||||
| -rw-r--r-- | examples/stm32f7/src/bin/adc.rs | 2 | ||||
| -rw-r--r-- | examples/stm32f7/src/bin/eth.rs | 8 | ||||
| -rw-r--r-- | examples/stm32f7/src/bin/usart_dma.rs | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/examples/stm32f7/Cargo.toml b/examples/stm32f7/Cargo.toml index b658a9640..bf8f413d8 100644 --- a/examples/stm32f7/Cargo.toml +++ b/examples/stm32f7/Cargo.toml | |||
| @@ -7,9 +7,9 @@ license = "MIT OR Apache-2.0" | |||
| 7 | [dependencies] | 7 | [dependencies] |
| 8 | # Change stm32f767zi to your chip name, if necessary. | 8 | # Change stm32f767zi to your chip name, if necessary. |
| 9 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f767zi", "memory-x", "unstable-pac", "time-driver-any", "exti"] } | 9 | embassy-stm32 = { version = "0.1.0", path = "../../embassy-stm32", features = ["nightly", "defmt", "stm32f767zi", "memory-x", "unstable-pac", "time-driver-any", "exti"] } |
| 10 | embassy-sync = { version = "0.2.0", path = "../../embassy-sync", features = ["defmt"] } | 10 | embassy-sync = { version = "0.3.0", path = "../../embassy-sync", features = ["defmt"] } |
| 11 | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } | 11 | embassy-executor = { version = "0.3.0", path = "../../embassy-executor", features = ["nightly", "arch-cortex-m", "executor-thread", "defmt", "integrated-timers"] } |
| 12 | embassy-time = { version = "0.1.2", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } | 12 | embassy-time = { version = "0.1.3", path = "../../embassy-time", features = ["defmt", "defmt-timestamp-uptime", "tick-hz-32_768"] } |
| 13 | embassy-net = { path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet"] } | 13 | embassy-net = { path = "../../embassy-net", features = ["defmt", "nightly", "tcp", "dhcpv4", "medium-ethernet"] } |
| 14 | embedded-io-async = { version = "0.5.0" } | 14 | embedded-io-async = { version = "0.5.0" } |
| 15 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } | 15 | embassy-usb = { version = "0.1.0", path = "../../embassy-usb", features = ["defmt"] } |
diff --git a/examples/stm32f7/src/bin/adc.rs b/examples/stm32f7/src/bin/adc.rs index 70b3b2a75..bc4ed2892 100644 --- a/examples/stm32f7/src/bin/adc.rs +++ b/examples/stm32f7/src/bin/adc.rs | |||
| @@ -17,7 +17,7 @@ async fn main(_spawner: Spawner) { | |||
| 17 | let mut pin = p.PA3; | 17 | let mut pin = p.PA3; |
| 18 | 18 | ||
| 19 | let mut vrefint = adc.enable_vrefint(); | 19 | let mut vrefint = adc.enable_vrefint(); |
| 20 | let vrefint_sample = adc.read_internal(&mut vrefint); | 20 | let vrefint_sample = adc.read(&mut vrefint); |
| 21 | let convert_to_millivolts = |sample| { | 21 | let convert_to_millivolts = |sample| { |
| 22 | // From http://www.st.com/resource/en/datasheet/DM00273119.pdf | 22 | // From http://www.st.com/resource/en/datasheet/DM00273119.pdf |
| 23 | // 6.3.27 Reference voltage | 23 | // 6.3.27 Reference voltage |
diff --git a/examples/stm32f7/src/bin/eth.rs b/examples/stm32f7/src/bin/eth.rs index f0e280c35..93c97c8ee 100644 --- a/examples/stm32f7/src/bin/eth.rs +++ b/examples/stm32f7/src/bin/eth.rs | |||
| @@ -80,7 +80,10 @@ async fn main(spawner: Spawner) -> ! { | |||
| 80 | )); | 80 | )); |
| 81 | 81 | ||
| 82 | // Launch network task | 82 | // Launch network task |
| 83 | unwrap!(spawner.spawn(net_task(&stack))); | 83 | unwrap!(spawner.spawn(net_task(stack))); |
| 84 | |||
| 85 | // Ensure DHCP configuration is up before trying connect | ||
| 86 | stack.wait_config_up().await; | ||
| 84 | 87 | ||
| 85 | info!("Network task initialized"); | 88 | info!("Network task initialized"); |
| 86 | 89 | ||
| @@ -98,6 +101,7 @@ async fn main(spawner: Spawner) -> ! { | |||
| 98 | let r = socket.connect(remote_endpoint).await; | 101 | let r = socket.connect(remote_endpoint).await; |
| 99 | if let Err(e) = r { | 102 | if let Err(e) = r { |
| 100 | info!("connect error: {:?}", e); | 103 | info!("connect error: {:?}", e); |
| 104 | Timer::after(Duration::from_secs(1)).await; | ||
| 101 | continue; | 105 | continue; |
| 102 | } | 106 | } |
| 103 | info!("connected!"); | 107 | info!("connected!"); |
| @@ -106,7 +110,7 @@ async fn main(spawner: Spawner) -> ! { | |||
| 106 | let r = socket.write_all(&buf).await; | 110 | let r = socket.write_all(&buf).await; |
| 107 | if let Err(e) = r { | 111 | if let Err(e) = r { |
| 108 | info!("write error: {:?}", e); | 112 | info!("write error: {:?}", e); |
| 109 | continue; | 113 | break; |
| 110 | } | 114 | } |
| 111 | Timer::after(Duration::from_secs(1)).await; | 115 | Timer::after(Duration::from_secs(1)).await; |
| 112 | } | 116 | } |
diff --git a/examples/stm32f7/src/bin/usart_dma.rs b/examples/stm32f7/src/bin/usart_dma.rs index 4700287a7..ba064081e 100644 --- a/examples/stm32f7/src/bin/usart_dma.rs +++ b/examples/stm32f7/src/bin/usart_dma.rs | |||
| @@ -20,7 +20,7 @@ bind_interrupts!(struct Irqs { | |||
| 20 | async fn main(_spawner: Spawner) { | 20 | async fn main(_spawner: Spawner) { |
| 21 | let p = embassy_stm32::init(Default::default()); | 21 | let p = embassy_stm32::init(Default::default()); |
| 22 | let config = Config::default(); | 22 | let config = Config::default(); |
| 23 | let mut usart = Uart::new(p.UART7, p.PA8, p.PA15, Irqs, p.DMA1_CH1, NoDma, config); | 23 | let mut usart = Uart::new(p.UART7, p.PA8, p.PA15, Irqs, p.DMA1_CH1, NoDma, config).unwrap(); |
| 24 | 24 | ||
| 25 | for n in 0u32.. { | 25 | for n in 0u32.. { |
| 26 | let mut s: String<128> = String::new(); | 26 | let mut s: String<128> = String::new(); |
