Move the bootloaders and stubs into a common resources directory, update dependencies (#231)

* Move the bootloaders and flasher stubs into a common resources directory

* Flatten the stubs module

* Update and normalize dependencies

Author: jessebraham

Cargo.lock

@@ -30,14 +30,14 @@ bin-dir = "{ bin }{ binary-ext }"
 pkg-fmt = "zip"
 
 [dependencies]
-cargo_metadata = "0.15"
-cargo_toml = "0.11"
-clap = { version = "3.2", features = ["derive", "env"] }
+cargo_metadata = "0.15.0"
+cargo_toml = "0.11.6"
+clap = { version = "3.2.20", features = ["derive", "env"] }
 espflash = { version = "=1.6.1-dev", path = "../espflash" }
 log = "0.4.17"
-miette = { version = "5.2", features = ["fancy"] }
-serde = { version = "1.0", features = ["derive"] }
-strum = "0.24"
-thiserror = "1.0"
-tracing-subscriber = { version = "0.3.11", features = [ "env-filter" ] }
-toml = "0.5"
+miette = { version = "5.3.0", features = ["fancy"] }
+serde = { version = "1.0.144", features = ["derive"] }
+strum = "0.24.1"
+thiserror = "1.0.34"
+tracing-subscriber = { version = "0.3.15", features = [ "env-filter" ] }
+toml = "0.5.9"

cargo-espflash/Cargo.toml

@@ -30,34 +30,34 @@ pkg-fmt = "zip"
 
 [dependencies]
 base64 = "0.13.0"
-binread = "2.2"
-bytemuck = { version = "1.11", features = ["derive"] }
-clap = { version = "3.2", features = ["derive", "env"] }
-comfy-table = "6.0"
-crossterm = "0.24"
-csv = "1.1"
-dialoguer = "0.10"
-directories-next = "2.0"
-espmonitor = "0.10"
-flate2 = "1.0"
-indicatif = "0.17"
+binread = "2.2.0"
+bytemuck = { version = "1.12.1", features = ["derive"] }
+clap = { version = "3.2.3", features = ["derive", "env"] }
+comfy-table = "6.1.0"
+crossterm = "0.25.0"
+csv = "1.1.6"
+dialoguer = "0.10.2"
+directories-next = "2.0.0"
+espmonitor = "0.10.0"
+flate2 = "1.0.24"
+indicatif = "0.17.0"
 log = "0.4.17"
-maplit = "1.0"
-md5 = "0.7"
-miette = { version = "5.2", features = ["fancy"] }
-parse_int = "0.6"
-regex = "1.6"
-serde = { version = "1.0", features = ["derive"] }
-serde-hex = "0.1"
-serde_json = "1.0.83"
-serde_plain = "1.0"
-serialport = "4.2"
-tracing-subscriber = { version = "0.3.11", features = [ "env-filter" ] }
-sha2 = "0.10"
-slip-codec = "0.3"
-strum = "0.24"
-strum_macros = "0.24"
-thiserror = "1.0"
-toml = "0.5"
-update-informer = "0.5"
-xmas-elf = "0.8"
+maplit = "1.0.2"
+md5 = "0.7.0"
+miette = { version = "5.3.0", features = ["fancy"] }
+parse_int = "0.6.0"
+regex = "1.6.0"
+serde = { version = "1.0.144", features = ["derive"] }
+serde-hex = "0.1.0"
+serde_json = "1.0.85"
+serde_plain = "1.0.0"
+serialport = "4.2.0"
+tracing-subscriber = { version = "0.3.15", features = [ "env-filter" ] }
+sha2 = "0.10.5"
+slip-codec = "0.3.3"
+strum = "0.24.1"
+strum_macros = "0.24.3"
+thiserror = "1.0.34"
+toml = "0.5.9"
+update-informer = "0.5.0"
+xmas-elf = "0.8.0"

espflash/Cargo.toml

@@ -18,7 +18,7 @@ pub const PARAMS: Esp32Params = Esp32Params::new(
     0x10000,
     0x3f0000,
     0,
-    include_bytes!("../../../bootloader/esp32-bootloader.bin"),
+    include_bytes!("../../../../resources/bootloaders/esp32-bootloader.bin"),
 );
 
 impl ChipType for Esp32 {

espflash/bootloader/README

@@ -19,7 +19,7 @@ pub const PARAMS: Esp32Params = Esp32Params::new(
     0x10000,
     0x1f0000,
     12,
-    include_bytes!("../../../bootloader/esp32c2-bootloader.bin"),
+    include_bytes!("../../../../resources/bootloaders/esp32c2-bootloader.bin"),
 );
 
 impl ChipType for Esp32c2 {

espflash/src/chip/esp32/esp32.rs

@@ -18,7 +18,7 @@ pub const PARAMS: Esp32Params = Esp32Params::new(
     0x10000,
     0x3f0000,
     5,
-    include_bytes!("../../../bootloader/esp32c3-bootloader.bin"),
+    include_bytes!("../../../../resources/bootloaders/esp32c3-bootloader.bin"),
 );
 
 impl ChipType for Esp32c3 {

espflash/src/chip/esp32/esp32c2.rs

@@ -18,7 +18,7 @@ pub const PARAMS: Esp32Params = Esp32Params::new(
     0x10000,
     0x100000,
     2,
-    include_bytes!("../../../bootloader/esp32s2-bootloader.bin"),
+    include_bytes!("../../../../resources/bootloaders/esp32s2-bootloader.bin"),
 );
 
 impl ChipType for Esp32s2 {

espflash/src/chip/esp32/esp32c3.rs

@@ -17,7 +17,7 @@ pub const PARAMS: Esp32Params = Esp32Params::new(
     0x10000,
     0x100000,
     9,
-    include_bytes!("../../../bootloader/esp32s3-bootloader.bin"),
+    include_bytes!("../../../../resources/bootloaders/esp32s3-bootloader.bin"),
 );
 
 impl ChipType for Esp32s3 {

espflash/src/chip/esp32/esp32s2.rs

@@ -19,12 +19,12 @@ pub struct FlashStub {
 
 // Include stub objects in binary
 
-const STUB_32: &str = include_str!("../../../stubs/stub_flasher_32.json");
-const STUB_32C2: &str = include_str!("../../../stubs/stub_flasher_32c2.json");
-const STUB_32C3: &str = include_str!("../../../stubs/stub_flasher_32c3.json");
-const STUB_32S2: &str = include_str!("../../../stubs/stub_flasher_32s2.json");
-const STUB_32S3: &str = include_str!("../../../stubs/stub_flasher_32s3.json");
-const STUB_8266: &str = include_str!("../../../stubs/stub_flasher_8266.json");
+const STUB_32: &str = include_str!("../../resources/stubs/stub_flasher_32.json");
+const STUB_32C2: &str = include_str!("../../resources/stubs/stub_flasher_32c2.json");
+const STUB_32C3: &str = include_str!("../../resources/stubs/stub_flasher_32c3.json");
+const STUB_32S2: &str = include_str!("../../resources/stubs/stub_flasher_32s2.json");
+const STUB_32S3: &str = include_str!("../../resources/stubs/stub_flasher_32s3.json");
+const STUB_8266: &str = include_str!("../../resources/stubs/stub_flasher_8266.json");
 
 impl FlashStub {
     /// Fetch flash stub for the provided chip