From 45d6ec5a90b8a91d4d53d27b6c5691aada72e53c Mon Sep 17 00:00:00 2001 From: Jacob Rosenthal Date: Tue, 13 Oct 2020 10:40:43 -0700 Subject: [PATCH 1/4] hf2: catch up with adafruit espressif boards https://github.com/adafruit/uf2-esp32s --- hf2/src/utils/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hf2/src/utils/mod.rs b/hf2/src/utils/mod.rs index 4351dda..205f229 100644 --- a/hf2/src/utils/mod.rs +++ b/hf2/src/utils/mod.rs @@ -191,7 +191,7 @@ fn verify( pub fn vendor_map() -> std::collections::HashMap> { maplit::hashmap! { 0x1D50 => vec![0x6110, 0x6112], - 0x239A => vec![0x0035, 0x002D, 0x0015, 0x001B, 0xB000, 0x0024, 0x000F, 0x0013, 0x0021, 0x0022, 0x0031, 0x002B, 0x0037, 0x0035, 0x002F, 0x002B, 0x0033, 0x0034, 0x003D, 0x0018, 0x001C, 0x001E, 0x0027, 0x0022], + 0x239A => vec![0x00AB, 0x00C5, 0x00A5, 0x00A7, 0x00C7, 0x0035, 0x002D, 0x0015, 0x001B, 0xB000, 0x0024, 0x000F, 0x0013, 0x0021, 0x0022, 0x0031, 0x002B, 0x0037, 0x0035, 0x002F, 0x002B, 0x0033, 0x0034, 0x003D, 0x0018, 0x001C, 0x001E, 0x0027, 0x0022], 0x04D8 => vec![0xEDB3, 0xEDBE, 0xEF66], 0x2341 => vec![0x024E, 0x8053, 0x024D], 0x16D0 => vec![0x0CDA], From e900092002ff8a4effffd48d9a9907f117f345aa Mon Sep 17 00:00:00 2001 From: Jacob Rosenthal Date: Tue, 13 Oct 2020 10:44:55 -0700 Subject: [PATCH 2/4] hf2: catch up with adafruit samd boards https://github.com/adafruit/uf2-samdx1 --- hf2/src/utils/mod.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hf2/src/utils/mod.rs b/hf2/src/utils/mod.rs index 205f229..9e09459 100644 --- a/hf2/src/utils/mod.rs +++ b/hf2/src/utils/mod.rs @@ -191,13 +191,15 @@ fn verify( pub fn vendor_map() -> std::collections::HashMap> { maplit::hashmap! { 0x1D50 => vec![0x6110, 0x6112], - 0x239A => vec![0x00AB, 0x00C5, 0x00A5, 0x00A7, 0x00C7, 0x0035, 0x002D, 0x0015, 0x001B, 0xB000, 0x0024, 0x000F, 0x0013, 0x0021, 0x0022, 0x0031, 0x002B, 0x0037, 0x0035, 0x002F, 0x002B, 0x0033, 0x0034, 0x003D, 0x0018, 0x001C, 0x001E, 0x0027, 0x0022], - 0x04D8 => vec![0xEDB3, 0xEDBE, 0xEF66], - 0x2341 => vec![0x024E, 0x8053, 0x024D], + 0x239A => vec![0x0061, 0xE005, 0x0095, 0x004D, 0x006B, 0x0057, 0x00B5, 0x007D, 0x00B9, 0x0065, 0x0047, 0x0049, 0x00AF, 0x00CD, 0x00BF, 0x00C3, 0x00CB, 0x00AB, 0x00AB, 0x00C5, 0x00A5, 0x00A7, 0x00C7, 0x0035, 0x002D, 0x0015, 0x001B, 0xB000, 0x0024, 0x000F, 0x0013, 0x0021, 0x0022, 0x0031, 0x002B, 0x0037, 0x0035, 0x002F, 0x002B, 0x0033, 0x0034, 0x003D, 0x0018, 0x001C, 0x001E, 0x0027, 0x0022], + 0x04D8 => vec![0xEC44, 0xEC64, 0xEC63, 0xEDB3, 0xEDBE, 0xEF66], + 0x2341 => vec![0x0057, 0x024E, 0x8053, 0x024D], 0x16D0 => vec![0x0CDA], 0x03EB => vec![0x2402], - 0x2886 => vec![0x000D, 0x002F], + 0x2886 => vec![0x002F, 0x000D, 0x002F], 0x1B4F => vec![0x0D23, 0x0D22], - 0x1209 => vec![0x4D44, 0x2017], + 0x1209 => vec![0x7102, 0x4D44, 0x2017], + 0x3171 => vec![0x0100], + } } From 6c13c140956d4a96194cd06375c04b762f4354cb Mon Sep 17 00:00:00 2001 From: Jacob Rosenthal Date: Tue, 13 Oct 2020 10:53:45 -0700 Subject: [PATCH 3/4] hf2: catch up with adafruit nrf boards https://github.com/adafruit/Adafruit_nRF52_Bootloader and remove dupes --- hf2/src/utils/mod.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hf2/src/utils/mod.rs b/hf2/src/utils/mod.rs index 9e09459..2248c15 100644 --- a/hf2/src/utils/mod.rs +++ b/hf2/src/utils/mod.rs @@ -191,15 +191,15 @@ fn verify( pub fn vendor_map() -> std::collections::HashMap> { maplit::hashmap! { 0x1D50 => vec![0x6110, 0x6112], - 0x239A => vec![0x0061, 0xE005, 0x0095, 0x004D, 0x006B, 0x0057, 0x00B5, 0x007D, 0x00B9, 0x0065, 0x0047, 0x0049, 0x00AF, 0x00CD, 0x00BF, 0x00C3, 0x00CB, 0x00AB, 0x00AB, 0x00C5, 0x00A5, 0x00A7, 0x00C7, 0x0035, 0x002D, 0x0015, 0x001B, 0xB000, 0x0024, 0x000F, 0x0013, 0x0021, 0x0022, 0x0031, 0x002B, 0x0037, 0x0035, 0x002F, 0x002B, 0x0033, 0x0034, 0x003D, 0x0018, 0x001C, 0x001E, 0x0027, 0x0022], + 0x239A => vec![0x007F, 0x00B3, 0x003F, 0x0051, 0x0093, 0x0087, 0x003B, 0x0071, 0x0045, 0x0063, 0x0029, 0x0079, 0x0061, 0xE005, 0x0095, 0x004D, 0x006B, 0x0057, 0x00B5, 0x007D, 0x00B9, 0x0065, 0x0047, 0x0049, 0x00AF, 0x00CD, 0x00BF, 0x00C3, 0x00CB, 0x00AB, 0x00C5, 0x00A5, 0x00A7, 0x00C7, 0x002D, 0x0015, 0x001B, 0xB000, 0x0024, 0x000F, 0x0013, 0x0021, 0x0031, 0x0037, 0x0035, 0x002F, 0x002B, 0x0033, 0x0034, 0x003D, 0x0018, 0x001C, 0x001E, 0x0027, 0x0022], 0x04D8 => vec![0xEC44, 0xEC64, 0xEC63, 0xEDB3, 0xEDBE, 0xEF66], 0x2341 => vec![0x0057, 0x024E, 0x8053, 0x024D], 0x16D0 => vec![0x0CDA], 0x03EB => vec![0x2402], - 0x2886 => vec![0x002F, 0x000D, 0x002F], + 0x2886 => vec![0x000D, 0x002F], 0x1B4F => vec![0x0D23, 0x0D22], - 0x1209 => vec![0x7102, 0x4D44, 0x2017], + 0x1209 => vec![0x805A, 0x7102, 0x4D44, 0x2017], 0x3171 => vec![0x0100], - + 0x1915 => vec![0x521F], } } From f99af7f7f58a5d75fa50fe4caca810bfeec703d6 Mon Sep 17 00:00:00 2001 From: Jacob Rosenthal Date: Tue, 13 Oct 2020 10:58:46 -0700 Subject: [PATCH 4/4] hf2: add wio terminal --- hf2/src/utils/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hf2/src/utils/mod.rs b/hf2/src/utils/mod.rs index 2248c15..b60cfc0 100644 --- a/hf2/src/utils/mod.rs +++ b/hf2/src/utils/mod.rs @@ -196,7 +196,7 @@ pub fn vendor_map() -> std::collections::HashMap> { 0x2341 => vec![0x0057, 0x024E, 0x8053, 0x024D], 0x16D0 => vec![0x0CDA], 0x03EB => vec![0x2402], - 0x2886 => vec![0x000D, 0x002F], + 0x2886 => vec![0x002D, 0x000D, 0x002F], 0x1B4F => vec![0x0D23, 0x0D22], 0x1209 => vec![0x805A, 0x7102, 0x4D44, 0x2017], 0x3171 => vec![0x0100],