diff --git a/radio/src/bitmaps/480x272/CMakeLists.txt b/radio/src/bitmaps/480x272/CMakeLists.txt index e5cc2e7eb..2233da191 100644 --- a/radio/src/bitmaps/480x272/CMakeLists.txt +++ b/radio/src/bitmaps/480x272/CMakeLists.txt @@ -8,8 +8,12 @@ elseif(PCB STREQUAL X12S) set(BITMAP_TARGET_PREFIX x12s) else() set(BITMAP_TARGET_PREFIX x10) - set(BITMAP_ARGS ${BITMAP_ARGS} --reverse) - set(MASK_ARGS ${MASK_ARGS} --reverse) + if(PCBREV STREQUAL T18) + # straight screen + else() + set(BITMAP_ARGS ${BITMAP_ARGS} --reverse) + set(MASK_ARGS ${MASK_ARGS} --reverse) + endif() endif() set(BITMAP_RLE_ARGS ${BITMAP_ARGS} --rle) diff --git a/radio/src/targets/horus/hal.h b/radio/src/targets/horus/hal.h index ddc9ad6ff..d6c56a70a 100644 --- a/radio/src/targets/horus/hal.h +++ b/radio/src/targets/horus/hal.h @@ -535,9 +535,6 @@ #if defined(PCBX10) && !defined(RADIO_T18) #define LCD_VERTICAL_INVERT #endif -#if defined(PCBX10) - #define LCD_VERTICAL_INVERT -#endif #define LTDC_IRQ_PRIO 4 #define DMA_SCREEN_IRQ_PRIO 6 diff --git a/radio/src/targets/horus/lcd_driver.cpp b/radio/src/targets/horus/lcd_driver.cpp index 4d7399a18..15764e3da 100644 --- a/radio/src/targets/horus/lcd_driver.cpp +++ b/radio/src/targets/horus/lcd_driver.cpp @@ -152,7 +152,7 @@ static void LCD_NRSTConfig(void) static void lcdReset(void) { #if defined(RADIO_T18) // T18 screen has issues if NRST is ever brought low - NRST_HIGH(); + LCD_NRST_HIGH(); #else LCD_NRST_HIGH(); delay_ms(1);