add Lucian Muresan's LCDproc 0.5 port port of Venky's iMON driver

LCDd.conf

@@ -39,6 +39,7 @@ Driver=curses
 #Driver=CFontz633
 #Driver=CwLnx
 #Driver=glcdlib
+#Driver=imon
 
 # Tells the driver to bind to the given interface
 Bind=127.0.0.1
@@ -611,4 +612,12 @@ PixelShiftX=0
 PixelshiftY=2
 
 
+## Soundgraph/Ahanix/Silverstone/Uneed/Accent iMON driver ##
+[imon]
+
+Size=16x2
+Device=/dev/lcd0
+
+
+
 # EOF

acinclude.m4

@@ -6,15 +6,15 @@ AC_ARG_ENABLE(drivers,
 	[                  drivers may be separated with commas.]
   	[                  Possible choices are:]
  	[                    mtxorb,cfontz,cfontz633,curses,cwlnx,text,lb216,]
- 	[                    hd44780,joy,irman,lirc,bayrad,glk,,mtc_s16209x]
+ 	[                    hd44780,joy,irman,lirc,bayrad,glk,mtc_s16209x]
  	[                    stv5730,sed1330,sed1520,svga,lcdm001,t6963]
-	[                    lcterm,icp_a106,ms6931,iowarrior,glcdlib]
+	[                    lcterm,icp_a106,ms6931,iowarrior,glcdlib,imon]
 	[                  \"all\" compiles all drivers],
   	drivers="$enableval",
   	drivers=[lcdm001,mtxorb,cfontz,cfontz633,curses,cwlnx,text,lb216,bayrad,glk])
 
 if test "$drivers" = "all"; then
-	drivers=[mtxorb,cfontz,cfontz633,curses,cwlnx,text,lb216,mtc_s16209x,hd44780,joy,irman,lirc,bayrad,glk,stv5730,sed1330,sed1520,svga,lcdm001,t6963,lcterm,icp_a106,ms6931,iowarrior,glcdlib]
+	drivers=[mtxorb,cfontz,cfontz633,curses,cwlnx,text,lb216,mtc_s16209x,hd44780,joy,irman,lirc,bayrad,glk,stv5730,sed1330,sed1520,svga,lcdm001,t6963,lcterm,icp_a106,ms6931,iowarrior,glcdlib,imon]
 fi
 
   	drivers=`echo $drivers | sed 's/,/ /g'`
@@ -247,6 +247,10 @@ dnl			else
 				AC_MSG_WARN([The glcdlib driver needs glcdproclib/glcdprocdriver.h])
 			])			
 			;;
+		imon)
+			DRIVERS="$DRIVERS imon${SO}"
+			actdrivers=["$actdrivers imon"]
+			;;			
 		*)
 			AC_MSG_ERROR([Unknown driver $driver])
 			;;

docs/LCDd.8

@@ -80,6 +80,9 @@ Code Mercenaries IOWarrior
 .B BayRAD
 EMAC BayRad displays
 .TP
+.B imon
+iMON VFD (Soundgraph/Ahanix/Silverstone/Uneed/Accent) display
+.TP
 .B irmanin
 IrMan infrared (input)
 .TP

docs/Makefile.am

@@ -1,3 +1,3 @@
 man_MANS = lcdproc.1 lcdexec.1 LCDd.8
 SUBDIRS = lcdproc-user lcdproc-dev
-EXTRA_DIST = README.dg README.dg2 README.glcdlib menustuff.txt netstuff.txt lcdproc.1 lcdexec.1 LCDd.8
+EXTRA_DIST = README.dg README.dg2 README.glcdlib README.imon menustuff.txt netstuff.txt lcdproc.1 lcdexec.1 LCDd.8

docs/README.imon

