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

glcd: merge led/lcd/simple clock into a single source file

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: f20ce17314
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-06-21 (Sun, 21 Jun 2020)

Origin message was:
------------------
- glcd: merge led/lcd/simple clock into a single source file

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-06-21 22:00:26 +02:00
parent ed287e7135
commit 4f4cc1656d
13 changed files with 50 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/driver/glcd/glcd.cpp
View File

@@ -41,8 +41,6 @@
#include "glcd.h"
#include "analogclock.h"
#include "digitalclock.h"
#include "lcdclock.h"
#include "ledclock.h"
#include "simpleclock.h"
#include "weather.h"
@@ -136,8 +134,6 @@ cGLCD::cGLCD()
InitAnalogClock();
InitDigitalClock();
InitLcdClock();
InitLedClock();
InitSimpleClock();
InitWeather();
@@ -232,28 +228,18 @@ void cGLCD::Exec()
if (doStandbyTime)
{
std::string Time;
if (g_settings.glcd_time_in_standby == 5)
if (g_settings.glcd_time_in_standby == CLOCK_ANALOG)
{
ShowAnalogClock(tm->tm_hour, tm->tm_min, tm->tm_sec, bitmap->Width()/2, bitmap->Height()/2);
}
else if (g_settings.glcd_time_in_standby == 4)
else if (g_settings.glcd_time_in_standby == CLOCK_DIGITAL)
{
ShowDigitalClock(tm->tm_hour, tm->tm_min);
}
else if (g_settings.glcd_time_in_standby == 3)
else if (g_settings.glcd_time_in_standby > CLOCK_OFF)
{
Time = strftime("%H:%M", tm);
ShowLcdClock(Time);
}
else if (g_settings.glcd_time_in_standby == 2)
{
Time = strftime("%H:%M", tm);
ShowLedClock(Time);
}
else
{
Time = strftime("%H:%M", tm);
ShowSimpleClock(Time);
ShowSimpleClock(Time, g_settings.glcd_time_in_standby);
}
if (g_settings.glcd_standby_weather == 1 && g_settings.glcd_time_in_standby != 5)
{