Prepare for release.

Author: davetcc

examples/arduino32/nano33ble/generated/nano33ble_menu.cpp

@@ -10,8 +10,7 @@
 
 #include <tcMenu.h>
 #include "nano33ble_menu.h"
-#include "ThemeMonoInverse.h"
-#include "tcMenuBLERemoteConnector.h"
+#include "../ThemeMonoInverse.h"
 
 // Global variable declarations
 const  ConnectorLocalInfo applicationInfo = { "Nano 33 BLE Sense", "e95fcf8a-8a03-4043-9313-01fd8b8e8707" };
@@ -50,10 +49,6 @@ AnalogMenuItem menuHumidity(&minfoHumidity, 0, &menuBPressure, INFO_LOCATION_PGM
 const AnalogMenuInfo minfoTemp = { "Temp", 1, 0xffff, 2000, NO_CALLBACK, 0, 10, "C" };
 AnalogMenuItem menuTemp(&minfoTemp, 0, &menuHumidity, INFO_LOCATION_PGM);
 
-tcremote::TcMenuRemoteServer remoteServer(applicationInfo);
-tcremote::BLEDeviceInitialisation bleInitialisation;
-tcremote::BLETagValTransport bleTransport;
-
 void setupMenu() {
     // First we set up eeprom and authentication (if needed).
     setSizeBasedEEPROMStorageEnabled(false);
@@ -62,15 +57,13 @@ void setupMenu() {
     menuHumidity.setReadOnly(true);
     menuTemp.setReadOnly(true);
 
-    // Code generated by plugins.
+    // Code generated by plugins and new operators.
     gfx.begin();
     renderer.setUpdatesPerSecond(10);
     switches.init(internalDigitalIo(), SWITCHES_POLL_EVERYTHING, true);
     menuMgr.initForEncoder(&renderer, &menuTemp, 5, 6, 4);
     renderer.setTitleMode(BaseGraphicalRenderer::TITLE_FIRST_ROW);
     renderer.setUseSliderForAnalog(false);
     installMonoInverseTitleTheme(renderer, MenuFontDef(nullptr, 1), MenuFontDef(nullptr, 1), true);
-
-    remoteServer.addConnection(new tcremote::TagValueRemoteServerConnection(bleTransport, bleInitialisation));
 }
 

examples/arduino32/nano33ble/generated/nano33ble_menu.h

@@ -16,7 +16,6 @@
 #include "tcMenuU8g2.h"
 #include <IoAbstraction.h>
 #include <EepromItemStorage.h>
-#include "tcMenuBLERemoteConnector.h"
 
 // variables we declare that you may need to access
 extern const PROGMEM ConnectorLocalInfo applicationInfo;

examples/arduino32/nano33ble/nano33ble.emf

@@ -369,14 +369,15 @@
     "eepromDefinition": "",
     "authenticatorDefinition": "",
     "projectIoExpanders": [
-      "deviceIO:",
-      "customIO:io23017"
+      "customIO:io23017",
+      "deviceIO:"
     ],
     "menuInMenuCollection": {
       "menuDefinitions": []
     },
     "packageNamespace": "",
-    "appIsModular": false
+    "appIsModular": false,
+    "listOfEmbeddedForms": []
   },
   "stringLists": []
 }

examples/arduino32/nano33ble/nano33ble.ino

@@ -14,6 +14,7 @@
 #include "MotionDetection.h"
 #include <AnalogDeviceAbstraction.h>
 #include <tcMenuVersion.h>
+#include <ArduinoBLE.h>
 #include <stockIcons/wifiAndConnectionIcons16x12.h>
 
 // on the analog menu, we both have an analog input and an analog output (PWM). You can configure those pins here.
