rebuild examples before release.

Author: dave

examples/esp/esp32s3TftEncoder/esp32s3TftEncoder.emf

@@ -384,7 +384,7 @@
       },
       {
         "name": "TITLE_SHOW_MODE",
-        "latestValue": "TITLE_FIRST_ROW",
+        "latestValue": "NO_TITLE",
         "subsystem": "THEME"
       },
       {

examples/esp/esp32s3TftEncoder/esp32s3TftEncoder.ino

@@ -7,6 +7,7 @@
 #include "stockIcons/directionalIcons.h"
 #include "app_icondata.h"
 #include "tcMenuVersion.h"
+#include <IoLogging.h>
 
 //
 // We use a card layout to present the items, here we demonstrate how to set it up and prepare custom menu items that
@@ -28,9 +29,9 @@ void setupGridLayoutForCardView() {
     const Coord iconBatSize(BATTERY_WIDTH, BATTERY_HEIGHT);
     factory.addImageToCache(DrawableIcon(menuBattery.getId(), iconBatSize, DrawableIcon::ICON_XBITMAP, batteryIcon40Bits));
 
-    factory.addGridPosition(&menuSettings, GridPosition(GridPosition::DRAW_AS_ICON_TEXT, GridPosition::JUSTIFY_CENTER_NO_VALUE, 1, 60));
-    factory.addGridPosition(&menuMute, GridPosition(GridPosition::DRAW_AS_ICON_TEXT, GridPosition::JUSTIFY_CENTER_NO_VALUE, 2, 60));
-    factory.addGridPosition(&menuBattery, GridPosition(GridPosition::DRAW_AS_ICON_TEXT, GridPosition::JUSTIFY_CENTER_NO_VALUE, 3, 60));
+    factory.addGridPosition(&menuSettings, GridPosition(GridPosition::DRAW_AS_ICON_TEXT, GridPosition::JUSTIFY_CENTER_NO_VALUE, 0, 60));
+    factory.addGridPosition(&menuMute, GridPosition(GridPosition::DRAW_AS_ICON_TEXT, GridPosition::JUSTIFY_CENTER_NO_VALUE, 1, 60));
+    factory.addGridPosition(&menuBattery, GridPosition(GridPosition::DRAW_AS_ICON_TEXT, GridPosition::JUSTIFY_CENTER_NO_VALUE, 2, 60));
 
     // after adding things to the drawing properties, we must refresh it.
     tcgfx::ConfigurableItemDisplayPropertiesFactory::refreshCache();
@@ -41,12 +42,12 @@ void setupGridLayoutForCardView() {
 void setup() {
     Serial.begin(115200);
 
+    serEnableLevel(SER_TCMENU_DEBUG, true);
     setupMenu();
 
     // Here we enable the card layout mode for the main menu by first enabling support, then adding the root menu.
     // We also set up the item layout for card view by calling our setup function, defined above.
     renderer.enableCardLayout(iconLeft, iconRight, nullptr, false);
-    renderer.setCardLayoutStatusForSubMenu(&rootMenuItem(), true);
     setupGridLayoutForCardView();
 
     // We can set a callback for when the title item is pressed on the main menu, here we show the app version

examples/esp/esp32s3TftEncoder/generated/esp32s3TftEncoder_menu.cpp

@@ -71,7 +71,7 @@ void setupMenu() {
     renderer.setUpdatesPerSecond(15);
     switches.init(internalDigitalIo(), SWITCHES_NO_POLLING, true);
     menuMgr.initForEncoder(&renderer, &menuSettings, 3, 4, 5);
-    renderer.setTitleMode(BaseGraphicalRenderer::TITLE_FIRST_ROW);
+    renderer.setTitleMode(BaseGraphicalRenderer::NO_TITLE);
     renderer.setUseSliderForAnalog(true);
     renderer.enableTcUnicode();
     installCoolBlueTraditionalTheme(renderer, MenuFontDef(&OpenSansCyrillicLatin12, 0), MenuFontDef(&OpenSansCyrillicLatin12, 0), true);

src/graphics/BaseGraphicalRenderer.cpp

@@ -59,7 +59,6 @@ uint8_t BaseGraphicalRenderer::setActiveItem(MenuItem *item) {
     uint16_t totalHeight = calculateHeightTo(activeIndex, rootItem);
     int startRow = 0;
     uint16_t adjustedHeight = height + (isLastRowExactFit() ? 0 : 1);
-    serdebugF4("toth, activeidx, adj ", totalHeight, activeIndex, adjustedHeight);
 
     auto startY = 0;
     if(titleMode == TITLE_ALWAYS) {
@@ -68,13 +67,13 @@ uint8_t BaseGraphicalRenderer::setActiveItem(MenuItem *item) {
         adjustedHeight -= startY;
         totalHeight -= startY;
     }
-    serdebugF4("sy, sr, adj ", startY, startRow, adjustedHeight);
+    serlogF4(SER_TCMENU_DEBUG, "totH, actIdx, adjH ", totalHeight, activeIndex, adjustedHeight);
 
     while (totalHeight > adjustedHeight) {
         totalHeight -= heightOfRow(startRow, true);
         startRow++;
     }
-    serdebugF3("sr, th", startRow, totalHeight);
+    serlogF4(SER_TCMENU_DEBUG, "sy, sr, adj ", startY, startRow, adjustedHeight);
 
     // the screen has moved, we must completely redraw the area, and we need a clear first.
     if(drawingLocation.getCurrentOffset() != startRow) {