Skip to content

Commit d7f800e

Browse files
Windows: Set RTS before DTR to avoid issues (#562)
* windows usb serial workaround: set dtr after rts * feat: Set rts before dtr for UsbJtagSerialReset * docs: Update changelog --------- Co-authored-by: Hailey Somerville <[email protected]>
1 parent 2f3d110 commit d7f800e

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3131
- Use partition table instead of hard-coded values for the location of partitions (#516)
3232
- Fixed a missed `flush` call that may be causing communication errors (#521)
3333
- Fix "SHA-256 comparison failed: [...] attempting to boot anyway..." (#567)
34+
- Windows: Update RST/DTR order to avoid issues.
3435

3536
### Changed
3637
- Created `FlashData`, `FlashDataBuilder` and `FlashSettings` structs to reduce number of input arguments in some functions (#512, #566)

espflash/src/connection/reset.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,24 +101,24 @@ impl ResetStrategy for ClassicReset {
101101
"Using Classic reset strategy with delay of {}ms",
102102
self.delay
103103
);
104-
self.set_dtr(interface, false)?;
105104
self.set_rts(interface, false)?;
105+
self.set_dtr(interface, false)?;
106106

107-
self.set_dtr(interface, true)?;
108107
self.set_rts(interface, true)?;
108+
self.set_dtr(interface, true)?;
109109

110-
self.set_dtr(interface, false)?; // IO0 = HIGH
111110
self.set_rts(interface, true)?; // EN = LOW, chip in reset
111+
self.set_dtr(interface, false)?; // IO0 = HIGH
112112

113113
sleep(Duration::from_millis(100));
114114

115-
self.set_dtr(interface, true)?; // IO0 = LOW
116115
self.set_rts(interface, false)?; // EN = HIGH, chip out of reset
116+
self.set_dtr(interface, true)?; // IO0 = LOW
117117

118118
sleep(Duration::from_millis(self.delay));
119119

120-
self.set_dtr(interface, false)?; // IO0 = HIGH, done
121120
self.set_rts(interface, false)?;
121+
self.set_dtr(interface, false)?; // IO0 = HIGH, done
122122

123123
Ok(())
124124
}
@@ -179,13 +179,13 @@ impl ResetStrategy for UsbJtagSerialReset {
179179
fn reset(&self, interface: &mut Interface) -> Result<(), Error> {
180180
debug!("Using UsbJtagSerial reset strategy");
181181

182-
self.set_dtr(interface, false)?; // Idle
183182
self.set_rts(interface, false)?;
183+
self.set_dtr(interface, false)?; // Idle
184184

185185
sleep(Duration::from_millis(100));
186186

187-
self.set_dtr(interface, true)?; // Set IO0
188187
self.set_rts(interface, false)?;
188+
self.set_dtr(interface, true)?; // Set IO0
189189

190190
sleep(Duration::from_millis(100));
191191

@@ -195,8 +195,8 @@ impl ResetStrategy for UsbJtagSerialReset {
195195

196196
sleep(Duration::from_millis(100));
197197

198-
self.set_dtr(interface, false)?;
199198
self.set_rts(interface, false)?;
199+
self.set_dtr(interface, false)?;
200200

201201
Ok(())
202202
}

0 commit comments

Comments
 (0)