diff --git a/radio/src/targets/nv14/lcd_driver.cpp b/radio/src/targets/nv14/lcd_driver.cpp index f697dc40d..4f1f1292b 100644 --- a/radio/src/targets/nv14/lcd_driver.cpp +++ b/radio/src/targets/nv14/lcd_driver.cpp @@ -20,10 +20,11 @@ #include "opentx.h" -uint8_t LCD_FIRST_FRAME_BUFFER[DISPLAY_BUFFER_SIZE] __SDRAM; -uint8_t LCD_SECOND_FRAME_BUFFER[DISPLAY_BUFFER_SIZE] __SDRAM; -uint8_t LCD_BACKUP_FRAME_BUFFER[DISPLAY_BUFFER_SIZE] __SDRAM; + +uint8_t LCD_FIRST_FRAME_BUFFER[DISPLAY_BUFFER_SIZE * sizeof(display_t)] __SDRAM; +uint8_t LCD_SECOND_FRAME_BUFFER[DISPLAY_BUFFER_SIZE * sizeof(display_t)] __SDRAM; +uint8_t LCD_BACKUP_FRAME_BUFFER[DISPLAY_BUFFER_SIZE * sizeof(display_t)] __SDRAM; uint8_t currentLayer = LCD_FIRST_LAYER; lcdSpiInitFucPtr lcdSpiInitFuc; diff --git a/radio/src/targets/nv14/touch_driver.cpp b/radio/src/targets/nv14/touch_driver.cpp index 23e10ce7c..a57eb16bc 100644 --- a/radio/src/targets/nv14/touch_driver.cpp +++ b/radio/src/targets/nv14/touch_driver.cpp @@ -38,8 +38,8 @@ static unsigned short TouchStartX; static unsigned short TouchStartY; -#include "ft6x06.h" -#include "STM32F4xx_DSP_StdPeriph_Lib_V1.4.0/Libraries/STM32F4xx_StdPeriph_Driver/inc/stm32f4xx_i2c.h" +#include "board.h" +#include "touch_driver.h" #define FT6x06_MAX_INSTANCE 1 @@ -496,7 +496,7 @@ void handleTouch() Ty = Tx; Tx = x; #endif - if( 2 == TouchEvent ) + if(TouchEvent == FT6206_TOUCH_EVT_FLAG_CONTACT) { touchState.X = Tx; touchState.Y = Ty;