From 18f2b24cd674e3b9aa5556cdd4ec484e691da789 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 28 Jun 2020 21:51:55 +0200 Subject: [PATCH] glcd: boxmodel VU+ Uno4k hasn't a display Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/2516aa05bac21db7245c25e761a00285546e1735 Author: vanhofen Date: 2020-06-28 (Sun, 28 Jun 2020) Origin message was: ------------------ - glcd: boxmodel VU+ Uno4k hasn't a display ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/glcd/glcd.cpp | 6 +++--- src/system/settings.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/driver/glcd/glcd.cpp b/src/driver/glcd/glcd.cpp index b3dd3e353..985dee914 100644 --- a/src/driver/glcd/glcd.cpp +++ b/src/driver/glcd/glcd.cpp @@ -836,7 +836,7 @@ void cGLCD::Run(void) static uint32_t *fbp = fb->getFrameBufferPointer(); int lcd_width = bitmap->Width(); int lcd_height = bitmap->Height(); -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE unsigned int fb_stride = fb->getStride()/4; if (!showImage(fbp, fb_stride, fb_height, 0, 0, lcd_width, lcd_height, false, true)) { @@ -860,7 +860,7 @@ void cGLCD::Run(void) if (g_settings.glcd_mirror_video && !doStandbyTime && !doStandbyWeather) { -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE lcd->SetMirrorVideo(true); #else char ws[10]; @@ -886,7 +886,7 @@ void cGLCD::Run(void) continue; #endif } -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE else lcd->SetMirrorVideo(false); #endif diff --git a/src/system/settings.h b/src/system/settings.h index 6c6e33755..c683de211 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -183,7 +183,7 @@ struct timer_remotebox_item bool online; }; -#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE || BOXMODEL_VUUNO4K +#if BOXMODEL_VUSOLO4K || BOXMODEL_VUDUO4K || BOXMODEL_VUULTIMO4K || BOXMODEL_VUUNO4KSE #define GLCD_DEFAULT_BRIGHTNESS 7 #define GLCD_DEFAULT_BRIGHTNESS_STANDBY 1 #define GLCD_DEFAULT_BRIGHTNESS_DIM 3