@@ -74,13 +75,7 @@ void setup() {
     // the tcMenu version number in a dialog.
     // https://www.thecoderscorner.com/products/arduino-libraries/tc-menu/rendering-with-tcmenu-lcd-tft-oled/#presenting-a-dialog-to-the-user
     setTitlePressedCallback([](int id) {
-        withMenuDialogIfAvailable([](MenuBasedDialog* dlg) {
-            dlg->setButtons(BTNTYPE_CLOSE, BTNTYPE_NONE);
-            dlg->showRam("Nano BLE Example", false);
-            char szVer[10];
-            tccore::copyTcMenuVersion(szVer, sizeof szVer);
-            dlg->copyIntoBuffer(szVer);
-        });
+        showVersionDialog(&applicationInfo);
     });
 
     // lastly we set up something simple to read from analog in

examples/arduino32/picoAdafruitDashboard/picoAdafruitDashboard_menu.cpp

@@ -51,6 +51,7 @@ AnalogMenuItem menuAnalog(&minfoAnalog, 222, &menuFloat, INFO_LOCATION_PGM);
 
 void setupMenu() {
     // First we set up eeprom and authentication (if needed).
+    CombinedMessageProcessor::setFormTemplatesInFlash(tcMenuAllEmbeddedForms);
     setSizeBasedEEPROMStorageEnabled(false);
     // Code generated by plugins and new operators.
     gfx.begin();
@@ -62,7 +63,6 @@ void setupMenu() {
     renderer.setTitleMode(BaseGraphicalRenderer::TITLE_FIRST_ROW);
     renderer.setUseSliderForAnalog(true);
     installCoolBlueModernTheme(renderer, MenuFontDef(&RobotoMedium24, 1), MenuFontDef(&RobotoMedium24, 1), false);
-    CombinedMessageProcessor::setFormTemplatesInFlash(tcMenuAllEmbeddedForms);
 }
 
 // Embedded form data

examples/arduino32/picoAdafruitDashboard/picoAdafruitDashboard_menu.h

@@ -53,6 +53,6 @@ void setupMenu();
 
 void CALLBACK_FUNCTION onSettingsAction(int id);
 
-const EmbedControlFlashedForm*[] tcMenuAllEmbeddedForms;
+extern const EmbedControlFlashedForm* tcMenuAllEmbeddedForms[];
 
 #endif // MENU_GENERATED_CODE_H

examples/arduino32/picoAdafruitDashboard/tcMenuAdaFruitGfx.cpp

@@ -34,6 +34,8 @@ using namespace tcgfx;
 #endif // AVR reduced size buffer
 #endif // COOKIE_CUT_MEMBUFFER_SIZE
 
+uint16_t memBuffer[COOKIE_CUT_MEMBUFFER_SIZE];
+
 void AdafruitDrawable::transaction(bool isStarting, bool redrawNeeded) {
     if(!isStarting) refreshDisplayIfNeeded(graphics, redrawNeeded);
 }
@@ -52,15 +54,58 @@ void AdafruitDrawable::drawBitmap(const Coord &where, const DrawableIcon *icon,
     if(icon->getIconType() == DrawableIcon::ICON_XBITMAP) {
         graphics->fillRect(where.x, where.y, icon->getDimensions().x, icon->getDimensions().y, backgroundColor);
         graphics->drawXBitmap(where.x, where.y, icon->getIcon(selected), icon->getDimensions().x, icon->getDimensions().y, drawColor);
-    }
-    else if(icon->getIconType() == DrawableIcon::ICON_NATIVE) {
+    } else if(icon->getIconType() == DrawableIcon::ICON_NATIVE) {
         graphics->drawRGBBitmap(where.x, where.y, (const uint16_t*)icon->getIcon(selected), icon->getDimensions().x, icon->getDimensions().y);
-    }
-    else if(icon->getIconType() == DrawableIcon::ICON_MONO) {
+    } else if(icon->getIconType() == DrawableIcon::ICON_MONO) {
         graphics->drawBitmap(where.x, where.y, icon->getIcon(selected), icon->getDimensions().x, icon->getDimensions().y, drawColor, backgroundColor);
+    } else if(icon->getPalette() != nullptr){
+        auto bpp = icon->getIconType() == tcgfx::DrawableIcon::ICON_PALLETE_2BPP ? 2 : 4;
+        drawBitmapNbpp(where, icon->getIcon(selected), icon->getDimensions(), bpp, icon->getPalette());
     }
 }
 
+void AdafruitDrawable::drawBitmapNbpp(const Coord& where, const uint8_t* data, const Coord& size, int bpp, const color_t* palette) {
+    auto* asTft = reinterpret_cast<Adafruit_SPITFT *>(graphics);
+    auto yTot = int16_t(where.y + size.y);
+    auto xTot = int16_t(where.x + size.x);
+    int bitsInByte = bpp == 2 ? 4 : 2;
+    uint8_t downShift = bpp == 2 ? 6 : 4;
+
+    uint16_t next = 0;
+    uint8_t byteIteration = bitsInByte;
+    uint8_t current;
+
+    asTft->startWrite();
+
+    for(int16_t y = where.y; y<yTot; y++) {
+        asTft->setAddrWindow(where.x, y, size.x, 1);
+        for(int16_t x = where.x; x<xTot; x++) {
+            if(byteIteration == bitsInByte) {
+                current = pgm_read_byte(data);
+                data += 1;
+                byteIteration = 0;
+            }
+            uint8_t idx = current >> downShift;
+            current = current << bpp;
+            byteIteration++;
+
+            memBuffer[next] = palette[idx];
+            next = next + 1;
+            if(next == COOKIE_CUT_MEMBUFFER_SIZE) {
+                asTft->writePixels(memBuffer, next);
+                next = 0;
+            }
+        }
+        if(next != 0) {
+            asTft->writePixels(memBuffer, next);
+            next = 0;
+        }
+        byteIteration = bitsInByte; // always need a new byte in this case
+    }
+
+    asTft->endWrite();
+}
+
 void AdafruitDrawable::drawXBitmap(const Coord &where, const Coord &size, const uint8_t *data) {
     graphics->fillRect(where.x, where.y, size.x, size.y, backgroundColor);
     graphics->drawXBitmap(where.x, where.y, data, size.x, size.y, drawColor);
@@ -69,8 +114,7 @@ void AdafruitDrawable::drawXBitmap(const Coord &where, const Coord &size, const
 void AdafruitDrawable::drawBox(const Coord &where, const Coord &size, bool filled) {
     if(filled) {
         graphics->fillRect(where.x, where.y, size.x, size.y, drawColor);
-    }
-    else {
+    } else {
         graphics->drawRect(where.x, where.y, size.x, size.y, drawColor);
     }
 }
@@ -157,8 +201,6 @@ UnicodeFontHandler *AdafruitDrawable::createFontHandler() {
 // helper functions
 //
 
-uint16_t memBuffer[COOKIE_CUT_MEMBUFFER_SIZE];
-
 void drawCookieCutBitmap(Adafruit_SPITFT* 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) {
@@ -519,7 +561,7 @@ DeviceDrawable *AdafruitDrawable::getSubDeviceFor(const Coord &where, const Coor
 }
 
 AdafruitCanvasDrawable2bpp::AdafruitCanvasDrawable2bpp(AdafruitDrawable *root,  int width, int height) : root(root),
-            sizeMax({width, height}), sizeCurrent(), palette{} {
+                                                                                                         sizeMax({width, height}), sizeCurrent(), palette{} {
     canvas = new TcGFXcanvas2(width, height);
     setGraphics(canvas);
 }
@@ -561,3 +603,26 @@ DeviceDrawable *AdafruitCanvasDrawable2bpp::getSubDeviceFor(const Coord&, const
     return nullptr; // don't allow further nesting.
 }
 
+void AdafruitCanvasDrawable2bpp::drawBitmapNbpp(const Coord& where, const uint8_t* data, const Coord& size, int bpp, const uint16_t* palette) {
+    auto yTot = int16_t(where.y + size.y);
+    auto xTot = int16_t(where.x + size.x);
+    int bitsInByte = bpp == 2 ? 4 : 2;
+    uint8_t downShift = bpp == 2 ? 6 : 4;
+
+    uint8_t byteIteration = bitsInByte;
+    uint8_t current;
+    for(int16_t y = where.y; y<yTot; y++) {
+        for(int16_t x = where.x; x<xTot; x++) {
+            if(byteIteration == bitsInByte) {
+                current = pgm_read_byte(data);
+                data += 1;
+                byteIteration = 0;
+            }
+            uint8_t idx = current >> downShift;
+            current = current << bitsInByte;
+            byteIteration++;
+            canvas->drawPixel(x, y, idx);
+        }
+        byteIteration = bitsInByte; // always need a new byte in this case
+    }
+}

examples/arduino32/picoAdafruitDashboard/tcMenuAdaFruitGfx.h

@@ -176,6 +176,7 @@ class AdafruitDrawable : public DeviceDrawable {
     void internalDrawText(const Coord &where, const void *font, int mag, const char *text) override;
     void drawBitmap(const Coord &where, const DrawableIcon *icon, bool selected) override;
     void drawXBitmap(const Coord &where, const Coord &size, const uint8_t *data) override;
+    virtual void drawBitmapNbpp(const Coord& where, const uint8_t* data, const Coord& size, int bpp, const color_t* palette);
     void drawBox(const Coord &where, const Coord &size, bool filled) override;
     void drawCircle(const Coord& where, int radius, bool filled) override;
     void drawPolygon(const Coord points[], int numPoints, bool filled) override;
@@ -212,6 +213,7 @@ class AdafruitCanvasDrawable2bpp : public AdafruitDrawable {
     void transaction(bool isStarting, bool redrawNeeded) override;
     color_t getUnderlyingColor(color_t col) override;
     DeviceDrawable *getSubDeviceFor(const Coord &where, const Coord &size, const color_t *palette, int paletteSize) override;
+    void drawBitmapNbpp(const Coord& where, const uint8_t* data, const Coord& size, int bpp, const color_t* palette) override;
 };
 
 #endif /* _TCMENU_TCMENUADAFRUITGFX_H_ */

examples/esp/esp32Amplifier/esp32Amplifier.ino

@@ -84,32 +84,42 @@ void setup() {
 #else
     touchScreen.calibrateMinMaxValues(0.250F, 0.890F, 0.09F, 0.88F);
 #endif // TC_TFT_ESPI_NEEDS_TOUCH
+
     /**
-     * Here we use the theme builder to modify the drawing of certain menu items, we want three of the main menu
-     * items to render using icons, we therefore request a "menuItemOverride" from the theme and then we simply
-     * say the item will render as an image.
+     * In the event that we want to modify how menu items are drawn, the easiest way is to use TcThemeBuilder.
+     * Here we use it to modify the drawing of certain menu items, we want three of the main menu items to render
+     * using icons, to do so we call `menuItemOverride` on the builder, and it returns a "properties builder" that is
+     * pre-prepared to adjust the menu item.
+     *
+     * See https://www.thecoderscorner.com/products/arduino-libraries/tc-menu/themes/rendering-with-themes-icons-grids/
      */
     TcThemeBuilder themeBuilder(renderer);
     const Coord iconSize(APPICONS_WIDTH, APPICONS_HEIGHT);
+
+    // get the properties editor for the settings submenu item itself and override it to draw as an icon. Also make it
+    // draw in a specific row and column grid, then finally call `apply` to make the adjustment. Note that in this case
+    // use a 4BPP (16 color) icon bitmap by providing both the data and the palette.
     themeBuilder.menuItemOverride(menuSettings)
         .withImage4bpp(Coord(31, 40), statusBitmap_palette0, statusBitmap0)
         .onRow(3).multiCol(1, 3)
         .apply();
-    //themeBuilder.menuItemOverride(menuSettings)
-    //    .withImageXbmp(iconSize, settingsIcon40Bits)
-    //    .onRow(3).multiCol(1, 3)
-    //    .apply();
+
+    // Again we take a menu item override for the status submenu item, and this time it will render a single color bitmap
     themeBuilder.menuItemOverride(menuStatus)
         .withImageXbmp(iconSize, statusIcon40Bits)
         .onRow(3).multiCol(2, 3)
         .apply();
+
+    // Again we take a menu item override for the mute boolean menu, and this time it will render a single color bitmap
     themeBuilder.menuItemOverride(menuMute)
         .withImageXbmp(iconSize, muteOffIcon40Bits, muteOnIcon40Bits)
         .onRow(3).multiCol(3, 3)
         .apply();
 
     /**
      * here is how we override drawing for items only when a submenu is active, you can also define at the item level.
+     * Note that unlike above, this affects all title items in that sub menu. We could do the same for all action or
+     * even regular items within a submenu.
      */
     color_t specialPalette[] { RGB(255, 255, 255), RGB(255, 0, 0), RGB(0, 0, 0), RGB(0, 0, 255) };
     themeBuilder.submenuPropertiesTitleOverride(menuStatus)
@@ -118,6 +128,7 @@ void setup() {
         .withBorder(MenuBorder(2))
         .apply();
 
+    // whenever adjusting themes, we should always apply them
     themeBuilder.apply();
 
     setTitlePressedCallback([](int) {

examples/esp/esp32SimHub/appTheme.cpp

@@ -115,11 +115,20 @@ const uint8_t engineBitmap0[] PROGMEM = {
 };
 
 void setupTheme() {
+    /**
+     * In the event that we want to modify how menu items are drawn, the easiest way is to use TcThemeBuilder.
+     * Here we use it to modify the drawing of certain menu items, we want three of the main menu items to render
+     * using icons, to do so we call `menuItemOverride` on the builder, and it returns a "properties builder" that is
+     * pre-prepared to adjust the menu item.
+     *
+     * See https://www.thecoderscorner.com/products/arduino-libraries/tc-menu/themes/rendering-with-themes-icons-grids/
+     */
     color_t coolBlueTitlePalette[] = {RGB(0,0,0), RGB(20,132,255), RGB(192,192,192), RGB(64, 64, 64)};
     color_t coolBlueItemPalette[] = {RGB(255, 255, 255), RGB(0,64,135), RGB(20,133,255), RGB(31,100,178)};
     TcThemeBuilder themeBuilder(renderer);
 
     themeBuilder.withSelectedColors(RGB(31, 88, 100), RGB(255, 255, 255))
+            .dimensionsFromRenderer()
             .withRenderingSettings(tcgfx::BaseGraphicalRenderer::TITLE_FIRST_ROW, true)
             .enablingTcUnicode()
             .withItemPadding(MenuPadding(2))