From 6145cabae1dd4e98bfbb33f282cf6f55b09ce981 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Sat, 5 Jan 2019 21:05:57 +0100 Subject: [PATCH] - lcd4l: activate new Samsung SPF types Signed-off-by: GetAway --- src/driver/lcd4l.cpp | 9 +++------ src/gui/lcd4l_setup.cpp | 12 ++++++------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/driver/lcd4l.cpp b/src/driver/lcd4l.cpp index 8aa9534aa..4d27b2a6f 100644 --- a/src/driver/lcd4l.cpp +++ b/src/driver/lcd4l.cpp @@ -776,16 +776,13 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) break; #endif case SAMSUNG800x480: - //DisplayType = "Samsung800x480_"; - DisplayType = "Samsung_"; + DisplayType = "Samsung800x480_"; break; case SAMSUNG800x600: - //DisplayType = "Samsung800x600_"; - DisplayType = "Samsung_"; + DisplayType = "Samsung800x600_"; break; case SAMSUNG1024x600: - //DisplayType = "Samsung1024x600_"; - DisplayType = "Samsung_"; + DisplayType = "Samsung1024x600_"; break; case PEARL320x240: default: diff --git a/src/gui/lcd4l_setup.cpp b/src/gui/lcd4l_setup.cpp index 674b2977e..6554024fb 100644 --- a/src/gui/lcd4l_setup.cpp +++ b/src/gui/lcd4l_setup.cpp @@ -66,14 +66,14 @@ const CMenuOptionChooser::keyval LCD4L_SUPPORT_OPTIONS[] = const CMenuOptionChooser::keyval_ext LCD4L_DISPLAY_TYPE_OPTIONS[] = { - { CLCD4l::PEARL320x240, NONEXISTANT_LOCALE, "Pearl"}, - { CLCD4l::SAMSUNG800x480, NONEXISTANT_LOCALE, "800x480 Samsung"}, - { CLCD4l::SAMSUNG800x600, NONEXISTANT_LOCALE, "800x600 Samsung"}, - { CLCD4l::SAMSUNG1024x600, NONEXISTANT_LOCALE, "1024x600 Samsung"}, + { CLCD4l::PEARL320x240, NONEXISTANT_LOCALE, "320x240 Pearl DPF"}, + { CLCD4l::SAMSUNG800x480, NONEXISTANT_LOCALE, "800x480 Samsung SPF"}, + { CLCD4l::SAMSUNG800x600, NONEXISTANT_LOCALE, "800x600 Samsung SPF"}, + { CLCD4l::SAMSUNG1024x600, NONEXISTANT_LOCALE, "1024x600 Samsung SPF"}, #if defined BOXMODEL_VUSOLO4K - { CLCD4l::VUSOLO4K, NONEXISTANT_LOCALE, "VUSolo4K"}, + { CLCD4l::VUSOLO4K480x320, NONEXISTANT_LOCALE, "480x320 VUSolo4K"}, #endif - { CLCD4l::PNG, NONEXISTANT_LOCALE, "PNG"} + { CLCD4l::PNG, NONEXISTANT_LOCALE, "800x600 PNG"} }; #define LCD4L_DISPLAY_TYPE_OPTION_COUNT (sizeof(LCD4L_DISPLAY_TYPE_OPTIONS)/sizeof(CMenuOptionChooser::keyval_ext))