recompile examples on V1.7

dave · dave · commit 6025e7a0bc4d · 2020-11-02T15:46:36.000Z
diff --git a/examples/nokia5110/nokia5110_menu.cpp b/examples/nokia5110/nokia5110_menu.cpp
@@ -74,6 +74,6 @@ void setupMenu() {
     gfx.setRotation(0);
     renderer.setGraphicsDevice(&gfx, &gfxConfig);
     switches.initialise(internalDigitalIo(), true);
-    menuMgr.initForEncoder(&renderer, &menuHall, 2, 3, A3);
+    menuMgr.initForEncoder(&renderer, &menuHall, 2, 6, A3);
     remoteServer.begin(&server, &applicationInfo);
 }
diff --git a/examples/nokia5110/securitySystem.emf b/examples/nokia5110/securitySystem.emf
@@ -1,6 +1,6 @@
 {
   "lastEdited": {
-    "seconds": 1603018923,
+    "seconds": 1604328319,
     "nanos": 0
   },
   "codeOptions": {
@@ -36,7 +36,7 @@
       },
       {
         "name": "ENCODER_PIN_B",
-        "latestValue": "3",
+        "latestValue": "6",
         "subsystem": "INPUT"
       },
       {
diff --git a/examples/nokia5110/tcMenuAdaFruitGfx.cpp b/examples/nokia5110/tcMenuAdaFruitGfx.cpp
@@ -402,3 +402,53 @@ void AdaGfxDialog::drawButton(Adafruit_GFX* gfx, AdaColorGfxMenuConfig* config,
     gfx->print(title);
 }
 
+
+/** A couple of helper functions that we'll submit for inclusion once a bit more testing is done */
+
+/**************************************************************************/
+/*!
+   @brief      Draw a RAM-resident 1-bit image at the specified (x,y) position,
+   from image data that may be wider or taller than the desired width and height.
+   Imagine a cookie dough rolled out, where you can cut a rectangle out of it.
+   It uses the specified foreground (for set bits) and background (unset bits) colors.
+   This is particularly useful for GFXCanvas1 operations, where you can allocate the
+   largest canvas needed and then use it for all drawing operations.
+
+    @param    x   Top left corner x coordinate
+    @param    y   Top left corner y coordinate
+    @param    bitmap  byte array with monochrome bitmap
+    @param    w   width of the portion you want to draw
+    @param    h   Height of the portion you want to draw
+    @param    totalWidth actual width of the bitmap
+    @param    xStart X position of the image in the data
+    @param    yStart Y position of the image in the data
+    @param    color 16-bit 5-6-5 Color to draw pixels with
+    @param    bg 16-bit 5-6-5 Color to draw background with
+*/
+/**************************************************************************/
+void drawCookieCutBitmap(Adafruit_GFX* gfx, int16_t x, int16_t y, const uint8_t *bitmap, int16_t w,
+                         int16_t h, int16_t totalWidth, int16_t xStart, int16_t yStart,
+                         uint16_t fgColor, uint16_t bgColor) {
+
+    // total width here is different to the width we are drawing, imagine rolling out a long
+    // line of dough and cutting cookies from it. The cookie is the part of the image we want
+    uint16_t byteWidth = (totalWidth + 7) / 8; // Bitmap scanline pad = whole byte
+    uint16_t yEnd = h + yStart;
+    uint16_t xEnd = w + xStart;
+    uint8_t byte;
+
+    gfx->startWrite();
+
+    for (uint16_t j = yStart; j < yEnd; j++, y++) {
+        byte = bitmap[size_t(((j * byteWidth) + xStart) / 8)];
+        for (uint16_t i = xStart; i < xEnd; i++) {
+            if (i & 7U)
+                byte <<= 1U;
+            else
+                byte = bitmap[size_t((j * byteWidth) + i / 8)];
+            gfx->writePixel(x + (i - xStart), y, (byte & 0x80U) ? fgColor : bgColor);
+        }
+    }
+
+    gfx->endWrite();
+}
diff --git a/examples/nokia5110/tcMenuAdaFruitGfx.h b/examples/nokia5110/tcMenuAdaFruitGfx.h
@@ -50,6 +50,10 @@ extern const ConnectorLocalInfo applicationInfo;
  */ 
 typedef struct ColorGfxMenuConfig<const GFXfont*> AdaColorGfxMenuConfig;
 
+void drawCookieCutBitmap(Adafruit_GFX* gfx, int16_t x, int16_t y, const uint8_t *bitmap, int16_t w,
+                         int16_t h, int16_t totalWidth, int16_t xStart, int16_t yStart,
+                         uint16_t fgColor, uint16_t bgColor);
+
 /**
  * A basic renderer that can use the AdaFruit_GFX library to render information onto a suitable
  * display. It is your responsibility to fully initialise and prepare the display before passing
@@ -99,6 +103,16 @@ class AdaGfxDialog : public BaseDialog {
     void drawButton(Adafruit_GFX* gfx, AdaColorGfxMenuConfig* config, const char* title, uint8_t num, bool active);
 };
 
+/**
+ * Provides the extents of the text as a Coord which is easier to work with.
+ * @param graphics the graphics object as a pointer
+ * @param text the text to measure
+ * @param x starting location X
+ * @param y starting location Y
+ * @return the coord object containing width and height
+ */
+Coord textExtents(Adafruit_GFX* graphics, const char* text, int16_t x, int16_t y);
+
 /**
  * The default graphics configuration for Ada GFX that needs no fonts and uses reasonable spacing options
  * for 100 - 150 dpi displays.
diff --git a/examples/remoteControlSerial/remoteControlSerial.emf b/examples/remoteControlSerial/remoteControlSerial.emf
@@ -1,6 +1,6 @@
 {
   "lastEdited": {
-    "seconds": 1603019484,
+    "seconds": 1604329022,
     "nanos": 0
   },
   "codeOptions": {
@@ -36,7 +36,7 @@
       },
       {
         "name": "ENCODER_PIN_B",
-        "latestValue": "3",
+        "latestValue": "6",
         "subsystem": "INPUT"
       },
       {
diff --git a/examples/remoteControlSerial/remoteControlSerial_menu.cpp b/examples/remoteControlSerial/remoteControlSerial_menu.cpp
@@ -58,6 +58,6 @@ void setupMenu() {
     gfx.setRotation(0);
     renderer.setGraphicsDevice(&gfx, &gfxConfig);
     switches.initialise(internalDigitalIo(), true);
-    menuMgr.initForEncoder(&renderer, &menuAnalogIn, 2, 3, A3);
+    menuMgr.initForEncoder(&renderer, &menuAnalogIn, 2, 6, A3);
     remoteServer.begin(&Serial1, &applicationInfo);
 }
diff --git a/examples/remoteControlSerial/tcMenuAdaFruitGfx.cpp b/examples/remoteControlSerial/tcMenuAdaFruitGfx.cpp
@@ -402,3 +402,53 @@ void AdaGfxDialog::drawButton(Adafruit_GFX* gfx, AdaColorGfxMenuConfig* config,
     gfx->print(title);
 }
 
+
+/** A couple of helper functions that we'll submit for inclusion once a bit more testing is done */
+
+/**************************************************************************/
+/*!
+   @brief      Draw a RAM-resident 1-bit image at the specified (x,y) position,
+   from image data that may be wider or taller than the desired width and height.
+   Imagine a cookie dough rolled out, where you can cut a rectangle out of it.
+   It uses the specified foreground (for set bits) and background (unset bits) colors.
+   This is particularly useful for GFXCanvas1 operations, where you can allocate the
+   largest canvas needed and then use it for all drawing operations.
+
+    @param    x   Top left corner x coordinate
+    @param    y   Top left corner y coordinate
+    @param    bitmap  byte array with monochrome bitmap
+    @param    w   width of the portion you want to draw
+    @param    h   Height of the portion you want to draw
+    @param    totalWidth actual width of the bitmap
+    @param    xStart X position of the image in the data
+    @param    yStart Y position of the image in the data
+    @param    color 16-bit 5-6-5 Color to draw pixels with
+    @param    bg 16-bit 5-6-5 Color to draw background with
+*/
+/**************************************************************************/
+void drawCookieCutBitmap(Adafruit_GFX* gfx, int16_t x, int16_t y, const uint8_t *bitmap, int16_t w,
+                         int16_t h, int16_t totalWidth, int16_t xStart, int16_t yStart,
+                         uint16_t fgColor, uint16_t bgColor) {
+
+    // total width here is different to the width we are drawing, imagine rolling out a long
+    // line of dough and cutting cookies from it. The cookie is the part of the image we want
+    uint16_t byteWidth = (totalWidth + 7) / 8; // Bitmap scanline pad = whole byte
+    uint16_t yEnd = h + yStart;
+    uint16_t xEnd = w + xStart;
+    uint8_t byte;
+
+    gfx->startWrite();
+
+    for (uint16_t j = yStart; j < yEnd; j++, y++) {
+        byte = bitmap[size_t(((j * byteWidth) + xStart) / 8)];
+        for (uint16_t i = xStart; i < xEnd; i++) {
+            if (i & 7U)
+                byte <<= 1U;
+            else
+                byte = bitmap[size_t((j * byteWidth) + i / 8)];
+            gfx->writePixel(x + (i - xStart), y, (byte & 0x80U) ? fgColor : bgColor);
+        }
+    }
+
+    gfx->endWrite();
+}
diff --git a/examples/remoteControlSerial/tcMenuAdaFruitGfx.h b/examples/remoteControlSerial/tcMenuAdaFruitGfx.h
@@ -50,6 +50,10 @@ extern const ConnectorLocalInfo applicationInfo;
  */ 
 typedef struct ColorGfxMenuConfig<const GFXfont*> AdaColorGfxMenuConfig;
 
+void drawCookieCutBitmap(Adafruit_GFX* gfx, int16_t x, int16_t y, const uint8_t *bitmap, int16_t w,
+                         int16_t h, int16_t totalWidth, int16_t xStart, int16_t yStart,
+                         uint16_t fgColor, uint16_t bgColor);
+
 /**
  * A basic renderer that can use the AdaFruit_GFX library to render information onto a suitable
  * display. It is your responsibility to fully initialise and prepare the display before passing
@@ -99,6 +103,16 @@ class AdaGfxDialog : public BaseDialog {
     void drawButton(Adafruit_GFX* gfx, AdaColorGfxMenuConfig* config, const char* title, uint8_t num, bool active);
 };
 
+/**
+ * Provides the extents of the text as a Coord which is easier to work with.
+ * @param graphics the graphics object as a pointer
+ * @param text the text to measure
+ * @param x starting location X
+ * @param y starting location Y
+ * @return the coord object containing width and height
+ */
+Coord textExtents(Adafruit_GFX* graphics, const char* text, int16_t x, int16_t y);
+
 /**
  * The default graphics configuration for Ada GFX that needs no fonts and uses reasonable spacing options
  * for 100 - 150 dpi displays.
diff --git a/examples/simpleU8g2/simpleU8g2.emf b/examples/simpleU8g2/simpleU8g2.emf
@@ -1,6 +1,6 @@
 {
   "lastEdited": {
-    "seconds": 1601471552,
+    "seconds": 1604331729,
     "nanos": 0
   },
   "codeOptions": {
diff --git a/examples/takeOverDisplay/takeOverDisplay.emf b/examples/takeOverDisplay/takeOverDisplay.emf
@@ -1,6 +1,6 @@
 {
   "lastEdited": {
-    "seconds": 1599238176,
+    "seconds": 1604329219,
     "nanos": 0
   },
   "codeOptions": {
@@ -12,6 +12,7 @@
     "embeddedPlatform": "ARDUINO_AVR",
     "namingRecursive": true,
     "saveToSrc": false,
+    "useCppMain": false,
     "lastProperties": [
       {
         "name": "PULLUP_LOGIC",
diff --git a/examples/takeOverDisplay/takeOverDisplay_menu.cpp b/examples/takeOverDisplay/takeOverDisplay_menu.cpp
@@ -8,6 +8,7 @@
     use elsewhere.
 */
 
+#include <Arduino.h>
 #include <tcMenu.h>
 #include "takeOverDisplay_menu.h"
 
@@ -28,8 +29,16 @@ const SubMenuInfo PROGMEM minfoConnectivity = { "Connectivity", 11, 0xFFFF, 0, N
 RENDERING_CALLBACK_NAME_INVOKE(fnConnectivityRtCall, backSubItemRenderFn, "Connectivity", -1, NO_CALLBACK)
 BackMenuItem menuBackConnectivity(fnConnectivityRtCall, &menuConnectivityChangePin);
 SubMenuItem menuConnectivity(&minfoConnectivity, &menuBackConnectivity, NULL);
+RENDERING_CALLBACK_NAME_INVOKE(fnSettingsDateRtCall, dateItemRenderFn, "Date", -1, NO_CALLBACK)
+DateFormattedMenuItem menuSettingsDate(fnSettingsDateRtCall, 18, NULL);
+RENDERING_CALLBACK_NAME_INVOKE(fnSettingsTimeRtCall, timeItemRenderFn, "Time", -1, NO_CALLBACK)
+TimeFormattedMenuItem menuSettingsTime(fnSettingsTimeRtCall, 17, (MultiEditWireType)EDITMODE_TIME_12H, &menuSettingsDate);
+RENDERING_CALLBACK_NAME_INVOKE(fnSettingsNum6x4RtCall, largeNumItemRenderFn, "Num6x4", -1, NO_CALLBACK)
+EditableLargeNumberMenuItem menuSettingsNum6x4(fnSettingsNum6x4RtCall, 16, 10, 4, &menuSettingsTime);
+RENDERING_CALLBACK_NAME_INVOKE(fnSettingsPositiveIntsRtCall, largeNumItemRenderFn, "PositiveInts", -1, NO_CALLBACK)
+EditableLargeNumberMenuItem menuSettingsPositiveInts(fnSettingsPositiveIntsRtCall, 15, 9, 0, false, &menuSettingsNum6x4);
 const AnyMenuInfo PROGMEM minfoSettingsSaveSettings = { "Save Settings", 6, 0xFFFF, 0, onSaveSettings };
-ActionMenuItem menuSettingsSaveSettings(&minfoSettingsSaveSettings, NULL);
+ActionMenuItem menuSettingsSaveSettings(&minfoSettingsSaveSettings, &menuSettingsPositiveInts);
 const AnalogMenuInfo PROGMEM minfoSettingsPower = { "Power", 5, 5, 250, NO_CALLBACK, 0, 10, "W" };
 AnalogMenuItem menuSettingsPower(&minfoSettingsPower, 0, &menuSettingsSaveSettings);
 const BooleanMenuInfo PROGMEM minfoSettingsEnabled = { "Enabled", 4, 2, 1, NO_CALLBACK, NAMING_TRUE_FALSE };
diff --git a/examples/takeOverDisplay/takeOverDisplay_menu.h b/examples/takeOverDisplay/takeOverDisplay_menu.h
@@ -11,11 +11,13 @@
 #ifndef MENU_GENERATED_CODE_H
 #define MENU_GENERATED_CODE_H
 
+#include <Arduino.h>
 #include <tcMenu.h>
 #include <RuntimeMenuItem.h>
 #include <LiquidCrystalIO.h>
 #include "EthernetTransport.h"
 #include <RemoteConnector.h>
+#include <EditableLargeNumberMenuItem.h>
 #include "tcMenuLiquidCrystal.h"
 
 void setupMenu();  // forward reference of the menu setup function.
@@ -38,6 +40,10 @@ extern IpAddressMenuItem menuConnectivityIPAddress;
 void CALLBACK_FUNCTION onChangePin(int id);
 extern TextMenuItem menuConnectivityChangePin;
 extern SubMenuItem menuConnectivity;
+extern DateFormattedMenuItem menuSettingsDate;
+extern TimeFormattedMenuItem menuSettingsTime;
+extern EditableLargeNumberMenuItem menuSettingsNum6x4;
+extern EditableLargeNumberMenuItem menuSettingsPositiveInts;
 void CALLBACK_FUNCTION onSaveSettings(int id);
 extern ActionMenuItem menuSettingsSaveSettings;
 extern AnalogMenuItem menuSettingsPower;
diff --git a/examples/takeOverDisplay/tcMenuLiquidCrystal.cpp b/examples/takeOverDisplay/tcMenuLiquidCrystal.cpp
@@ -13,6 +13,7 @@
  */
 
 #include "tcMenuLiquidCrystal.h"
+#include "tcUtil.h"
 
 extern const ConnectorLocalInfo applicationInfo;
 
@@ -35,7 +36,7 @@ void LiquidCrystalRenderer::initialise() {
         serdebugF2("Title widget present max=", wid->getMaxValue());
         for(int i = 0; i < wid->getMaxValue(); i++) {
             serdebugF2("Creating char ", charNo);
-            lcd->createCharPgm((byte)charNo, wid->getIcon(i));
+            lcd->createCharPgm((uint8_t)charNo, wid->getIcon(i));
             charNo++;
         }
         wid = wid->getNext();
@@ -81,7 +82,7 @@ void LiquidCrystalRenderer::renderTitle(bool forceDraw) {
         strcpy_P(buffer, applicationInfo.name);
         serdebugF2("print app name", buffer);
         uint8_t bufSz = bufferSize;
-        uint8_t last = min(bufSz, strlen(buffer));
+        uint8_t last = min(bufSz, (uint8_t)strlen(buffer));
         for(uint8_t i = last; i < bufSz; i++) {
             buffer[i] = ' ';
         }
diff --git a/examples/unoSsd1306Ascii/src/SerialTransport.cpp b/examples/unoSsd1306Ascii/src/SerialTransport.cpp
diff --git a/examples/unoSsd1306Ascii/src/SerialTransport.h b/examples/unoSsd1306Ascii/src/SerialTransport.h
diff --git a/examples/unoSsd1306Ascii/src/unoSsd1306Ascii_menu.cpp b/examples/unoSsd1306Ascii/src/unoSsd1306Ascii_menu.cpp
diff --git a/examples/unoSsd1306Ascii/src/unoSsd1306Ascii_menu.h b/examples/unoSsd1306Ascii/src/unoSsd1306Ascii_menu.h
diff --git a/examples/unoSsd1306Ascii/unoSsd1306Ascii.emf b/examples/unoSsd1306Ascii/unoSsd1306Ascii.emf
diff --git a/examples/unoSsd1306Ascii/unoSsd1306Ascii.ino b/examples/unoSsd1306Ascii/unoSsd1306Ascii.ino

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,6 @@ void setupMenu() {`
`74`	`74`	`gfx.setRotation(0);`
`75`	`75`	`renderer.setGraphicsDevice(&gfx, &gfxConfig);`
`76`	`76`	`switches.initialise(internalDigitalIo(), true);`
`77`		`- menuMgr.initForEncoder(&renderer, &menuHall, 2, 3, A3);`
	`77`	`+ menuMgr.initForEncoder(&renderer, &menuHall, 2, 6, A3);`
`78`	`78`	`remoteServer.begin(&server, &applicationInfo);`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"lastEdited": {`
`3`		`- "seconds": 1603018923,`
	`3`	`+ "seconds": 1604328319,`
`4`	`4`	`"nanos": 0`
`5`	`5`	`},`
`6`	`6`	`"codeOptions": {`
`@@ -36,7 +36,7 @@`
`36`	`36`	`},`
`37`	`37`	`{`
`38`	`38`	`"name": "ENCODER_PIN_B",`
`39`		`- "latestValue": "3",`
	`39`	`+ "latestValue": "6",`
`40`	`40`	`"subsystem": "INPUT"`
`41`	`41`	`},`
`42`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"lastEdited": {`
`3`		`- "seconds": 1603019484,`
	`3`	`+ "seconds": 1604329022,`
`4`	`4`	`"nanos": 0`
`5`	`5`	`},`
`6`	`6`	`"codeOptions": {`
`@@ -36,7 +36,7 @@`
`36`	`36`	`},`
`37`	`37`	`{`
`38`	`38`	`"name": "ENCODER_PIN_B",`
`39`		`- "latestValue": "3",`
	`39`	`+ "latestValue": "6",`
`40`	`40`	`"subsystem": "INPUT"`
`41`	`41`	`},`
`42`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,6 @@ void setupMenu() {`
`58`	`58`	`gfx.setRotation(0);`
`59`	`59`	`renderer.setGraphicsDevice(&gfx, &gfxConfig);`
`60`	`60`	`switches.initialise(internalDigitalIo(), true);`
`61`		`- menuMgr.initForEncoder(&renderer, &menuAnalogIn, 2, 3, A3);`
	`61`	`+ menuMgr.initForEncoder(&renderer, &menuAnalogIn, 2, 6, A3);`
`62`	`62`	`remoteServer.begin(&Serial1, &applicationInfo);`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"lastEdited": {`
`3`		`- "seconds": 1601471552,`
	`3`	`+ "seconds": 1604331729,`
`4`	`4`	`"nanos": 0`
`5`	`5`	`},`
`6`	`6`	`"codeOptions": {`