Skip to content

Commit 47437cb

Browse files
committed
make translate; fix display pins
1 parent ea82ca1 commit 47437cb

File tree

3 files changed

+15
-36
lines changed

3 files changed

+15
-36
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,6 @@ TAGS
8686
####################
8787
.venv
8888
.env
89+
90+
# Uncrustify formatting
91+
*.uncrustify

locale/circuitpython.pot

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,10 @@ msgstr ""
338338
msgid "All UART peripherals are in use"
339339
msgstr ""
340340

341+
#: shared-bindings/pwmio/PWMOut.c
342+
msgid "All channels in use"
343+
msgstr ""
344+
341345
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
342346
msgid "All event channels in use"
343347
msgstr ""
@@ -667,7 +671,7 @@ msgstr ""
667671
msgid "Cannot unambiguously get sizeof scalar"
668672
msgstr ""
669673

670-
#: ports/stm/common-hal/pwmio/PWMOut.c
674+
#: shared-bindings/pwmio/PWMOut.c
671675
msgid "Cannot vary frequency on a timer that is already in use"
672676
msgstr ""
673677

@@ -749,11 +753,7 @@ msgstr ""
749753
msgid "Could not initialize UART"
750754
msgstr ""
751755

752-
#: ports/esp32s2/common-hal/pwmio/PWMOut.c ports/stm/common-hal/pwmio/PWMOut.c
753-
msgid "Could not initialize channel"
754-
msgstr ""
755-
756-
#: ports/esp32s2/common-hal/pwmio/PWMOut.c ports/stm/common-hal/pwmio/PWMOut.c
756+
#: ports/esp32s2/common-hal/pwmio/PWMOut.c
757757
msgid "Could not initialize timer"
758758
msgstr ""
759759

@@ -777,7 +777,7 @@ msgstr ""
777777
msgid "Could not set address"
778778
msgstr ""
779779

780-
#: ports/stm/common-hal/pwmio/PWMOut.c
780+
#: shared-bindings/pwmio/PWMOut.c
781781
msgid "Could not start PWM"
782782
msgstr ""
783783

@@ -1026,7 +1026,7 @@ msgstr ""
10261026
msgid "Framebuffer requires %d bytes"
10271027
msgstr ""
10281028

1029-
#: ports/stm/common-hal/pwmio/PWMOut.c
1029+
#: shared-bindings/pwmio/PWMOut.c
10301030
msgid "Frequency must match existing PWMOut using this timer"
10311031
msgstr ""
10321032

@@ -1254,10 +1254,6 @@ msgstr ""
12541254
msgid "Invalid frequency"
12551255
msgstr ""
12561256

1257-
#: ports/stm/common-hal/pwmio/PWMOut.c
1258-
msgid "Invalid frequency supplied"
1259-
msgstr ""
1260-
12611257
#: supervisor/shared/safe_mode.c
12621258
msgid "Invalid memory access."
12631259
msgstr ""
@@ -1303,10 +1299,6 @@ msgstr ""
13031299
msgid "Invalid pins"
13041300
msgstr ""
13051301

1306-
#: ports/stm/common-hal/pwmio/PWMOut.c
1307-
msgid "Invalid pins for PWMOut"
1308-
msgstr ""
1309-
13101302
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c
13111303
#: shared-bindings/displayio/FourWire.c
13121304
msgid "Invalid polarity"
@@ -1559,18 +1551,6 @@ msgstr ""
15591551
msgid "No long integer support"
15601552
msgstr ""
15611553

1562-
#: ports/esp32s2/common-hal/pwmio/PWMOut.c
1563-
msgid "No more channels available"
1564-
msgstr ""
1565-
1566-
#: ports/esp32s2/common-hal/pwmio/PWMOut.c
1567-
msgid "No more timers available"
1568-
msgstr ""
1569-
1570-
#: ports/stm/common-hal/pwmio/PWMOut.c
1571-
msgid "No more timers available on this pin."
1572-
msgstr ""
1573-
15741554
#: shared-bindings/wifi/Radio.c
15751555
msgid "No network with that ssid"
15761556
msgstr ""
@@ -2124,11 +2104,6 @@ msgstr ""
21242104
msgid "Timeout is too long: Maximum timeout length is %d seconds"
21252105
msgstr ""
21262106

2127-
#: ports/stm/common-hal/pwmio/PWMOut.c
2128-
msgid ""
2129-
"Timer was reserved for internal use - declare PWM pins earlier in the program"
2130-
msgstr ""
2131-
21322107
#: supervisor/shared/safe_mode.c
21332108
msgid "To exit, please reset the board without "
21342109
msgstr ""
@@ -3737,6 +3712,7 @@ msgstr ""
37373712

37383713
#: ports/esp32s2/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.h
37393714
#: ports/esp32s2/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h
3715+
#: ports/esp32s2/boards/adafruit_funhouse/mpconfigboard.h
37403716
#: ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
37413717
#: ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h
37423718
#: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h

ports/esp32s2/boards/adafruit_funhouse/board.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ void board_init(void) {
6666
bus->base.type = &displayio_fourwire_type;
6767
common_hal_displayio_fourwire_construct(bus,
6868
spi,
69-
&pin_GPIO38, // TFT_DC Command or data
70-
&pin_GPIO39, // TFT_CS Chip select
71-
&pin_GPIO40, // TFT_RESET Reset
69+
&pin_GPIO39, // TFT_DC Command or data
70+
&pin_GPIO40, // TFT_CS Chip select
71+
&pin_GPIO41, // TFT_RESET Reset
7272
60000000, // Baudrate
7373
0, // Polarity
7474
0); // Phase

0 commit comments

Comments
 (0)