summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTargett363 <targett363@aol.com>2020-10-10 21:44:14 +0100
committerTargett363 <targett363@aol.com>2020-10-10 21:44:14 +0100
commit74954286f09b2fc861db759232569520552f7cd8 (patch)
tree79aae9b6948b147e95a802d86418eb867cd00381
parentf38e868e90fb467cf0f910e4990ffacba07abefb (diff)
Putting the Saola Wrover files back and adding my Wrover board files this time
-rw-r--r--ports/esp32s2/boards/espressif_saola_1_wrover/board.c4
-rw-r--r--ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h6
-rw-r--r--ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk4
-rw-r--r--ports/esp32s2/boards/targett_module_clip_wrover/board.c4
-rw-r--r--ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h6
-rw-r--r--ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.mk4
6 files changed, 14 insertions, 14 deletions
diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/board.c b/ports/esp32s2/boards/espressif_saola_1_wrover/board.c
index 83dcb920a..9f708874b 100644
--- 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
index 3c74d27fa..961522891 100644
--- 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
index 4b70f4a68..d5ff1c5ac 100644
--- 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
index 9f708874b..83dcb920a 100644
--- 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
index 961522891..3c74d27fa 100644
--- 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
index d5ff1c5ac..4b70f4a68 100644
--- 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