Skip to content

Commit 678779c

Browse files
C47DC47D
authored
Merge pull request #89 from ropg/range_remove
Remove remaining IDF_TARGET-dependent GPIO ranges.
2 parents 7a05cb1 + 779bf4e commit 678779c

File tree

2 files changed

+0
-68
lines changed

2 files changed

+0
-68
lines changed

‎lvgl_tft/Kconfig

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -742,10 +742,6 @@ menu "LVGL TFT Display controller"
742742

743743
config LV_DISP_SPI_MOSI
744744
int "GPIO for MOSI (Master Out Slave In)" if LV_TFT_DISPLAY_PROTOCOL_SPI
745-
range 0 39 if IDF_TARGET_ESP32
746-
range 0 46 if IDF_TARGET_ESP32S2
747-
range 0 21 if IDF_TARGET_ESP32C3
748-
749745
default 23 if LV_PREDEFINED_DISPLAY_WROVER4
750746
default 23 if LV_PREDEFINED_DISPLAY_ATAG
751747
default 23 if LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_M5STICK
@@ -757,7 +753,6 @@ menu "LVGL TFT Display controller"
757753
default 19 if LV_PREDEFINED_DISPLAY_TTGO_CAMERA_PLUS
758754
default 13 if LV_PREDEFINED_DISPLAY_WT32_SC01
759755
default 13
760-
761756
help
762757
Configure the display MOSI pin here.
763758

@@ -772,10 +767,6 @@ menu "LVGL TFT Display controller"
772767
config LV_DISP_SPI_MISO
773768
int "GPIO for MISO (Master In Slave Out)" if LV_TFT_DISPLAY_PROTOCOL_SPI
774769
depends on LV_DISPLAY_USE_SPI_MISO
775-
range 0 39 if IDF_TARGET_ESP32
776-
range 0 46 if IDF_TARGET_ESP32S2
777-
range 0 21 if IDF_TARGET_ESP32C3
778-
779770
default 19 if LV_PREDEFINED_PINS_TKOALA
780771
default 38 if LV_PREDEFINED_DISPLAY_M5CORE2
781772
default 0
@@ -795,10 +786,6 @@ menu "LVGL TFT Display controller"
795786
config LV_DISP_SPI_IO2
796787
int "GPIO for Quad SPI IO2/WP" if LV_TFT_DISPLAY_PROTOCOL_SPI
797788
depends on LV_TFT_DISPLAY_SPI_TRANS_MODE_QIO
798-
range -1 39 if IDF_TARGET_ESP32
799-
range -1 43 if IDF_TARGET_ESP32S2
800-
range 0 21 if IDF_TARGET_ESP32C3
801-
802789
default 22 if LV_PREDEFINED_PINS_TKOALA && LV_TFT_DISPLAY_SPI_TRANS_MODE_QIO
803790
default -1
804791
help
@@ -807,21 +794,13 @@ menu "LVGL TFT Display controller"
807794
config LV_DISP_SPI_IO3
808795
int "GPIO for Quad SPI IO3/HD" if LV_TFT_DISPLAY_PROTOCOL_SPI
809796
depends on LV_TFT_DISPLAY_SPI_TRANS_MODE_QIO
810-
range -1 39 if IDF_TARGET_ESP32
811-
range -1 43 if IDF_TARGET_ESP32S2
812-
range 0 21 if IDF_TARGET_ESP32C3
813-
814797
default 21 if LV_PREDEFINED_PINS_TKOALA && LV_TFT_DISPLAY_SPI_TRANS_MODE_QIO
815798
default -1
816799
help
817800
Configure the display Quad SPI IO2 pin here.
818801

