mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- glcd: remove unnecessary defines; count arrays automatically; fix path to icons

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-06-23 01:05:35 +02:00
committed by Thilo Graf
parent 0271586fd5
commit abdd262a61
6 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/driver/glcd/weather.cpp
View File

@@ -42,7 +42,7 @@ enum weathers
//WEATHER_UNKNOWN = 10
};
const char * const weather_name[LCD_NUMBER_OF_WEATHERS] =
const char * const weather_name[] =
{
"clear-day",
"clear-night",
@@ -56,13 +56,14 @@ const char * const weather_name[LCD_NUMBER_OF_WEATHERS] =
"wind",
//"unknown"
};
#define LCD_NUMBER_OF_WEATHERS (sizeof(weather_name)/sizeof(weather_name[0]))
#define NUMBER_OF_PATHS 2
const char * const weather_path[NUMBER_OF_PATHS] =
const char * const weather_path[] =
{
LCDDIR_VAR "/oled/weather/",
DATADIR "/oled/weather/"
ICONSDIR "/oled/weather/",
ICONSDIR_VAR "/oled/weather/"
};
#define NUMBER_OF_PATHS (sizeof(weather_path)/sizeof(weather_path[0]))
static bool ForceUpdate = true;
static bool fonts_initialized = false;
@@ -85,10 +86,10 @@ static std::string st_next_wicon = "";
void InitWeather(void)
{
for (int i = 0; i < LCD_NUMBER_OF_WEATHERS; i++)
for (unsigned int i = 0; i < LCD_NUMBER_OF_WEATHERS; i++)
{
std::string weather_file;
for (int j = 0; j < NUMBER_OF_PATHS; j++)
for (unsigned int j = 0; j < NUMBER_OF_PATHS; j++)
{
std::string file_jpg = weather_path[j];
file_jpg += weather_name[i];