#229 theme builder example from latest designer

Author: davetcc

examples/esp/esp32Amplifier/ThemeCoolBlueModern.h

@@ -0,0 +1,68 @@
+/**
+ * Cool blue modern theme by TheCodersCorner.com. This is part of the standard themes shipped with TcMenu.
+ * This file will not be updated by the designer, you can edit.
+ */
+#ifndef THEME_COOL_BLUE
+#define THEME_COOL_BLUE
+
+#include <graphics/TcThemeBuilder.h>
+
+const color_t coolBlueTitlePalette[] = {RGB(0,0,0), RGB(20,132,255), RGB(192,192,192), RGB(64, 64, 64)};
+const color_t coolBlueItemPalette[] = {RGB(255, 255, 255), RGB(0,64,135), RGB(20,133,255), RGB(31,100,178)};
+const color_t coolBlueActionPalette[] = {RGB(255, 255, 255), RGB(0,45,120), RGB(20,133,255), RGB(31,100,178)};
+
+#define ACTION_BORDER_WIDTH 0
+#define USE_SLIDER_FOR_ANALOG 1
+
+/**
+ * This is one of the stock themes, you can modify it to meet your requirements, and it will not be updated by tcMenu
+ * Designer unless you delete it. This sets up the fonts, spacing and padding for all items.
+ * @param gr the graphical renderer
+ * @param itemFont the font for items
+ * @param titleFont the font for titles
+ * @param needEditingIcons if editing icons are needed
+ */
+void installCoolBlueModernTheme(GraphicsDeviceRenderer& gr, const MenuFontDef& itemFont, const MenuFontDef& titleFont,
+                                bool needEditingIcons, BaseGraphicalRenderer::TitleMode titleMode, bool useUnicode) {
+
+    TcThemeBuilder themeBuilder(gr);
+
+    themeBuilder.dimensionsFromRenderer()
+            .withSelectedColors(RGB(31, 88, 100), RGB(255, 255, 255))
+            .withItemPadding(MenuPadding(4, 3, 4, 3))
+            .withTitlePadding(MenuPadding(4, 3, 4, 3))
+            .withRenderingSettings(titleMode, USE_SLIDER_FOR_ANALOG)
+            .withPalette(coolBlueItemPalette)
+            .withNativeFont(itemFont.fontData, itemFont.fontMag)
+            .withSpacing(2);
+
+    if(needEditingIcons) {
+        themeBuilder.withStandardMedResCursorIcons();
+    }
+
+    if(useUnicode) {
+        themeBuilder.enableTcUnicode();
+    }
+
+    themeBuilder.defaultItemProperties()
+            .withJustification(GridPosition::JUSTIFY_TITLE_LEFT_VALUE_RIGHT)
+            .apply();
+
+    themeBuilder.defaultTitleProperties()
+            .withJustification(GridPosition::JUSTIFY_CENTER_WITH_VALUE)
+            .withNativeFont(titleFont.fontData, titleFont.fontMag)
+            .withPalette(coolBlueTitlePalette)
+            .withSpacing(3)
+            .apply();
+
+
+    themeBuilder.defaultActionProperties()
+            .withJustification(GridPosition::JUSTIFY_CENTER_WITH_VALUE)
+            .withPalette(coolBlueActionPalette)
+            .withBorder(MenuBorder(ACTION_BORDER_WIDTH))
+            .apply();
+
+    themeBuilder.apply();
+}
+
+#endif //THEME_COOL_BLUE

examples/esp/esp32Amplifier/ThemeCoolBlueModernBuilder.h

@@ -470,9 +470,9 @@
     "lastDisplayUuid": "e6342680-6fab-4d1b-ac08-ce8dbfc0974c",
     "lastInputUuid": "183448ac-a717-4b2b-823d-ffc7c8140ab9",
     "lastRemoteUuids": [
-      "46c30011-cac6-4598-a7b8-b0630d55daab"
+      "B93C6ACA-F1A3-4FF3-87F1-07E4F2F1ED5A"
     ],
