diff options
| -rw-r--r-- | Make.config | 8 | ||||
| -rw-r--r-- | docs/DRIVER.ax206dpf | 2 | ||||
| -rw-r--r-- | glcddrivers/Makefile | 12 | ||||
| -rw-r--r-- | glcddrivers/drivers.c | 18 | ||||
| -rw-r--r-- | glcddrivers/drivers.h | 6 | ||||
| -rw-r--r-- | graphlcd.conf | 2 |
6 files changed, 25 insertions, 23 deletions
diff --git a/Make.config b/Make.config index f782845..238be3f 100644 --- a/Make.config +++ b/Make.config @@ -74,11 +74,13 @@ HAVE_FONTCONFIG=1 #HAVE_GRAPHICSMAGICK=1 # comment this variable or set to 0 if you do not want to build the vncserver driver, even if requirements (libvncserver) are fullfilled on the system -WANT_DRV_VNCSERVER=1 +HAVE_DRIVER_VNCSERVER=1 + +### Experimental drivers # uncomment this variable if you want to enable the experimental AX 206 based digital photo frame driver # Read DRIVER.ax206dpf before use! -#HAVE_AX206DPF_EXPERIMENTAL=1 +#HAVE_DRIVER_AX206DPF=1 # uncomment this variable if you want to enable the experimental support for picoLCD 256x64 -#HAVE_picoLCD_256x64_EXPERIMENTAL=1 +#HAVE_DRIVER_picoLCD_256x64=1 diff --git a/docs/DRIVER.ax206dpf b/docs/DRIVER.ax206dpf index 268c74d..7c11d97 100644 --- a/docs/DRIVER.ax206dpf +++ b/docs/DRIVER.ax206dpf @@ -16,7 +16,7 @@ http://www.pearl.de/a-PX1184-5618.shtml or http://www.pearl.de/a-HPM1184-5618.sh Important Notes --------------- This driver is experimental and not enabled by default. -To use this driver uncomment the HAVE_AX206DPF_EXPERIMENTAL line in +To use this driver uncomment the HAVE_DRIVER_AX206DPF line in Make.config and recompile the library. The DPF does not work out of the box with this driver. It has to be modified with a custom firmware (see "Hacking your DPF"). diff --git a/glcddrivers/Makefile b/glcddrivers/Makefile index 040b1f0..9f70592 100644 --- a/glcddrivers/Makefile +++ b/glcddrivers/Makefile @@ -28,23 +28,23 @@ endif ifeq ($(shell pkg-config --exists libusb && echo 1), 1) DEFINES += -DHAVE_LIBUSB - ifdef HAVE_AX206DPF_EXPERIMENTAL + ifdef HAVE_DRIVER_AX206DPF OBJS += ax206dpf.o INCLUDES += $(shell pkg-config --cflags libusb) LIBS += $(shell pkg-config --libs libusb) - DEFINES += -DHAVE_AX206DPF_EXPERIMENTAL + DEFINES += -DHAVE_DRIVER_AX206DPF endif - ifdef HAVE_picoLCD_256x64_EXPERIMENTAL + ifdef HAVE_DRIVER_picoLCD_256x64 OBJS += picoLCD_256x64.o INCLUDES += $(shell pkg-config --cflags libusb) LIBS += $(shell pkg-config --libs libusb) - DEFINES += -DHAVE_picoLCD_256x64_EXPERIMENTAL + DEFINES += -DHAVE_DRIVER_picoLCD_256x64 endif endif -ifeq ($(WANT_DRV_VNCSERVER), 1) +ifeq ($(HAVE_DRIVER_VNCSERVER), 1) ifeq ($(shell libvncserver-config --version >/dev/null && echo 1), 1) - DEFINES += -DHAVE_LIBVNCSERVER + DEFINES += -DHAVE_DRIVER_VNCSERVER OBJS += vncserver.o INCLUDES += $(shell libvncserver-config --cflags) LIBS += $(shell libvncserver-config --libs) diff --git a/glcddrivers/drivers.c b/glcddrivers/drivers.c index 9aa70ac..e720c0e 100644 --- a/glcddrivers/drivers.c +++ b/glcddrivers/drivers.c @@ -30,13 +30,13 @@ #include "dm140gink.h" #include "serdisp.h" #include "g15daemon.h" -#ifdef HAVE_AX206DPF_EXPERIMENTAL +#ifdef HAVE_DRIVER_AX206DPF #include "ax206dpf.h" #endif -#ifdef HAVE_picoLCD_256x64_EXPERIMENTAL +#ifdef HAVE_DRIVER_picoLCD_256x64 #include "picoLCD_256x64.h" #endif -#ifdef HAVE_LIBVNCSERVER +#ifdef HAVE_DRIVER_VNCSERVER #include "vncserver.h" #endif @@ -63,13 +63,13 @@ tDriver drivers[] = {"dm140gink", kDriverDM140GINK}, {"serdisp", kDriverSerDisp}, {"g15daemon", kDriverG15daemon}, -#ifdef HAVE_AX206DPF_EXPERIMENTAL +#ifdef HAVE_DRIVER_AX206DPF {"ax206dpf", kDriverAX206DPF}, #endif -#ifdef HAVE_picoLCD_256x64_EXPERIMENTAL +#ifdef HAVE_DRIVER_picoLCD_256x64 {"picolcd256x64", kDriverPicoLCD_256x64}, #endif -#ifdef HAVE_LIBVNCSERVER +#ifdef HAVE_DRIVER_VNCSERVER {"vncserver", kDriverVncServer}, #endif {"", kDriverUnknown} @@ -130,15 +130,15 @@ cDriver * CreateDriver(int driverID, cDriverConfig * config) return new cDriverSerDisp(config); case kDriverG15daemon: return new cDriverG15daemon(config); -#ifdef HAVE_AX206DPF_EXPERIMENTAL +#ifdef HAVE_DRIVER_AX206DPF case kDriverAX206DPF: return new cDriverAX206DPF(config); #endif -#ifdef HAVE_picoLCD_256x64_EXPERIMENTAL +#ifdef HAVE_DRIVER_picoLCD_256x64 case kDriverPicoLCD_256x64: return new cDriverPicoLCD_256x64(config); #endif -#ifdef HAVE_LIBVNCSERVER +#ifdef HAVE_DRIVER_VNCSERVER case kDriverVncServer: return new cDriverVncServer(config); #endif diff --git a/glcddrivers/drivers.h b/glcddrivers/drivers.h index c7bbdf8..3968e81 100644 --- a/glcddrivers/drivers.h +++ b/glcddrivers/drivers.h @@ -40,13 +40,13 @@ enum eDriver kDriverNetwork = 14, kDriverGU126X64D_K610A4 = 15, kDriverDM140GINK = 16, -#ifdef HAVE_AX206DPF_EXPERIMENTAL +#ifdef HAVE_DRIVER_AX206DPF kDriverAX206DPF = 17, #endif -#ifdef HAVE_picoLCD_256x64_EXPERIMENTAL +#ifdef HAVE_DRIVER_picoLCD_256x64 kDriverPicoLCD_256x64 = 18, #endif -#ifdef HAVE_LIBVNCSERVER +#ifdef HAVE_DRIVER_VNCSERVER kDriverVncServer = 19, #endif kDriverSerDisp = 100, diff --git a/graphlcd.conf b/graphlcd.conf index ef65bbf..e14a589 100644 --- a/graphlcd.conf +++ b/graphlcd.conf @@ -579,7 +579,7 @@ Driver=dm140gink [ax206dpf] # THIS IS AN EXPERIMENTAL DRIVER! -# You have to uncomment the variable HAVE_AX206DPF_EXPERIMENTAL +# You have to uncomment the variable HAVE_DRIVER_AX206DPF # in Make.config to use this driver. # READ the READDME.ax206dpf before use! # |