Merge pull request #5789 from adafruit/7.1.x

dhalbert · web-flow · commit 8aafc734a48c · 2021-12-28T18:12:29.000-05:00
Merge latest changes from 7.1.x
diff --git a/frozen/Adafruit_CircuitPython_Display_Text b/frozen/Adafruit_CircuitPython_Display_Text
@@ -1 +1 @@
-Subproject commit ca141954c0b39cc0343c63bedb64c02f307159b9
+Subproject commit 0ec87891f9a28ee3c5ae3b020b60d361684f466d
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2/board.c b/ports/espressif/boards/adafruit_feather_esp32s2/board.c
@@ -27,6 +27,7 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
+#include "components/driver/include/driver/gpio.h"
 
 void board_init(void) {
     // USB
@@ -39,7 +40,9 @@ bool board_requests_safe_mode(void) {
 }
 
 void reset_board(void) {
-
+    // Turn on I2C power by default.
+    gpio_set_direction(7, GPIO_MODE_DEF_OUTPUT);
+    gpio_set_level(7, false);
 }
 
 void board_deinit(void) {
diff --git a/ports/espressif/boards/adafruit_feather_esp32s2/pins.c b/ports/espressif/boards/adafruit_feather_esp32s2/pins.c
@@ -14,8 +14,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_GPIO5) },
     { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_GPIO6) },
 
-    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
     { MP_ROM_QSTR(MP_QSTR_I2C_POWER_INVERTED), MP_ROM_PTR(&pin_GPIO7) },
+    { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_GPIO7) },
 
     { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO8) },
     { MP_ROM_QSTR(MP_QSTR_D8), MP_ROM_PTR(&pin_GPIO8) },
diff --git a/ports/raspberrypi/common-hal/rgbmatrix/RGBMatrix.c b/ports/raspberrypi/common-hal/rgbmatrix/RGBMatrix.c
@@ -33,6 +33,7 @@
 #include "shared-module/rgbmatrix/RGBMatrix.h"
 
 #include "src/rp2_common/hardware_pwm/include/hardware/pwm.h"
+#include "src/rp2_common/hardware_irq/include/hardware/irq.h"
 
 void *common_hal_rgbmatrix_timer_allocate(rgbmatrix_rgbmatrix_obj_t *self) {
     // Choose a PWM channel based on the first RGB pin
@@ -58,13 +59,17 @@ void common_hal_rgbmatrix_timer_enable(void *ptr) {
 void common_hal_rgbmatrix_timer_disable(void *ptr) {
     int8_t slice = ((intptr_t)ptr) & 0xff;
     pwm_set_enabled(slice, false);
+    irq_set_enabled(PWM_IRQ_WRAP, false);
+    pwm_clear_irq(slice);
 }
 
 void common_hal_rgbmatrix_timer_free(void *ptr) {
     intptr_t value = (intptr_t)ptr;
     uint8_t slice = value & 0xff;
     uint8_t channel = value >> 8;
     pwm_set_enabled(slice, false);
+    irq_set_enabled(PWM_IRQ_WRAP, false);
+    pwm_clear_irq(slice);
     pwmout_free(slice, channel);
     return;
 }
