#564 #593 Support for RGB OLED 1351 using Adafruit library. Ensure I18n cleared when closed.

Author: davetcc

web-designer/tcmenu-code-generator/src/main/java/com/thecoderscorner/menu/editorui/generator/plugin/display/ColorAdafruitStarterPlugin.java

@@ -11,6 +11,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Stream;
 
 import static com.thecoderscorner.menu.editorui.generator.core.CreatorProperty.PropType.VARIABLE;
 import static com.thecoderscorner.menu.editorui.generator.core.HeaderDefinition.HeaderType;
@@ -26,9 +27,9 @@ protected ColorAdafruitStarterPlugin(JavaPluginGroup group, CodePluginManager ma
         requiredProperties = createRequiredProperties(); 
         var codePlugin = new CodePluginItem();
         codePlugin.setId("4dcb12ec-13d8-4466-b8b6-bd575eae4612");
-        codePlugin.setDescription("AdafruitGFX quick start for color displays: ST77xx and ILI9341");
+        codePlugin.setDescription("AdafruitGFX quick start for color displays: ST77xx/ILI9341/SSD1351");
         codePlugin.setConfig(group.getConfig());
-        codePlugin.setExtendedDescription("Draw menus using AdafruitGFX library using our quick start for ST77xx and ILI9341. This version is a template that creates the display variable and configures it.");
+        codePlugin.setExtendedDescription("Draw menus using AdafruitGFX library using our quick start for SSD1351, ST77xx and ILI9341. This version is a template that creates the display variable and configures it.");
         codePlugin.setThemeDescription(ThemeDescription.colorWithFont(FontMode.ADAFRUIT));
         codePlugin.setDocsLink("https://www.thecoderscorner.com/products/arduino-libraries/tc-menu/tcmenu-plugins/adafruit_gfx-renderer-plugin/");
         codePlugin.setJavaImpl(this);
@@ -45,9 +46,10 @@ private List<CreatorProperty> createRequiredProperties() {
                 separatorProperty("DISPLAY", "Display Information"),
                 new CreatorProperty("DISPLAY_TYPE", "Display Type", "Choose the display type for your display",
                      "Adafruit_ST7735", DISPLAY, VARIABLE, CannedPropertyValidators.choicesValidator(List.of(
-                             new ChoiceDescription("Adafruit_ST7735", "Adafruit ST7735 library"),
-                             new ChoiceDescription("Adafruit_ST7789", "Adafruit ST7789 library"),
-                             new ChoiceDescription("Adafruit_ILI9341", "Adafruit ILI9341 library")
+                             new ChoiceDescription("Adafruit_ST7735", "Adafruit ST7735 TFT library"),
+                             new ChoiceDescription("Adafruit_ST7789", "Adafruit ST7789 TFT library"),
+                             new ChoiceDescription("Adafruit_SSD1351", "Adafruit SSD1351 RGB-OLED library"),
+                             new ChoiceDescription("Adafruit_ILI9341", "Adafruit ILI9341 TFT library")
                         ), "Adafruit_ST7735"), ALWAYS_APPLICABLE),
                 new CreatorProperty("DISPLAY_VARIABLE", "Display Variable Name", "The variable name available in your sketch", "display", DISPLAY, VARIABLE, CannedPropertyValidators.variableValidator(), ALWAYS_APPLICABLE),
                 CreatorProperty.uintProperty("DISPLAY_WIDTH", "Display Width in Pixels", "Display width in pixels", DISPLAY, 320, 8192),
@@ -148,6 +150,7 @@ public List<CodeVariable> getVariables() {
         CodeVariable display = switch(displayType) {
             case "Adafruit_ST7735", "Adafruit_ST7789" -> st77xxVariable(displayType);
             case "Adafruit_ILI9341" -> ili9341Variable(displayType);
+            case "Adafruit_SSD1351" -> ssd1351Variable(displayType);
             default -> throw new IllegalStateException("Unexpected value: " + displayType);
         };
 
@@ -165,6 +168,19 @@ private CodeVariable ili9341Variable(String displayType) {
                 VariableDefinitionMode.VARIABLE_AND_EXPORT, false, false, false, params, ALWAYS_APPLICABLE);
     }
 
+    private CodeVariable ssd1351Variable(String displayType) {
+        boolean hwSpi = findPropOrFail("DISPLAY_DATA_PIN").equals("-1");
+
+        List<CodeParameter> stdParams = standardSpiConfigurationParams(hwSpi);
+        List<CodeParameter> dispSizeParams = List.of(
+                CodeParameter.unNamedValue(findPropOrFail("DISPLAY_WIDTH")),
+                CodeParameter.unNamedValue(findPropOrFail("DISPLAY_HEIGHT"))
+        );
+        var params = Stream.concat(dispSizeParams.stream(), stdParams.stream()).toList();
+        return new CodeVariable(findPropOrFail("DISPLAY_VARIABLE"), displayType,
+                VariableDefinitionMode.VARIABLE_AND_EXPORT, false, false, false, params, ALWAYS_APPLICABLE);
+    }
+
     private CodeVariable st77xxVariable(String displayType) {
         boolean hwSpi = findPropOrFail("DISPLAY_DATA_PIN").equals("-1");
 

web-designer/tcmenugen/src/App.tsx

@@ -14,7 +14,7 @@ import {IoExpanderComponent} from "./generator/IoExpanderComponent";
 import ReleaseNotes from "./releaseNotes";
 import {get, set} from 'idb-keyval';
 import fontEdIcon from './img/font-editor-example.jpg'
-import {i18nStateHasChanged} from "./generator/I18nImpls";
+import {closedI18n, i18nStateHasChanged, resetI18n} from "./generator/I18nImpls";
 
 const TC_MENU_STORAGE_KEY = "tcMenuTurboProject";
 const TC_MENU_POLICY_KEY = "tcMenuTurboPolicyAccepted";
@@ -114,6 +114,7 @@ export function setCurrentlyOpenProject(proj: MenuTreeWithCodeOptions | null, di
     } else {
         localStorage.removeItem(TC_MENU_STORAGE_KEY);
         globalDirectoryHandle = null;
+        closedI18n();
     }
     projectListeners.forEach(l => l(proj));
 }

web-designer/tcmenugen/src/generator/I18nImpls.ts

@@ -48,6 +48,11 @@ export async function getInternationalization(): Promise<I18nHandler> {
     }
 }
 
+export function closedI18n() {
+    globalI18nHandler = NOT_INITIALIZED_I18N;
+    i18nRehydrationPromise = null;
+}
+
 export function resetI18n() {
     console.log("Remove I18N support for a new project");
     let currentlyOpenProject = getCurrentlyOpenProject();