Skip to content

Commit 3f10da5

Browse files
committed
Fix compilation
1 parent b0cbd30 commit 3f10da5

File tree

4 files changed

+10
-1
lines changed

4 files changed

+10
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Added
1111
- `save-image` now checks if the ELF contains the app descriptor (#920)
12+
- Add support for secure padding for save-image (#876)
1213

1314
### Changed
1415

@@ -48,7 +49,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4849
- `ProgressCallbacks` now has a `verifying` method to notify when post-flash checksum checking has begun (#908)
4950
- Implement `From<Connection> for Port` and both `From<Flasher> for Connection` and `Port` conversions (#915)
5051
- Add support for serial port configuration files. (#777)
51-
- Add support for secure padding for save-image (#876)
5252

5353
### Changed
5454

cargo-espflash/src/main.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> {
373373
config,
374374
chip,
375375
target_xtal_freq,
376+
args.idf_format_args.secure_pad_v2,
376377
);
377378
let image_format = make_image_format(
378379
&elf_data,
@@ -643,6 +644,7 @@ fn save_image(args: SaveImageArgs, config: &Config) -> Result<()> {
643644
config,
644645
args.save_image_args.chip,
645646
xtal_freq,
647+
args.idf_format_args.secure_pad_v2,
646648
);
647649
let image_format = make_image_format(
648650
&elf_data,

espflash/src/bin/espflash.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,7 @@ fn flash(args: FlashArgs, config: &Config) -> Result<()> {
286286
config,
287287
chip,
288288
target_xtal_freq,
289+
args.idf_format_args.secure_pad_v2,
289290
);
290291
let image_format = make_image_format(
291292
&elf_data,
@@ -370,6 +371,7 @@ fn save_image(args: SaveImageArgs, config: &Config) -> Result<()> {
370371
config,
371372
args.save_image_args.chip,
372373
xtal_freq,
374+
args.idf_format_args.secure_pad_v2,
373375
);
374376
let image_format = make_image_format(
375377
&elf_data,

espflash/src/connection/reset.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,25 @@ const EXTRA_RESET_DELAY: u64 = 500; // ms
3030

3131
/// Reset strategies for resetting a target device.
3232
pub trait ResetStrategy {
33+
/// Resets the target device.
3334
fn reset(&self, serial_port: &mut Port) -> Result<(), Error>;
3435

36+
/// Sets DTR (data terminal ready) to a specified level.
3537
fn set_dtr(&self, serial_port: &mut Port, level: bool) -> Result<(), Error> {
3638
serial_port.write_data_terminal_ready(level)?;
3739

3840
Ok(())
3941
}
4042

43+
/// Sets RTS (request to send) to a specified level.
4144
fn set_rts(&self, serial_port: &mut Port, level: bool) -> Result<(), Error> {
4245
serial_port.write_request_to_send(level)?;
4346

4447
Ok(())
4548
}
4649

50+
/// Sets RTS (request to send) and DTS (data termina lready) to specified
51+
/// levels.
4752
#[cfg(unix)]
4853
fn set_dtr_rts(
4954
&self,

0 commit comments

Comments
 (0)