aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--embassy-stm32/src/usart/mod.rs12
-rw-r--r--examples/stm32g0/src/bin/onewire_ds18b20.rs4
2 files changed, 8 insertions, 8 deletions
diff --git a/embassy-stm32/src/usart/mod.rs b/embassy-stm32/src/usart/mod.rs
index 49f536799..48f9a84fa 100644
--- a/embassy-stm32/src/usart/mod.rs
+++ b/embassy-stm32/src/usart/mod.rs
@@ -142,20 +142,20 @@ pub enum HalfDuplexReadback {
142pub enum OutputConfig { 142pub enum OutputConfig {
143 /// Push pull allows for faster baudrates, no internal pullup 143 /// Push pull allows for faster baudrates, no internal pullup
144 PushPull, 144 PushPull,
145 /// Open drain output using external pull down resistor 145 /// Open drain output (external pull up needed)
146 OpenDrainExternal, 146 OpenDrain,
147 #[cfg(not(gpio_v1))] 147 #[cfg(not(gpio_v1))]
148 /// Open drain output using internal pull up resistor 148 /// Open drain output with internal pull up resistor
149 OpenDrainInternal, 149 OpenDrainPullUp,
150} 150}
151 151
152impl OutputConfig { 152impl OutputConfig {
153 const fn af_type(self) -> AfType { 153 const fn af_type(self) -> AfType {
154 match self { 154 match self {
155 OutputConfig::PushPull => AfType::output(OutputType::PushPull, Speed::Medium), 155 OutputConfig::PushPull => AfType::output(OutputType::PushPull, Speed::Medium),
156 OutputConfig::OpenDrainExternal => AfType::output(OutputType::OpenDrain, Speed::Medium), 156 OutputConfig::OpenDrain => AfType::output(OutputType::OpenDrain, Speed::Medium),
157 #[cfg(not(gpio_v1))] 157 #[cfg(not(gpio_v1))]
158 OutputConfig::OpenDrainInternal => AfType::output_pull(OutputType::OpenDrain, Speed::Medium, Pull::Up), 158 OutputConfig::OpenDrainPullUp => AfType::output_pull(OutputType::OpenDrain, Speed::Medium, Pull::Up),
159 } 159 }
160 } 160 }
161} 161}
diff --git a/examples/stm32g0/src/bin/onewire_ds18b20.rs b/examples/stm32g0/src/bin/onewire_ds18b20.rs
index 75519bbf2..62f8711a6 100644
--- a/examples/stm32g0/src/bin/onewire_ds18b20.rs
+++ b/examples/stm32g0/src/bin/onewire_ds18b20.rs
@@ -22,7 +22,7 @@ fn create_onewire(p: embassy_stm32::Peripherals) -> OneWire<UartTx<'static, Asyn
22 }); 22 });
23 23
24 let mut config = Config::default(); 24 let mut config = Config::default();
25 config.tx_config = OutputConfig::OpenDrainExternal; 25 config.tx_config = OutputConfig::OpenDrain;
26 26
27 let usart = Uart::new_half_duplex( 27 let usart = Uart::new_half_duplex(
28 p.USART1, 28 p.USART1,
@@ -53,7 +53,7 @@ fn create_onewire(p: embassy_stm32::Peripherals) -> OneWire<BufferedUartTx<'stat
53 53
54 const BUFFER_SIZE: usize = 16; 54 const BUFFER_SIZE: usize = 16;
55 let mut config = Confi::default(); 55 let mut config = Confi::default();
56 config.tx_config = OutputConfig::OpenDrainExternal; 56 config.tx_config = OutputConfig::OpenDrain;
57 let tx_buf: &mut [u8; BUFFER_SIZE] = singleton!(TX_BUF: [u8; BUFFER_SIZE] = [0; BUFFER_SIZE]).unwrap(); 57 let tx_buf: &mut [u8; BUFFER_SIZE] = singleton!(TX_BUF: [u8; BUFFER_SIZE] = [0; BUFFER_SIZE]).unwrap();
58 let rx_buf: &mut [u8; BUFFER_SIZE] = singleton!(RX_BUF: [u8; BUFFER_SIZE] = [0; BUFFER_SIZE]).unwrap(); 58 let rx_buf: &mut [u8; BUFFER_SIZE] = singleton!(RX_BUF: [u8; BUFFER_SIZE] = [0; BUFFER_SIZE]).unwrap();
59 let usart = BufferedUart::new_half_duplex( 59 let usart = BufferedUart::new_half_duplex(