Fixes before release.

Author: davetcc

examples/avr/keyboardEthernetShield/keyboardEthernetShield.ino

@@ -18,7 +18,6 @@
 #include <EepromAbstraction.h>
 #include <Ethernet.h>
 #include <IoLogging.h>
-#include <stockIcons/wifiAndConnectionIconsLCD.h>
 
 using namespace tcremote;
 
@@ -34,12 +33,6 @@ const char pgmListPressed[] PROGMEM = "List Item Pressed";
 const char pgmHeaderSavedItem[] PROGMEM = "Saved Item";
 const char * romSpaceNames = "item 01item 02item 03item 04item 05item 06item 07item 08item 09item 10 ";
 
-// We add a title widget that shows when a user is connected to the device. Connection icons
-// are in the standard icon set we included at the top.
-// Yes even on LCD we now support title widgets, but they eat up a few of your custom chars.
-// The width must always be 1, and the height is the first custom character that is used.
-TitleWidget connectedWidget(iconsConnection, 2, 1, 0);
-
 // used by the take over display logic.
 int counter = 0;
 
@@ -61,15 +54,6 @@ void prepareLayout() {
                             GridPosition(GridPosition::DRAW_TEXTUAL_ITEM, GridPosition::JUSTIFY_RIGHT_WITH_VALUE, 2, 2, 2, 1));
 }
 
