Skip to content

Commit 21e6400

Browse files
committed
feat: simplify devcontainer setup by using web-flash by default on all systems
1 parent 539e94d commit 21e6400

File tree

8 files changed

+8
-232
lines changed

8 files changed

+8
-232
lines changed

mqtt_example/.cargo/config.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ target = "xtensa-esp32-espidf"
33

44
[target.xtensa-esp32-espidf]
55
linker = "ldproxy"
6-
# Use web-flash on mac instead
7-
# runner = "web-flash --chip=esp32 "
8-
runner = "espflash flash --monitor"
6+
# espflash requires usb-passthrough or not using a devcontainer
7+
# runner = "espflash flash --monitor"
8+
runner = "web-flash --chip=esp32 "
99
rustflags = ["--cfg", "espidf_time64"]
1010

1111
[unstable]

mqtt_example/.devcontainer/mac/devcontainer.json renamed to mqtt_example/.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "mqtt_example",
33
"build": {
4-
"dockerfile": "../Dockerfile",
4+
"dockerfile": "Dockerfile",
55
"args": {
66
"CONTAINER_USER": "esp",
77
"CONTAINER_GROUP": "esp",

mqtt_example/.devcontainer/linux/devcontainer.json

Lines changed: 0 additions & 56 deletions
This file was deleted.

mqtt_example/.devcontainer/wsl2/devcontainer.json

Lines changed: 0 additions & 56 deletions
This file was deleted.

spi_display_example/.cargo/config.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ target = "xtensa-esp32-espidf"
33

44
[target.xtensa-esp32-espidf]
55
linker = "ldproxy"
6-
# Use web-flash on mac instead
7-
# runner = "web-flash --chip=esp32 "
8-
runner = "espflash flash --monitor"
6+
# espflash requires usb-passthrough or not using a devcontainer
7+
# runner = "espflash flash --monitor"
8+
runner = "web-flash --chip=esp32 "
99
rustflags = [ "--cfg", "espidf_time64"]
1010

1111
[unstable]

spi_display_example/.devcontainer/mac/devcontainer.json renamed to spi_display_example/.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "spi_display_example",
33
"build": {
4-
"dockerfile": "../Dockerfile",
4+
"dockerfile": "Dockerfile",
55
"args": {
66
"CONTAINER_USER": "esp",
77
"CONTAINER_GROUP": "esp",

spi_display_example/.devcontainer/linux/devcontainer.json

Lines changed: 0 additions & 56 deletions
This file was deleted.

spi_display_example/.devcontainer/wsl2/devcontainer.json

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)