From 47437cb415252b1aaf8a061988072eabe35b04c7 Mon Sep 17 00:00:00 2001
From: Dan Halbert <halbert@halwitz.org>
Date: Thu, 18 Mar 2021 23:42:24 -0400
Subject: [PATCH] make translate; fix display pins

---
 .gitignore                                    |  3 ++
 locale/circuitpython.pot                      | 42 ++++---------------
 .../esp32s2/boards/adafruit_funhouse/board.c  |  6 +--
 3 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index a8814be45e..54e23c379f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,3 +86,6 @@ TAGS
 ####################
 .venv
 .env
+
+# Uncrustify formatting
+*.uncrustify
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index eea693dc62..97d46debd2 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -338,6 +338,10 @@ msgstr ""
 msgid "All UART peripherals are in use"
 msgstr ""
 
+#: shared-bindings/pwmio/PWMOut.c
+msgid "All channels in use"
+msgstr ""
+
 #: ports/atmel-samd/common-hal/audioio/AudioOut.c
 msgid "All event channels in use"
 msgstr ""
@@ -667,7 +671,7 @@ msgstr ""
 msgid "Cannot unambiguously get sizeof scalar"
 msgstr ""
 
-#: ports/stm/common-hal/pwmio/PWMOut.c
+#: shared-bindings/pwmio/PWMOut.c
 msgid "Cannot vary frequency on a timer that is already in use"
 msgstr ""
 
@@ -749,11 +753,7 @@ msgstr ""
 msgid "Could not initialize UART"
 msgstr ""
 
-#: ports/esp32s2/common-hal/pwmio/PWMOut.c ports/stm/common-hal/pwmio/PWMOut.c
-msgid "Could not initialize channel"
-msgstr ""
-
-#: ports/esp32s2/common-hal/pwmio/PWMOut.c ports/stm/common-hal/pwmio/PWMOut.c
+#: ports/esp32s2/common-hal/pwmio/PWMOut.c
 msgid "Could not initialize timer"
 msgstr ""
 
@@ -777,7 +777,7 @@ msgstr ""
 msgid "Could not set address"
 msgstr ""
 
-#: ports/stm/common-hal/pwmio/PWMOut.c
+#: shared-bindings/pwmio/PWMOut.c
 msgid "Could not start PWM"
 msgstr ""
 
@@ -1026,7 +1026,7 @@ msgstr ""
 msgid "Framebuffer requires %d bytes"
 msgstr ""
 
-#: ports/stm/common-hal/pwmio/PWMOut.c
+#: shared-bindings/pwmio/PWMOut.c
 msgid "Frequency must match existing PWMOut using this timer"
 msgstr ""
 
@@ -1254,10 +1254,6 @@ msgstr ""
 msgid "Invalid frequency"
 msgstr ""
 
-#: ports/stm/common-hal/pwmio/PWMOut.c
-msgid "Invalid frequency supplied"
-msgstr ""
-
 #: supervisor/shared/safe_mode.c
 msgid "Invalid memory access."
 msgstr ""
@@ -1303,10 +1299,6 @@ msgstr ""
 msgid "Invalid pins"
 msgstr ""
 
-#: ports/stm/common-hal/pwmio/PWMOut.c
-msgid "Invalid pins for PWMOut"
-msgstr ""
-
 #: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c
 #: shared-bindings/displayio/FourWire.c
 msgid "Invalid polarity"
@@ -1559,18 +1551,6 @@ msgstr ""
 msgid "No long integer support"
 msgstr ""
 
-#: ports/esp32s2/common-hal/pwmio/PWMOut.c
-msgid "No more channels available"
-msgstr ""
-
-#: ports/esp32s2/common-hal/pwmio/PWMOut.c
-msgid "No more timers available"
-msgstr ""
-
-#: ports/stm/common-hal/pwmio/PWMOut.c
-msgid "No more timers available on this pin."
-msgstr ""
-
 #: shared-bindings/wifi/Radio.c
 msgid "No network with that ssid"
 msgstr ""
@@ -2124,11 +2104,6 @@ msgstr ""
 msgid "Timeout is too long: Maximum timeout length is %d seconds"
 msgstr ""
 
-#: ports/stm/common-hal/pwmio/PWMOut.c
-msgid ""
-"Timer was reserved for internal use - declare PWM pins earlier in the program"
-msgstr ""
-
 #: supervisor/shared/safe_mode.c
 msgid "To exit, please reset the board without "
 msgstr ""
@@ -3737,6 +3712,7 @@ msgstr ""
 
 #: ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.h
 #: ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h
+#: ports/esp32s2/boards/adafruit_funhouse/mpconfigboard.h
 #: ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
 #: ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h
 #: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
diff --git a/ports/esp32s2/boards/adafruit_funhouse/board.c b/ports/esp32s2/boards/adafruit_funhouse/board.c
index 09eb9266eb..8f5e6120a0 100644
--- a/ports/esp32s2/boards/adafruit_funhouse/board.c
+++ b/ports/esp32s2/boards/adafruit_funhouse/board.c
@@ -66,9 +66,9 @@ void board_init(void) {
     bus->base.type = &displayio_fourwire_type;
     common_hal_displayio_fourwire_construct(bus,
         spi,
-        &pin_GPIO38, // TFT_DC Command or data
-        &pin_GPIO39, // TFT_CS Chip select
-        &pin_GPIO40, // TFT_RESET Reset
+        &pin_GPIO39, // TFT_DC Command or data
+        &pin_GPIO40, // TFT_CS Chip select
+        &pin_GPIO41, // TFT_RESET Reset
         60000000, // Baudrate
         0, // Polarity
         0); // Phase