From c5f014f2a650d1a1953fe86b92cdebed0b2e037b Mon Sep 17 00:00:00 2001 From: Patrick <4002194+askpatrickw@users.noreply.github.com> Date: Fri, 9 Sep 2022 15:40:02 -0700 Subject: [PATCH 1/6] web workflow file system page Fixes #6884 --- supervisor/shared/web_workflow/static/directory.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html index baa5d9e9af..a631fb5c38 100644 --- a/supervisor/shared/web_workflow/static/directory.html +++ b/supervisor/shared/web_workflow/static/directory.html @@ -9,7 +9,7 @@

 

- + From b50bafa22c337c3962791b0f1940270f5e73b7fc Mon Sep 17 00:00:00 2001 From: Patrick <4002194+askpatrickw@users.noreply.github.com> Date: Fri, 9 Sep 2022 16:31:11 -0700 Subject: [PATCH 2/6] Update supervisor/shared/web_workflow/static/directory.html --- supervisor/shared/web_workflow/static/directory.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html index a631fb5c38..6fdbaf0bdf 100644 --- a/supervisor/shared/web_workflow/static/directory.html +++ b/supervisor/shared/web_workflow/static/directory.html @@ -9,7 +9,7 @@

 

- +
TypeSizePathModified
From c271a421bfef62cd54e034cb16ead574e00e52e9 Mon Sep 17 00:00:00 2001 From: Patrick <4002194+askpatrickw@users.noreply.github.com> Date: Fri, 9 Sep 2022 16:34:11 -0700 Subject: [PATCH 3/6] Update supervisor/shared/web_workflow/static/directory.html --- supervisor/shared/web_workflow/static/directory.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supervisor/shared/web_workflow/static/directory.html b/supervisor/shared/web_workflow/static/directory.html index 6fdbaf0bdf..cf9ff507f9 100644 --- a/supervisor/shared/web_workflow/static/directory.html +++ b/supervisor/shared/web_workflow/static/directory.html @@ -9,7 +9,7 @@

 

