[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

diff --git a/lcd4linux.conf.sample b/lcd4linux.conf.sample
index 567cf926b2cd5085d05b8b67ca9dd4d1a1fa1d18..992f6193552c6d9b9350b04bca1cdd03ed7bc672 100644 (file)
--- 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 d9fe01b6b2dcd07ceb1bb4d1266991ed8481380a..79705d11a63ef5c331a59593fe55bffcf3584d8f 100644 (file)
--- 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";