Merge branch 'master' of github.com:adafruit/Adafruit_TestBed

adafruit · Jul 17, 2024 · cd2ecc5 · cd2ecc5
2 parents bbc2afa + e0d3b19
commit cd2ecc5
Show file tree

Hide file tree

Showing 10 changed files with 22,150 additions and 62 deletions.
diff --git a/examples/Brain/program_esp_cdc/esp_binaries.h b/examples/Brain/program_esp_cdc/esp_binaries.h
@@ -26,15 +26,14 @@
 #define ESP_BINARIES_H_
 
 // Configuration: select which bins to flash
-#define BIN_FILES BIN_FEATHER_8266_BLINKY
+#define BIN_FILES BIN_C6_BLINK_IO8
 
 //--------------------------------------------------------------------+
 // LIST OF BINARIES
 //--------------------------------------------------------------------+
 
-#define BIN_ESP32_NINA_1_7_4 0 // nina 1.7.4
-#define BIN_ESP32_WIFI_AP_SKETCH                                               \
-  1 // esp32 wifi accesspoint sketch with ssdi "YourAP"
+#define BIN_ESP32_NINA_1_7_4 0        // nina 1.7.4
+#define BIN_ESP32_WIFI_AP_SKETCH 1    // esp32 AP with ssdi "YourAP"
 #define BIN_FEATHER_ESP32_V2_BLINKY 2 // Feather esp32 v2 blinky sketch
 
 #define BIN_FEATHER_S2 10 // Feather esp32s2 factory firmware
@@ -46,6 +45,8 @@
 
 #define BIN_FEATHER_8266_BLINKY 30 // Feather esp8266 blinky sketch
 
+#define BIN_C6_BLINK_IO8 40 // Blink sketch for C6 with LED on IO8
+
 //--------------------------------------------------------------------+
 // Binaries include
 //--------------------------------------------------------------------+
@@ -77,6 +78,12 @@
 #elif BIN_FILES == BIN_FEATHER_8266_BLINKY
 #include "esp_binaries/feather_esp8266_blinky.h"
 
