From d7a25c2106eb170bf205c5e1ae90e1e182293e37 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 4 Jan 2019 22:34:05 +0100 Subject: [PATCH] lcd4l: activate new Samsung SPF types Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/84db5020105da04ad35de135a5734f23daae0756 Author: vanhofen Date: 2019-01-04 (Fri, 04 Jan 2019) Origin message was: ------------------ - lcd4l: activate new Samsung SPF types ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/driver/lcd4l.cpp | 9 +++------ src/gui/lcd4l_setup.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/driver/lcd4l.cpp b/src/driver/lcd4l.cpp index 4ec53b894..001c604f8 100644 --- a/src/driver/lcd4l.cpp +++ b/src/driver/lcd4l.cpp @@ -739,16 +739,13 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun) switch (g_settings.lcd4l_display_type) { 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 85f57aa77..c7acfb1ee 100644 --- a/src/gui/lcd4l_setup.cpp +++ b/src/gui/lcd4l_setup.cpp @@ -65,10 +65,10 @@ 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"} }; #define LCD4L_DISPLAY_TYPE_OPTION_COUNT (sizeof(LCD4L_DISPLAY_TYPE_OPTIONS)/sizeof(CMenuOptionChooser::keyval_ext))