update glcd

Conflicts:
	src/gui/movieplayer.h
	src/gui/weather_locations.h
	src/neutrino.cpp
This commit is contained in:
redblue-pkt
2020-06-19 23:56:12 +02:00
committed by Thilo Graf
parent 6435b167e5
commit 1b6f4fedf5
118 changed files with 6154 additions and 1538 deletions

View File

@@ -54,6 +54,8 @@
#include <hardware/video.h>
#include <cs_api.h>
#include <driver/display.h>
extern cVideo * videoDecoder;
extern CPictureViewer * g_PicViewer;
@@ -2020,3 +2022,10 @@ uint32_t CFrameBuffer::getWidth4FB_HW_ACC(const uint32_t /*x*/, const uint32_t w
{
return w;
}
void CFrameBuffer::blit()
{
#ifdef ENABLE_GRAPHLCD
cGLCD::Blit();
#endif
}