Prepare for next release

Author: davetcc

examples/colorTftEthernet32/colorTftEthernet.emf

@@ -1,6 +1,6 @@
 {
   "lastEdited": {
-    "seconds": 1584202435,
+    "seconds": 1584888681,
     "nanos": 0
   },
   "codeOptions": {

examples/colorTftEthernet32/colorTftEthernet32.ino

@@ -4,7 +4,6 @@
 #include <AnalogDeviceAbstraction.h>
 #include <RemoteAuthentication.h>
 #include <RemoteMenuItem.h>
-#include <Fonts/FreeSans18pt7b.h>
 #include <Fonts/FreeSans9pt7b.h>
 #include <Ethernet.h>
 
@@ -22,8 +21,11 @@ byte mac[] = {
   0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED
 };
 
-// we set up a TFT display first using the exact graphics variable used in the designer.
-Adafruit_ILI9341 gfx(6, 7);
+  #define TFT_CS        6
+  #define TFT_RST       3
+  #define TFT_DC        7
+
+Adafruit_ST7735 gfx = Adafruit_ST7735(TFT_CS, TFT_DC, TFT_RST);
 
 // we also want to customise the colours and menu spacing. So we create this config object too
 // which we initialise during the setup method.
@@ -56,20 +58,20 @@ EepromAuthenicationInfoMenuItem menuAuthKeyMgr(1002, &authManager, &menuRemoteMo
 void prepareCustomConfiguration() {
     // first we set the spacing around title, items and widgets. The make padding function follows the
     // same standard as CSS. Top, right, bottom, left.
-	makePadding(colorConfig.titlePadding, 12, 5, 12, 5); // top, right, bottom & left
-	makePadding(colorConfig.itemPadding, 5, 3, 6, 5);   // top, right, bottom & left
-	makePadding(colorConfig.widgetPadding, 5, 10, 0, 5);// top, right, bottom & left
+	makePadding(colorConfig.titlePadding, 6, 3, 6, 3); // top, right, bottom & left
+	makePadding(colorConfig.itemPadding, 3, 3, 3, 3);   // top, right, bottom & left
+	makePadding(colorConfig.widgetPadding, 3, 8, 0, 3);// top, right, bottom & left
 
     // and then the foreground, background and font of the title
 	colorConfig.bgTitleColor = RGB(50, 100, 200);
 	colorConfig.fgTitleColor = RGB(0, 0, 0);
-	colorConfig.titleFont = &FreeSans18pt7b;
+	colorConfig.titleFont = &FreeSans9pt7b;
 	colorConfig.titleBottomMargin = 10; // the space between title and items.
 
     // and then the colours for items.
 	colorConfig.bgItemColor = RGB(0, 0, 0);
 	colorConfig.fgItemColor = RGB(222, 222, 222);
-	colorConfig.itemFont = &FreeSans9pt7b;
+	colorConfig.itemFont = NULL;
 
     // and when items are selected.
 	colorConfig.bgSelectColor = RGB(0, 50, 200);
@@ -92,8 +94,8 @@ void prepareCustomConfiguration() {
 
 void setup() {
     // we are responsible for setting up the initial graphics
-    gfx.begin();
-    gfx.setRotation(3);
+    gfx.initR(INITR_BLACKTAB);
+    gfx.setRotation(1);
 
     // we used an i2c device (io8574) so must initialise wire too
     Wire.begin();

examples/colorTftEthernet32/colorTftEthernet32_menu.h

@@ -14,7 +14,7 @@
 #include <tcMenu.h>
 #include <RuntimeMenuItem.h>
 #include "Adafruit_GFX.h"
-#include "Adafruit_ILI9341.h"
+#include "Adafruit_ST7735.h"
 #include "tcMenuAdaFruitGfx.h"
 #include "EthernetTransport.h"
 #include <RemoteConnector.h>
@@ -24,7 +24,7 @@ extern const PROGMEM ConnectorLocalInfo applicationInfo;  // defines the app inf
 
 // Global variables that need exporting
 
-extern Adafruit_ILI9341 gfx;
+extern Adafruit_ST7735 gfx;
 extern AdaColorGfxMenuConfig colorConfig;
 extern AdaFruitGfxMenuRenderer renderer;
 extern IoAbstractionRef io8574;

examples/colorTftEthernet32/tcMenuAdaFruitGfx.cpp

@@ -19,7 +19,7 @@ extern const ConnectorLocalInfo applicationInfo;
 int drawingCount = 0;
 
 #if DISPLAY_HAS_MEMBUFFER == true
-    #define refreshDisplayIfNeeded(gr, needUpd) {if(needUpd) reinterpret_cast<Adafruit_ILI9341*>(gr)->display();}
+    #define refreshDisplayIfNeeded(gr, needUpd) {if(needUpd) reinterpret_cast<Adafruit_ST7735*>(gr)->display();}
 #else
     #define refreshDisplayIfNeeded(g, n)
 #endif

examples/colorTftEthernet32/tcMenuAdaFruitGfx.h

@@ -22,7 +22,7 @@
 #include <tcUtil.h>
 #include <BaseRenderers.h>
 #include <Adafruit_GFX.h>
-#include <Adafruit_ILI9341.h>
+#include <Adafruit_ST7735.h>
 #include <gfxfont.h>
 #include <GfxMenuConfig.h>
 #include <BaseDialog.h>

examples/esp8266WifiOled/EthernetTransport.cpp

@@ -49,7 +49,7 @@ int EthernetTagValTransport::writeStr(const char* data) {
     int i  = 0;
     int len = strlen(data);
 	for(int i = 0; i < len; ++i) {
-        if(write(data[i]) == 0) {
+        if(writeChar(data[i]) == 0) {
             return 0;
         }
     }

examples/esp8266WifiOled/Greenhouse.emf

@@ -1,6 +1,6 @@
 {
   "lastEdited": {
-    "seconds": 1584187390,
+    "seconds": 1584898446,
     "nanos": 0
   },
   "codeOptions": {

examples/simpleJoystickLcd/simpleJoystick.emf

@@ -1,6 +1,6 @@
 {
   "lastEdited": {
-    "seconds": 1584195309,
+    "seconds": 1584470457,
     "nanos": 0
   },
   "codeOptions": {