@@ -0,0 +1,15 @@
+Driver for Soundgraph/Ahanix/Silverstone/Uneed/Accent iMON IR/VFD Module
+
+In order to be able to use it, you have to get and install one of
+the following kernel modules:
+ - standalone iMON VFD driver from http://venky.ws/projects/imon/
+ - the iMON module included with LIRC ver. 0.7.1 or newer
+   from http://www.lirc.org/
+
+Adjust the 'Device' key in the [imon] section of /etc/LCDd.conf as
+necessary, depending on what device is file created by the kernel module
+when loaded (this may depend on your system configuration).
+
+For further details, please consult the page and the forum at
+http://venky.ws/projects/imon/.
+

docs/lcdproc-user/running.docbook

@@ -74,7 +74,7 @@ Available options are:
 
 Currently available drivers:
 	lcdm001, LCDM001, MtxOrb, MatrixOrbital, CFontz, CrystalFontz, LB216, text,
-	curses, ncurses, BayRAD, glk, glc, IOWarrior, glcdlib
+	curses, ncurses, BayRAD, glk, glc, IOWarrior, glcdlib, imon
 
 
 ]]>

server/drivers/Makefile.am

@@ -18,7 +18,7 @@ AM_LDFLAGS = @LDSHARED@
 LIBS =
 
 pkglib_PROGRAMS = @DRIVERS@
-EXTRA_PROGRAMS = bayrad CFontz CFontz633 curses CwLnx glk hd44780 irman icp_a106 joy lb216 mtc_s16209x lcdm001 lcterm lirc MtxOrb sed1330 sed1520 stv5730 svga t6963 text wirz_sli ms6931 IOWarrior glcdlib
+EXTRA_PROGRAMS = bayrad CFontz CFontz633 curses CwLnx glk hd44780 irman icp_a106 joy lb216 mtc_s16209x lcdm001 lcterm lirc MtxOrb sed1330 sed1520 stv5730 svga t6963 text wirz_sli ms6931 IOWarrior glcdlib imon
 noinst_LIBRARIES = libLCD.a
 
 IOWarrior_CFLAGS =   @libusb_cflags@
@@ -39,6 +39,7 @@ lcterm_LDADD =       libLCD.a
 svga_LDADD =         @LIBSVGA@
 t6963_LDADD =        libLCD.a
 glcdlib_LDADD =      libLCD.a @LIBGLCD@
+imon_LDADD =         libLCD.a
 
 libLCD_a_SOURCES =   lcd_lib.h lcd_lib.c
 
@@ -68,6 +69,7 @@ t6963_SOURCES =      lcd.h t6963.c t6963.h t6963_font.h report.h
 text_SOURCES =       lcd.h text.h text.c report.h
 wirz_sli_SOURCES =   lcd.h wirz-sli.h wirz-sli.c report.h
 ms6931_SOURCES =     lcd.h ms6931.h ms6931.c report.h
-glcdlib_SOURCES =     lcd.h glcdlib.h glcdlib.c report.h
+glcdlib_SOURCES =    lcd.h glcdlib.h glcdlib.c report.h
+imon_SOURCES =       lcd.h imon.h imon.c report.h
 
 INCLUDES = -I$(top_srcdir)

server/drivers/imon.c

