Changeset 881

Timestamp:

07/15/08 06:15:53 (4 months ago)

Author:

michael

Message:

picoLCDGraphic driver by Nicu Pavel added

Location:

trunk

Files:

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

trunk/Makefile.am

@@ -90 +90 @@
 drv_Pertelian                 \
 drv_picoLCD.c                 \
+drv_picoLCDGraphic.c          \
 drv_RouterBoard.c             \
 drv_Sample.c                  \

trunk/Makefile.in

@@ -1 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -20 +20 @@
 # Process this file with automake to produce Makefile.in
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -43 +39 @@
 host_triplet = @host@
 bin_PROGRAMS = lcd4linux$(EXEEXT)
+subdir = .
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
   $(srcdir)/Makefile.in $(srcdir)/config.h.in \
   $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
-  TODO config.guess config.sub depcomp install-sh missing \
-  mkinstalldirs
-subdir = .
+  TODO config.guess config.rpath config.sub depcomp install-sh \
+  missing mkinstalldirs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/curses.m4 \
@@ -56 +52 @@
   $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
@@ -75 +71 @@
   plugin_test.$(OBJEXT) plugin_time.$(OBJEXT)
 lcd4linux_OBJECTS = $(am_lcd4linux_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+lcd4linux_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(lcd4linux_LDFLAGS) \
+  $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -98 +96 @@
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AUTOCONF = @AUTOCONF@
@@ -123 +119 @@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -135 +132 @@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -162 +160 @@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -176 +176 @@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
@@ -203 +204 @@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = gnu
 CLEANFILES = *~
@@ -285 +289 @@
 drv_Pertelian                 \
 drv_picoLCD.c                 \
+drv_picoLCDGraphic.c          \
 drv_RouterBoard.c             \
 drv_Sample.c                  \
@@ -395 +400 @@
   @if test ! -f $@; then \
     rm -f stamp-h1; \
-    $(MAKE) stamp-h1; \
+    $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
   else :; fi
 
@@ -410 +415 @@
 install-binPROGRAMS: $(bin_PROGRAMS)
   @$(NORMAL_INSTALL)
-  test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+  test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
   @list='$(bin_PROGRAMS)'; for p in $$list; do \
     p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
@@ -433 +438 @@
 lcd4linux$(EXEEXT): $(lcd4linux_OBJECTS) $(lcd4linux_DEPENDENCIES) 
   @rm -f lcd4linux$(EXEEXT)
-  $(LINK) $(lcd4linux_LDFLAGS) $(lcd4linux_OBJECTS) $(lcd4linux_LDADD) $(LIBS)
+  $(lcd4linux_LINK) $(lcd4linux_OBJECTS) $(lcd4linux_LDADD) $(LIBS)
 
 mostlyclean-compile:
@@ -482 +487 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_generic_text.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_picoLCD.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_picoLCDGraphic.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_serdisplib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_st2205.Po@am__quote@
@@ -542 +548 @@
 
 .c.o:
-@am__fastdepCC_TRUE@  if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@  $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@  mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@@ -549 +555 @@
 
 .c.obj:
-@am__fastdepCC_TRUE@  if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@  then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@  $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@  mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-uninstall-info-am:
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -561 +566 @@
       if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     done | \
-    $(AWK) '    { files[$$0] = 1; } \
-         END { for (i in files) print i; }'`; \
+    $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+        END { if (nonempty) { for (i in files) print i; }; }'`; \
   mkid -fID $$unique
 tags: TAGS
@@ -574 +579 @@
       if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     done | \
-    $(AWK) '    { files[$$0] = 1; } \
-         END { for (i in files) print i; }'`; \
+    $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+        END { if (nonempty) { for (i in files) print i; }; }'`; \
   if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
     test -n "$$unique" || unique=$$empty_fix; \
@@ -585 +590 @@
     $(TAGS_FILES) $(LISP)
   tags=; \
-  here=`pwd`; \
   list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
   unique=`for i in $$list; do \
       if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     done | \
-    $(AWK) '    { files[$$0] = 1; } \
-         END { for (i in files) print i; }'`; \
+    $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+        END { if (nonempty) { for (i in files) print i; }; }'`; \
   test -z "$(CTAGS_ARGS)$$tags$$unique" \
     || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
@@ -606 +610 @@
 distdir: $(DISTFILES)
   $(am__remove_distdir)
-  mkdir $(distdir)
-  @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-  topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-  list='$(DISTFILES)'; for file in $$list; do \
-    case $$file in \
-      $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-      $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-    esac; \
+  test -d $(distdir) || mkdir $(distdir)
+  @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+  topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+  list='$(DISTFILES)'; \
+    dist_files=`for file in $$list; do echo $$file; done | \
+    sed -e "s|^$$srcdirstrip/||;t" \
+        -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+  case $$dist_files in \
+    */*) $(MKDIR_P) `echo "$$dist_files" | \
+         sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+         sort -u` ;; \
+  esac; \
+  for file in $$dist_files; do \
     if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-    dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-    if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-      dir="/$$dir"; \
-      $(mkdir_p) "$(distdir)$$dir"; \
-    else \
-      dir=''; \
-    fi; \
     if test -d $$d/$$file; then \
+      dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
       if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
         cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
@@ -636 +639 @@
     ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
     ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-    ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+    ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
   || chmod -R a+r $(distdir)
 dist-gzip: distdir
@@ -644 +647 @@
 dist-bzip2: distdir
   tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+  $(am__remove_distdir)
+
+dist-lzma: distdir
+  tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
   $(am__remove_distdir)
 
@@ -672 +679 @@
   *.tar.bz2*) \
     bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+  *.tar.lzma*) \
+    unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
   *.tar.Z*) \
     uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
@@ -711 +720 @@
   @(echo "$(distdir) archives ready for distribution: "; \
     list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-    sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+    sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
   @cd $(distuninstallcheck_dir) \
@@ -735 +744 @@
 installdirs:
   for dir in "$(DESTDIR)$(bindir)"; do \
-    test -z "$$dir" || $(mkdir_p) "$$dir"; \
+    test -z "$$dir" || $(MKDIR_P) "$$dir"; \
   done
 install: install-am
@@ -785 +794 @@
 install-data-am:
 
+install-dvi: install-dvi-am
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
 install-info: install-info-am
 
 install-man:
+
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
 
 installcheck-am:
@@ -812 +829 @@
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
   clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
-  dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-  distclean-compile distclean-generic distclean-hdr \
+  dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+  distclean distclean-compile distclean-generic distclean-hdr \
   distclean-tags distcleancheck distdir distuninstallcheck dvi \
   dvi-am html html-am info info-am install install-am \
-  install-binPROGRAMS install-data install-data-am install-exec \
-  install-exec-am install-info install-info-am install-man \
+  install-binPROGRAMS install-data install-data-am install-dvi \
+  install-dvi-am install-exec install-exec-am install-html \
+  install-html-am install-info install-info-am install-man \
+  install-pdf install-pdf-am install-ps install-ps-am \
   install-strip installcheck installcheck-am installdirs \
   maintainer-clean maintainer-clean-generic mostlyclean \
   mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-  tags uninstall uninstall-am uninstall-binPROGRAMS \
-  uninstall-info-am
+  tags uninstall uninstall-am uninstall-binPROGRAMS
 
 

trunk/config.h.in

@@ -476 +476 @@
 /* picoLCD driver */
 #undef WITH_PICOLCD
+
+/* picoLCDGraphic driver */
+#undef WITH_PICOLCDGRAPHIC
 
 /* PNG driver */

trunk/configure

@@ -1346 +1346 @@
                           G15, HD44780, LCD2USB LCDLinux, LCDTerm, LPH7508,
                           LUIse, M50530, MatrixOrbital, MilfordInstruments,
-                          Noritake, NULL, PNG, PPM, Pertelian, picoLCD, RouterBoard,
-                          Sample, serdisplib, SimpleLCD, st2205, T6963, Trefon,
+                          Noritake, NULL, PNG, PPM, Pertelian, picoLCD, picoLCDGraphic,
+                          RouterBoard, Sample, serdisplib, SimpleLCD, st2205, T6963, Trefon,
                           USBLCD, USBHUB, WincorNixdorf, X11
   --with-plugins=<list>   choose which plugins to compile.
@@ -7557 +7557 @@
          PERTELIAN="yes"
          PICOLCD="yes"
+   PICOLCDGRAPHIC="yes"
          PNG="yes"
          PPM="yes"
@@ -7637 +7638 @@
          PICOLCD=$val
          ;;
+      picoLCDGraphic)
+         PICOLCDGRAPHIC=$val
+         ;;
+
       PNG)
          PNG=$val
@@ -7808 +7813 @@
    I2C="yes"
    GPIO="yes"
+   KEYPAD="yes"
    DRIVERS="$DRIVERS drv_HD44780.o"
 
@@ -7997 +8003 @@
       { echo "$as_me:$LINENO: WARNING: usb.h not found: picoLCD driver disabled" >&5
 echo "$as_me: WARNING: usb.h not found: picoLCD driver disabled" >&2;}
+   fi
+fi
+
+if test "$PICOLCDGRAPHIC" = "yes"; then
+   if test "$has_usb" = "true"; then
+      TEXT="yes"
+      GRAPHIC="yes"
+      GPIO="yes"
+      SERIAL="yes"
+      LIBUSB="yes"
+      DRIVERS="$DRIVERS drv_picoLCDGraphic.o"
+
+cat >>confdefs.h <<\_ACEOF
+#define WITH_PICOLCDGRAPHIC 1
+_ACEOF
+
+   else
+      { echo "$as_me:$LINENO: WARNING: usb.h not found: picoLCDGraphic driver disabled" >&5
+echo "$as_me: WARNING: usb.h not found: picoLCDGraphic driver disabled" >&2;}
    fi
 fi

trunk/drivers.m4

@@ -36 +36 @@
   [                        G15, HD44780, LCD2USB LCDLinux, LCDTerm, LPH7508,]
   [                        LUIse, M50530, MatrixOrbital, MilfordInstruments,]
-  [                        Noritake, NULL, PNG, PPM, Pertelian, picoLCD, RouterBoard,]
-  [                        Sample, serdisplib, SimpleLCD, st2205, T6963, Trefon,]
+  [                        Noritake, NULL, PNG, PPM, Pertelian, picoLCD, picoLCDGraphic,]
+  [                        RouterBoard, Sample, serdisplib, SimpleLCD, st2205, T6963, Trefon,]
   [                        USBLCD, USBHUB, WincorNixdorf, X11],
   drivers=$withval, 
@@ -80 +80 @@
          PERTELIAN="yes"
          PICOLCD="yes"
+   PICOLCDGRAPHIC="yes"
          PNG="yes"
          PPM="yes"
@@ -160 +161 @@
          PICOLCD=$val
          ;;         
+      picoLCDGraphic)
+         PICOLCDGRAPHIC=$val
+         ;;         
+         
       PNG)
          PNG=$val
@@ -297 +302 @@
    I2C="yes"
    GPIO="yes"
+   KEYPAD="yes"
    DRIVERS="$DRIVERS drv_HD44780.o"
    AC_DEFINE(WITH_HD44780,1,[HD44780 driver])
@@ -422 +428 @@
    else
       AC_MSG_WARN(usb.h not found: picoLCD driver disabled)
+   fi
+fi
+
+if test "$PICOLCDGRAPHIC" = "yes"; then
+   if test "$has_usb" = "true"; then
+      TEXT="yes"
+      GRAPHIC="yes"
+      GPIO="yes"
+      SERIAL="yes"
+      LIBUSB="yes"
+      DRIVERS="$DRIVERS drv_picoLCDGraphic.o"
+      AC_DEFINE(WITH_PICOLCDGRAPHIC,1,[picoLCDGraphic driver])
+   else
+      AC_MSG_WARN(usb.h not found: picoLCDGraphic driver disabled)
    fi
 fi

trunk/drv.c

@@ -70 +70 @@
 extern DRIVER drv_Pertelian;
 extern DRIVER drv_picoLCD;
+extern DRIVER drv_picoLCDGraphic;
 extern DRIVER drv_RouterBoard;
 extern DRIVER drv_Sample;
@@ -154 +155 @@
 #ifdef WITH_PICOLCD
     &drv_picoLCD,
+#endif
+#ifdef WITH_PICOLCDGRAPHIC
+    &drv_picoLCDGraphic,
 #endif
 #ifdef WITH_ROUTERBOARD

trunk/lcd4linux.conf.sample

@@ -253 +253 @@
     Backlight 1
     Icons     1
+}
+
+Display picoLCDGraphic {
+    Driver 'picoLCDGraphic'
+    Size     '256x64'
+    Contrast  0
+    Backlight 100
 }
 

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 PNG PPM RouterBoard Sample serdisplib SimpleLCD T6963 Trefon USBHUB USBLCD WincorNixdorf X11; do
+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
 
     make distclean