prepare release

TcMenu · Jan 29, 2024 · 4603506 · 4603506
1 parent 74afe47
commit 4603506
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/embeddedJavaExample/src/main/java/com/thecoderscorner/menuexample/tcmenu/MenuConfig.java b/embeddedJavaExample/src/main/java/com/thecoderscorner/menuexample/tcmenu/MenuConfig.java
@@ -44,17 +44,6 @@ public MenuManagerServer menuManagerServer(Clock clock, EmbeddedJavaDemoMenu men
         return new MenuManagerServer(executorService, menuDef.getMenuTree(), mandatoryStringProp("server.name"), UUID.fromString(mandatoryStringProp("server.uuid")), authenticator, clock);
     }
 
-    @TcComponent
-    public EmbeddedJavaDemoController menuController() {
-        return new EmbeddedJavaDemoController(
-                getBean(EmbeddedJavaDemoMenu.class),
-                getBean(JfxNavigationManager.class),
-                getBean(ScheduledExecutorService.class),
-                getBean(GlobalSettings.class),
-                getBean(MenuItemStore.class)
-        );
-    }
-
     @TcComponent
     public MenuItemStore itemStore(GlobalSettings settings, EmbeddedJavaDemoMenu menuDef) {
         return new MenuItemStore(settings, menuDef.getMenuTree(), "", 7, 2, settings.isDefaultRecursiveRendering());
@@ -99,6 +88,13 @@ public TcJettyWebServer webServer(ConfigurableProtocolConverter protocol, Clock
         return new TcJettyWebServer(protocol, clock, "./data/www", 8080, false);
     }
 
+    @TcComponent
+    public EmbeddedJavaDemoController controller(EmbeddedJavaDemoMenu menuDef, JfxNavigationManager navMgr,
+                                                 ScheduledExecutorService executor, GlobalSettings settings,
+                                                 MenuItemStore itemStore) {
+        return new EmbeddedJavaDemoController(menuDef, navMgr, executor, settings, itemStore);
+    }
+
     public MenuConfig() {
         // Do not change this constructor, it is replaced with each build, put your objects in appCustomConfiguration
         super(null, null);

diff --git a/xmlPlugins/core-display/adaGfxDisplay.xml b/xmlPlugins/core-display/adaGfxDisplay.xml
@@ -26,8 +26,6 @@
     <SourceFiles>
         <Replacement find="#define DISPLAY_HAS_MEMBUFFER (true|false)" replace="#define DISPLAY_HAS_MEMBUFFER ${DISPLAY_BUFFERED}"/>
         <Replacement find="Adafruit_Driver" replace="${DISPLAY_TYPE}"/>
-        <Replacement find="Adafruit_Driver" replace="${DISPLAY_TYPE}"/>
-        <Replacement find="Adafruit_Header" replace="${DISPLAY_TYPE}"/>
         <Replacement find="Adafruit_Header" replace="${DISPLAY_TYPE}"/>
         <SourceFile name="adaGfxDriver/tcMenuAdaFruitGfxMono.cpp" whenProperty="DISPLAY_BUFFERED" isValue="true"/>
         <SourceFile name="adaGfxDriver/tcMenuAdaFruitGfxMono.h" whenProperty="DISPLAY_BUFFERED" isValue="true"/>

diff --git a/xmlPlugins/core-display/adaGfxDriver/tcMenuAdaFruitGfx.cpp b/xmlPlugins/core-display/adaGfxDriver/tcMenuAdaFruitGfx.cpp
@@ -21,7 +21,7 @@ using namespace tcgfx;
 
 
 #if DISPLAY_HAS_MEMBUFFER == true
-#define refreshDisplayIfNeeded(gr, needUpd) {if(needUpd) reinterpret_cast<Adafruit_ILI9341*>(gr)->display();}
+#define refreshDisplayIfNeeded(gr, needUpd) {if(needUpd) reinterpret_cast<Adafruit_Driver*>(gr)->display();}
 #else
 #define refreshDisplayIfNeeded(g, n)
 #endif

diff --git a/xmlPlugins/core-display/adaGfxDriver/tcMenuAdaFruitGfx.h b/xmlPlugins/core-display/adaGfxDriver/tcMenuAdaFruitGfx.h
@@ -23,7 +23,7 @@
 #include <BaseRenderers.h>
 #include <tcUnicodeHelper.h>
 #include <Adafruit_GFX.h>
-#include <Adafruit_ILI9341.h>
+#include <Adafruit_Header.h>
 #include <gfxfont.h>
 #include <graphics/GfxMenuConfig.h>
 #include <BaseDialog.h>