Interim update midway through feature

Author: dave

src/MenuItems.h

@@ -192,6 +192,15 @@ struct FloatMenuInfo {
 	MenuCallbackFn callback;
 };
 
+union AllMenuInfoTypes {
+	AnyMenuInfo anyInfo;
+	AnalogMenuInfo analogInfo;
+	EnumMenuInfo enumInfo;
+	BooleanMenuInfo booleanInfo;
+	SubMenuInfo subInfo;
+	FloatMenuInfo floatInfo;
+};
+
 /** 
  * Each menu item can be in the following states.
  */

src/TcMenuBuilder.cpp

@@ -0,0 +1,67 @@
+//
+// Created by David Cherry on 22/01/2026.
+//
+
+#include "TcMenuBuilder.h"
+
+#include "tcMenu.h"
+
+void MenuFlags::setOnMenuItem(MenuItem &item) const {
+    item.setReadOnly((flags & INT_MENU_FLAG_READ)!=0);
+    item.setSecured((flags & INT_MENU_FLAG_SECURE)!=0);
+    item.setLocalOnly((flags & INT_MENU_FLAG_LOCAL)!=0);
+    if ((flags & INT_MENU_FLAG_HIDE)!=0) {
+        item.setVisible(false);
+    }
+}
+
+BtreeList<menuid_t, AnyInfoReserve> infoAllocator;
+
+void TcMenuBuilder::putAtEndOfMenu(MenuItem * toAdd) {
+    int loopcount = 0;
+    auto item = &localRoot;
+    while (item && item->getNext() && loopcount < 100) {
+        ++loopcount;
+        item = item->getNext();
+    }
+    if (item) {
+        item->setNext(toAdd);
+    }
+}
+
+AnyInfoReserve* TcMenuBuilder::fillInAnyInfo(menuid_t id, const char *name, int eeprom, int maxVal, MenuCallbackFn callback_fn) {
+    AnyInfoReserve reserve;
+    reserve.getInfo()->anyInfo.id = id;
+    strncpy(reserve.getInfo()->anyInfo.name, name, NAME_SIZE_T);
+    reserve.getInfo()->anyInfo.eepromAddr = eepromPosition;
+    reserve.getInfo()->anyInfo.callback = callbackFn;
+    reserve.getInfo()->anyInfo.maxValue = maxVal;
+    infoAllocator.add(reserve);
+    return infoAllocator.getByKey(id);
+}
+
+TcMenuBuilder & TcMenuBuilder::actionItem(menuid_t id, const char *name, MenuFlags flags, MenuCallbackFn callbackFn) {
+    AnyInfoReserve* reserve = fillInAnyInfo(id, name, 0xFFFF, 0, callbackFn);
+    auto item = new FloatMenuItem(&reserve.getInfo()->floatInfo, nullptr,  false);
+    flags.setOnMenuItem(*item);
+    putAtEndOfMenu(item);
+    return *this;
+}
+
+TcMenuBuilder& TcMenuBuilder::floatItem(menuid_t id, const char *name, EepromPosition eepromPosition, uint16_t decimalPlaces, MenuFlags flags, MenuCallbackFn callbackFn) {
+    AnyInfoReserve* reserve = fillInAnyInfo(id, name, 0xFFFF, decimalPlaces, );
+    auto item = new FloatMenuItem(&reserve.getInfo()->floatInfo, nullptr,  false);
+    flags.setOnMenuItem(*item);
+    putAtEndOfMenu(item);
+    return *this;
+}
+
+MenuFlags flags = MenuFlags().localOnly();
+
+MenuItem item(MENUTYPE_FLOAT_VALUE, nullptr, nullptr, false);
+TcMenuBuilder builder(item);
+
+void f() {
+    builder.floatItem(1, "test", 0, 2, MenuFlags().localOnly())
+        .floatItem(1, "test", 0, 2, NoMenuFlags);
+}

src/TcMenuBuilder.h

@@ -0,0 +1,60 @@
+
+#ifndef TCLIBRARYDEV_TCMENUBUILDER_H
+#define TCLIBRARYDEV_TCMENUBUILDER_H
+#include "EepromAbstraction.h"
+#include "MenuItems.h"
+
+
+class MenuManager;
+
+#define INT_MENU_FLAG_READ 0x01
+#define INT_MENU_FLAG_HIDE 0x02
+#define INT_MENU_FLAG_LOCAL 0x04
+#define INT_MENU_FLAG_SECURE 0x08
+
+class MenuFlags {
+    uint8_t flags;
+public:
+    MenuFlags() = default;
+    ~MenuFlags() = default;
+
+    MenuFlags& readOnly() { flags |= INT_MENU_FLAG_READ; return *this; }
+    MenuFlags& hide() { flags |= INT_MENU_FLAG_HIDE; return *this; }
+    MenuFlags& localOnly() { flags |= INT_MENU_FLAG_LOCAL; return *this; }
+    MenuFlags& securePin() { flags |= INT_MENU_FLAG_SECURE; return *this; }
+
+    void setOnMenuItem(MenuItem& item) const;
+};
+
+const MenuFlags NoMenuFlags;
+
+class AnyInfoReserve {
+    AllMenuInfoTypes info;
+public:
+    AnyInfoReserve() : info() {}
+    AnyInfoReserve(const AnyInfoReserve&) = default;
+    AnyInfoReserve& operator=(const AnyInfoReserve&) = default;
+    ~AnyInfoReserve() = default;
+    menuid_t getKey() const { return info.anyInfo.id; }
+    bool isInUse() const { return info.anyInfo.id > 0;}
+    AllMenuInfoTypes* getInfo() { return &info; }
+};
+
+class TcMenuBuilder {
+private:
+    MenuItem& localRoot;
+public:
+    TcMenuBuilder(MenuItem& root) : localRoot(root) {}
+    ~TcMenuBuilder() = default;
+
+    void putAtEndOfMenu(MenuItem * item);
+    AnyInfoReserve* fillInAnyInfo(menuid_t id, const char *name, int eeprom, int maxVal, MenuCallbackFn callback_fn);
+
+    TcMenuBuilder& floatItem(menuid_t id, const char *name, EepromPosition eepromPosition, uint16_t decimalPlaces, MenuFlags flags, float value = 0.0F, MenuCallbackFn callbackFn = nullptr);
+    TcMenuBuilder& actionItem(menuid_t id, const char *name, MenuFlags flags, MenuCallbackFn callbackFn = nullptr);
+    TcMenuBuilder& boolItem(menuid_t id, const char *name, EepromPosition eepromPosition, BooleanNaming naming, MenuFlags flags, bool initial = false, MenuCallbackFn callbackFn = nullptr);
+    void build(MenuManager& mgr);
+};
+
+
+#endif //TCLIBRARYDEV_TCMENUBUILDER_H

src/tcMenu.h

@@ -510,6 +510,7 @@ class MenuManager {
 	 * @param item the item to become the active edit, the right submenu should have already been enabled first
 	 */
 	void setupForEditing(MenuItem* item);
+
 protected:
 	void actionOnCurrentItem(MenuItem * toEdit);
     void actionOnSubMenu(MenuItem* nextSub);