Skip to content

Commit c3926a7

Browse files
authored
Merge pull request #33 from jessebraham/housekeeping
Update repository URLs, remove build tool info from README
2 parents 92a0b6c + e056c48 commit c3926a7

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

cargo-espflash/Cargo.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@ authors = [
77
"Robin Appelman <[email protected]>",
88
"Jesse Braham <[email protected]>",
99
]
10-
repository = "https://github.com/icewind1991/espflash"
10+
repository = "https://github.com/esp-rs/espflash"
1111
edition = "2018"
1212

1313
[dependencies]
14-
cargo-project = "0.2.4"
1514
espflash = { version = "0.1.3", path = "../espflash" }
1615
pico-args = "0.4.0"
1716
serial = "0.4"
1817
serde = { version = "1", features = ["derive"] }
1918
toml = "0.5"
2019
cargo_metadata = "0.14.0"
2120
guess_host_triple = "0.1.2"
22-
anyhow = "1.0"
21+
anyhow = "1.0"

cargo-espflash/README.md

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,24 @@
22

33
_ESP8266_ and _ESP32_ cross-compiler and serial flasher cargo subcommand.
44

5-
To build the project before flashing, `cargo-espflash` has a few options, specified with the `--tool TOOL` flag.
6-
7-
- `--tool xbuild`, build using `cargo xbuild`. Requires [cargo xbuild](https://github.com/rust-osdev/cargo-xbuild) installed on your system. This is the default option.
8-
- `--tool cargo`, build using the `build-std` unstable cargo feature.
9-
- `--tool xargo`, build using `xargo`. Requires [xargo](https://github.com/japaric/xargo) installed on your system.
5+
Prior to flashing, the project is built using the `build-std` unstable cargo feature. Please refer to the [cargo documentation](https://doc.rust-lang.org/cargo/reference/unstable.html#build-std) for more information.
106

117
## Usage
128

139
```bash
14-
$ cargo espflash [--board-info] [--ram] [--release] [--example EXAMPLE] [--chip {esp32,esp8266}] [--tool {{cargo,xargo,xbuild}}] <serial>
10+
$ cargo espflash [--board-info] [--ram] [--release] [--example EXAMPLE] [--chip {esp32,esp8266}] <serial>
1511
```
1612

1713
When the `--ram` option is specified, the provided ELF image will be loaded into ram and executed without touching the flash.
1814

1915
### Config
2016

21-
You can also specify the serial port or build tool by setting it in the config file located at `~/.config/espflash/espflash.toml` or Linux
17+
You can also specify the serial port by setting it in the config file located at `~/.config/espflash/espflash.toml` or Linux
2218
or `%APPDATA%/esp/espflash/espflash.toml` on Windows.
2319

2420
```toml
2521
[connection]
2622
serial = "/dev/ttyUSB0"
27-
28-
[build]
29-
tool = "cargo"
3023
```
3124

3225
### Example

espflash/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ authors = ["Robin Appelman <[email protected]>"]
55
edition = "2018"
66
license = "GPL-2.0"
77
description = "ESP8266 and ESP32 serial flasher"
8-
repository = "https://github.com/icewind1991/espflash"
8+
repository = "https://github.com/esp-rs/espflash"
99

1010
[[bin]]
1111
name = "espflash"

0 commit comments

Comments
 (0)