- +
TypeSizePathModified
From 8cd4b9fc0431716b83fc78ba39efab9c5d18d3bf Mon Sep 17 00:00:00 2001 From: microDev <70126934+microDev1@users.noreply.github.com> Date: Sat, 10 Sep 2022 12:34:25 +0530 Subject: [PATCH 4/6] fix espressif run modes --- ports/espressif/common-hal/microcontroller/__init__.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ports/espressif/common-hal/microcontroller/__init__.c b/ports/espressif/common-hal/microcontroller/__init__.c index 1014ce9532..68479dc46f 100644 --- a/ports/espressif/common-hal/microcontroller/__init__.c +++ b/ports/espressif/common-hal/microcontroller/__init__.c @@ -97,12 +97,12 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) { #endif break; case RUNMODE_NORMAL: - #if defined(CONFIG_IDF_TARGET_ESP32) - safe_mode_on_next_reset(NO_SAFE_MODE); - #else // revert back to normal boot + #if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) REG_WRITE(RTC_RESET_CAUSE_REG, 0); // reset uf2 + #endif REG_WRITE(RTC_CNTL_STORE0_REG, 0); // reset safe mode + #if !defined(CONFIG_IDF_TARGET_ESP32) REG_WRITE(RTC_CNTL_OPTION1_REG, 0); // reset bootloader #endif break; @@ -112,10 +112,12 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) { break; case RUNMODE_BOOTLOADER: // DFU download - #if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3) + #if defined(CONFIG_IDF_TARGET_ESP32) mp_arg_error_invalid(MP_QSTR_run_mode); #else + #if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) chip_usb_set_persist_flags(USBDC_BOOT_DFU); + #endif REG_WRITE(RTC_CNTL_OPTION1_REG, RTC_CNTL_FORCE_DOWNLOAD_BOOT); #endif break; From 36221bd749da23cf29686c89d879b0618596b881 Mon Sep 17 00:00:00 2001 From: microDev <70126934+microDev1@users.noreply.github.com> Date: Sun, 11 Sep 2022 13:31:38 +0530 Subject: [PATCH 5/6] update board microdev_micro_c3 --- .../boards/microdev_micro_c3/mpconfigboard.h | 35 +++++----- .../boards/microdev_micro_c3/mpconfigboard.mk | 2 +- .../boards/microdev_micro_c3/sdkconfig | 65 +++++++++++++++++++ 3 files changed, 86 insertions(+), 16 deletions(-) diff --git a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h index 6e2bf9d7b8..97a18f3235 100644 --- a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h +++ b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.h @@ -25,26 +25,31 @@ */ // Board setup -#define MICROPY_HW_BOARD_NAME "MicroDev microC3" -#define MICROPY_HW_MCU_NAME "ESP32-C3FN4" +#define MICROPY_HW_BOARD_NAME "MicroDev microC3" +#define MICROPY_HW_MCU_NAME "ESP32-C3FN4" // Status LEDs -#define MICROPY_HW_NEOPIXEL (&pin_GPIO7) -#define MICROPY_HW_NEOPIXEL_COUNT (2) +#define MICROPY_HW_NEOPIXEL (&pin_GPIO7) +#define MICROPY_HW_NEOPIXEL_COUNT (2) -#define MICROPY_HW_LED_STATUS (&pin_GPIO8) +#define MICROPY_HW_LED_STATUS (&pin_GPIO8) // Default bus pins -#define DEFAULT_I2C_BUS_SCL (&pin_GPIO4) -#define DEFAULT_I2C_BUS_SDA (&pin_GPIO5) +#define DEFAULT_I2C_BUS_SCL (&pin_GPIO4) +#define DEFAULT_I2C_BUS_SDA (&pin_GPIO5) -#define DEFAULT_SPI_BUS_SCK (&pin_GPIO1) -#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO2) -#define DEFAULT_SPI_BUS_MISO (&pin_GPIO3) +#define DEFAULT_SPI_BUS_SCK (&pin_GPIO1) +#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO2) +#define DEFAULT_SPI_BUS_MISO (&pin_GPIO3) -#define DEFAULT_UART_BUS_RX (&pin_GPIO20) -#define DEFAULT_UART_BUS_TX (&pin_GPIO21) +#define DEFAULT_UART_BUS_RX (&pin_GPIO20) +#define DEFAULT_UART_BUS_TX (&pin_GPIO21) -// Serial over UART -#define CIRCUITPY_CONSOLE_UART_RX DEFAULT_UART_BUS_RX -#define CIRCUITPY_CONSOLE_UART_TX DEFAULT_UART_BUS_TX +// For REPL over built-in USB Serial +#define CIRCUITPY_ESP_USB_SERIAL_JTAG (1) + +// For entering safe mode +#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO9) + +// Explanation of how a user got into safe mode +#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n") diff --git a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk index ce431624ae..646522db8d 100644 --- a/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk +++ b/ports/espressif/boards/microdev_micro_c3/mpconfigboard.mk @@ -5,6 +5,6 @@ IDF_TARGET = esp32c3 INTERNAL_FLASH_FILESYSTEM = 1 -CIRCUITPY_ESP_FLASH_MODE = qio +CIRCUITPY_ESP_FLASH_MODE = dio CIRCUITPY_ESP_FLASH_FREQ = 80m CIRCUITPY_ESP_FLASH_SIZE = 4MB diff --git a/ports/espressif/boards/microdev_micro_c3/sdkconfig b/ports/espressif/boards/microdev_micro_c3/sdkconfig index f6f038a77c..6674dbfb90 100644 --- a/ports/espressif/boards/microdev_micro_c3/sdkconfig +++ b/ports/espressif/boards/microdev_micro_c3/sdkconfig @@ -1,5 +1,70 @@ +# Automatically generated file. DO NOT EDIT. +# Espressif IoT Development Framework (ESP-IDF) Project Configuration +# +# Bootloader config +# +CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y +# CONFIG_BOOTLOADER_LOG_LEVEL_INFO is not set +CONFIG_BOOTLOADER_LOG_LEVEL=0 +# end of Bootloader config + +# +# Serial flasher config +# +# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set +# end of Serial flasher config + +# +# Partition Table +# +CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-4MB-no-uf2.csv" +CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-4MB-no-uf2.csv" +# end of Partition Table + +# +# Compiler options +# +# CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS is not set +# end of Compiler options + +# +# Component config +# +# + +# +# PHY +# +CONFIG_ESP_PHY_ENABLE_USB=y +# end of PHY + +# +# ESP System Settings +# +# CONFIG_ESP_SYSTEM_USE_EH_FRAME is not set +CONFIG_ESP_CONSOLE_SECONDARY_NONE=y +# CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG is not set +# CONFIG_ESP_DEBUG_STUBS_ENABLE is not set +# end of ESP System Settings + # # LWIP # CONFIG_LWIP_LOCAL_HOSTNAME="MicroDev-microC3" # end of LWIP + +# +# SPI Flash driver +# +# CONFIG_SPI_FLASH_AUTO_SUSPEND is not set +# end of SPI Flash driver + +# end of Component config + +# +# Deprecated options for backward compatibility +# +# CONFIG_LOG_BOOTLOADER_LEVEL_INFO is not set +CONFIG_LOG_BOOTLOADER_LEVEL=0 +# CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG is not set +# end of Deprecated options for backward compatibility From 863a8bce03765ea0fc2a5c7a04fb796531bce5bf Mon Sep 17 00:00:00 2001 From: gamblor21 Date: Sun, 11 Sep 2022 20:34:53 -0500 Subject: [PATCH 6/6] Fix with PWM for brightness slowing devices down --- shared-module/displayio/Display.c | 1 - 1 file changed, 1 deletion(-) diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c index 59aa843aca..9fd55fe19d 100644 --- a/shared-module/displayio/Display.c +++ b/shared-module/displayio/Display.c @@ -399,7 +399,6 @@ void common_hal_displayio_display_set_auto_refresh(displayio_display_obj_t *self } void displayio_display_background(displayio_display_obj_t *self) { - common_hal_displayio_display_set_brightness(self, 1.0); if (self->auto_refresh && (supervisor_ticks_ms64() - self->core.last_refresh) > self->native_ms_per_frame) { _refresh_display(self); }
TypeSizePathModified