mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 02:11:04 +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
------------------
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
This commit is contained in:
vanhofen
2020-06-23 01:05:35 +02:00
parent 1ad2313515
commit ea3dcc6eca
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/analogclock.cpp
View File

@@ -38,28 +38,29 @@ enum files
ANALOG_MIN = 2
};
const char * const file_name[LCD_NUMBER_OF_FILES] =
const char * const file_name[] =
{
"analog_clock",
"analog_hour",
"analog_min"
};
#define LCD_NUMBER_OF_FILES (sizeof(file_name)/sizeof(file_name[0]))
#define NUMBER_OF_PATHS 2
const char * const file_path[NUMBER_OF_PATHS] =
const char * const file_path[] =
{
LCDDIR_VAR "/oled/clock/",
DATADIR "/oled/clock/"
ICONSDIR "/oled/clock/",
ICONSDIR_VAR "/oled/clock/"
};
#define NUMBER_OF_PATHS (sizeof(file_path)/sizeof(file_path[0]))
static std::string file[LCD_NUMBER_OF_FILES] = {""};
void InitAnalogClock(void)
{
for (int i = 0; i < LCD_NUMBER_OF_FILES; i++)
for (unsigned int i = 0; i < LCD_NUMBER_OF_FILES; i++)
{
std::string tmp_file;
for (int j = 0; j < NUMBER_OF_PATHS; j++)
for (unsigned int j = 0; j < NUMBER_OF_PATHS; j++)
{
std::string file_jpg = file_path[j];
file_jpg += file_name[i];