diff options
| author | Andreas Regel <andreas.regel@gmx.de> | 2016-10-20 20:49:18 +0200 |
|---|---|---|
| committer | Andreas Regel <andreas.regel@gmx.de> | 2016-10-20 20:49:18 +0200 |
| commit | 7958e1b058b98ecf8d8a3fbeebbee71572a2ac21 (patch) | |
| tree | 0f336c3f9784c4afa1c954ed2081eb164c463b43 /glcddrivers | |
| parent | d4622366d9886fcb62a74507af362dbe73573bcc (diff) | |
| parent | aacb78d4335e498417835d518c64b33acb58c749 (diff) | |
| download | graphlcd-base-7958e1b058b98ecf8d8a3fbeebbee71572a2ac21.tar.gz graphlcd-base-7958e1b058b98ecf8d8a3fbeebbee71572a2ac21.tar.bz2 | |
Merge branch 'master' into touchcol
# Conflicts:
# HISTORY
# Makefile
# glcddrivers/Makefile
# glcddrivers/drivers.c
# glcddrivers/drivers.h
# glcddrivers/futabaMDM166A.c
# glcddrivers/futabaMDM166A.h
# glcddrivers/image.c
# glcddrivers/noritake800.c
# glcddrivers/noritake800.h
# glcdgraphics/Makefile
# glcdgraphics/bitmap.c
# glcdgraphics/bitmap.h
# glcdgraphics/font.c
# glcdgraphics/font.h
# glcdskin/config.h
# glcdskin/display.c
# glcdskin/display.h
# glcdskin/object.c
# glcdskin/object.h
# glcdskin/parser.c
# graphlcd.conf
# tools/convpic/Makefile
# tools/crtfont/Makefile
# tools/genfont/Makefile
# tools/lcdtestpattern/Makefile
# tools/showpic/Makefile
# tools/showpic/showpic.c
# tools/showtext/Makefile
Diffstat (limited to 'glcddrivers')
| -rw-r--r-- | glcddrivers/Makefile | 2 | ||||
| -rw-r--r-- | glcddrivers/drivers.c | 10 | ||||
| -rw-r--r-- | glcddrivers/drivers.h | 11 | ||||
| -rw-r--r-- | glcddrivers/futabaMDM166A.h | 2 | ||||
| -rw-r--r-- | glcddrivers/gu256x64-372.c | 6 |
5 files changed, 21 insertions, 10 deletions
diff --git a/glcddrivers/Makefile b/glcddrivers/Makefile index e144698..8c2b3d6 100644 --- a/glcddrivers/Makefile +++ b/glcddrivers/Makefile @@ -66,7 +66,7 @@ endif ### Implicit rules: %.o: %.c - $(CXX) $(CXXEXTRA) $(CXXFLAGS) $(LDFLAGS) -c $(DEFINES) $(INCLUDES) $< + $(CXX) $(CXXEXTRA) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< # Dependencies: diff --git a/glcddrivers/drivers.c b/glcddrivers/drivers.c index d30a2e5..4c7e67a 100644 --- a/glcddrivers/drivers.c +++ b/glcddrivers/drivers.c @@ -30,6 +30,9 @@ #include "dm140gink.h" #include "serdisp.h" #include "g15daemon.h" +#ifdef HAVE_LIBHID +#include "futabaMDM166A.h" +#endif #ifdef HAVE_DRIVER_AX206DPF #include "ax206dpf.h" #endif @@ -67,6 +70,9 @@ tDriver drivers[] = {"network", kDriverNetwork}, {"gu126x64D-K610A4", kDriverGU126X64D_K610A4}, {"dm140gink", kDriverDM140GINK}, +#ifdef HAVE_LIBHID + {"futabaMDM166A", kDriverFutabaMDM166A}, +#endif {"serdisp", kDriverSerDisp}, {"g15daemon", kDriverG15daemon}, #ifdef HAVE_DRIVER_AX206DPF @@ -138,6 +144,10 @@ cDriver * CreateDriver(int driverID, cDriverConfig * config) return new cDriverGU126X64D_K610A4(config); case kDriverDM140GINK: return new cDriverDM140GINK(config); +#ifdef HAVE_LIBHID + case kDriverFutabaMDM166A: + return new cDriverFutabaMDM166A(config); +#endif case kDriverSerDisp: return new cDriverSerDisp(config); case kDriverG15daemon: diff --git a/glcddrivers/drivers.h b/glcddrivers/drivers.h index fe19d2f..970b01e 100644 --- a/glcddrivers/drivers.h +++ b/glcddrivers/drivers.h @@ -40,20 +40,21 @@ enum eDriver kDriverNetwork = 14, kDriverGU126X64D_K610A4 = 15, kDriverDM140GINK = 16, + kDriverFutabaMDM166A = 17, #ifdef HAVE_DRIVER_AX206DPF - kDriverAX206DPF = 17, + kDriverAX206DPF = 18, #endif #ifdef HAVE_DRIVER_picoLCD_256x64 - kDriverPicoLCD_256x64 = 18, + kDriverPicoLCD_256x64 = 19, #endif #ifdef HAVE_DRIVER_VNCSERVER - kDriverVncServer = 19, + kDriverVncServer = 20, #endif #ifdef HAVE_DRIVER_SSD1306 - kDriverSSD1306 = 20, + kDriverSSD1306 = 21, #endif #ifdef HAVE_DRIVER_ILI9341 - kDriverILI9341 = 21, + kDriverILI9341 = 22, #endif kDriverSerDisp = 100, kDriverG15daemon = 200 diff --git a/glcddrivers/futabaMDM166A.h b/glcddrivers/futabaMDM166A.h index ec3b046..65323be 100644 --- a/glcddrivers/futabaMDM166A.h +++ b/glcddrivers/futabaMDM166A.h @@ -62,7 +62,7 @@ namespace GLCD virtual int DeInit(); virtual void Clear(); - virtual void SetPixel(int x, int y, uint32_t data); + virtual void SetPixel(int x, int y, uint32_t data); //virtual void Set8Pixels(int x, int y, byte data); virtual void Refresh(bool refreshAll = false); diff --git a/glcddrivers/gu256x64-372.c b/glcddrivers/gu256x64-372.c index 5cbff7a..1709568 100644 --- a/glcddrivers/gu256x64-372.c +++ b/glcddrivers/gu256x64-372.c @@ -76,10 +76,10 @@ const unsigned char kStandardRDLO = 0x00; // const unsigned char kStandardCDHI = 0x00; // 17 / nSELECT const unsigned char kStandardCDLO = 0x08; // -const unsigned char kWindowsWRHI = 0x00; // 01 / nSTRB -const unsigned char kWindowsWRLO = 0x01; // +const unsigned char kWindowsWRHI = 0x01; // 01 / nSTRB +const unsigned char kWindowsWRLO = 0x00; // const unsigned char kWindowsRDHI = 0x00; // 14 / nLINEFEED -const unsigned char kWindowsRDLO = 0x02; // +const unsigned char kWindowsRDLO = 0x00; // const unsigned char kWindowsCDHI = 0x00; // 17 / nSELECT const unsigned char kWindowsCDLO = 0x08; // |