@@ -0,0 +1,292 @@
+/**
+ * Driver for Soundgraph/Ahanix/Silverstone/Uneed/Accent iMON IR/VFD Module
+ *
+ * In order to be able to use it, you have to get and install one of
+ * the following kernel modules:
+ *  - standalone iMON VFD driver from http://venky.ws/projects/imon/
+ *  - the iMON module included with LIRC ver. 0.7.1 or newer
+ *    from http://www.lirc.org/
+ *
+ * Copyright (c) 2004, Venky Raju <dev@venky.ws>, original author of
+ * the LCDproc 0.4.5 iMON driver, the standalone and the LIRC kernel
+ * modules for the iMON IR/VFD at http://venky.ws/projects/imon/
+ * Inspired by:
+ * 	TextMode driver (LCDproc authors?)
+ *	Sasem driver	(Oliver Stabel)
+ *
+ * Copyright (c)  2005 Lucian Muresan <lucianm AT users.sourceforge.net>,
+ * porting the LCDproc 0.4.5 code to LCDproc 0.5
+ *
+ * This source code is being released under the GPL.
+ * Please see the file COPYING in this package for details.
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <termios.h>
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include "lcd.h"
+#include "lcd_lib.h"
+#include "shared/debug.h"
+//#define DEBUG
+#include "report.h"
+
+
+#include "imon.h"
+
+#define PAD				'#'
+#define DEFAULT_DEVICE	"/dev/usb/lcd"
+#define DEFAULT_SIZE	"16x2"
+/* The two value below are only used internally, we don't support custom char. */
+#define VFD_DEFAULT_CELL_WIDTH	5
+#define VFD_DEFAULT_CELL_HEIGHT	8
+
+
+// Vars for the server core
+MODULE_EXPORT char *api_version = API_VERSION;
+MODULE_EXPORT int stay_in_foreground = 0;
+MODULE_EXPORT int supports_multiple = 0;
+MODULE_EXPORT char *symbol_prefix = "imon_";
+
+// our private data
+typedef struct {
+	char info[255];
+	int imon_fd;
+	unsigned char * framebuf;
+	int height;
+	int width;
+} imonPD;
+
+
+/** 
+ * driver initialization
+ */
+MODULE_EXPORT int imon_init (Driver *drvthis, char *args)
+{
+	imonPD * pPD = 0;
+
+	// Alocate, initialize and store private p
+	pPD = (imonPD *) malloc( sizeof(imonPD) );
+	if(!pPD)
+	{
+		debug(RPT_ERR, "imon_init: failed to allocate private data");
+		return -1;
+	}
+
+	memset(pPD->info, '\0', sizeof(pPD->info));
+
+	if( drvthis->store_private_ptr( drvthis, pPD ) )
+	{
+		debug(RPT_ERR, "imon_init: failed to store private data pointer");
+		return -1;
+	}
+
+	char buf[256];
+	pPD->width = 0;
+	pPD->height = 0;
+
+	/* some variables for the server core.*/
+	drvthis->name = "imon";
+	drvthis->filename = "imon.so";
+
+	/* Get settings from config file*/
+
+	/* Get device */
+	strncpy (buf, drvthis->config_get_string (drvthis->name, "device", 0, DEFAULT_DEVICE), sizeof (buf));
+	buf [sizeof(buf)-1] = 0;
+	report (RPT_INFO, "imon_init: using device %s", buf);
+
+	/* Open device for writing */
+	if ((pPD->imon_fd = open (buf, O_WRONLY)) < 0)
+	{
+		report (RPT_ERR, "imon_init: ERROR opening %s (%s).", buf, strerror (errno));
+		report (RPT_ERR, "imon_init: Did you load the iMON VFD kernel module?");
+		report (RPT_ERR, "imon_init: More info in lcdproc/docs/README.imon");
+		return -1;
+	}
+
+	/* Get size settings*/
+	strncpy (buf, drvthis->config_get_string (drvthis->name , "Size" , 0 , DEFAULT_SIZE), sizeof(buf));
+	buf[sizeof(buf)-1] = 0;
+	if (sscanf(buf , "%dx%d", &pPD->width, &pPD->height ) != 2 || (pPD->width <= 0) || (pPD->height <= 0))
+	{
+		report (RPT_WARNING, "imon: cannot read size: %s. Using default value %s.\n", 
+				buf, DEFAULT_SIZE);
+		sscanf (DEFAULT_SIZE , "%dx%d", &pPD->width, &pPD->height );
+	}
+
+	/* Make sure the frame buffer is there... */
+	if (!pPD->framebuf)
+		pPD->framebuf = (unsigned char *) malloc (pPD->width * pPD->height);
+	memset (pPD->framebuf, ' ', pPD->width * pPD->height);
+
+	return !0;		 
+}
+
+/** 
+ * provides some info about this driver
+ */
+MODULE_EXPORT char * imon_get_info (Driver *drvthis)
+{
+	imonPD * pPD = drvthis->private_data;
+	strcpy(pPD->info, "Soundgraph/Ahanix/Silverstone/Uneed/Accent iMON IR/VFD driver ");
+	return pPD->info;
+}
+
+/** 
+ * closes driver
+ */
+MODULE_EXPORT void imon_close (Driver *drvthis)
+{
+	imonPD * pPD = drvthis->private_data;
+	if (pPD->framebuf != NULL)
+		free (pPD->framebuf);
+
+	pPD->framebuf = NULL;
+	close (pPD->imon_fd);
+}
+
+/** 
+ * Clears the VFD screen 
+ */
+MODULE_EXPORT void imon_clear (Driver *drvthis)
+{
+	imonPD * pPD = drvthis->private_data;
+	memset (pPD->framebuf, ' ', pPD->width * pPD->height);
+}
+
+/**
+ * Flushes all output to the VFD...  
+ */
+MODULE_EXPORT void imon_flush (Driver *drvthis)
+{
+	imonPD * pPD = drvthis->private_data;
+	write (pPD->imon_fd, pPD->framebuf, pPD->width * pPD->height);
+}
+
+/**
+ * Prints a string on the VFD display, at position (x,y).
+ * The upper-left is (1,1) and the lower right is (16, 2).  
+ */
+MODULE_EXPORT void imon_string (Driver *drvthis, int x, int y, char string[])
+{
+	int i;
+
+	for (i = 0; string[i]; i++)
+		imon_chr (drvthis, x+i, y, string [i]);
+}
+
+/**
+ * Prints a character on the VFD display, at position (x,y).
+ * The upper-left is (1,1) and the lower right is (16,2).
+ */
+MODULE_EXPORT void imon_chr (Driver *drvthis, int x, int y, char ch)
+{
+	imonPD * pPD = drvthis->private_data;
+	y--; x--;
+
+	switch (ch)
+	{
+		case 0:
+		case -1:	
+			ch = PAD;
+			break;
+		default:
+			;
+	}
+	pPD->framebuf[(y * pPD->width) + x] = ch;
+}
+
+/**
+ * Draws a vertical bar (adapted from the curses driver, because
+ * this device does not support custom characters, as Venky
+ * states in the original LCDproc-0.4.5 implementation)
+ */
+MODULE_EXPORT void imon_vbar (Driver *drvthis, int x, int y, int len, int promille, int options)
+{
+	int pos;
+	int pixels;
+	int total_pixels = ((long) 2 * len * VFD_DEFAULT_CELL_HEIGHT + 1 ) * promille / 2000;
+
+	for (pos = 0; pos < len; pos++ )
+	{
+		pixels = total_pixels - VFD_DEFAULT_CELL_HEIGHT * pos;
+		if ( pixels >= VFD_DEFAULT_CELL_HEIGHT )
+		{
+			/* write a "full" block to the screen... */
+			drvthis->icon (drvthis, x, y-pos, ICON_BLOCK_FILLED);
+		}
+		else if (pixels > 0)
+		{
+			/* write a "partial" block to the screen... */
+			imon_chr (drvthis, x, y-pos, '|');
+			break;
+		}
+		else
+		{
+			; // write nothing (not even a space) 
+		}
+	}
+}
+
+/**
+ * Draws a horizontal bar (adapted from the curses driver, because
+ * this device does not support custom characters, as Venky
+ * states in the original LCDproc-0.4.5 implementation)
+ */
+MODULE_EXPORT void imon_hbar (Driver *drvthis, int x, int y, int len, int promille, int options)
+{
+	int pos;
+	int pixels;
+	int total_pixels = ((long) 2 * len * VFD_DEFAULT_CELL_WIDTH + 1 ) * promille / 2000;
+
+	for (pos = 0; pos < len; pos++ )
+	{
+		pixels = total_pixels - VFD_DEFAULT_CELL_WIDTH * pos;
+		if ( pixels >= VFD_DEFAULT_CELL_WIDTH )
+		{
+			/* write a "full" block to the screen... */
+			drvthis->icon (drvthis, x+pos, y, ICON_BLOCK_FILLED);
+		}
+		else if (pixels > 0)
+		{
+			/* write a "partial" block to the screen... */
+			imon_chr (drvthis, x+pos, y, '-');
+			break;
+		}
+		else
+		{
+			; // write nothing (not even a space) 
+		}
+	}
+}
+
+/** 
+ * returns the display's width
+ */
+MODULE_EXPORT int  imon_width (Driver *drvthis)
+{
+	imonPD * pPD = drvthis->private_data;
+	return pPD->width;
+}
+
+/** 
+ * returns the display's height
+ */
+MODULE_EXPORT int  imon_height (Driver *drvthis)
+{
+	imonPD * pPD = drvthis->private_data;
+	return pPD->height;
+}
+
+// EOF

