Merge remote-tracking branch 'adafruit/main' into native_wifi

8 files changed, 15 insertions, 47 deletions

diff --git a/ports/stm/boards/meowbit_v121/board.c b/ports/stm/boards/meowbit_v121/board.c
index 812a8c208..b74f13516 100644
--- a/ports/stm/boards/meowbit_v121/board.c
+++ b/ports/stm/boards/meowbit_v121/board.c
@@ -106,7 +106,7 @@ void board_init(void) {
         &pin_PB03,
         NO_BRIGHTNESS_COMMAND,
         1.0f, // brightness (ignored)
-        true, // auto_brightness
+        false, // auto_brightness
         false, // single_byte_bounds
         false, // data_as_commands
         true, // auto_refresh
diff --git a/ports/stm/boards/meowbit_v121/mpconfigboard.h b/ports/stm/boards/meowbit_v121/mpconfigboard.h
index 106f25b15..be9f2a75f 100644
--- a/ports/stm/boards/meowbit_v121/mpconfigboard.h
+++ b/ports/stm/boards/meowbit_v121/mpconfigboard.h
@@ -36,8 +36,7 @@
 #define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000)
 
 #define HSE_VALUE ((uint32_t)12000000U)
-#define LSE_VALUE ((uint32_t)32000U)
-#define BOARD_HAS_LOW_SPEED_CRYSTAL (1)
+#define BOARD_HAS_LOW_SPEED_CRYSTAL (0)
 
 #define BOARD_NO_VBUS_SENSE (1)
 #define BOARD_VTOR_DEFER (1) //Leave VTOR relocation to bootloader
diff --git a/ports/stm/boards/meowbit_v121/mpconfigboard.mk b/ports/stm/boards/meowbit_v121/mpconfigboard.mk
index a63818301..16ffb2022 100644
--- a/ports/stm/boards/meowbit_v121/mpconfigboard.mk
+++ b/ports/stm/boards/meowbit_v121/mpconfigboard.mk
@@ -18,5 +18,5 @@ OPTIMIZATION_FLAGS = -Os
 
 LD_COMMON = boards/common_default.ld
 LD_FILE = boards/STM32F401xe_boot.ld
-# use for internal flash
+# For debugging - also comment BOOTLOADER_OFFSET and BOARD_VTOR_DEFER
 # LD_FILE = boards/STM32F401xe_fs.ld
diff --git a/ports/stm/common-hal/pwmio/PWMOut.c b/ports/stm/common-hal/pwmio/PWMOut.c
index 5427a39c7..85427185e 100644
--- a/ports/stm/common-hal/pwmio/PWMOut.c
+++ b/ports/stm/common-hal/pwmio/PWMOut.c
@@ -239,13 +239,14 @@ void common_hal_pwmio_pwmout_deinit(pwmio_pwmout_obj_t* self) {
         HAL_TIM_PWM_Stop(&self->handle, self->channel);
     }
     reset_pin_number(self->tim->pin->port,self->tim->pin->number);
-    self->tim = NULL;
 
     //if reserved timer has no active channels, we can disable it
     if (!reserved_tim[self->tim->tim_index - 1]) {
         tim_frequencies[self->tim->tim_index - 1] = 0x00;
         stm_peripherals_timer_free(self->handle.Instance);
     }
+
+    self->tim = NULL;
 }
 
 void common_hal_pwmio_pwmout_set_duty_cycle(pwmio_pwmout_obj_t* self, uint16_t duty) {
diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk
index 19f9ffa44..b827aa48b 100644
--- a/ports/stm/mpconfigport.mk
+++ b/ports/stm/mpconfigport.mk
@@ -7,6 +7,7 @@ ifeq ($(MCU_VARIANT),STM32F405xx)
 	CIRCUITPY_FRAMEBUFFERIO ?= 1
 	CIRCUITPY_RGBMATRIX ?= 1
 	CIRCUITPY_SDIOIO ?= 1
+	USB_NUM_EP = 4
 endif
 
 ifeq ($(MCU_SERIES),F4)
diff --git a/ports/stm/peripherals/stm32f4/clocks.c b/ports/stm/peripherals/stm32f4/clocks.c
index 7a16812b3..c2d0a452a 100644
--- a/ports/stm/peripherals/stm32f4/clocks.c
+++ b/ports/stm/peripherals/stm32f4/clocks.c
@@ -49,7 +49,6 @@ void stm32_peripherals_clocks_init(void) {
     RCC_ClkInitTypeDef RCC_ClkInitStruct;
     RCC_OscInitTypeDef RCC_OscInitStruct;
     RCC_PeriphCLKInitTypeDef PeriphClkInitStruct;
-    bool lse_failure = false;
 
     // Set voltage scaling in accordance with system clock speed
     __HAL_RCC_PWR_CLK_ENABLE();
@@ -76,15 +75,9 @@ void stm32_peripherals_clocks_init(void) {
     #endif
 
     if(HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
-        // Failure likely means a LSE issue - attempt to swap to LSI, and set to crash
-        RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
-        RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_LSI;
-        RCC_OscInitStruct.LSIState = RCC_LSI_ON;
-        if(HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
-            // No HSE means no USB, so just fail forever
-            while(1);
-        }
-        lse_failure = true;
+        // Clock issues are too problematic to even attempt recovery.
+        // If you end up here, check whether your LSE settings match your board.
+        while(1);
     }
 
     // Configure bus clock sources and divisors
@@ -113,8 +106,4 @@ void stm32_peripherals_clocks_init(void) {
     #endif
 
     HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct);
-
-    if (lse_failure) {
-        reset_into_safe_mode(HARD_CRASH); //TODO: make safe mode category CLOCK_FAULT?
-    }
 }
diff --git a/ports/stm/peripherals/stm32f7/clocks.c b/ports/stm/peripherals/stm32f7/clocks.c
index 93016f682..f13088782 100644
--- a/ports/stm/peripherals/stm32f7/clocks.c
+++ b/ports/stm/peripherals/stm32f7/clocks.c
@@ -40,7 +40,6 @@ void stm32_peripherals_clocks_init(void) {
     RCC_ClkInitTypeDef RCC_ClkInitStruct;
     RCC_OscInitTypeDef RCC_OscInitStruct;
     RCC_PeriphCLKInitTypeDef PeriphClkInitStruct;
-    bool lse_failure = false;
 
     // Configure LSE Drive
     HAL_PWR_EnableBkUpAccess();
@@ -68,15 +67,9 @@ void stm32_peripherals_clocks_init(void) {
     RCC_OscInitStruct.PLL.PLLQ = CPY_CLK_PLLQ;
 
     if(HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
-        // Failure likely means a LSE issue - attempt to swap to LSI, and set to crash
-        RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
-        RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_LSI;
-        RCC_OscInitStruct.LSIState = RCC_LSI_ON;
-        if(HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
-            // No HSE means no USB, so just fail forever
-            while(1);
-        }
-        lse_failure = true;
+        // Clock issues are too problematic to even attempt recovery.
+        // If you end up here, check whether your LSE settings match your board.
+        while(1);
     }
 
     /* Activate the OverDrive to reach the 216 MHz Frequency */
@@ -111,8 +104,4 @@ void stm32_peripherals_clocks_init(void) {
     #endif
 
     HAL_RCCEx_PeriphCLKConfig(&PeriphClkInitStruct);
-
-    if (lse_failure) {
-        reset_into_safe_mode(HARD_CRASH); //TODO: make safe mode category CLOCK_FAULT?
-    }
 }
diff --git a/ports/stm/peripherals/stm32h7/clocks.c b/ports/stm/peripherals/stm32h7/clocks.c
index 0e4e79f9f..a088f78bf 100644
--- a/ports/stm/peripherals/stm32h7/clocks.c
+++ b/ports/stm/peripherals/stm32h7/clocks.c
@@ -37,7 +37,6 @@ void stm32_peripherals_clocks_init(void) {
     RCC_OscInitTypeDef RCC_OscInitStruct = {0};
     RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
     RCC_PeriphCLKInitTypeDef PeriphClkInitStruct = {0};
-    bool lse_failure = false;
 
     // Set voltage scaling in accordance with system clock speed
     HAL_PWREx_ConfigSupply(PWR_LDO_SUPPLY);
@@ -73,15 +72,9 @@ void stm32_peripherals_clocks_init(void) {
     RCC_OscInitStruct.PLL.PLLVCOSEL = RCC_PLL1VCOWIDE;
     RCC_OscInitStruct.PLL.PLLFRACN = 0;
     if(HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
-        // Failure likely means a LSE issue - attempt to swap to LSI, and set to crash
-        RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
-        RCC_OscInitStruct.OscillatorType |= RCC_OSCILLATORTYPE_LSI;
-        RCC_OscInitStruct.LSIState = RCC_LSI_ON;
-        if(HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
-            // No HSE means no USB, so just fail forever
-            while(1);
-        }
-        lse_failure = true;
+        // Clock issues are too problematic to even attempt recovery.
+        // If you end up here, check whether your LSE settings match your board.
+        while(1);
     }
 
     // Configure bus clock sources and divisors
@@ -116,8 +109,4 @@ void stm32_peripherals_clocks_init(void) {
 
     // Enable USB Voltage detector
     HAL_PWREx_EnableUSBVoltageDetector();
-
-    if (lse_failure) {
-        reset_into_safe_mode(HARD_CRASH); //TODO: make safe mode category CLOCK_FAULT?
-    }
 }