819802
config LV_DISP_SPI_CLK
820803
int "GPIO for CLK (SCK / Serial Clock)" if LV_TFT_DISPLAY_PROTOCOL_SPI
821-
range 0 39 if IDF_TARGET_ESP32
822-
range 0 46 if IDF_TARGET_ESP32S2
823-
range 0 21 if IDF_TARGET_ESP32C3
824-
825804
default 18 if LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_M5STICK
826805
default 18 if LV_PREDEFINED_DISPLAY_M5CORE2
827806
default 13 if LV_PREDEFINED_DISPLAY_M5STICKC
@@ -847,10 +826,6 @@ menu "LVGL TFT Display controller"
847826
config LV_DISP_SPI_CS
848827
int "GPIO for CS (Slave Select)" if LV_TFT_DISPLAY_PROTOCOL_SPI
849828
depends on LV_DISPLAY_USE_SPI_CS
850-
range 0 39 if IDF_TARGET_ESP32
851-
range 0 46 if IDF_TARGET_ESP32S2
852-
range 0 21 if IDF_TARGET_ESP32C3
853-
854829
default 5 if LV_PREDEFINED_PINS_38V1
855830
default 14 if LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_M5STICK
856831
default 5 if LV_PREDEFINED_DISPLAY_M5CORE2
@@ -876,10 +851,6 @@ menu "LVGL TFT Display controller"
876851

877852
config LV_DISP_PIN_DC
878853
int "GPIO for DC (Data / Command)" if LV_TFT_DISPLAY_PROTOCOL_SPI
879-
range 0 39 if IDF_TARGET_ESP32
880-
range 0 46 if IDF_TARGET_ESP32S2
881-
range 0 21 if IDF_TARGET_ESP32C3
882-
883854
depends on LV_DISPLAY_USE_DC
884855
default 19 if LV_PREDEFINED_PINS_38V1
885856
default 17 if LV_PREDEFINED_PINS_38V4
@@ -914,10 +885,6 @@ menu "LVGL TFT Display controller"
914885
config LV_DISP_PIN_RST
915886
int "GPIO for Reset" if LV_TFT_DISPLAY_PROTOCOL_SPI && !LV_DISP_ST7789_SOFT_RESET
916887
depends on LV_DISP_USE_RST
917-
range 0 39 if IDF_TARGET_ESP32
918-
range 0 46 if IDF_TARGET_ESP32S2
919-
range 0 21 if IDF_TARGET_ESP32C3
920-
921888
default 18 if LV_PREDEFINED_PINS_38V1
922889
default 25 if LV_PREDEFINED_PINS_38V4
923890
default 33 if LV_PREDEFINED_DISPLAY_M5STACK || LV_PREDEFINED_DISPLAY_M5STICK
@@ -936,10 +903,6 @@ menu "LVGL TFT Display controller"
936903

937904
config LV_DISP_PIN_BUSY
938905
int "GPIO for Busy" if LV_TFT_DISPLAY_CONTROLLER_IL3820 || LV_TFT_DISPLAY_CONTROLLER_JD79653A || LV_TFT_DISPLAY_CONTROLLER_UC8151D
939-
range 0 39 if IDF_TARGET_ESP32
940-
range 0 46 if IDF_TARGET_ESP32S2
941-
range 0 21 if IDF_TARGET_ESP32C3
942-
943906
default 35 if LV_TFT_DISPLAY_CONTROLLER_IL3820 || LV_TFT_DISPLAY_CONTROLLER_JD79653A || LV_TFT_DISPLAY_CONTROLLER_UC8151D
944907
default 35 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2
945908
default 21 if IDF_TARGET_ESP32C3
@@ -977,10 +940,6 @@ menu "LVGL TFT Display controller"
977940
config LV_DISP_PIN_BCKL
978941
int "GPIO for Backlight Control"
979942
depends on LV_ENABLE_BACKLIGHT_CONTROL
980-
range 0 39 if IDF_TARGET_ESP32
981-
range 0 46 if IDF_TARGET_ESP32S2
982-
range 0 21 if IDF_TARGET_ESP32C3
983-
984943
default 23 if LV_PREDEFINED_PINS_38V1
985944
default 26 if LV_PREDEFINED_PINS_38V4
986945
default 32 if LV_PREDEFINED_DISPLAY_M5STACK

‎lvgl_touch/Kconfig

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@ menu "LVGL Touch controller"
8686
config LV_TOUCH_SPI_MISO
8787
int
8888
prompt "GPIO for MISO (Master In Slave Out)"
89-
range 0 39 if IDF_TARGET_ESP32
90-
range 0 46 if IDF_TARGET_ESP32S2
91-
range 0 21 if IDF_TARGET_ESP32C3
9289

