aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreinelt <reinelt@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2005-01-11 10:19:33 +0000
committerreinelt <reinelt@3ae390bd-cb1e-0410-b409-cd5a39f66f1f>2005-01-11 10:19:33 +0000
commit2e0d1b315d39447a9b90b77c0fa6375d8f682f5f (patch)
tree6cf9214c6c657b7b72379a4aee51d02ba4b49ae3
parent5541660c2f1d4d0fbec52ed80e1c09e0880fac0b (diff)
downloadlcd4linux-2e0d1b315d39447a9b90b77c0fa6375d8f682f5f.tar.gz
[lcd4linux @ 2005-01-11 10:19:33 by reinelt]
changes to lcd4linux.conf.sample git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@502 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
Diffstat (limited to '')
-rw-r--r--lcd4linux.conf.sample45
-rw-r--r--plugin_proc_stat.c7
2 files changed, 42 insertions, 10 deletions
diff --git a/lcd4linux.conf.sample b/lcd4linux.conf.sample
index 567cf92..992f619 100644
--- a/lcd4linux.conf.sample
+++ b/lcd4linux.conf.sample
@@ -59,23 +59,50 @@ Display Curses {
Size '20x6'
}
+# generic HD44780 display (LCD4Linux wiring)
+Display HD44780-generic {
+ Driver 'HD44780'
+ Model 'generic'
+ Port '/dev/parports/0'
+ Size '20x4'
+ Wire {
+ RW 'GND'
+ RS 'AUTOFD'
+ ENABLE 'STROBE'
+ ENABLE2 'GND'
+ GPO 'GND'
+ }
+}
-Display HD44780-20x4 {
+# generic HD44780 display (WinAmp wiring)
+Display HD44780-winamp {
Driver 'HD44780'
+ Model 'generic'
Port '/dev/parports/0'
-# Port '0x378'
- Bits '8'
Size '20x4'
- asc255bug 0
- Icons 1
Wire {
- RW 'GND'
- RS 'AUTOFD'
- ENABLE 'STROBE'
- GPO 'INIT'
+ RW 'AUTOFD'
+ RS 'INIT'
+ ENABLE 'STROBE'
+ ENABLE2 'GND'
+ GPO 'GND'
}
}
+# HD44780 display from www.kernelconcepts.de
+Display HD44780-winamp {
+ Driver 'HD44780'
+ Model 'HD66712'
+ Port '/dev/parports/0'
+ Size '20x4'
+ Wire {
+ RW 'AUTOFD'
+ RS 'INIT'
+ ENABLE 'STROBE'
+ ENABLE2 'GND'
+ GPO 'GND'
+ }
+}
Display SC1602D {
Driver 'HD44780'
diff --git a/plugin_proc_stat.c b/plugin_proc_stat.c
index d9fe01b..79705d1 100644
--- a/plugin_proc_stat.c
+++ b/plugin_proc_stat.c
@@ -1,4 +1,4 @@
-/* $Id: plugin_proc_stat.c,v 1.23 2004/06/26 12:05:00 reinelt Exp $
+/* $Id: plugin_proc_stat.c,v 1.24 2005/01/11 10:19:33 reinelt Exp $
*
* plugin for /proc/stat parsing
*
@@ -23,6 +23,9 @@
*
*
* $Log: plugin_proc_stat.c,v $
+ * Revision 1.24 2005/01/11 10:19:33 reinelt
+ * changes to lcd4linux.conf.sample
+ *
* Revision 1.23 2004/06/26 12:05:00 reinelt
*
* uh-oh... the last CVS log message messed up things a lot...
@@ -208,6 +211,7 @@ static int parse_proc_stat (void)
beg=end?end+1:NULL;
}
}
+
else if (strncmp(buffer, "page ", 5)==0) {
char *key[] = { "in", "out" };
char delim[] = " \t\n";
@@ -252,6 +256,7 @@ static int parse_proc_stat (void)
beg=end?end+1:NULL;
}
}
+
else if (strncmp(buffer, "disk_io:", 8)==0) {
char *key[] = { "io", "rio", "rblk", "wio", "wblk" };
char delim[] = " ():,\t\n";