Skip to content

Commit fb66f45

Browse files
authored
Merge pull request #78 from jsmestad/patch-1
Update KConfig to remove LV_ prefix on orientation checks
2 parents b70d2dc + 82ba726 commit fb66f45

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

lvgl_tft/Kconfig

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -222,15 +222,15 @@ menu "LVGL TFT Display controller"
222222
config LV_TFT_DISPLAY_X_OFFSET
223223
depends on LV_TFT_DISPLAY_OFFSETS
224224
int
225-
default 40 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_LANDSCAPE || LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED)
226-
default 53 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_PORTRAIT || LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED)
225+
default 40 if LV_PREDEFINED_DISPLAY_TTGO && (DISPLAY_ORIENTATION_LANDSCAPE || DISPLAY_ORIENTATION_LANDSCAPE_INVERTED)
226+
default 53 if LV_PREDEFINED_DISPLAY_TTGO && (DISPLAY_ORIENTATION_PORTRAIT || DISPLAY_ORIENTATION_PORTRAIT_INVERTED)
227227
default 0
228228

229229
config LV_TFT_DISPLAY_Y_OFFSET
230230
depends on LV_TFT_DISPLAY_OFFSETS
231231
int
232-
default 53 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_LANDSCAPE || LV_DISPLAY_ORIENTATION_LANDSCAPE_INVERTED)
233-
default 40 if LV_PREDEFINED_DISPLAY_TTGO && (LV_DISPLAY_ORIENTATION_PORTRAIT || LV_DISPLAY_ORIENTATION_PORTRAIT_INVERTED)
232+
default 53 if LV_PREDEFINED_DISPLAY_TTGO && (DISPLAY_ORIENTATION_LANDSCAPE || DISPLAY_ORIENTATION_LANDSCAPE_INVERTED)
233+
default 40 if LV_PREDEFINED_DISPLAY_TTGO && (DISPLAY_ORIENTATION_PORTRAIT || DISPLAY_ORIENTATION_PORTRAIT_INVERTED)
234234
default 0
235235

236236

@@ -459,8 +459,7 @@ menu "LVGL TFT Display controller"
459459
endchoice
460460

461461
choice
462-
prompt "TFT SPI Bus." if LV_TFT_DISPLAY_PROTOCOL_SPI && \
463-
!LV_PREDEFINED_DISPLAY_TTGO
462+
prompt "TFT SPI Bus." if LV_TFT_DISPLAY_PROTOCOL_SPI
464463
default LV_TFT_DISPLAY_SPI_VSPI if LV_PREDEFINED_DISPLAY_TTGO && \
465464
!IDF_TARGET_ESP32S2
466465
default LV_TFT_DISPLAY_SPI_FSPI if IDF_TARGET_ESP32S2

0 commit comments

Comments
 (0)