#242 fixes for outside Arduino use, in particular for ESP32 IDF

Author: dave

examples/esp/esp32s2Saola/esp32s2Saola.emf

@@ -539,8 +539,7 @@
       "menuDefinitions": []
     },
     "packageNamespace": "",
-    "appIsModular": false,
-    "listOfEmbeddedForms": []
+    "appIsModular": false
   },
   "stringLists": []
 }

library.json

@@ -26,7 +26,7 @@
         "authors": "tcmenu"
       }
     ],
-    "version": "4.4.0",
+    "version": "4.4.1",
     "license": "Apache-2.0",
     "frameworks": "arduino, mbed",
     "platforms": "*"

library.properties

@@ -4,7 +4,7 @@
 #
 
 name=tcMenu
-version=4.4.0
+version=4.4.1
 maintainer=www.thecoderscorner.com
 author=davetcc
 category=Other

src/BaseRenderers.h

@@ -241,7 +241,7 @@ class MenuRenderer {
     /**
      * Gets the buffer size of the buffer
      */
-    uint8_t getBufferSize() {return bufferSize;}
+    uint8_t getBufferSize() const {return bufferSize;}
 
     /** Returns if this is a no display type renderer or a base renderer type. */
     RendererType getRendererType() { return rendererType; }

src/graphics/BaseGraphicalRenderer.cpp

@@ -49,7 +49,7 @@ uint8_t BaseGraphicalRenderer::setActiveItem(MenuItem *item) {
     auto ret = BaseMenuRenderer::setActiveItem(item);
 
     // if we're drawing a list, clear out the drawing location, lists handled differently
-    if(menuMgr.getCurrentMenu()->getMenuType() == MENUTYPE_RUNTIME_LIST) {
+    if(menuMgr.getCurrentMenu() && menuMgr.getCurrentMenu()->getMenuType() == MENUTYPE_RUNTIME_LIST) {
         drawingLocation = CachedDrawingLocation();
         return 0;
     }
@@ -85,7 +85,6 @@ uint8_t BaseGraphicalRenderer::setActiveItem(MenuItem *item) {
         serlogF2(SER_TCMENU_DEBUG, "Screen Row moved ", startRow);
     }
     drawingLocation = CachedDrawingLocation(startY, startRow);
-
     return ret;
 }
 
@@ -369,6 +368,7 @@ void BaseGraphicalRenderer::recalculateDisplayOrder(MenuItem *root, bool safeMod
     if(areRowsOutOfOrder() && !safeMode) {
         recalculateDisplayOrder(root, true);
     }
+    serlogF(SER_TCMENU_INFO, "Calculated Display Order");
 }
 
 

src/graphics/DeviceDrawableHelper.h

@@ -140,6 +140,11 @@ namespace tcgfx {
          */
         explicit DeviceDrawableHelper(DeviceDrawable* root);
 
+        void setDrawable(DeviceDrawable* dr) {
+            this-> drawable = dr;
+            this->rootDrawable = dr;
+        }
+
 
         void reConfigure(color_t *palette, uint8_t paletteSize, const Coord &startPosition, const Coord &size);
 

src/graphics/GraphicsDeviceRenderer.cpp

@@ -25,9 +25,11 @@ namespace tcgfx {
 
     GraphicsDeviceRenderer::GraphicsDeviceRenderer(int bufferSize, const char *appTitle, DeviceDrawable *drawable)
             : BaseGraphicalRenderer(bufferSize, 1, 1, false, appTitle), rootDrawable(drawable), helper(drawable) {
-        const Coord &coord = rootDrawable->getDisplayDimensions();
-        width = coord.x;
-        height = coord.y;
+        if (rootDrawable) {
+            const Coord &coord = rootDrawable->getDisplayDimensions();
+            width = coord.x;
+            height = coord.y;
+        }
     }
 
     void GraphicsDeviceRenderer::drawingCommand(BaseGraphicalRenderer::RenderDrawingCommand command) {
@@ -513,5 +515,11 @@ namespace tcgfx {
         return (cardLayoutPane->isSubMenuCardLayout(rootItem)) ? LAYOUT_CARD_SIDEWAYS : LAYOUT_VERTICAL_DEFAULT;
     }
 
-
+    void GraphicsDeviceRenderer::setDrawable(DeviceDrawable *drawable) {
+        this->rootDrawable = drawable;
+        this->helper.setDrawable(drawable);
+        const Coord &coord = rootDrawable->getDisplayDimensions();
+        width = coord.x;
+        height = coord.y;
+    }
 } // namespace tcgfx

src/graphics/GraphicsDeviceRenderer.h

@@ -148,6 +148,14 @@ namespace tcgfx {
         void setCardLayoutStatusForSubMenu(MenuItem* root, bool onOrOff);
 
         LayoutMode getLayoutMode(MenuItem* rootItem) override;
+
+        /**
+         * this is for cases where the display driver and drawable are allocated during setup instead of at start up
+         * time, and therefore need to be configured in creation order.
+         * @param drawable the drawable instance to associate
+         */
+        void setDrawable(DeviceDrawable* drawable);
+
     protected:
         /**
          * Overrides the default implementation to allow for card based layouts, if this is not enabled for the submenu