#181 standard version dialog, #178 activation callback for lists.

Author: davetcc

examples/arduino32/piPicoTftEncoder/piPicoTftEncoder.ino

@@ -9,7 +9,7 @@
 #include <IoLogging.h>
 #include <TaskManagerIO.h>
 #include <BaseDialog.h>
-#include <tcMenuVersion.h>
+#include <tcUtil.h>
 
 // TFT_eSPI setup is "Setup60_RP2040_ILI9341.h".
 
@@ -24,8 +24,6 @@ const char* fileNames[] = {
 
 #define FILE_NAME_SIZE 5
 
-void onTitlePressed(int);
-
 void setup() {
     // This example logs using IoLogging, see the following guide to enable
     // https://www.thecoderscorner.com/products/arduino-libraries/io-abstraction/arduino-logging-with-io-logging/
@@ -35,7 +33,10 @@ void setup() {
     setupMenu();
 
     // Add a callback to show the build version when the title is pressed
-    setTitlePressedCallback(onTitlePressed);
+    // this uses the standard function to show a version dialog from tcUtil.h
+    setTitlePressedCallback([](int) {
+        showVersionDialog(&applicationInfo);
+    });
 
     // Add another button that directly controls the mute menu item
     switches.addSwitch(22, [] (pinid_t key, bool held) {
@@ -154,6 +155,9 @@ void CALLBACK_FUNCTION onShowDialogs(int) {
  */
 int CALLBACK_FUNCTION fnRootListRtCall(RuntimeMenuItem* item, uint8_t row, RenderFnMode mode, char* buffer, int bufferSize) {
    switch(mode) {
+    case RENDERFN_ACTIVATE:
+        serlogF2(SER_DEBUG, "List activate ", row);
+        return false;
     case RENDERFN_INVOKE:
         // we have a list of files and a refresh option at the end.
         if(row < FILE_NAME_SIZE) {
@@ -187,13 +191,3 @@ int CALLBACK_FUNCTION fnRootListRtCall(RuntimeMenuItem* item, uint8_t row, Rende
     default: return false;
     }
 }
-
-void onTitlePressed(int) {
-    withMenuDialogIfAvailable([](MenuBasedDialog *dlg) {
-        dlg->setButtons(BTNTYPE_NONE, BTNTYPE_CLOSE);
-        dlg->show("TcMenu PI Pico example", false);
-        char sz[20];
-        tccore::copyTcMenuVersion(sz, sizeof sz);
-        dlg->copyIntoBuffer(sz);
-    });
-}

src/MenuItems.h

@@ -297,6 +297,8 @@ enum RenderFnMode : uint8_t {
 	RENDERFN_EEPROM_POS,
 	/** the callback has been triggered, buffer not needed */
 	RENDERFN_INVOKE,
+    /** list only - an item in a list has been activated, IE the index has changed) */
+	RENDERFN_ACTIVATE,
 	/** A new value for a position in the list, provided in buffer, it's length is in size. - used only in editable mode */
 	RENDERFN_SET_VALUE,
 	/** Gets the range zero based, for this part - used only in editable mode, buffer not needed */

src/RuntimeMenuItem.cpp

@@ -32,7 +32,10 @@ ListRuntimeMenuItem::ListRuntimeMenuItem(menuid_t id, int numberOfRows, RuntimeR
 RuntimeMenuItem *ListRuntimeMenuItem::getChildItem(int pos) {
     menuType = MENUTYPE_RUNTIME_LIST;
     itemPosition = pos;
-    setActive((activeItem - 1) == pos);
+    if((activeItem - 1) == pos) {
+        setActive(true);
+        renderFn(this, activeItem, RENDERFN_ACTIVATE, nullptr, 0);
+    } else setActive(false);
     return this;
 }
 
@@ -43,7 +46,11 @@ RuntimeMenuItem *ListRuntimeMenuItem::asParent() {
 }
 
 RuntimeMenuItem *ListRuntimeMenuItem::asBackMenu() {
-    setActive(activeItem == 0);
+    if(activeItem == 0) {
+        // the title is active.
+        setActive(true);
+        renderFn(this, 0, RENDERFN_ACTIVATE, nullptr, 0);
+    } else setActive(false);
     menuType = MENUTYPE_BACK_VALUE;
     itemPosition = LIST_PARENT_ITEM_POS;
     return this;

src/extras/DrawableTouchCalibrator.cpp

@@ -138,4 +138,5 @@ bool IoaTouchScreenCalibrator::loadCalibration() {
     if(rom->hasErrorOccurred()) return false;
 
     serlogF(SER_TCMENU_INFO, "Loaded calibration OK");
+    return true;
 }

src/tcMenuVersion.h

@@ -39,6 +39,7 @@ namespace tccore {
         fastltoa(buffer, TCMENU_PATCH, 3, NOT_PADDED, bufferSize);
     }
 
+
 }
 
 #endif //TCMENU_VERSION_H

src/tcUtil.cpp

@@ -6,6 +6,8 @@
 #include "MenuItems.h"
 #include "tcMenu.h"
 #include "tcUtil.h"
+#include "BaseDialog.h"
+#include "tcMenuVersion.h"
 
 #if defined __AVR__ || defined ESP_H
 char szGlobalBuffer[16];
@@ -23,3 +25,15 @@ uint8_t safeProgCpy(char* dst, const char* pgmSrc, uint8_t size) {
     dst[pos] = 0;
     return pos;
 }
+
+void showVersionDialog(const ConnectorLocalInfo *localInfo) {
+    static const ConnectorLocalInfo *localInfoStatic = localInfo;
+    withMenuDialogIfAvailable([](MenuBasedDialog *dialog) {
+        dialog->setButtons(BTNTYPE_NONE, BTNTYPE_CLOSE);
+        dialog->show(localInfoStatic->name, false, nullptr);
+        char sz[10];
+        tccore::copyTcMenuVersion(sz, sizeof(sz));
+        dialog->copyIntoBuffer(sz);
+    });
+
+}

src/tcUtil.h

@@ -29,6 +29,8 @@ struct ConnectorLocalInfo {
     char uuid[38];
 };
 
+void showVersionDialog(const ConnectorLocalInfo* localInfo);
+
 // There now follows pretty much internal code, boolean negative for dealing with program memory
 // never use direct program memory commands, always prefer these, it allows us
 // to compile it out much easier.