+#elif BIN_FILES == BIN_C6_BLINK_IO8
+#include "esp_binaries/c6_blink_io8.h"
+
+#else
+#error "Please select BIN_FILES in esp_binaries.h"
+
 #endif
 
 struct {
@@ -128,8 +135,14 @@ struct {
 #elif BIN_FILES == BIN_FEATHER_8266_BLINKY
     {0x0000, &Blink_ino},
 
+#elif BIN_FILES == BIN_C6_BLINK_IO8
+    {0x00000, &c6_blink_io8_bootloader},
+    {0x8000, &c6_blink_io8_partitions},
+    {0xe000, &boot_app0},
+    {0x10000, &c6_blink_io8},
+
 #else
-#error bin_files[] not defined
+#error "Please select BIN_FILES in esp_binaries.h"
 #endif
 };
 

diff --git a/examples/Brain/program_esp_cdc/esp_binaries/c6_blink_io8.h b/examples/Brain/program_esp_cdc/esp_binaries/c6_blink_io8.h
diff --git a/examples/Brain/program_esp_uart/esp_binaries.h b/examples/Brain/program_esp_uart/esp_binaries.h
@@ -26,13 +26,14 @@
 #define ESP_BINARIES_H_
 
 // Configuration: select which bins to flash
-#define BIN_FILES BIN_METRO_S2
+#define BIN_FILES BIN_C6_BLINK_IO8
 
-//------------- Binaries Define -------------//
+//--------------------------------------------------------------------+
+// LIST OF BINARIES
+//--------------------------------------------------------------------+
 
-#define BIN_ESP32_NINA_1_7_4 0 // nina 1.7.4
-#define BIN_ESP32_WIFI_AP_SKETCH                                               \
-  1 // esp32 wifi accesspoint sketch with ssdi "YourAP"
+#define BIN_ESP32_NINA_1_7_4 0     // nina 1.7.4
+#define BIN_ESP32_WIFI_AP_SKETCH 1 // esp32 AP with ssdi "YourAP"
 
 #define BIN_FEATHER_S2 10 // Feather esp32s2 factory firmware
 #define BIN_FEATHER_S3 11 // Feather esp32s3 factory firmware
@@ -43,7 +44,11 @@
 
 #define BIN_ESP8266 30 // Espressif esp8266
 
-//------------- Binaries include -------------//
+#define BIN_C6_BLINK_IO8 40 // Blink sketch for C6 with LED on IO8
+
+//--------------------------------------------------------------------+
+// Binaries include
+//--------------------------------------------------------------------+
 
 #if BIN_FILES == BIN_ESP32_WIFI_AP_SKETCH
 #include "esp_binaries/wifi_ap_binaries.h"
@@ -69,6 +74,9 @@
 #elif BIN_FILES == BIN_ESP8266
 #include "esp_binaries/esp8266_binaries.h"
 
+#elif BIN_FILES == BIN_C6_BLINK_IO8
+#include "esp_binaries/c6_blink_io8.h"
+
 #else
 #error "Please select BIN_FILES in esp_binaries.h"
 
@@ -116,6 +124,13 @@ struct {
 
 #elif BIN_FILES == BIN_ESP8266
     {0x00000, &esp8266_blink_io0},
+
+#elif BIN_FILES == BIN_C6_BLINK_IO8
+    {0x00000, &c6_blink_io8_bootloader},
+    {0x8000, &c6_blink_io8_partitions},
+    {0xe000, &boot_app0},
+    {0x10000, &c6_blink_io8},
+
 #else
 #error "Please select BIN_FILES in esp_binaries.h"
 #endif

diff --git a/examples/Brain/program_esp_uart/esp_binaries/c6_blink_io8.h b/examples/Brain/program_esp_uart/esp_binaries/c6_blink_io8.h
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Adafruit TestBed
-version=1.12.1
+version=1.12.2
 author=Adafruit
 maintainer=Adafruit <[email protected]>
 sentence=Adafruit's internal test bed code library

diff --git a/src/Adafruit_TestBed.cpp b/src/Adafruit_TestBed.cpp
@@ -1,5 +1,8 @@
 #include "Adafruit_TestBed.h"
 
+// change to 1 to skip pre-flash md5 check for testing
+#define SKIP_PRE_FLASH_MD5_CHECK 0
+
 static inline uint32_t div_ceil(uint32_t v, uint32_t d) {
   return (v + d - 1) / d;
 }
@@ -525,7 +528,7 @@ Adafruit_TestBed::_esp32_programFlashDefl_impl(const esp32_zipfile_t *zfile,
   // Check if MD5 matches to skip this file
   uint8_t esp_md5[16];
 
-#if 1 // change to 0 to skip pre-flash md5 check for testing
+#if !SKIP_PRE_FLASH_MD5_CHECK
   esp32boot->md5Flash(addr, zfile->uncompressed_len, esp_md5);
   Serial.print("Flash MD5: ");
   print_buf(esp_md5, 16);

diff --git a/src/ESP32BootROM.cpp b/src/ESP32BootROM.cpp
@@ -19,11 +19,13 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
+// https://docs.espressif.com/projects/esptool/en/latest/esp32/advanced-topics/serial-protocol.html
+
 #if defined(ARDUINO_RASPBERRY_PI_PICO) || defined(__SAMD51__) ||  defined(TARGET_RP2040) || defined(ARDUINO_ARCH_ESP32) || \
     (defined(ARDUINO_ARCH_SAMD) && defined(ARM_MATH_CM0PLUS))
 
 #include "ESP32BootROM.h"
-#include "stub_esp32.h"
+#include "stub_esp.h"
 
 #ifdef USE_TINYUSB
 #include "Adafruit_TinyUSB.h"
@@ -252,36 +254,19 @@ uint32_t ESP32BootROMClass::begin(unsigned long baudrate) {
   Serial.printf("Chip Detect: 0x%08lX\r\n", _chip_detect);
 
   const esp32_stub_loader_t *stub = NULL;
-  switch (_chip_detect) {
-  case CHIP_DETECT_MAGIC_ESP32:
-    // only ESP32 have SUPPORTS_ENCRYPTED_FLASH = false
-    Serial.println("Found ESP32");
-    stub = &stub_esp32;
-    _supports_encrypted_flash = false;
-    break;
-  case CHIP_DETECT_MAGIC_ESP32S2:
-    Serial.println("Found ESP32-S2");
-    stub = &stub_esp32s2;
-    break;
-
-  case CHIP_DETECT_MAGIC_ESP32S3:
-    Serial.println("Found ESP32-S3");
-    stub = &stub_esp32s3;
-    break;
-
-  case CHIP_DETECT_MAGIC_ESP8266:
-    Serial.println("Found ESP8266");
-    stub = &stub_esp8266;
-    break;
-
-  default:
-    Serial.println("Found unknown ESP");
-    break;
+  for (uint32_t i = 0; i < ESP_STUB_COUNT; i++) {
+    if (stub_esp_arr[i]->chip_detect == _chip_detect) {
+      stub = stub_esp_arr[i];
+      break;
+    }
   }
 
   if (stub) {
+    Serial.printf("Found %s\r\n", stub->chip_name);
     VERIFY(uploadStub(stub));
     VERIFY(syncStub(3000));
+  } else {
+    Serial.println("Found unknown ESP chip");
   }
 
   if (baudrate != ESP_ROM_BAUD) {

diff --git a/src/ESP32BootROM.h b/src/ESP32BootROM.h
@@ -30,16 +30,19 @@ enum {
   CHIP_DETECT_MAGIC_ESP32S2 = 0x000007C6,
   CHIP_DETECT_MAGIC_ESP32S3 = 0x9,
   CHIP_DETECT_MAGIC_ESP8266 = 0xFFF0C101,
+  CHIP_DETECT_MAGIC_ESP32C6 = 0x2CE0806F,
 };
 
 typedef struct {
+  uint32_t chip_detect;
   uint32_t entry;
   uint32_t text_start;
   uint32_t text_length;
   const uint8_t *text;
   uint32_t data_start;
   uint32_t data_length;
   const uint8_t *data;
+  const char *chip_name;
 } esp32_stub_loader_t;
 
 class ESP32BootROMClass {