server/drivers/imon.h

@@ -0,0 +1,55 @@
+/**
+ * Driver for Soundgraph/Ahanix/Silverstone/Uneed/Accent iMON IR/VFD Module
+ *
+ * In order to be able to use it, you have to get and install one of
+ * the following kernel modules:
+ *  - standalone iMON VFD driver from http://venky.ws/projects/imon/
+ *  - the iMON module included with LIRC ver. 0.7.1 or newer
+ *    from http://www.lirc.org/
+ *
+ * Copyright (c) 2004, Venky Raju <dev@venky.ws>, original author of
+ * the LCDproc 0.4.5 iMON driver, the standalone and the LIRC kernel
+ * modules for the iMON IR/VFD at http://venky.ws/projects/imon/
+ * Inspired by:
+ * 	TextMode driver (LCDproc authors?)
+ *	Sasem driver	(Oliver Stabel)
+ *
+ * Copyright (c)  2005 Lucian Muresan <lucianm AT users.sourceforge.net>,
+ * porting the LCDproc 0.4.5 code to LCDproc 0.5
+ *
+ * This source code is being released under the GPL.
+ * Please see the file COPYING in this package for details.
+ *
+ */
+
+#ifndef IMON_H
+#define IMON_H
+
+#include "lcd.h"
+
+MODULE_EXPORT int  imon_init (Driver *drvthis, char *args);
+MODULE_EXPORT void imon_close (Driver *drvthis);
+MODULE_EXPORT int  imon_width (Driver *drvthis);
+MODULE_EXPORT int  imon_height (Driver *drvthis);
+MODULE_EXPORT void imon_clear (Driver *drvthis);
+MODULE_EXPORT void imon_flush (Driver *drvthis);
+MODULE_EXPORT void imon_string (Driver *drvthis, int x, int y, char string[]);
+MODULE_EXPORT void imon_chr (Driver *drvthis, int x, int y, char c);
+MODULE_EXPORT char * imon_get_info (Driver *drvthis);
+MODULE_EXPORT void imon_vbar (Driver *drvthis, int x, int y, int len, int promille, int options);
+MODULE_EXPORT void imon_hbar (Driver *drvthis, int x, int y, int len, int promille, int options);
+
+/**
+ * theese are not (yet?) supported by the iMON IR/VFD kernel module
+ */
+//MODULE_EXPORT int  imon_icon (Driver *drvthis, int x, int y, int icon);
+//MODULE_EXPORT int  imon_cellwidth (Driver *drvthis);
+//MODULE_EXPORT int  imon_cellheight (Driver *drvthis);
+//MODULE_EXPORT int  imon_get_free_chars (Driver *drvthis);
+//MODULE_EXPORT void imon_set_char (Driver *drvthis, int n, char *dat);
+//MODULE_EXPORT void imon_num (Driver *drvthis, int x, int num);
+//MODULE_EXPORT int  imon_get_brightness(Driver *drvthis);
+//MODULE_EXPORT void imon_set_brightness(Driver *drvthis, int promille);
+//MODULE_EXPORT void imon_backlight(Driver *drvthis, int on);
+
+#endif