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

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

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

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

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2020-06-23 01:05:35 +02:00
parent 529b217443
commit f2174ab04a
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];