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

simple_display: use VFDSETTIME2 ioctl on spark

Browse Source
This commit is contained in:
Stefan Seyfried
2012-07-07 19:59:21 +02:00
parent e52cc57efb
commit 71a6d325bd
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/driver/simple_display.cpp
View File

@@ -35,7 +35,7 @@
//#include <math.h> //#include <math.h>
#include <sys/stat.h> #include <sys/stat.h>
#if HAVE_SPARK_HARDWARE #if HAVE_SPARK_HARDWARE
#include "spark_led.h" #include <aotom_main.h>
#define DISPLAY_DEV "/dev/vfd" #define DISPLAY_DEV "/dev/vfd"
#define DISPLAY_LEN 4 #define DISPLAY_LEN 4
#endif #endif
@@ -219,11 +219,31 @@ void CLCD::showTime(bool force)
if (force || last_display || (hour != t->tm_hour) || (minute != t->tm_min)) { if (force || last_display || (hour != t->tm_hour) || (minute != t->tm_min)) {
hour = t->tm_hour; hour = t->tm_hour;
minute = t->tm_min; minute = t->tm_min;
#if HAVE_SPARK_HARDWARE
now += t->tm_gmtoff;
int fd = dev_open();
#if 0 /* VFDSETTIME is broken and too complicated anyway -> use VFDSETTIME2 */
int mjd = 40587 + now / 86400; /* 1970-01-01 is mjd 40587 */
struct aotom_ioctl_data d;
d.u.time.time[0] = mjd >> 8;
d.u.time.time[1] = mjd & 0xff;
d.u.time.time[2] = hour;
d.u.time.time[3] = minute;
d.u.time.time[4] = t->tm_sec;
int ret = ioctl(fd, VFDSETTIME, &d);
#else
int ret = ioctl(fd, VFDSETTIME2, &now);
#endif
close(fd);
if (ret < 0)
#endif
{
if (DISPLAY_LEN < 5) if (DISPLAY_LEN < 5)
sprintf(timestr, "%02d%02d", hour, minute); sprintf(timestr, "%02d%02d", hour, minute);
else /* pad with spaces on the left side to center the time string */ else /* pad with spaces on the left side to center the time string */
sprintf(timestr, "%*s%02d:%02d",(DISPLAY_LEN - 5)/2, "", hour, minute); sprintf(timestr, "%*s%02d:%02d",(DISPLAY_LEN - 5)/2, "", hour, minute);
display(timestr, false); display(timestr, false);
}
last_display = 0; last_display = 0;
} }
} }