commit e9391edbbda2164b37ec129b94a061f6e7837d67
author Anthony DiGirolamo <tonymd@google.com> Fri Oct 06 19:22:30 2023 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Oct 06 19:22:30 2023 +0000
tree 15490fa8437eb7daa94f066793badffb4325df73
parent 7c6818c13a71f95194dc310dfc76270c61cfb6b6

Pico display fixup

Change-Id: I20749f3c4d2df48eb887ec6efc57e52b030659e3
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/experimental/+/174990
Reviewed-by: Armando Montanez <amontanez@google.com>
Commit-Queue: Anthony DiGirolamo <tonymd@google.com>

applications/app_common_impl/common_pico.cc

diff --git a/applications/app_common_impl/common_pico.cc b/applications/app_common_impl/common_pico.cc
index ba29f9e..43fba39 100644
--- a/applications/app_common_impl/common_pico.cc
+++ b/applications/app_common_impl/common_pico.cc
@@ -144,9 +144,10 @@
     .pixel_format = PixelFormat::RGB565,
 });
 DisplayDriver s_display_driver({
-  .data_cmd_gpio = s_display_dc_pin, .spi_cs_gpio = s_display_cs_pin,
+  .data_cmd_gpio = s_display_dc_pin.as<pw::digital_io::DigitalOut>(),
+  .spi_cs_gpio = s_display_cs_pin.as<pw::digital_io::DigitalOut>(),
 #if DISPLAY_RESET_GPIO != -1
-  .reset_gpio = &s_display_reset_pin,
+  .reset_gpio = &s_display_reset_pin.as<pw::digital_io::DigitalOut>(),
 #else
   .reset_gpio = nullptr,
 #endif

targets/rp2040/board_configs.gni

diff --git a/targets/rp2040/board_configs.gni b/targets/rp2040/board_configs.gni
index 9cb5d12..fdc3300 100644
--- a/targets/rp2040/board_configs.gni
+++ b/targets/rp2040/board_configs.gni
@@ -69,12 +69,26 @@
       "$dir_pigweed_experimental/applications/app_common_impl:pico_st7789_pio"
   pw_app_common_DISPLAY_WIDTH = "320"
   pw_app_common_DISPLAY_HEIGHT = "240"
-  pw_app_common_BACKLIGHT_GPIO = "20"
+
+  # Kudzu pin assignments.
+  pw_app_common_BACKLIGHT_GPIO = "15"
   pw_app_common_DISPLAY_TE_GPIO = "21"
   pw_app_common_DISPLAY_CS_GPIO = "17"
-  pw_app_common_DISPLAY_DC_GPIO = "16"
-  pw_app_common_DISPLAY_RESET_GPIO = "-1"
-  pw_app_common_SPI_MISO_GPIO = "-1"
+  pw_app_common_DISPLAY_DC_GPIO = "20"
   pw_app_common_SPI_MOSI_GPIO = "19"
   pw_app_common_SPI_CLOCK_GPIO = "18"
+
+  # Data from the display is unused.
+  pw_app_common_SPI_MISO_GPIO = "-1"
+
+  # Display reset pin is on the Kudzu GPIO expander
+  pw_app_common_DISPLAY_RESET_GPIO = "-1"
+
+  # Pico display pack 2 pin assignments.
+  # pw_app_common_BACKLIGHT_GPIO = "20"
+  # pw_app_common_DISPLAY_TE_GPIO = "21"
+  # pw_app_common_DISPLAY_CS_GPIO = "17"
+  # pw_app_common_DISPLAY_DC_GPIO = "16"
+  # pw_app_common_SPI_MOSI_GPIO = "19"
+  # pw_app_common_SPI_CLOCK_GPIO = "18"
 }