-// when there's a change in communication status (client connects for example) this gets called.
-void onCommsChange(CommunicationInfo info) {
-    if(info.remoteNo == 0) {
-        connectedWidget.setCurrentState(info.connected ? 1 : 0);
-    }
-    // this relies on logging in IoAbstraction's ioLogging.h, to turn it on visit the file for instructions.
-    serdebugF4("Comms notify (rNo, con, enum)", info.remoteNo, info.connected, info.errorMode);
-}
-
 void setup() {
 	//
 	// If you are using serial (connectivity or logging) and wire they must be initialised 
@@ -88,11 +72,6 @@ void setup() {
     // Here we set the character to be used for back, next and editing for the "cursor".
     renderer.setEditorChars(0b01111111, 0b01111110, '=');
 
-    // You can also have title widgets on LCDs, maximum of 7 states. They use up the custom chars 0..7. How it works
-    // is that you define a custom character for each icon, and treat them just as you would a regular icon. The height
-    // of the widget is fixed, and the height field instead indicates the first custom character for the first icon.
-    renderer.setFirstWidget(&connectedWidget);
-
     // we can choose which way RGB items should present, either has HEX_HTML or DECIMAL
     Rgb32MenuItem::setRgbPrintMode(HEX_HTML);
 
@@ -132,10 +111,6 @@ void setup() {
     // here we customize the LCD layout for one menu, to have two items per line.
     prepareLayout();
 
-    // and lastly we register a communication listener, it updates the title widget
-    // that shows connectivity state on the right corner.
-    menuConnectivityIoTMonitor.registerCommsNotification(onCommsChange);
-
     // and finally, when the display times out, take over and draw a custom screen
     renderer.setResetCallback([] {
         onTakeOverDisplay(-1);
@@ -357,6 +332,6 @@ int CALLBACK_FUNCTION customHexEditorRtCall(RuntimeMenuItem* item, uint8_t row,
             }
             return true;
         }
+        default: return textItemRenderFn(item, row, mode, buffer, bufferSize);
     }
-    return textItemRenderFn(item, row, mode, buffer, bufferSize);
 }

examples/avr/keyboardEthernetShield/tcMenuLiquidCrystal.cpp

@@ -87,7 +87,7 @@ void copyIntoBuffer(char* buffer, const char* source, int offset, int bufferLen)
 
 void LiquidCrystalRenderer::drawMenuItem(GridPositionRowCacheEntry* entry, Coord where, Coord areaSize, const DrawingFlags& drawingFlags) {
     auto* theItem = entry->getMenuItem();
-    theItem->setChanged(false);
+    theItem->setChanged(displayNumber, false);
     char sz[21];
 
     if(entry->getPosition().getJustification() == GridPosition::JUSTIFY_TITLE_LEFT_VALUE_RIGHT) {

src/MenuItems.cpp

@@ -110,9 +110,15 @@ uint16_t MenuItem::getEepromPosition() const
 }
 
 void MenuItem::setChanged(bool changed) {
-    flags = flags | MENUITEM_ALL_CHANGE;
-    if(isLocalOnly()) return;
-    flags = flags | MENUITEM_ALL_REMOTES;
+    if(changed) {
+        flags = flags | MENUITEM_ALL_CHANGE;
+    } else {
+        flags = flags & (~MENUITEM_ALL_CHANGE);
+    }
+
+    if(isLocalOnly() || !changed) return;
+
+    setSendRemoteNeededAll();
 }
 
 // on avr boards we store all info structures in progmem, so we need this code to

src/MenuItems.h

@@ -200,8 +200,6 @@ enum Flags : uint8_t {
 	MENUITEM_CHANGED = 0,
     /** the menu has changed and needs drawing by the renderer 1 */
 	MENUITEM_CHANGED_1 = 1,
-    /** the menu has changed and needs drawing by the renderer 2 */
-    MENUITEM_CHANGED_2 = 2,
     /** the menu cannot be changed by the renderer or remote, it can be changed by calling the setter. */
 	MENUITEM_READONLY = 3,
     /** the menu must not be sent remotely, and is only available via the local renderer */
@@ -366,8 +364,11 @@ class MenuItem {
 
     bool isInfoProgMem() const { return bitRead(flags, MENUITEM_INFO_STRUCT_PGM); }
 
-	/** set the item to be changed, this lets the renderer know it needs painting */
+	/** set the item to be changed to all renderers, and when changed is true all remotes as well. When clearing
+	 * changed flag prefer to use the numbered version below. */
 	void setChanged(bool changed);
+	/** set the item to be changed, this lets a renderer know it needs painting */
+	void setChanged(int num, bool changed) { bitWrite(flags, (num & 3), changed); }
 	/** returns the changed state of the item */
 	bool isChanged(int num = 0) const { return bitRead(flags, (num & 3)); }
 	/** returns if the menu item needs to be sent remotely */

src/graphics/BaseGraphicalRenderer.cpp

@@ -48,7 +48,8 @@ void BaseGraphicalRenderer::render() {
 uint8_t BaseGraphicalRenderer::setActiveItem(MenuItem *item) {
     auto ret = BaseMenuRenderer::setActiveItem(item);
 
-    if(item->getMenuType() == MENUTYPE_RUNTIME_LIST) {
+    // if we're drawing a list, clear out the drawing location, lists handled differently
+    if(menuMgr.getCurrentMenu()->getMenuType() == MENUTYPE_RUNTIME_LIST) {
         drawingLocation = CachedDrawingLocation();
         return 0;
     }
@@ -58,19 +59,22 @@ 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) {
+    if(titleMode == TITLE_ALWAYS && menuMgr.getRoot() == rootItem) {
         startRow++;
         startY = heightOfRow(0, true);
         adjustedHeight -= startY;
         totalHeight -= startY;
     }
+    serdebugF4("sy, sr, adj ", startY, startRow, adjustedHeight);
 
     while (totalHeight > adjustedHeight) {
         totalHeight -= heightOfRow(startRow, true);
         startRow++;
     }
+    serdebugF3("sr, th", startRow, totalHeight);
 
     // the screen has moved, we must completely redraw the area, and we need a clear first.
     if(drawingLocation.getCurrentOffset() != startRow) {
@@ -197,7 +201,7 @@ bool BaseGraphicalRenderer::drawTheMenuItems(int startRow, int startY, bool draw
 
             if (drawEveryLine || item->isChanged(displayNumber)) {
                 serlogF4(SER_TCMENU_DEBUG, "draw item (pos,id,chg)", i, item->getId(), item->isChanged(displayNumber));
-                item->setChanged(false);
+                item->setChanged(displayNumber, false);
                 taskManager.yieldForMicros(0);
                 if(itemCfg->getPosition().getGridSize() > 1) {
                     int colWidth = int(width) / itemCfg->getPosition().getGridSize();
@@ -261,7 +265,7 @@ void BaseGraphicalRenderer::renderList() {
 
     // reset the list item to a normal list again.
     runList->asParent();
-    runList->setChanged(false);
+    runList->setChanged(displayNumber, false);
     setTitleOnDisplay(true);
 }
 

src/graphics/GraphicsDeviceRenderer.cpp

@@ -54,7 +54,7 @@ namespace tcgfx {
 
     void GraphicsDeviceRenderer::drawMenuItem(GridPositionRowCacheEntry *entry, Coord where, Coord areaSize, const DrawingFlags& drawingFlags) {
         redrawNeeded = true;
-        entry->getMenuItem()->setChanged(false);
+        entry->getMenuItem()->setChanged(displayNumber, false);
 
         // if it's in a multi grid layout, put a small gap at the start of each one.
         if(entry->getPosition().getGridSize() > 1) {