prepare for release, fixes to touch screen

Author: dave

examples/arduino32/stm32DuinoDemo/generated/stm32DuinoDemo_menu.cpp

@@ -120,7 +120,7 @@ void setupMenu() {
     switches.init(internalDigitalIo(), SWITCHES_POLL_EVERYTHING, true);
     menuMgr.initForEncoder(&renderer, &menu33, PC8, PC10, PC9);
     remoteServer.addConnection(&ethernetConnection);
-    renderer.setTitleMode(BaseGraphicalRenderer::TITLE_ALWAYS);
+    renderer.setTitleMode(BaseGraphicalRenderer::NO_TITLE);
     renderer.setUseSliderForAnalog(false);
     installMonoInverseTitleTheme(renderer, MenuFontDef(nullptr, 1), MenuFontDef(u8g2_font_prospero_bold_nbp_tr, 1), true);
 

examples/arduino32/stm32DuinoDemo/stm32DuinoDemo.emf

@@ -662,7 +662,7 @@
       },
       {
         "name": "TITLE_SHOW_MODE",
-        "latestValue": "TITLE_ALWAYS",
+        "latestValue": "NO_TITLE",
         "subsystem": "THEME"
       },
       {

src/extras/DrawableTouchCalibrator.cpp

@@ -57,21 +57,24 @@ void IoaTouchScreenCalibrator::renderLoop(unsigned int currentValue, RenderPress
     strcat(sz, ", z: ");
     fastltoa(sz, touchState, 1, NOT_PADDED, sizeof sz);
     drawable->setDrawColor(TOUCH_BLACK);
-    drawable->drawBox(Coord(0, 140), Coord(dims.x, 50), true);
+    drawable->drawBox(Coord(0, 140), Coord(dims.x, 70), true);
     drawable->setColors(TOUCH_YELLOW, TOUCH_BLACK);
     drawable->drawText(Coord(0, 140), itemConfig->getFont(), 0, sz);
 
+    drawable->setDrawColor(TOUCH_BLACK);
+    drawable->setColors(TOUCH_YELLOW, TOUCH_BLACK);
+
     strcpy(sz, "sx:");
     fastftoa(sz, calibrationHandler.getMinX(), 3, sizeof sz);
     strcat(sz, ", ex:");
     fastftoa(sz, calibrationHandler.getMaxX(), 3, sizeof sz);
-    strcat(sz, ", sy:");
+    drawable->drawText(Coord(0, 160), itemConfig->getFont(), 0, sz);
+
+    strcpy(sz, ", sy:");
     fastftoa(sz, calibrationHandler.getMinY(), 3, sizeof sz);
     strcat(sz, ", ey:");
     fastftoa(sz, calibrationHandler.getMaxY(), 3, sizeof sz);
-    drawable->setDrawColor(TOUCH_BLACK);
-    drawable->setColors(TOUCH_YELLOW, TOUCH_BLACK);
-    drawable->drawText(Coord(0, 160), itemConfig->getFont(), 0, sz);
+    drawable->drawText(Coord(0, 180), itemConfig->getFont(), 0, sz);
 #endif
 
     int buttonSize = 75;
@@ -105,9 +108,7 @@ void IoaTouchScreenCalibrator::renderLoop(unsigned int currentValue, RenderPress
         } else if(oldX > rightCorner) {
             calibrationHandler.setXPosition(lastX, !orientation.isXInverted());
             calibrationHandler.setYPosition(lastY, orientation.isYInverted());
-
         }
-
     } else if(oldY > (dims.y - buttonSize)) {
         // bottom
         if(oldX < buttonSize) {
@@ -116,7 +117,7 @@ void IoaTouchScreenCalibrator::renderLoop(unsigned int currentValue, RenderPress
             giveItBack();
         }
         else if(oldX > rightCorner) {
-            calibrationHandler.setYPosition(lastY, orientation.isYInverted());
+            calibrationHandler.setYPosition(lastY, !orientation.isYInverted());
         }
     }
 

src/graphics/MenuTouchScreenEncoder.cpp

@@ -69,7 +69,10 @@ void MenuTouchScreenEncoder::touched(const TouchNotification &evt) {
             bool wasActive = renderer->getActiveItem() == theItem;
             if(!wasActive) {
                 // if it's not active try and activate, if it fails we can't continue.
-                if (!menuMgr.activateMenuItem(theItem)) return;
+                uint8_t itemIdx = renderer->setActiveItem(theItem);
+                if(switches.getEncoder()) {
+                    switches.getEncoder()->setCurrentReading(itemIdx);
+                }
             }
 
             auto menuType = theItem->getMenuType();

src/tcMenu.cpp

@@ -302,23 +302,6 @@ MenuItem* MenuManager::getParentAndReset() {
 	return pItem;
 }
 
-bool MenuManager::activateMenuItem(MenuItem *item) {
-    if(renderer->getRendererType() == RENDER_TYPE_NOLOCAL) return false;
-    auto* r = reinterpret_cast<BaseMenuRenderer*>(renderer);
-    uint8_t count = r->itemCount(getCurrentMenu(), false);
-    for(int i=0; i < count; i++) {
-        auto* pItem = r->getMenuItemAtIndex(getCurrentMenu(), i);
-        if(pItem != nullptr && pItem->getId() == item->getId()) {
-            if(switches.getEncoder()) {
-                switches.getEncoder()->setCurrentReading(i);
-            }
-            valueChanged(i);
-            return true;
-        }
-    }
-    return false;
-}
-
 void MenuManager::setupForEditing(MenuItem* item) {
 	// if the item is NULL, or it's read only, then it can't be edited.
 	if (item == nullptr || item->isReadOnly()) return;

src/tcMenu.h

@@ -358,14 +358,6 @@ class MenuManager {
 	 */
 	MenuItem* findCurrentActive();
 
-	/**
-	 * Activates the menu item provided if it is within the current menu, this actually does
-	 * more than set active, it does the equivalent of an encoder button press.
-	 * @param item the item to activate
-	 * @return if the item was activated
-	 */
-	bool activateMenuItem(MenuItem* item);
-
 	/**
 	 * Get the root of all menus, the first menu item basically
 	 */