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/drivers.h | |
| 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/drivers.h')
| -rw-r--r-- | glcddrivers/drivers.h | 11 |
1 files changed, 6 insertions, 5 deletions
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 |