Add mutable brightness

Author: tannewt

ports/espressif/common-hal/microcontroller/Pin.c

@@ -204,13 +204,8 @@ static const uint64_t pin_mask_reset_forbidden =
     #endif // ESP32H2
 
     #if defined(CONFIG_IDF_TARGET_ESP32P4)
-    // Never ever reset pins used to communicate with the SPI flash.
-    GPIO_SEL_28 |
-    GPIO_SEL_29 |
-    GPIO_SEL_30 |
-    GPIO_SEL_32 |
-    GPIO_SEL_33 |
-    GPIO_SEL_34 |
+    // SPI flash is on dedicated pins.
+
     // USB is on the FS OTG
     #if CIRCUITPY_USB_DEVICE_INSTANCE == 0
     #if CIRCUITPY_ESP32P4_SWAP_LSFS == 1

ports/espressif/common-hal/mipidsi/Display.c

@@ -222,6 +222,40 @@ void common_hal_mipidsi_display_refresh(mipidsi_display_obj_t *self) {
     // sends data from the framebuffer to the display
 }
 
+mp_float_t common_hal_mipidsi_display_get_brightness(mipidsi_display_obj_t *self) {
+    return self->current_brightness;
+}
+
+bool common_hal_mipidsi_display_set_brightness(mipidsi_display_obj_t *self, mp_float_t brightness) {
+    if (!self->backlight_on_high) {
+        brightness = 1.0 - brightness;
+    }
+    bool ok = false;
+
+    // Avoid PWM types and functions when the module isn't enabled
+    #if (CIRCUITPY_PWMIO)
+    bool ispwm = (self->backlight_pwm.base.type == &pwmio_pwmout_type) ? true : false;
+    #else
+    bool ispwm = false;
+    #endif
+
+    if (ispwm) {
+        #if (CIRCUITPY_PWMIO)
+        common_hal_pwmio_pwmout_set_duty_cycle(&self->backlight_pwm, (uint16_t)(0xffff * brightness));
+        ok = true;
+        #else
+        ok = false;
+        #endif
+    } else if (self->backlight_inout.base.type == &digitalio_digitalinout_type) {
+        common_hal_digitalio_digitalinout_set_value(&self->backlight_inout, brightness > 0.99);
+        ok = true;
+    }
+    if (ok) {
+        self->current_brightness = brightness;
+    }
+    return ok;
+}
+
 int common_hal_mipidsi_display_get_width(mipidsi_display_obj_t *self) {
     return self->width;
 }

ports/espressif/common-hal/mipidsi/Display.h

@@ -34,4 +34,5 @@ typedef struct {
         #endif
     };
     bool backlight_on_high;
+    mp_float_t current_brightness;
 } mipidsi_display_obj_t;

shared-bindings/mipidsi/Display.c

@@ -220,6 +220,15 @@ static void mipidsi_display_get_bufinfo(mp_obj_t self_in, mp_buffer_info_t *bufi
     common_hal_mipidsi_display_get_buffer(self_in, bufinfo, 0);
 }
 
+static float mipidsi_display_get_brightness_proto(mp_obj_t self_in) {
+    return common_hal_mipidsi_display_get_brightness(self_in);
+}
+
+static bool mipidsi_display_set_brightness_proto(mp_obj_t self_in, mp_float_t value) {
+    common_hal_mipidsi_display_set_brightness(self_in, value);
+    return true;
+}
+
 // These versions exist so that the prototype matches the protocol,
 // avoiding a type cast that can hide errors
 static void mipidsi_display_swapbuffers(mp_obj_t self_in, uint8_t *dirty_row_bitmap) {
@@ -266,6 +275,8 @@ static int mipidsi_display_get_row_stride_proto(mp_obj_t self_in) {
 static const framebuffer_p_t mipidsi_display_proto = {
     MP_PROTO_IMPLEMENT(MP_QSTR_protocol_framebuffer)
     .get_bufinfo = mipidsi_display_get_bufinfo,
+    .set_brightness = mipidsi_display_set_brightness_proto,
+    .get_brightness = mipidsi_display_get_brightness_proto,
     .get_width = mipidsi_display_get_width_proto,
     .get_height = mipidsi_display_get_height_proto,
     .get_color_depth = mipidsi_display_get_color_depth_proto,

shared-bindings/mipidsi/Display.h

@@ -35,6 +35,8 @@ void common_hal_mipidsi_display_construct(mipidsi_display_obj_t *self,
 void common_hal_mipidsi_display_deinit(mipidsi_display_obj_t *self);
 bool common_hal_mipidsi_display_deinited(mipidsi_display_obj_t *self);
 void common_hal_mipidsi_display_refresh(mipidsi_display_obj_t *self);
+mp_float_t common_hal_mipidsi_display_get_brightness(mipidsi_display_obj_t *self);
+bool common_hal_mipidsi_display_set_brightness(mipidsi_display_obj_t *self, mp_float_t brightness);
 int common_hal_mipidsi_display_get_width(mipidsi_display_obj_t *self);
 int common_hal_mipidsi_display_get_height(mipidsi_display_obj_t *self);
 int common_hal_mipidsi_display_get_row_stride(mipidsi_display_obj_t *self);