From 5f6a87c7c09793d2c04fcd9bfce5efcac87a97bd Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Mon, 19 Aug 2019 18:17:44 +0200 Subject: [PATCH] Update libraries and fix SSD1306 power control Update libraries and fix SSD1306 power control --- .../.gitignore | 0 .../.travis.yml | 0 .../Adafruit_GFX.cpp | 0 .../Adafruit_GFX.h | 0 .../Adafruit_SPITFT.cpp | 0 .../Adafruit_SPITFT.h | 0 .../Adafruit_SPITFT_Macros.h | 0 .../Fonts/FreeMono12pt7b.h | 0 .../Fonts/FreeMono18pt7b.h | 0 .../Fonts/FreeMono24pt7b.h | 0 .../Fonts/FreeMono9pt7b.h | 0 .../Fonts/FreeMonoBold12pt7b.h | 0 .../Fonts/FreeMonoBold18pt7b.h | 0 .../Fonts/FreeMonoBold24pt7b.h | 0 .../Fonts/FreeMonoBold9pt7b.h | 0 .../Fonts/FreeMonoBoldOblique12pt7b.h | 0 .../Fonts/FreeMonoBoldOblique18pt7b.h | 0 .../Fonts/FreeMonoBoldOblique24pt7b.h | 0 .../Fonts/FreeMonoBoldOblique9pt7b.h | 0 .../Fonts/FreeMonoOblique12pt7b.h | 0 .../Fonts/FreeMonoOblique18pt7b.h | 0 .../Fonts/FreeMonoOblique24pt7b.h | 0 .../Fonts/FreeMonoOblique9pt7b.h | 0 .../Fonts/FreeSans12pt7b.h | 0 .../Fonts/FreeSans18pt7b.h | 0 .../Fonts/FreeSans24pt7b.h | 0 .../Fonts/FreeSans9pt7b.h | 0 .../Fonts/FreeSansBold12pt7b.h | 0 .../Fonts/FreeSansBold18pt7b.h | 0 .../Fonts/FreeSansBold24pt7b.h | 0 .../Fonts/FreeSansBold9pt7b.h | 0 .../Fonts/FreeSansBoldOblique12pt7b.h | 0 .../Fonts/FreeSansBoldOblique18pt7b.h | 0 .../Fonts/FreeSansBoldOblique24pt7b.h | 0 .../Fonts/FreeSansBoldOblique9pt7b.h | 0 .../Fonts/FreeSansOblique12pt7b.h | 0 .../Fonts/FreeSansOblique18pt7b.h | 0 .../Fonts/FreeSansOblique24pt7b.h | 0 .../Fonts/FreeSansOblique9pt7b.h | 0 .../Fonts/FreeSerif12pt7b.h | 0 .../Fonts/FreeSerif18pt7b.h | 0 .../Fonts/FreeSerif24pt7b.h | 0 .../Fonts/FreeSerif9pt7b.h | 0 .../Fonts/FreeSerifBold12pt7b.h | 0 .../Fonts/FreeSerifBold18pt7b.h | 0 .../Fonts/FreeSerifBold24pt7b.h | 0 .../Fonts/FreeSerifBold9pt7b.h | 0 .../Fonts/FreeSerifBoldItalic12pt7b.h | 0 .../Fonts/FreeSerifBoldItalic18pt7b.h | 0 .../Fonts/FreeSerifBoldItalic24pt7b.h | 0 .../Fonts/FreeSerifBoldItalic9pt7b.h | 0 .../Fonts/FreeSerifItalic12pt7b.h | 0 .../Fonts/FreeSerifItalic18pt7b.h | 0 .../Fonts/FreeSerifItalic24pt7b.h | 0 .../Fonts/FreeSerifItalic9pt7b.h | 0 .../Fonts/Org_01.h | 0 .../Fonts/Picopixel.h | 0 .../Fonts/Tiny3x3a2pt7b.h | 0 .../Fonts/TomThumb.h | 0 .../README.md | 0 .../examples/mock_ili9341/mock_ili9341.ino | 0 .../fontconvert/Makefile | 0 .../fontconvert/fontconvert.c | 0 .../fontconvert/fontconvert_win.md | 0 .../fontconvert/makefonts.sh | 0 .../gfxfont.h | 0 .../glcdfont.c | 0 .../library.properties | 0 .../license.txt | 0 .../Adafruit_SH1106.cpp | 0 .../Adafruit_SH1106.h | 0 .../LICENSE.txt | 0 .../README.md | 0 .../sh1106_128x64_i2c/sh1106_128x64_i2c.ino | 0 .../sh1106_128x64_spi/sh1106_128x64_spi.ino | 0 .../.github/ISSUE_TEMPLATE.md | 0 .../.github/PULL_REQUEST_TEMPLATE.md | 0 .../.gitignore | 0 .../.travis.yml | 0 .../Adafruit_SSD1306.cpp | 10 ++++++ .../Adafruit_SSD1306.h | 1 + .../README.md | 0 .../OLED_featherwing/OLED_featherwing.ino | 0 .../ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino | 0 .../ssd1306_128x32_spi/ssd1306_128x32_spi.ino | 0 .../ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino | 0 .../ssd1306_128x64_spi/ssd1306_128x64_spi.ino | 0 .../library.properties | 0 .../license.txt | 0 .../splash.h | 0 sonoff/_changelog.ino | 2 ++ sonoff/xdrv_13_display.ino | 32 +++++++++++-------- sonoff/xdsp_02_ssd1306.ino | 26 +++++++-------- 93 files changed, 44 insertions(+), 27 deletions(-) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/.gitignore (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/.travis.yml (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Adafruit_GFX.cpp (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Adafruit_GFX.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Adafruit_SPITFT.cpp (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Adafruit_SPITFT.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Adafruit_SPITFT_Macros.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeMono12pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeMono18pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeMono24pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeMono9pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeMonoBold12pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeMonoBold18pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeMonoBold24pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeMonoBold9pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeMonoBoldOblique12pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeMonoBoldOblique18pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeMonoBoldOblique24pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeMonoBoldOblique9pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeMonoOblique12pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeMonoOblique18pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeMonoOblique24pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeMonoOblique9pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSans12pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSans18pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSans24pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSans9pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSansBold12pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSansBold18pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSansBold24pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSansBold9pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSansBoldOblique12pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSansBoldOblique18pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSansBoldOblique24pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSansBoldOblique9pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSansOblique12pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSansOblique18pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSansOblique24pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSansOblique9pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSerif12pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSerif18pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSerif24pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSerif9pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSerifBold12pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSerifBold18pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSerifBold24pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSerifBold9pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSerifBoldItalic12pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSerifBoldItalic18pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSerifBoldItalic24pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSerifBoldItalic9pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSerifItalic12pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSerifItalic18pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSerifItalic24pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/FreeSerifItalic9pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/Org_01.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/Picopixel.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/Tiny3x3a2pt7b.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/Fonts/TomThumb.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/README.md (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/examples/mock_ili9341/mock_ili9341.ino (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/fontconvert/Makefile (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/fontconvert/fontconvert.c (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/fontconvert/fontconvert_win.md (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/fontconvert/makefonts.sh (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/gfxfont.h (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/glcdfont.c (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/library.properties (100%) rename lib/{Adafruit-GFX-Library-1.5.6 => Adafruit-GFX-Library-1.5.6-gemu-1.0}/license.txt (100%) rename lib/{Adafruit_SH1106 => Adafruit_SH1106-gemu-1.0}/Adafruit_SH1106.cpp (100%) mode change 100755 => 100644 rename lib/{Adafruit_SH1106 => Adafruit_SH1106-gemu-1.0}/Adafruit_SH1106.h (100%) mode change 100755 => 100644 rename lib/{Adafruit_SH1106 => Adafruit_SH1106-gemu-1.0}/LICENSE.txt (100%) mode change 100755 => 100644 rename lib/{Adafruit_SH1106 => Adafruit_SH1106-gemu-1.0}/README.md (100%) mode change 100755 => 100644 rename lib/{Adafruit_SH1106 => Adafruit_SH1106-gemu-1.0}/examples/sh1106_128x64_i2c/sh1106_128x64_i2c.ino (100%) mode change 100755 => 100644 rename lib/{Adafruit_SH1106 => Adafruit_SH1106-gemu-1.0}/examples/sh1106_128x64_spi/sh1106_128x64_spi.ino (100%) mode change 100755 => 100644 rename lib/{Adafruit_SSD1306-1.3.0 => Adafruit_SSD1306-1.3.0-gemu-1.1}/.github/ISSUE_TEMPLATE.md (100%) rename lib/{Adafruit_SSD1306-1.3.0 => Adafruit_SSD1306-1.3.0-gemu-1.1}/.github/PULL_REQUEST_TEMPLATE.md (100%) rename lib/{Adafruit_SSD1306-1.3.0 => Adafruit_SSD1306-1.3.0-gemu-1.1}/.gitignore (100%) rename lib/{Adafruit_SSD1306-1.3.0 => Adafruit_SSD1306-1.3.0-gemu-1.1}/.travis.yml (100%) rename lib/{Adafruit_SSD1306-1.3.0 => Adafruit_SSD1306-1.3.0-gemu-1.1}/Adafruit_SSD1306.cpp (99%) rename lib/{Adafruit_SSD1306-1.3.0 => Adafruit_SSD1306-1.3.0-gemu-1.1}/Adafruit_SSD1306.h (99%) rename lib/{Adafruit_SSD1306-1.3.0 => Adafruit_SSD1306-1.3.0-gemu-1.1}/README.md (100%) rename lib/{Adafruit_SSD1306-1.3.0 => Adafruit_SSD1306-1.3.0-gemu-1.1}/examples/OLED_featherwing/OLED_featherwing.ino (100%) rename lib/{Adafruit_SSD1306-1.3.0 => Adafruit_SSD1306-1.3.0-gemu-1.1}/examples/ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino (100%) rename lib/{Adafruit_SSD1306-1.3.0 => Adafruit_SSD1306-1.3.0-gemu-1.1}/examples/ssd1306_128x32_spi/ssd1306_128x32_spi.ino (100%) rename lib/{Adafruit_SSD1306-1.3.0 => Adafruit_SSD1306-1.3.0-gemu-1.1}/examples/ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino (100%) rename lib/{Adafruit_SSD1306-1.3.0 => Adafruit_SSD1306-1.3.0-gemu-1.1}/examples/ssd1306_128x64_spi/ssd1306_128x64_spi.ino (100%) rename lib/{Adafruit_SSD1306-1.3.0 => Adafruit_SSD1306-1.3.0-gemu-1.1}/library.properties (100%) rename lib/{Adafruit_SSD1306-1.3.0 => Adafruit_SSD1306-1.3.0-gemu-1.1}/license.txt (100%) rename lib/{Adafruit_SSD1306-1.3.0 => Adafruit_SSD1306-1.3.0-gemu-1.1}/splash.h (100%) diff --git a/lib/Adafruit-GFX-Library-1.5.6/.gitignore b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/.gitignore similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/.gitignore rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/.gitignore diff --git a/lib/Adafruit-GFX-Library-1.5.6/.travis.yml b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/.travis.yml similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/.travis.yml rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/.travis.yml diff --git a/lib/Adafruit-GFX-Library-1.5.6/Adafruit_GFX.cpp b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.cpp similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Adafruit_GFX.cpp rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.cpp diff --git a/lib/Adafruit-GFX-Library-1.5.6/Adafruit_GFX.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Adafruit_GFX.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_GFX.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Adafruit_SPITFT.cpp b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_SPITFT.cpp similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Adafruit_SPITFT.cpp rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_SPITFT.cpp diff --git a/lib/Adafruit-GFX-Library-1.5.6/Adafruit_SPITFT.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_SPITFT.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Adafruit_SPITFT.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_SPITFT.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Adafruit_SPITFT_Macros.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_SPITFT_Macros.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Adafruit_SPITFT_Macros.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Adafruit_SPITFT_Macros.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMono12pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono12pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMono12pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono12pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMono18pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono18pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMono18pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono18pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMono24pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono24pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMono24pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono24pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMono9pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono9pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMono9pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMono9pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoBold12pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold12pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoBold12pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold12pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoBold18pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold18pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoBold18pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold18pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoBold24pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold24pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoBold24pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold24pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoBold9pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold9pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoBold9pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBold9pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoBoldOblique12pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique12pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoBoldOblique12pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique12pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoBoldOblique18pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique18pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoBoldOblique18pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique18pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoBoldOblique24pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique24pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoBoldOblique24pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique24pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoBoldOblique9pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique9pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoBoldOblique9pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoBoldOblique9pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoOblique12pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique12pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoOblique12pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique12pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoOblique18pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique18pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoOblique18pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique18pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoOblique24pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique24pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoOblique24pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique24pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoOblique9pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique9pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeMonoOblique9pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeMonoOblique9pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSans12pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans12pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSans12pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans12pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSans18pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans18pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSans18pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans18pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSans24pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans24pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSans24pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans24pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSans9pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans9pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSans9pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSans9pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansBold12pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold12pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansBold12pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold12pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansBold18pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold18pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansBold18pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold18pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansBold24pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold24pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansBold24pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold24pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansBold9pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold9pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansBold9pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBold9pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansBoldOblique12pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique12pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansBoldOblique12pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique12pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansBoldOblique18pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique18pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansBoldOblique18pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique18pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansBoldOblique24pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique24pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansBoldOblique24pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique24pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansBoldOblique9pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique9pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansBoldOblique9pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansBoldOblique9pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansOblique12pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique12pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansOblique12pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique12pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansOblique18pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique18pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansOblique18pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique18pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansOblique24pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique24pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansOblique24pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique24pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansOblique9pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique9pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSansOblique9pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSansOblique9pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerif12pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif12pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerif12pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif12pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerif18pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif18pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerif18pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif18pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerif24pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif24pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerif24pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif24pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerif9pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif9pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerif9pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerif9pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifBold12pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold12pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifBold12pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold12pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifBold18pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold18pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifBold18pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold18pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifBold24pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold24pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifBold24pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold24pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifBold9pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold9pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifBold9pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBold9pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifBoldItalic12pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic12pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifBoldItalic12pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic12pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifBoldItalic18pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic18pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifBoldItalic18pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic18pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifBoldItalic24pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic24pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifBoldItalic24pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic24pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifBoldItalic9pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic9pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifBoldItalic9pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifBoldItalic9pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifItalic12pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic12pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifItalic12pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic12pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifItalic18pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic18pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifItalic18pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic18pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifItalic24pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic24pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifItalic24pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic24pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifItalic9pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic9pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/FreeSerifItalic9pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/FreeSerifItalic9pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/Org_01.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/Org_01.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/Org_01.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/Org_01.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/Picopixel.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/Picopixel.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/Picopixel.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/Picopixel.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/Tiny3x3a2pt7b.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/Tiny3x3a2pt7b.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/Tiny3x3a2pt7b.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/Tiny3x3a2pt7b.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/Fonts/TomThumb.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/TomThumb.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/Fonts/TomThumb.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/Fonts/TomThumb.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/README.md b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/README.md similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/README.md rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/README.md diff --git a/lib/Adafruit-GFX-Library-1.5.6/examples/mock_ili9341/mock_ili9341.ino b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/examples/mock_ili9341/mock_ili9341.ino similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/examples/mock_ili9341/mock_ili9341.ino rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/examples/mock_ili9341/mock_ili9341.ino diff --git a/lib/Adafruit-GFX-Library-1.5.6/fontconvert/Makefile b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/Makefile similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/fontconvert/Makefile rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/Makefile diff --git a/lib/Adafruit-GFX-Library-1.5.6/fontconvert/fontconvert.c b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/fontconvert.c similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/fontconvert/fontconvert.c rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/fontconvert.c diff --git a/lib/Adafruit-GFX-Library-1.5.6/fontconvert/fontconvert_win.md b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/fontconvert_win.md similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/fontconvert/fontconvert_win.md rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/fontconvert_win.md diff --git a/lib/Adafruit-GFX-Library-1.5.6/fontconvert/makefonts.sh b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/makefonts.sh similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/fontconvert/makefonts.sh rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/fontconvert/makefonts.sh diff --git a/lib/Adafruit-GFX-Library-1.5.6/gfxfont.h b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/gfxfont.h similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/gfxfont.h rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/gfxfont.h diff --git a/lib/Adafruit-GFX-Library-1.5.6/glcdfont.c b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/glcdfont.c similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/glcdfont.c rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/glcdfont.c diff --git a/lib/Adafruit-GFX-Library-1.5.6/library.properties b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/library.properties similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/library.properties rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/library.properties diff --git a/lib/Adafruit-GFX-Library-1.5.6/license.txt b/lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/license.txt similarity index 100% rename from lib/Adafruit-GFX-Library-1.5.6/license.txt rename to lib/Adafruit-GFX-Library-1.5.6-gemu-1.0/license.txt diff --git a/lib/Adafruit_SH1106/Adafruit_SH1106.cpp b/lib/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.cpp old mode 100755 new mode 100644 similarity index 100% rename from lib/Adafruit_SH1106/Adafruit_SH1106.cpp rename to lib/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.cpp diff --git a/lib/Adafruit_SH1106/Adafruit_SH1106.h b/lib/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.h old mode 100755 new mode 100644 similarity index 100% rename from lib/Adafruit_SH1106/Adafruit_SH1106.h rename to lib/Adafruit_SH1106-gemu-1.0/Adafruit_SH1106.h diff --git a/lib/Adafruit_SH1106/LICENSE.txt b/lib/Adafruit_SH1106-gemu-1.0/LICENSE.txt old mode 100755 new mode 100644 similarity index 100% rename from lib/Adafruit_SH1106/LICENSE.txt rename to lib/Adafruit_SH1106-gemu-1.0/LICENSE.txt diff --git a/lib/Adafruit_SH1106/README.md b/lib/Adafruit_SH1106-gemu-1.0/README.md old mode 100755 new mode 100644 similarity index 100% rename from lib/Adafruit_SH1106/README.md rename to lib/Adafruit_SH1106-gemu-1.0/README.md diff --git a/lib/Adafruit_SH1106/examples/sh1106_128x64_i2c/sh1106_128x64_i2c.ino b/lib/Adafruit_SH1106-gemu-1.0/examples/sh1106_128x64_i2c/sh1106_128x64_i2c.ino old mode 100755 new mode 100644 similarity index 100% rename from lib/Adafruit_SH1106/examples/sh1106_128x64_i2c/sh1106_128x64_i2c.ino rename to lib/Adafruit_SH1106-gemu-1.0/examples/sh1106_128x64_i2c/sh1106_128x64_i2c.ino diff --git a/lib/Adafruit_SH1106/examples/sh1106_128x64_spi/sh1106_128x64_spi.ino b/lib/Adafruit_SH1106-gemu-1.0/examples/sh1106_128x64_spi/sh1106_128x64_spi.ino old mode 100755 new mode 100644 similarity index 100% rename from lib/Adafruit_SH1106/examples/sh1106_128x64_spi/sh1106_128x64_spi.ino rename to lib/Adafruit_SH1106-gemu-1.0/examples/sh1106_128x64_spi/sh1106_128x64_spi.ino diff --git a/lib/Adafruit_SSD1306-1.3.0/.github/ISSUE_TEMPLATE.md b/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/.github/ISSUE_TEMPLATE.md similarity index 100% rename from lib/Adafruit_SSD1306-1.3.0/.github/ISSUE_TEMPLATE.md rename to lib/Adafruit_SSD1306-1.3.0-gemu-1.1/.github/ISSUE_TEMPLATE.md diff --git a/lib/Adafruit_SSD1306-1.3.0/.github/PULL_REQUEST_TEMPLATE.md b/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from lib/Adafruit_SSD1306-1.3.0/.github/PULL_REQUEST_TEMPLATE.md rename to lib/Adafruit_SSD1306-1.3.0-gemu-1.1/.github/PULL_REQUEST_TEMPLATE.md diff --git a/lib/Adafruit_SSD1306-1.3.0/.gitignore b/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/.gitignore similarity index 100% rename from lib/Adafruit_SSD1306-1.3.0/.gitignore rename to lib/Adafruit_SSD1306-1.3.0-gemu-1.1/.gitignore diff --git a/lib/Adafruit_SSD1306-1.3.0/.travis.yml b/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/.travis.yml similarity index 100% rename from lib/Adafruit_SSD1306-1.3.0/.travis.yml rename to lib/Adafruit_SSD1306-1.3.0-gemu-1.1/.travis.yml diff --git a/lib/Adafruit_SSD1306-1.3.0/Adafruit_SSD1306.cpp b/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/Adafruit_SSD1306.cpp similarity index 99% rename from lib/Adafruit_SSD1306-1.3.0/Adafruit_SSD1306.cpp rename to lib/Adafruit_SSD1306-1.3.0-gemu-1.1/Adafruit_SSD1306.cpp index 3c273f634..b2f27c20f 100644 --- a/lib/Adafruit_SSD1306-1.3.0/Adafruit_SSD1306.cpp +++ b/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/Adafruit_SSD1306.cpp @@ -1108,6 +1108,16 @@ void Adafruit_SSD1306::dim(boolean dim) { TRANSACTION_END } +void Adafruit_SSD1306::DisplayOnff(int8_t on) { + TRANSACTION_START + if(on) { + ssd1306_command1(SSD1306_DISPLAYON); + } else { + ssd1306_command1(SSD1306_DISPLAYOFF); + } + TRANSACTION_END +} + void Adafruit_SSD1306::Updateframe(void) { display(); } diff --git a/lib/Adafruit_SSD1306-1.3.0/Adafruit_SSD1306.h b/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/Adafruit_SSD1306.h similarity index 99% rename from lib/Adafruit_SSD1306-1.3.0/Adafruit_SSD1306.h rename to lib/Adafruit_SSD1306-1.3.0-gemu-1.1/Adafruit_SSD1306.h index 69ab374fc..5df0ceba8 100644 --- a/lib/Adafruit_SSD1306-1.3.0/Adafruit_SSD1306.h +++ b/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/Adafruit_SSD1306.h @@ -140,6 +140,7 @@ public: void display(void); void invertDisplay(boolean i); void dim(boolean dim); + void DisplayOnff(int8_t on); #if 0 void clearDisplay(void); diff --git a/lib/Adafruit_SSD1306-1.3.0/README.md b/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/README.md similarity index 100% rename from lib/Adafruit_SSD1306-1.3.0/README.md rename to lib/Adafruit_SSD1306-1.3.0-gemu-1.1/README.md diff --git a/lib/Adafruit_SSD1306-1.3.0/examples/OLED_featherwing/OLED_featherwing.ino b/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/OLED_featherwing/OLED_featherwing.ino similarity index 100% rename from lib/Adafruit_SSD1306-1.3.0/examples/OLED_featherwing/OLED_featherwing.ino rename to lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/OLED_featherwing/OLED_featherwing.ino diff --git a/lib/Adafruit_SSD1306-1.3.0/examples/ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino b/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino similarity index 100% rename from lib/Adafruit_SSD1306-1.3.0/examples/ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino rename to lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x32_i2c/ssd1306_128x32_i2c.ino diff --git a/lib/Adafruit_SSD1306-1.3.0/examples/ssd1306_128x32_spi/ssd1306_128x32_spi.ino b/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x32_spi/ssd1306_128x32_spi.ino similarity index 100% rename from lib/Adafruit_SSD1306-1.3.0/examples/ssd1306_128x32_spi/ssd1306_128x32_spi.ino rename to lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x32_spi/ssd1306_128x32_spi.ino diff --git a/lib/Adafruit_SSD1306-1.3.0/examples/ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino b/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino similarity index 100% rename from lib/Adafruit_SSD1306-1.3.0/examples/ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino rename to lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x64_i2c/ssd1306_128x64_i2c.ino diff --git a/lib/Adafruit_SSD1306-1.3.0/examples/ssd1306_128x64_spi/ssd1306_128x64_spi.ino b/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x64_spi/ssd1306_128x64_spi.ino similarity index 100% rename from lib/Adafruit_SSD1306-1.3.0/examples/ssd1306_128x64_spi/ssd1306_128x64_spi.ino rename to lib/Adafruit_SSD1306-1.3.0-gemu-1.1/examples/ssd1306_128x64_spi/ssd1306_128x64_spi.ino diff --git a/lib/Adafruit_SSD1306-1.3.0/library.properties b/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/library.properties similarity index 100% rename from lib/Adafruit_SSD1306-1.3.0/library.properties rename to lib/Adafruit_SSD1306-1.3.0-gemu-1.1/library.properties diff --git a/lib/Adafruit_SSD1306-1.3.0/license.txt b/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/license.txt similarity index 100% rename from lib/Adafruit_SSD1306-1.3.0/license.txt rename to lib/Adafruit_SSD1306-1.3.0-gemu-1.1/license.txt diff --git a/lib/Adafruit_SSD1306-1.3.0/splash.h b/lib/Adafruit_SSD1306-1.3.0-gemu-1.1/splash.h similarity index 100% rename from lib/Adafruit_SSD1306-1.3.0/splash.h rename to lib/Adafruit_SSD1306-1.3.0-gemu-1.1/splash.h diff --git a/sonoff/_changelog.ino b/sonoff/_changelog.ino index 157eba93b..cc9c497e4 100644 --- a/sonoff/_changelog.ino +++ b/sonoff/_changelog.ino @@ -1,5 +1,7 @@ /*********************************************************************************************\ * 6.6.0.6 20190819 + * Add I2C display driver for SH1106 oled by Gerhard Mutz + * Add SPI display drivers for epaper 4.2 inch, ILI9488 TFT, SSD1351 Color oled and RA8876 TFT by Gerhard Mutz * * 6.6.0.5 20190816 * Add command WebSensor 0/1 to control display of sensor data in web GUI (#6085) diff --git a/sonoff/xdrv_13_display.ino b/sonoff/xdrv_13_display.ino index bb8fd78f4..6a0153545 100755 --- a/sonoff/xdrv_13_display.ino +++ b/sonoff/xdrv_13_display.ino @@ -17,7 +17,6 @@ along with this program. If not, see . */ - #if defined(USE_I2C) || defined(USE_SPI) #ifdef USE_DISPLAY @@ -28,7 +27,7 @@ Renderer *renderer; -enum ColorType { COLOR_BW,COLOR_COLOR}; +enum ColorType { COLOR_BW, COLOR_COLOR }; #ifndef MAXBUTTONS #define MAXBUTTONS 16 @@ -45,7 +44,6 @@ uint16_t bg_color = 0; uint8_t color_type = COLOR_BW; uint8_t auto_draw=1; - const uint8_t DISPLAY_MAX_DRIVERS = 16; // Max number of display drivers/models supported by xdsp_interface.ino const uint8_t DISPLAY_MAX_COLS = 44; // Max number of columns allowed with command DisplayCols const uint8_t DISPLAY_MAX_ROWS = 32; // Max number of lines allowed with command DisplayRows @@ -87,7 +85,6 @@ void (* const DisplayCommand[])(void) PROGMEM = { &CmndDisplayDimmer, &CmndDisplayColumns, &CmndDisplayRows, &CmndDisplaySize, &CmndDisplayFont, &CmndDisplayRotate, &CmndDisplayText, &CmndDisplayAddress }; - char *dsp_str; uint16_t dsp_x; @@ -433,12 +430,18 @@ void DisplayText(void) DisplayInit(DISPLAY_INIT_FULL); break; case 'o': - if (!renderer) DisplayOnOff(0); - else renderer->DisplayOnff(0); + if (!renderer) { + DisplayOnOff(0); + } else { + renderer->DisplayOnff(0); + } break; case 'O': - if (!renderer) DisplayOnOff(1); - else renderer->DisplayOnff(1); + if (!renderer) { + DisplayOnOff(1); + } else { + renderer->DisplayOnff(1); + } break; case 'x': // set disp_xpos @@ -1261,9 +1264,15 @@ void DisplayInitDriver(void) void DisplaySetPower(void) { disp_power = bitRead(XdrvMailbox.index, disp_device -1); + +AddLog_P2(LOG_LEVEL_DEBUG, PSTR("DSP: Power %d"), disp_power); + if (Settings.display_model) { - if (!renderer) XdspCall(FUNC_DISPLAY_POWER); - else renderer->DisplayOnff(disp_power); + if (!renderer) { + XdspCall(FUNC_DISPLAY_POWER); + } else { + renderer->DisplayOnff(disp_power); + } } } @@ -1466,12 +1475,10 @@ void CmndDisplayRows(void) ResponseCmndNumber(Settings.display_rows); } - /*********************************************************************************************\ * optional drivers \*********************************************************************************************/ - #if defined(USE_SCRIPT_FATFS) && defined(USE_SCRIPT) void Draw_RGB_Bitmap(char *file,uint16_t xp, uint16_t yp) { if (!renderer) return; @@ -1957,7 +1964,6 @@ bool Xdrv13(uint8_t function) case FUNC_SET_POWER: DisplaySetPower(); break; - case FUNC_EVERY_SECOND: #ifdef USE_GRAPH DisplayCheckGraph(); diff --git a/sonoff/xdsp_02_ssd1306.ino b/sonoff/xdsp_02_ssd1306.ino index 6896b281a..42f3fa005 100755 --- a/sonoff/xdsp_02_ssd1306.ino +++ b/sonoff/xdsp_02_ssd1306.ino @@ -1,5 +1,5 @@ /* - xdsp_02_SSD1306.ino - Display Oled SSD1306 support for Sonoff-Tasmota + xdsp_02_ssd1306.ino - Display Oled SSD1306 support for Sonoff-Tasmota Copyright (C) 2019 Theo Arends and Adafruit @@ -21,14 +21,12 @@ #ifdef USE_DISPLAY #ifdef USE_DISPLAY_SSD1306 +#define XDSP_02 2 + #define OLED_RESET 4 #define SPRINT(A) char str[32];sprintf(str,"val: %d ",A);Serial.println((char*)str); -extern uint8_t *buffer; - -#define XDSP_02 2 - #define OLED_ADDRESS1 0x3C // Oled 128x32 I2C address #define OLED_ADDRESS2 0x3D // Oled 128x64 I2C address @@ -44,8 +42,9 @@ extern uint8_t *buffer; Adafruit_SSD1306 *oled1306; -/*********************************************************************************************/ +extern uint8_t *buffer; +/*********************************************************************************************/ void SSD1306InitDriver() { @@ -75,16 +74,16 @@ void SSD1306InitDriver() } // allocate screen buffer - if (buffer) free(buffer); - buffer=(unsigned char*)calloc((Settings.display_width * Settings.display_height) / 8,1); - if (!buffer) return; + if (buffer) { free(buffer); } + buffer = (unsigned char*)calloc((Settings.display_width * Settings.display_height) / 8,1); + if (!buffer) { return; } // init renderer - //oled1306 = new Adafruit_SSD1306(SSD1306_LCDWIDTH,SSD1306_LCDHEIGHT); + // oled1306 = new Adafruit_SSD1306(SSD1306_LCDWIDTH,SSD1306_LCDHEIGHT); oled1306 = new Adafruit_SSD1306(Settings.display_width, Settings.display_height, &Wire, reset_pin); - oled1306->begin(SSD1306_SWITCHCAPVCC, Settings.display_address[0],0); - renderer=oled1306; - renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font); + oled1306->begin(SSD1306_SWITCHCAPVCC, Settings.display_address[0], 0); + renderer = oled1306; + renderer->DisplayInit(DISPLAY_INIT_MODE, Settings.display_size, Settings.display_rotate, Settings.display_font); renderer->setTextColor(1,0); @@ -100,7 +99,6 @@ void SSD1306InitDriver() } } - /*********************************************************************************************/ #ifdef USE_DISPLAY_MODES1TO5