Putting the Saola Wrover files back and adding my Wrover board files this time

Targett363 · Targett363 · commit 74954286f09b · 2020-10-10T21:44:14.000+01:00
diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/board.c b/ports/esp32s2/boards/espressif_saola_1_wrover/board.c
@@ -36,10 +36,6 @@ void board_init(void) {
     // Debug UART
     common_hal_never_reset_pin(&pin_GPIO43);
     common_hal_never_reset_pin(&pin_GPIO44);
-
-    //Crystal
-    common_hal_never_reset_pin(&pin_GPIO15);
-    common_hal_never_reset_pin(&pin_GPIO16);
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
@@ -26,12 +26,10 @@
 
 //Micropython setup
 
-//Same setup as the Saola board but with no Neopixel on board
-
-#define MICROPY_HW_BOARD_NAME       "Targett Module Clip w/Wrover"
+#define MICROPY_HW_BOARD_NAME       "Saola 1 w/Wrover"
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
 
-//#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
+#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
 
diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk
@@ -1,7 +1,7 @@
 USB_VID = 0x239A
 USB_PID = 0x80A6
-USB_PRODUCT = "Targett Module Clip w/WROVER"
-USB_MANUFACTURER = "Targett"
+USB_PRODUCT = "Saola 1 w/WROVER"
+USB_MANUFACTURER = "Espressif"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/board.c b/ports/esp32s2/boards/targett_module_clip_wrover/board.c
@@ -36,6 +36,10 @@ void board_init(void) {
     // Debug UART
     common_hal_never_reset_pin(&pin_GPIO43);
     common_hal_never_reset_pin(&pin_GPIO44);
+
+    //Crystal
+    common_hal_never_reset_pin(&pin_GPIO15);
+    common_hal_never_reset_pin(&pin_GPIO16);
 }
 
 bool board_requests_safe_mode(void) {
diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h b/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
@@ -26,10 +26,12 @@
 
 //Micropython setup
 
-#define MICROPY_HW_BOARD_NAME       "Saola 1 w/Wrover"
+//Same setup as the Saola board but with no Neopixel on board
+
+#define MICROPY_HW_BOARD_NAME       "Targett Module Clip w/Wrover"
 #define MICROPY_HW_MCU_NAME         "ESP32S2"
 
-#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
+//#define MICROPY_HW_NEOPIXEL (&pin_GPIO18)
 
 #define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
 
diff --git a/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk b/ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk
@@ -1,7 +1,7 @@
 USB_VID = 0x239A
 USB_PID = 0x80A6
-USB_PRODUCT = "Saola 1 w/WROVER"
-USB_MANUFACTURER = "Espressif"
+USB_PRODUCT = "Targett Module Clip w/WROVER"
+USB_MANUFACTURER = "Targett"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
