aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreinelt <reinelt@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2005-11-04 04:44:52 +0000
committerreinelt <reinelt@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2005-11-04 04:44:52 +0000
commit7d94facdb6cfcd91c404d906af11de1672951600 (patch)
treea0e2199800aa6b138e7460374a1443e330afb7b3
parentdb8e2f2c065e9a35374c309cb75ae80d133727bd (diff)
downloadlcd4linux-7d94facdb6cfcd91c404d906af11de1672951600.tar.gz
[lcd4linux @ 2005-11-04 04:44:52 by reinelt]
LPH7508 driver (not yet finished) git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@590 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
Diffstat (limited to '')
pre { line-height: 125%; margin: 0; } td.linenos pre { color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px; } span.linenos { color: #000000; background-color: #f0f0f0; padding: 0 5px 0 5px; } td.linenos pre.special { color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px; } span.linenos.special { color: #000000; background-color: #ffffc0; padding: 0 5px 0 5px; } .highlight .hll { background-color: #ffffcc } .highlight .c { color: #888888 } /* Comment */ .highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */ .highlight .k { color: #008800; font-weight: bold } /* Keyword */ .highlight .ch { color: #888888 } /* Comment.Hashbang */ .highlight .cm { color: #888888 } /* Comment.Multiline */ .highlight .cp { color: #cc0000; font-weight: bold } /* Comment.Preproc */ .highlight .cpf { color: #888888 } /* Comment.PreprocFile */ .highlight .c1 { color: #888888 } /* Comment.Single */ .highlight .cs { color: #cc0000; font-weight: bold; background-color: #fff0f0 } /* Comment.Special */ .highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ .highlight .ge { font-style: italic } /* Generic.Emph */ .highlight .gr { color: #aa0000 } /* Generic.Error */ .highlight .gh { color: #333333 } /* Generic.Heading */ .highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ .highlight .go { color: #888888 } /* Generic.Output */ .highlight .gp { color: #555555 } /* Generic.Prompt */ .highlight .gs { font-weight: bold } /* Generic.Strong */ .highlight .gu { color: #666666 } /* Generic.Subheading */ .highlight .gt { color: #aa0000 } /* Generic.Traceback */ .highlight .kc { color: #008800; font-weight: bold } /* Keyword.Constant */ .highlight .kd { color: #008800; font-weight: bold } /* Keyword.Declaration */ .highlight .kn { color: #008800; font-weight: bold } /* Keyword.Namespace */ .highlight .kp { color: #008800 } /* Keyword.Pseudo */ .highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */ .highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */ .highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
# Process this file with automake to produce Makefile.in

AUTOMAKE_OPTIONS = gnu
CLEANFILES = *~
DRIVERS=@DRIVERS@
PLUGINS=@PLUGINS@

bin_PROGRAMS = lcd4linux
#lib_LTLIBRARIES = liblcd4linux.la

AM_CFLAGS = $(X_CFLAGS) -D_GNU_SOURCE -Wall

lcd4linux_LDFLAGS = $(X_LIBS)
lcd4linux_LDADD   = @DRIVERS@ @PLUGINS@ @DRVLIBS@ @PLUGINLIBS@
#lcd4linux_LDADD  = liblcd4linux.la @DRVLIBS@ 
#remove next line for liblcd4linux
lcd4linux_DEPENDENCIES = @DRIVERS@ @PLUGINS@

lcd4linux_SOURCES =         \
lcd4linux.c                 \
cfg.c         cfg.h         \
debug.c       debug.h       \
drv.c         drv.h         \
evaluator.c   evaluator.h   \
hash.c        hash.h        \
layout.c      layout.h      \
pid.c         pid.h         \
timer.c       timer.h       \
thread.c      thread.h      \
udelay.c      udelay.h      \
qprintf.c     qprintf.h     \
                            \
widget.c      widget.h      \
widget_text.c widget_text.h \
widget_bar.c  widget_bar.h  \
widget_icon.c widget_icon.h \
                            \
plugin.c      plugin.h      \
plugin_cfg.c                \
plugin_math.c               \
plugin_string.c             \
plugin_time.c

#liblcd4linux_la_DEPENDENCIES = @DRIVERS@
#liblcd4linux_la_LDFLAGS = -version-info 9:12:9
#liblcd4linux_la_LIBADD = @DRIVERS@

#liblcd4linux_la_SOURCES =

EXTRA_lcd4linux_SOURCES=    \
drv_generic_text.c          \
drv_generic_text.h          \
drv_generic_graphic.c       \
drv_generic_graphic.h       \
drv_generic_serial.c        \
drv_generic_serial.h        \
drv_generic_parport.c       \
drv_generic_parport.h       \
drv_BeckmannEgle.c          \
drv_Crystalfontz.c          \
drv_Curses.c                \
drv_Cwlinux.c               \
drv_HD44780.c               \
drv_Image.c                 \
drv_M50530.c                \
drv_MatrixOrbital.c         \
drv_MilfordInstruments.c    \
drv_T6963.c                 \
drv_USBLCD.c                \
drv_X11.c                   \
                            \
font_6x8.h                  \
                            \
plugin_apm.c                \
plugin_cpuinfo.c            \
plugin_diskstats.c          \
plugin_dvb.c                \
plugin_exec.c               \
plugin_i2c_sensors.c        \
plugin_imon.c               \
plugin_isdn.c               \
plugin_loadavg.c            \
plugin_meminfo.c            \
plugin_mysql.c              \
plugin_netdev.c             \
plugin_pop3.c               \
plugin_ppp.c                \
plugin_proc_stat.c          \
plugin_seti.c               \
plugin_uname.c              \
plugin_uptime.c             \
plugin_wireless.c           \
plugin_xmms.c


EXTRA_DIST =                \
lcd4linux.conf.sample       \
lcd4kde.conf                \
lcd4linux.kdelnk            \
lcd4linux.xpm               \
lcd4linux.lsm               \
curses.m4                   \
AUTHORS                     \
CREDITS                     \
FAQ                         \
NEWS                        \
TODO                        \
README                      \
README.Drivers              \
README.Plugins              \
README.KDE                  \
plugin_sample.c
-rw-r--r--Makefile.am1
-rw-r--r--Makefile.in14
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-02 02:47:12 +0000
BeckmannEgle, BWCT, CrystalFontz, Curses, Cwlinux,
- HD44780, LCDLinux, LCDTerm, M50530, MatrixOrbital,
- MilfordInstruments, Noritake, NULL, PNG, PPM,
- RouterBoard, serdisplib, SimpleLCD, T6963, Trefon,
- USBLCD, WincorNixdorf, X11
+ HD44780, LCDLinux, LCDTerm, LPH7508, M50530,
+ MatrixOrbital, MilfordInstruments, Noritake, NULL,
+ PNG, PPM, RouterBoard, serdisplib, SimpleLCD, T6963,
+ Trefon, USBLCD, WincorNixdorf, X11
--with-plugins=<list> choose which plugins to compile.
type --with-plugins=list for a list
of avaible plugins
@@ -6039,6 +6039,7 @@ for driver in $drivers; do
HD44780="yes"
LCDLINUX="yes"
LCDTERM="yes"
+ LPH7508="yes"
M50530="yes"
MATRIXORBITAL="yes"
MILINST="yes"
@@ -6079,6 +6080,9 @@ for driver in $drivers; do
LCDTerm)
LCDTERM=$val
;;
+ LPH7508)
+ LPH7508=$val
+ ;;
M50530)
M50530=$val
;;
@@ -6251,6 +6255,17 @@ _ACEOF
fi
+if test "$LPH7508" = "yes"; then
+ GRAPHICS="yes"
+ PARPORT="yes"
+ DRIVERS="$DRIVERS drv_LPH7508.o"
+
+cat >>confdefs.h <<\_ACEOF
+#define WITH_LPH7508 1
+_ACEOF
+
+fi
+
if test "$M50530" = "yes"; then
TEXT="yes"
PARPORT="yes"
@@ -9491,18 +9506,24 @@ else
ac_cv_func_fork_works=cross
else
cat >conftest.$ac_ext <<_ACEOF
-/* By Ruediger Kuhlmann. */
- #include <sys/types.h>
- #if HAVE_UNISTD_H
- # include <unistd.h>
- #endif
- /* Some systems only have a dummy stub for fork() */
- int main ()
- {
- if (fork() < 0)
- exit (1);
- exit (0);
- }
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+
+ /* By Ruediger Kuhlmann. */
+ if (fork() < 0)
+ exit (1);
+ exit (0);
+
+ ;
+ return 0;
+}
_ACEOF
rm -f conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
diff --git a/drivers.m4 b/drivers.m4
index a3330fb..a5ec90e 100644
--- a/drivers.m4
+++ b/drivers.m4
@@ -29,10 +29,10 @@ AC_ARG_WITH(
[ (try 'all,\!<driver>' if your shell complains...)]
[ possible drivers are:]
[ BeckmannEgle, BWCT, CrystalFontz, Curses, Cwlinux,]
- [ HD44780, LCDLinux, LCDTerm, M50530, MatrixOrbital,]
- [ MilfordInstruments, Noritake, NULL, PNG, PPM,]
- [ RouterBoard, serdisplib, SimpleLCD, T6963, Trefon,]
- [ USBLCD, WincorNixdorf, X11],
+ [ HD44780, LCDLinux, LCDTerm, LPH7508, M50530,]
+ [ MatrixOrbital, MilfordInstruments, Noritake, NULL,]
+ [ PNG, PPM, RouterBoard, serdisplib, SimpleLCD, T6963,]
+ [ Trefon, USBLCD, WincorNixdorf, X11],
drivers=$withval,
drivers=all
)
@@ -61,6 +61,7 @@ for driver in $drivers; do
HD44780="yes"
LCDLINUX="yes"
LCDTERM="yes"
+ LPH7508="yes"
M50530="yes"
MATRIXORBITAL="yes"
MILINST="yes"
@@ -101,6 +102,9 @@ for driver in $drivers; do
LCDTerm)
LCDTERM=$val
;;
+ LPH7508)
+ LPH7508=$val
+ ;;
M50530)
M50530=$val
;;
@@ -235,6 +239,13 @@ if test "$LCDTERM" = "yes"; then
AC_DEFINE(WITH_LCDTERM,1,[LCDTerm driver])
fi
+if test "$LPH7508" = "yes"; then
+ GRAPHICS="yes"
+ PARPORT="yes"
+ DRIVERS="$DRIVERS drv_LPH7508.o"
+ AC_DEFINE(WITH_LPH7508,1,[LPH7508 driver])
+fi
+
if test "$M50530" = "yes"; then
TEXT="yes"
PARPORT="yes"
diff --git a/drv.c b/drv.c
index 99430f2..b461f9e 100644
--- a/drv.c
+++ b/drv.c
@@ -1,4 +1,4 @@
-/* $Id: drv.c,v 1.33 2005/08/22 05:44:43 reinelt Exp $
+/* $Id: drv.c,v 1.34 2005/11/04 04:44:52 reinelt Exp $
*
* new framework for display drivers
*
@@ -23,6 +23,9 @@
*
*
* $Log: drv.c,v $
+ * Revision 1.34 2005/11/04 04:44:52 reinelt
+ * LPH7508 driver (not yet finished)
+ *
* Revision 1.33 2005/08/22 05:44:43 reinelt
* new driver 'WincorNixdorf'
* some fixes to the bar code
@@ -210,6 +213,7 @@ extern DRIVER drv_HD44780;
extern DRIVER drv_Image;
extern DRIVER drv_LCDLinux;
extern DRIVER drv_LCDTerm;
+extern DRIVER drv_LPH7508;
extern DRIVER drv_M50530;
extern DRIVER drv_MatrixOrbital;
extern DRIVER drv_MilfordInstruments;
@@ -258,6 +262,9 @@ DRIVER *Driver[] = {
#ifdef WITH_LCDTERM
&drv_LCDTerm,
#endif
+#ifdef WITH_LPH7508
+ &drv_LPH7508,
+#endif
#ifdef WITH_M50530
&drv_M50530,
#endif
diff --git a/drv_Image.c b/drv_Image.c
index de4e3e7..5066dcd 100644
--- a/drv_Image.c
+++ b/drv_Image.c
@@ -1,4 +1,4 @@
-/* $Id: drv_Image.c,v 1.12 2005/05/08 04:32:44 reinelt Exp $
+/* $Id: drv_Image.c,v 1.13 2005/11/04 04:44:52 reinelt Exp $
*
* new style Image (PPM/PNG) Driver for LCD4Linux
*
@@ -23,6 +23,9 @@
*
*
* $Log: drv_Image.c,v $
+ * Revision 1.13 2005/11/04 04:44:52 reinelt
+ * LPH7508 driver (not yet finished)
+ *
* Revision 1.12 2005/05/08 04:32:44 reinelt
* CodingStyle added and applied
*
@@ -427,21 +430,21 @@ static int drv_IMG_start(const char *section)
if (cfg_number(section, "border", 0, 0, -1, &border) < 0)
return -1;
- if (sscanf(s = cfg_get(NULL, "foreground", "#102000"), "#%x", &fg_col) != 1) {
+ if (sscanf(s = cfg_get(section, "foreground", "#102000"), "#%x", &fg_col) != 1) {
error("%s: bad %s.foreground color '%s' from %s", Name, section, s, cfg_source());
free(s);
return -1;
}
free(s);
- if (sscanf(s = cfg_get(NULL, "halfground", "#70c000"), "#%x", &hg_col) != 1) {
+ if (sscanf(s = cfg_get(section, "halfground", "#70c000"), "#%x", &hg_col) != 1) {
error("%s: bad %s.halfground color '%s' from %s", Name, section, s, cfg_source());
free(s);
return -1;
}
free(s);
- if (sscanf(s = cfg_get(NULL, "background", "#80d000"), "#%x", &bg_col) != 1) {
+ if (sscanf(s = cfg_get(section, "background", "#80d000"), "#%x", &bg_col) != 1) {
error("%s: bad %s.background color '%s' from %s", Name, section, s, cfg_source());
free(s);
return -1;
diff --git a/lcd4linux.conf.sample b/lcd4linux.conf.sample
index 47cff2d..18c885a 100644
--- a/lcd4linux.conf.sample
+++ b/lcd4linux.conf.sample
@@ -1,3 +1,9 @@
+Variables {
+ tick 500
+ tack 100
+ minute 60000
+}
+
Display SerDispLib {
Driver 'serdisplib'
Port 'PAR:/dev/parports/0'
@@ -274,6 +280,18 @@ Display T6963-240x64 {
}
+#Display LPH7508 {
+# Driver 'LPH7508'
+# Port '/dev/parports/0'
+# Font '6x8'
+#}
+
+Display LPH7508 {
+ Driver 'serdisplib'
+ Port 'PAR:/dev/parports/0'
+ Model 'LPH7508'
+}
+
Display XWindow {
Driver 'X11'
Size '120x32'
@@ -703,7 +721,7 @@ Layout Default {
}
Row3 {
Col1 'Busy'
-# Col10 'Rain'
+ Col10 'Rain'
Col11 'BusyBar'
}
Row4 {
@@ -762,22 +780,22 @@ Layout L20x2 {
}
Layout Test {
- Row01.Col1 'Test'
- Row02.Col1 'Test'
- Row03.Col1 'Test'
- Row04.Col1 'Test'
- Row05.Col1 'Test'
- Row06.Col1 'Test'
- Row07.Col1 'Test'
- Row08.Col1 'Test'
-# Row09.Col1 'Test'
-# Row10.Col1 'Test'
-# Row11.Col1 'Test'
-# Row12.Col1 'Test'
-# Row13.Col1 'Test'
-# Row14.Col1 'Test'
-# Row15.Col1 'Test'
-# Row16.Col1 'Test'
+ Row01.Col1 'Test1'
+ Row02.Col1 'Test1'
+ Row03.Col1 'Test1'
+ Row04.Col1 'Test1'
+ Row05.Col1 'Test1'
+ Row06.Col1 'Test1'
+ Row07.Col1 'Test1'
+ Row08.Col1 'Test1'
+ Row09.Col1 'Test1'
+ Row10.Col1 'Test1'
+ Row11.Col1 'Test1'
+ Row12.Col1 'Test1'
+ Row13.Col1 'Test1'
+ Row14.Col1 'Test1'
+ Row15.Col1 'Test1'
+ Row16.Col1 'Test1'
}
Layout Test2 {
@@ -803,7 +821,7 @@ Layout testMySQL {
#Display 'SerDispLib'
-Display 'LCD-Linux'
+#Display 'LCD-Linux'
#Display 'LK204'
#Display 'MI240'
#Display 'CW12232'
@@ -827,17 +845,13 @@ Display 'LCD-Linux'
#Display 'BWCT'
#Display 'Image'
#Display 'Trefon'
+Display 'LPH7508'
-#Layout 'Default'
+#Layout 'Default'
#Layout 'L8x2'
#Layout 'L16x2'
-Layout 'L20x2'
-#Layout 'Test'
+#Layout 'L20x2'
+Layout 'Test'
#Layout 'Test2'
-Variables {
- tick 500
- tack 100
- minute 60000
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-02 02:47:12 +0000