Changeset 884

Timestamp:

07/15/08 12:22:19 (7 weeks ago)

Author:

michael

Message:

added IRLCD driver by Jean-Philippe Civade

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• config.h.in (modified) (1 diff)
• configure (modified) (4 diffs)
• drivers.m4 (modified) (4 diffs)
• drv.c (modified) (2 diffs)
• drv_IRLCD.c (added)
• lcd4linux.conf.sample (modified) (2 diffs)
• smoketest.sh (modified) (1 diff)
• svn_version.h (modified) (1 diff)

trunk/Makefile.am

@@ -77 +77 @@
 drv_HD44780.c                 \
 drv_Image.c                   \
+drv_IRLCD.c                   \
 drv_LCD2USB.c                 \
 drv_LCDLinux.c                \

trunk/Makefile.in

@@ -276 +276 @@
 drv_HD44780.c                 \
 drv_Image.c                   \
+drv_IRLCD.c                   \
 drv_LCD2USB.c                 \
 drv_LCDLinux.c                \
@@ -457 +458 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_G15.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_HD44780.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_IRLCD.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_Image.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_LCD2USB.Po@am__quote@

trunk/config.h.in

@@ -434 +434 @@
 /* image widget */
 #undef WITH_IMAGE
+
+/* IRLCD driver */
+#undef WITH_IRLCD
 
 /* LCD2USB driver */

trunk/configure

@@ -1344 +1344 @@
                           possible drivers are:
                           BeckmannEgle, BWCT, CrystalFontz, Curses, Cwlinux,
-                          G15, HD44780, LCD2USB LCDLinux, LCDTerm, LPH7508,
+                          G15, HD44780, IRLCD, LCD2USB LCDLinux, LCDTerm, LPH7508,
                           LUIse, M50530, MatrixOrbital, MilfordInstruments,
                           Noritake, NULL, PNG, PPM, Pertelian, picoLCD, picoLCDGraphic,
@@ -7544 +7544 @@
          G15="yes"
          HD44780="yes"
+   IRLCD="yes"
          LCD2USB="yes"
    LCDLINUX="yes"
@@ -7599 +7600 @@
          HD44780_I2C=$val
    ;;
+      IRLCD)
+         IRLCD=$val
+         ;;
       LCD2USB)
          LCD2USB=$val
@@ -7832 +7836 @@
 _ACEOF
 
+fi
+
+if test "$IRLCD" = "yes"; then
+   if test "$has_usb" = "true"; then
+      TEXT="yes"
+      SERIAL="yes"
+      DRIVERS="$DRIVERS drv_IRLCD.o"
+      LIBUSB="yes"
+
+cat >>confdefs.h <<\_ACEOF
+#define WITH_IRLCD 1
+_ACEOF
+
+   else
+      { echo "$as_me:$LINENO: WARNING: usb.h not found: IRLCD driver disabled" >&5
+echo "$as_me: WARNING: usb.h not found: IRLCD driver disabled" >&2;}
+   fi
 fi
 

trunk/drivers.m4

@@ -34 +34 @@
   [                        possible drivers are:] 
   [                        BeckmannEgle, BWCT, CrystalFontz, Curses, Cwlinux,]
-  [                        G15, HD44780, LCD2USB LCDLinux, LCDTerm, LPH7508,]
+  [                        G15, HD44780, IRLCD, LCD2USB LCDLinux, LCDTerm, LPH7508,]
   [                        LUIse, M50530, MatrixOrbital, MilfordInstruments,]
   [                        Noritake, NULL, PNG, PPM, Pertelian, picoLCD, picoLCDGraphic,]
@@ -67 +67 @@
          G15="yes"
          HD44780="yes"
+   IRLCD="yes"
          LCD2USB="yes"
    LCDLINUX="yes"
@@ -122 +123 @@
          HD44780_I2C=$val
    ;;
+      IRLCD)
+         IRLCD=$val
+         ;;
       LCD2USB)
          LCD2USB=$val
@@ -315 +319 @@
 fi
 
+if test "$IRLCD" = "yes"; then
+   if test "$has_usb" = "true"; then
+      TEXT="yes"
+      SERIAL="yes"
+      DRIVERS="$DRIVERS drv_IRLCD.o"
+      LIBUSB="yes"
+      AC_DEFINE(WITH_IRLCD,1,[IRLCD driver])
+   else
+      AC_MSG_WARN(usb.h not found: IRLCD driver disabled)
+   fi
+fi
+
 if test "$LCD2USB" = "yes"; then
    if test "$has_usb" = "true"; then

trunk/drv.c

@@ -57 +57 @@
 extern DRIVER drv_HD44780;
 extern DRIVER drv_Image;
+extern DRIVER drv_IRLCD;
 extern DRIVER drv_LCD2USB;
 extern DRIVER drv_LCDLinux;
@@ -117 +118 @@
     &drv_Image,
 #endif
+#ifdef WITH_IRLCD
+    &drv_IRLCD,
+#endif
 #ifdef WITH_LCD2USB
     &drv_LCD2USB,

trunk/lcd4linux.conf.sample

@@ -40 +40 @@
     Size '20x2'
     UseBusy 0
+}
+
+Display IRLCD {
+    Driver 'IRLCD'
+    Size '16x2'
+    Backlight 0
+    Icons 1
 }
 
@@ -1207 +1214 @@
 #Display 'T6963-240x128D'
 #Display 'XWindow'
+#Display 'IRLCD'
 #Display 'USBLCD'
 #Display 'BWCT'

trunk/smoketest.sh

@@ -10 +10 @@
 ./bootstrap
 
-for driver in BeckmannEgle BWCT CrystalFontz Curses Cwlinux EA232graphic G15 HD44780 LCD2USB LCDLinux LCDTerm LEDMatrix LPH7508 LUIse M50530 MatrixOrbital MilfordInstruments Noritake NULL Pertelian picoLCD picoLCDGraphic PNG PPM RouterBoard Sample serdisplib SimpleLCD T6963 Trefon USBHUB USBLCD WincorNixdorf X11; do
+for driver in BeckmannEgle BWCT CrystalFontz Curses Cwlinux EA232graphic G15 HD44780 IRLCD LCD2USB LCDLinux LCDTerm LEDMatrix LPH7508 LUIse M50530 MatrixOrbital MilfordInstruments Noritake NULL Pertelian picoLCD picoLCDGraphic PNG PPM RouterBoard Sample serdisplib SimpleLCD T6963 Trefon USBHUB USBLCD WincorNixdorf X11; do
 
     make distclean
     ./configure --with-drivers=$driver
-    make
+    make -j 2
     
     if [ -x lcd4linux ]; then

trunk/svn_version.h

@@ -1 @@
-#define SVN_VERSION "796"
+#define SVN_VERSION "877:883M"