9390
default 35 if LV_PREDEFINED_PINS_38V1
9491
default 19
@@ -98,9 +95,6 @@ menu "LVGL Touch controller"
9895
config LV_TOUCH_SPI_MOSI
9996
int
10097
prompt "GPIO for MOSI (Master Out Slave In)"
101-
range 0 39 if IDF_TARGET_ESP32
102-
range 0 46 if IDF_TARGET_ESP32S2
103-
range 0 21 if IDF_TARGET_ESP32C3
10498

10599
default 32 if LV_PREDEFINED_PINS_38V1
106100
default 23
@@ -109,9 +103,6 @@ menu "LVGL Touch controller"
109103

110104
config LV_TOUCH_SPI_CLK
111105
int "GPIO for CLK (SCK / Serial Clock)"
112-
range 0 39 if IDF_TARGET_ESP32
113-
range 0 46 if IDF_TARGET_ESP32S2
114-
range 0 21 if IDF_TARGET_ESP32C3
115106

116107
default 26 if LV_PREDEFINED_PINS_38V1
117108
default 18
@@ -120,8 +111,6 @@ menu "LVGL Touch controller"
120111

121112
config LV_TOUCH_SPI_CS
122113
int "GPIO for CS (Slave Select)"
123-
range 0 39 if IDF_TARGET_ESP32
124-
range 0 46 if IDF_TARGET_ESP32S2
125114

126115
default 33 if LV_PREDEFINED_PINS_38V1
127116
default 5
@@ -130,9 +119,6 @@ menu "LVGL Touch controller"
130119

131120
config LV_TOUCH_PIN_IRQ
132121
int "GPIO for IRQ (Interrupt Request)"
133-
range 0 39 if IDF_TARGET_ESP32
134-
range 0 46 if IDF_TARGET_ESP32S2
135-
range 0 21 if IDF_TARGET_ESP32C3
136122

137123
default 27 if LV_PREDEFINED_PINS_38V4
138124
default 25
@@ -223,9 +209,6 @@ menu "LVGL Touch controller"
223209
config LV_TOUCH_SPI_MISO
224210
int
225211
prompt "GPIO for MISO (Master In Slave Out)"
226-
range 0 39 if IDF_TARGET_ESP32
227-
range 0 46 if IDF_TARGET_ESP32S2
228-
range 0 21 if IDF_TARGET_ESP32C3
229212

230213
default 35 if LV_PREDEFINED_PINS_38V1
231214
default 19 if LV_PREDEFINED_DISPLAY_ADA_FEATHERWING
@@ -238,9 +221,6 @@ menu "LVGL Touch controller"
238221
# TODO Fix default for ESP32C3
239222
int
240223
prompt "GPIO for MOSI (Master Out Slave In)"
241-
range 0 39 if IDF_TARGET_ESP32
242-
range 0 46 if IDF_TARGET_ESP32S2
243-
range 0 21 if IDF_TARGET_ESP32C3
244224

245225
default 32 if LV_PREDEFINED_PINS_38V1
246226
default 18 if LV_PREDEFINED_DISPLAY_ADA_FEATHERWING
@@ -251,9 +231,6 @@ menu "LVGL Touch controller"
251231

252232
config LV_TOUCH_SPI_CLK
253233
int "GPIO for CLK (SCK / Serial Clock)"
254-
range 0 39 if IDF_TARGET_ESP32
255-
range 0 46 if IDF_TARGET_ESP32S2
256-
range 0 21 if IDF_TARGET_ESP32C3
257234

258235
default 26 if LV_PREDEFINED_PINS_38V1
259236
default 5 if LV_PREDEFINED_DISPLAY_ADA_FEATHERWING
@@ -263,10 +240,6 @@ menu "LVGL Touch controller"
263240

264241
config LV_TOUCH_SPI_CS
265242
int "GPIO for CS (Slave Select)"
266-
range 0 39 if IDF_TARGET_ESP32
267-
range 0 46 if IDF_TARGET_ESP32S2
268-
range 0 21 if IDF_TARGET_ESP32C3
269-
270243
default 33 if LV_PREDEFINED_PINS_38V1
271244
default 32 if LV_PREDEFINED_DISPLAY_ADA_FEATHERWING
272245
default 5

0 commit comments

Comments
 (0)