mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

simple_display: allow to control led brightness for some vuplus boxmodels

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b7f176a5e
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-10-28 (Mon, 28 Oct 2019)

Origin message was:
------------------
- simple_display: allow to control led brightness for some vuplus boxmodels

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-10-28 22:36:28 +01:00
parent 5d6847b54b
commit b0829105df
2 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/hardware/coolstream/hardware_caps.h
View File

@@ -12,6 +12,7 @@
typedef enum typedef enum
{ {
HW_DISPLAY_NONE, HW_DISPLAY_NONE,
HW_DISPLAY_LED_ONLY,
HW_DISPLAY_LED_NUM, /* simple 7 segment LED display */ HW_DISPLAY_LED_NUM, /* simple 7 segment LED display */
HW_DISPLAY_LINE_TEXT, /* 1 line text display */ HW_DISPLAY_LINE_TEXT, /* 1 line text display */
HW_DISPLAY_GFX HW_DISPLAY_GFX

37
src/driver/simple_display.cpp
View File

@@ -153,7 +153,7 @@ CLCD* CLCD::getInstance()
void CLCD::wake_up() void CLCD::wake_up()
{ {
if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT) if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT || g_info.hw_caps->display_type == HW_DISPLAY_LED_ONLY)
{ {
if (atoi(g_settings.lcd_setting_dim_time.c_str()) > 0) if (atoi(g_settings.lcd_setting_dim_time.c_str()) > 0)
{ {
@@ -212,7 +212,7 @@ void CLCD::init(const char *, const char *, const char *, const char *, const ch
void CLCD::setlcdparameter(void) void CLCD::setlcdparameter(void)
{ {
if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT) if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT || g_info.hw_caps->display_type == HW_DISPLAY_LED_ONLY)
{ {
last_toggle_state_power = g_settings.lcd_setting[SNeutrinoSettings::LCD_POWER]; last_toggle_state_power = g_settings.lcd_setting[SNeutrinoSettings::LCD_POWER];
@@ -535,7 +535,7 @@ void CLCD::setBrightness(int dimm)
struct aotom_ioctl_data d; struct aotom_ioctl_data d;
if (dimm < 0 || dimm > 7) if (dimm < 0 || dimm > 7)
return; return;
if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT) { if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT) {
@@ -550,12 +550,12 @@ void CLCD::setBrightness(int dimm)
close(fd); close(fd);
} }
#elif HAVE_ARM_HARDWARE #elif HAVE_ARM_HARDWARE || HAVE_MIPS_HARDWARE
std::string value = to_string(255/15*dimm); std::string value = to_string(255/15*dimm);
proc_put("/proc/stb/lcd/oled_brightness", value.c_str(), value.length()); if (access("/proc/stb/lcd/oled_brightness", F_OK) == 0)
#elif HAVE_MIPS_HARDWARE proc_put("/proc/stb/lcd/oled_brightness", value.c_str(), value.length());
std::string value = to_string(255/15*dimm); else if (access("/proc/stb/fp/oled_brightness", F_OK) == 0)
proc_put("/proc/stb/fp/oled_brightness", value.c_str(), value.length()); proc_put("/proc/stb/fp/oled_brightness", value.c_str(), value.length());
#else #else
(void)dimm; // avoid compiler warning (void)dimm; // avoid compiler warning
#endif #endif
@@ -563,8 +563,9 @@ void CLCD::setBrightness(int dimm)
int CLCD::getBrightness() int CLCD::getBrightness()
{ {
if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT) { if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT || g_info.hw_caps->display_type == HW_DISPLAY_LED_ONLY)
if(g_settings.lcd_setting[SNeutrinoSettings::LCD_BRIGHTNESS] > 15) {
if (g_settings.lcd_setting[SNeutrinoSettings::LCD_BRIGHTNESS] > 15)
g_settings.lcd_setting[SNeutrinoSettings::LCD_BRIGHTNESS] = 15; g_settings.lcd_setting[SNeutrinoSettings::LCD_BRIGHTNESS] = 15;
return g_settings.lcd_setting[SNeutrinoSettings::LCD_BRIGHTNESS]; return g_settings.lcd_setting[SNeutrinoSettings::LCD_BRIGHTNESS];
} else } else
@@ -573,7 +574,8 @@ int CLCD::getBrightness()
void CLCD::setBrightnessStandby(int bright) void CLCD::setBrightnessStandby(int bright)
{ {
if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT) { if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT || g_info.hw_caps->display_type == HW_DISPLAY_LED_ONLY)
{
g_settings.lcd_setting[SNeutrinoSettings::LCD_STANDBY_BRIGHTNESS] = bright; g_settings.lcd_setting[SNeutrinoSettings::LCD_STANDBY_BRIGHTNESS] = bright;
setlcdparameter(); setlcdparameter();
} }
@@ -581,11 +583,13 @@ void CLCD::setBrightnessStandby(int bright)
int CLCD::getBrightnessStandby() int CLCD::getBrightnessStandby()
{ {
if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT) { if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT || g_info.hw_caps->display_type == HW_DISPLAY_LED_ONLY)
if(g_settings.lcd_setting[SNeutrinoSettings::LCD_STANDBY_BRIGHTNESS] > 15) {
if (g_settings.lcd_setting[SNeutrinoSettings::LCD_STANDBY_BRIGHTNESS] > 15)
g_settings.lcd_setting[SNeutrinoSettings::LCD_STANDBY_BRIGHTNESS] = 15; g_settings.lcd_setting[SNeutrinoSettings::LCD_STANDBY_BRIGHTNESS] = 15;
return g_settings.lcd_setting[SNeutrinoSettings::LCD_STANDBY_BRIGHTNESS]; return g_settings.lcd_setting[SNeutrinoSettings::LCD_STANDBY_BRIGHTNESS];
} else }
else
return 0; return 0;
} }
@@ -614,7 +618,7 @@ void CLCD::setPower(int)
int CLCD::getPower() int CLCD::getPower()
{ {
if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT) if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT || g_info.hw_caps->display_type == HW_DISPLAY_LED_ONLY)
return g_settings.lcd_setting[SNeutrinoSettings::LCD_POWER]; return g_settings.lcd_setting[SNeutrinoSettings::LCD_POWER];
else else
return 0; return 0;
@@ -628,7 +632,7 @@ void CLCD::togglePower(void)
else else
showTime(true); showTime(true);
if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT) if (g_info.hw_caps->display_type == HW_DISPLAY_LINE_TEXT || g_info.hw_caps->display_type == HW_DISPLAY_LED_ONLY)
{ {
last_toggle_state_power = 1 - last_toggle_state_power; last_toggle_state_power = 1 - last_toggle_state_power;
@@ -911,4 +915,3 @@ void CLCD::ShowText(const char * str, bool update_timestamp)
void CLCD::setEPGTitle(const std::string) void CLCD::setEPGTitle(const std::string)
{ {
} }