-    "lastThemeUuid": "850dc0a3-f534-47c2-94d8-1e64ff368a54",
+    "lastThemeUuid": "1947F585-9D36-448C-8A80-B425686107BD",
     "applicationUUID": "4656c798-10c6-4110-8e03-b9c51ed8fffb",
     "applicationName": "ESP Amplifier",
     "lastProperties": [
@@ -612,28 +612,18 @@
         "subsystem": "INPUT"
       },
       {
-        "name": "ESPWIFI_CONCURRENT_CONNECTIONS",
-        "latestValue": "1",
-        "subsystem": "REMOTE"
-      },
-      {
-        "name": "ESPWIFI_LISTEN_PORT1",
-        "latestValue": "3333",
+        "name": "ETH_LIBRARY_TYPE",
+        "latestValue": "ESP32_WIFI",
         "subsystem": "REMOTE"
       },
       {
-        "name": "ESPWIFI_LISTEN_PORT2",
-        "latestValue": "3334",
+        "name": "REMOTE_IP_ADDRESS",
+        "latestValue": "192.168.0.37",
         "subsystem": "REMOTE"
       },
       {
-        "name": "ESPWIFI_LISTEN_PORT3",
-        "latestValue": "3335",
-        "subsystem": "REMOTE"
-      },
-      {
-        "name": "ESPWIFI_BUFFERED",
-        "latestValue": "true",
+        "name": "REMOTE_PORT",
+        "latestValue": "3333",
         "subsystem": "REMOTE"
       },
       {

examples/esp/esp32Amplifier/esp32Amplifier.emf

@@ -8,9 +8,11 @@
     use elsewhere.
  */
 
+// Generated for Arduino ESP32 by TcMenu 4.3.1-SNAPSHOT on 2024-08-31T08:17:44.237948Z.
+
 #include <tcMenu.h>
 #include "esp32Amplifier_menu.h"
-#include "ThemeCoolBlueModern.h"
+#include "ThemeCoolBlueModernBuilder.h"
 
 // Global variable declarations
 const PROGMEM  ConnectorLocalInfo applicationInfo = { "ESP Amplifier", "4656c798-10c6-4110-8e03-b9c51ed8fffb" };
@@ -24,9 +26,9 @@ iotouch::ResistiveTouchInterrogator touchInterrogator(2, 33, 32, 0);
 iotouch::TouchOrientationSettings touchOrientation(true, false, true);
 MenuTouchScreenManager touchScreen(&touchInterrogator, &renderer, touchOrientation);
 tcextras::IoaTouchScreenCalibrator touchCalibrator(&touchScreen, &renderer, 400);
-ClientEthernetInitialisation ethernetInitialisation("192.168.0.37", 3333);
-ClientEthernetTagValTransport ethernetTransport;
-TagValueRemoteServerConnection ethernetConnection(ethernetTransport, ethernetInitialisation);
+ClientEthernetInitialisation clientEthInit("192.168.0.37", 3333);
+ClientEthernetTagValTransport clientEthTransport;
+TagValueRemoteServerConnection clientConnection(clientEthTransport, clientEthInit);
 
 // Global Menu Item declarations
 const PROGMEM char pgmStrConnectivityAuthenticatorText[] = { "Authenticator" };
@@ -101,19 +103,17 @@ void setupMenu() {
     menuMgr.setAuthenticator(&authManager);
     // Now add any readonly, non-remote and visible flags.
     menuConnectivityIPAddress.setReadOnly(true);
-    menuConnectivityAuthenticator.setLocalOnly(true);
     menuConnectivityIoTMonitor.setLocalOnly(true);
+    menuConnectivityAuthenticator.setLocalOnly(true);
 
     // Code generated by plugins and new operators.
     tft.begin();
     tft.setRotation(1);
     renderer.setUpdatesPerSecond(10);
     touchScreen.start();
     menuMgr.initWithoutInput(&renderer, &menuVolume);
-    remoteServer.addConnection(&ethernetConnection);
-    renderer.setTitleMode(BaseGraphicalRenderer::TITLE_ALWAYS);
-    renderer.setUseSliderForAnalog(true);
-    installCoolBlueModernTheme(renderer, MenuFontDef(nullptr, 4), MenuFontDef(nullptr, 4), false);
+    remoteServer.addConnection(&clientConnection);
+    installCoolBlueModernTheme(renderer, MenuFontDef(nullptr, 4), MenuFontDef(nullptr, 4), false, BaseGraphicalRenderer::TITLE_ALWAYS, false);
 
     // We have an IoT monitor, register the server
     menuConnectivityIoTMonitor.setRemoteServer(remoteServer);

examples/esp/esp32Amplifier/esp32Amplifier_menu.cpp

@@ -35,13 +35,8 @@ extern GraphicsDeviceRenderer renderer;
 extern iotouch::ResistiveTouchInterrogator touchInterrogator;
 extern MenuTouchScreenManager touchScreen;
 extern tcextras::IoaTouchScreenCalibrator touchCalibrator;
-extern WiFiServer server;
-extern ClientEthernetInitialisation ethernetInitialisation;
-
-
-extern EepromAuthenticatorManager authManager;
-
-
+extern ClientEthernetInitialisation clientEthInit;
+extern ClientEthernetTagValTransport clientEthTransport;
 
 // Any externals needed by IO expanders, EEPROMs etc
 

examples/esp/esp32Amplifier/esp32Amplifier_menu.h

@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2018 https://www.thecoderscorner.com (Dave Cherry).
+ * This product is licensed under an Apache license, see the LICENSE file in the top-level directory.
+ */
+
+/**
+ * Ethernet remote capability plugin. This file is a plugin file and should not be directly edited,
+ * it will be replaced each time the project is built. If you want to edit this file in place,
+ * make sure to rename it first.
+ */
+
+#include "ClientEthernetTransport.h"
+#include <TaskManager.h>
+
+using namespace tcremote;
+
+#if ETHERNET_BUFFER_SIZE > 0 // we need buffering when dealing with Ethernet2
+
+bool ClientEthernetTagValTransport::available() {
+	return client && client.connected();
+}
+
+bool ClientEthernetTagValTransport::connected() {
+	return client && client.connected();
+}
+
+void ClientEthernetTagValTransport::flush() {
+    if(!client || writeBufferPos == 0) return;
+
+    if((int)client.write(writeBuffer, writeBufferPos) == writeBufferPos) {
+        serdebugF2("Buffer written ", writeBufferPos);
+        writeBufferPos = 0;
+        client.flush();
+    }
+    else {
+        writeBufferPos = 0;
+        close();
+    }
+}
+
+int ClientEthernetTagValTransport::fillReadBuffer(uint8_t* dataBuffer, int maxData) {
+    if(client && client.connected() && client.available()) {
+        auto amt = client.read(dataBuffer, maxData);
+        if(amt <= 0) {
+            close();
+            return 0;
+        }
+        serdebugF2("read to buffer ", amt);
+        return amt;
+    }
+    return 0;
+}
+
+void ClientEthernetTagValTransport::close() {
+    serdebugF("socket close");
+    BaseBufferedRemoteTransport::close();
+    client.stop();
+}
+
+#else // unbuffed client - requires library to support Nagle algorythm.
+
+bool EthernetTagValTransport::available() {
+	return client && client.connected();
+}
+
+bool EthernetTagValTransport::connected() {
+	return client && client.connected();
+}
+
+int EthernetTagValTransport::writeChar(char data) {
+    // only uncomment below for worst case debugging..
+//	serdebug2("writing ", data);
+	return client.write(data);
+}
+
+int EthernetTagValTransport::writeStr(const char* data) {
+    // only uncomment below for worst case debugging..
+//	serdebug2("writing ", data);
+	return client.write(data);
+}
+
+void EthernetTagValTransport::flush() {
+	if(client) client.flush();
+}
+
+uint8_t EthernetTagValTransport::readByte() {
+	return client.read();
+}
+
+bool EthernetTagValTransport::readAvailable() {
+	return client && client.connected() && client.available();
+}
+
+void EthernetTagValTransport::close() {
+    serdebugF("socket close");
+    client.stop();
+    currentField.msgType = UNKNOWN_MSG_TYPE;
+    currentField.fieldType = FVAL_PROCESSING_AWAITINGMSG;
+}
+
+#endif
+
+bool ClientEthernetInitialisation::attemptInitialisation() {
+#ifdef ARDUINO_ARCH_STM32
+    // we'll keep checking if the link is up before trying to initialise further
+    if(Ethernet.linkStatus() == LinkOFF) return false;
+#endif
+    serdebugF("Initialising server ");
+    initialised = true;
+    return initialised;
+}
+
+bool ClientEthernetInitialisation::attemptNewConnection(BaseRemoteServerConnection *remoteServerConnection) {
+    if(!checkBackoffPeriod()) return false;
+
+    client.connect(host, port);
+    if(client.connected()) {
+        serdebugF("Client found");
+        auto* tvCon = reinterpret_cast<TagValueRemoteServerConnection*>(remoteServerConnection);
+        reinterpret_cast<ClientEthernetTagValTransport*>(tvCon->transport())->setClient(client);
+        return true;
+    }
+    return false;
+}
+
+bool ClientEthernetInitialisation::checkBackoffPeriod() {
+    if(backOffPeriod == 0) {
+        backOffPeriod = DEFAULT_BACKOFF_PERIOD;
+        return true;
+    }
+    backOffPeriod--;
+    return false;
+}