Merge remote-tracking branch 'origin/main' into python_spark_dev

WJ-vd-Heuvel · WJ-vd-Heuvel · commit 0f4a154dfba4 · 2026-07-15T15:16:27.000+02:00
diff --git a/packages/blocks/src/blocks/arduino.ts b/packages/blocks/src/blocks/arduino.ts
@@ -340,6 +340,89 @@ const blocks: BlockDefinition = [
 		"BKY_LEAPHY_DISPLAY_LARGE",
 		6,
 	),
+	{
+		type: "leaphy_lcd_clear",
+		message0: "%{BKY_LEAPHY_LCD_CLEAR}",
+		previousStatement: null,
+		nextStatement: null,
+		style: "leaphy_blocks",
+		helpUrl: "",
+
+		aiHelp: "Clear the I2C LCD display",
+		relevanceKey: "LEAPHY_LCD_DISPLAY",
+	},
+	{
+		type: "leaphy_lcd_print_line",
+		message0: "%{BKY_LEAPHY_LCD_PRINT} %1 %2 %3",
+		args0: [
+			{ type: "input_dummy" },
+			{
+				type: "field_dropdown",
+				name: "DISPLAY_ROW",
+				options: [
+					["1", "0"],
+					["2", "1"],
+				],
+			},
+			{ type: "input_value", name: "VALUE" },
+		],
+		inputsInline: true,
+		previousStatement: null,
+		nextStatement: null,
+		style: "leaphy_blocks",
+		helpUrl: "",
+
+		aiHelp: "Print the value to the I2C LCD display on a selected row",
+		relevanceKey: "LEAPHY_LCD_DISPLAY",
+	},
+	{
+		type: "leaphy_lcd_print_value",
+		message0: "%{BKY_LEAPHY_LCD_PRINT} %1 %2 %3 = %4 %5",
+		args0: [
+			{ type: "input_dummy" },
+			{
+				type: "field_dropdown",
+				name: "DISPLAY_ROW",
+				options: [
+					["1", "0"],
+					["2", "1"],
+				],
+			},
+			{ type: "input_value", name: "NAME" },
+			{ type: "input_dummy" },
+			{ type: "input_value", name: "VALUE" },
+		],
+		inputsInline: true,
+		previousStatement: null,
+		nextStatement: null,
+		style: "leaphy_blocks",
+		helpUrl: "",
+
+		aiHelp:
+			"Print the value with name to the I2C LCD display on a selected row",
+		relevanceKey: "LEAPHY_LCD_DISPLAY",
+	},
+	{
+		type: "leaphy_lcd_set_backlight",
+		message0: "%{BKY_LEAPHY_LCD_SET_BACKLIGHT} %1",
+		args0: [
+			{
+				type: "field_dropdown",
+				name: "BACKLIGHT",
+				options: [
+					["%{BKY_LEAPHY_LCD_BACKLIGHT_ON}", "ON"],
+					["%{BKY_LEAPHY_LCD_BACKLIGHT_OFF}", "OFF"],
+				],
+			},
+		],
+		previousStatement: null,
+		nextStatement: null,
+		style: "leaphy_blocks",
+		helpUrl: "",
+
+		aiHelp: "Turn the backlight of the I2C LCD display on or off",
+		relevanceKey: "LEAPHY_LCD_DISPLAY",
+	},
 	{
 		type: "leaphy_gas_sensor",
 		message0: "%%{BKY_LEAPHY_CHOOSE_GAS} %1",
diff --git a/packages/blocks/src/generators/arduino/dependencies.ts b/packages/blocks/src/generators/arduino/dependencies.ts
@@ -1,12 +1,13 @@
 export enum Dependencies {
-	LEAPHY_EXTENSIONS = "Leaphy Extensions@1.2.1",
+	LEAPHY_EXTENSIONS = "Leaphy Extensions@1.2.3",
 	ARDUINO_BLE = "ArduinoBLE@1.4.0",
 	LIST = "List@3.0.1",
 
 	SERVO = "Servo@1.2.2",
 	ESP_SERVO = "ESP32Servo@3",
 
 	ADAFRUIT_SSD1306_OLED = "Adafruit SSD1306@2.5",
+	LIQUIDCRYSTAL_PCF8574 = "LiquidCrystal_PCF8574@2.3.0",
 	ADAFRUIT_SH110X_OLED = "Adafruit SH110X@2.1.12",
 	ADAFRUIT_VL53L0X_TOF = "Adafruit_VL53L0X@1.2.4",
 	ADAFRUIT_LSM6DS_ACCELEROMETER = "Adafruit LSM6DS@4.7.4",
diff --git a/packages/blocks/src/generators/arduino/leaphy_extra.ts b/packages/blocks/src/generators/arduino/leaphy_extra.ts
@@ -260,6 +260,61 @@ function getCodeGenerators(arduino: Arduino) {
 
 	createDisplayBlocks("leaphy_display", false);
 	createDisplayBlocks("leaphy_display_large", true);
+
+	const addLCDSetupCode = () => {
+		const lcdSetup = "lcd.begin(16, 2);\n      lcd.setBacklight(255);\n";
+		const setup = arduino.addI2CSetup("lcd", lcdSetup);
+
+		arduino.addDependency(Dependencies.LIQUIDCRYSTAL_PCF8574);
+		arduino.addInclude("include_lcd", "#include <LiquidCrystal_PCF8574.h>");
+		arduino.addInclude("define_lcd", "LiquidCrystal_PCF8574 lcd(0x27);");
+		return setup;
+	};
+
+	const addLCDPrintLine = () => {
+		arduino.addDeclaration(
+			"lcd_print_line",
+			"void lcdPrintLine(uint8_t row, String value) {\n" +
+				"    lcd.setCursor(0, row);\n" +
+				"    lcd.print(value);\n" +
+				"    for (int i = value.length(); i < 16; i++) lcd.print(' ');\n" +
+				"}\n",
+		);
+	};
+
+	arduino.forBlock.leaphy_lcd_clear = () => {
+		const setup = addLCDSetupCode();
+		return `${setup}lcd.clear();\n`;
+	};
+
+	arduino.forBlock.leaphy_lcd_print_line = (block) => {
+		const setup = addLCDSetupCode();
+		addLCDPrintLine();
+
+		const value =
+			arduino.valueToCode(block, "VALUE", arduino.ORDER_ATOMIC) || "0";
+		const row = block.getFieldValue("DISPLAY_ROW");
+		return `${setup}lcdPrintLine(${row}, String(${value}));\n`;
+	};
+
+	arduino.forBlock.leaphy_lcd_print_value = (block) => {
+		const setup = addLCDSetupCode();
+		addLCDPrintLine();
+
+		const name =
+			arduino.valueToCode(block, "NAME", arduino.ORDER_ATOMIC) || "0";
+		const value =
+			arduino.valueToCode(block, "VALUE", arduino.ORDER_ATOMIC) || "0";
+		const row = block.getFieldValue("DISPLAY_ROW");
+		return `${setup}lcdPrintLine(${row}, String(${name}) + " = " + String(${value}));\n`;
+	};
+
+	arduino.forBlock.leaphy_lcd_set_backlight = (block) => {
+		const setup = addLCDSetupCode();
+
+		const backlight = block.getFieldValue("BACKLIGHT");
+		return `${setup}lcd.setBacklight(${backlight === "ON" ? "255" : "0"});\n`;
+	};
 }
 
 export default getCodeGenerators;
diff --git a/packages/blocks/src/generators/arduino/lists.ts b/packages/blocks/src/generators/arduino/lists.ts
@@ -1,8 +1,10 @@
 import { type List, listManager } from "../../categories/lists";
 import type { Arduino } from "../arduino";
+import { Dependencies } from "./dependencies";
 
 function getCodeGenerators(arduino: Arduino) {
 	arduino.forBlock.lists_add = (block) => {
+		arduino.addDependency(Dependencies.LIST);
 		const list = listManager.getItem(block.getFieldValue("LIST")) as List;
 		const value =
 			arduino.valueToCode(block, "VALUE", arduino.ORDER_ATOMIC) || "0";
@@ -12,6 +14,7 @@ function getCodeGenerators(arduino: Arduino) {
 	};
 
 	arduino.forBlock.lists_delete = (block) => {
+		arduino.addDependency(Dependencies.LIST);
 		const list = listManager.getItem(block.getFieldValue("LIST")) as List;
 		const index =
 			arduino.valueToCode(block, "INDEX", arduino.ORDER_ATOMIC) || "0";
@@ -21,13 +24,15 @@ function getCodeGenerators(arduino: Arduino) {
 	};
 
 	arduino.forBlock.lists_clear = (block) => {
+		arduino.addDependency(Dependencies.LIST);
 		const list = listManager.getItem(block.getFieldValue("LIST")) as List;
 
 		const name = list.name.replaceAll(" ", "_");
 		return `${name}.clear();\n`;
 	};
 
 	arduino.forBlock.lists_insert = (block) => {
+		arduino.addDependency(Dependencies.LIST);
 		const list = listManager.getItem(block.getFieldValue("LIST")) as List;
 		const value =
 			arduino.valueToCode(block, "VALUE", arduino.ORDER_ATOMIC) || "0";
@@ -39,6 +44,7 @@ function getCodeGenerators(arduino: Arduino) {
 	};
 
 	arduino.forBlock.lists_get = (block) => {
+		arduino.addDependency(Dependencies.LIST);
 		const list = listManager.getItem(block.getFieldValue("LIST")) as List;
 		const index =
 			arduino.valueToCode(block, "INDEX", arduino.ORDER_ATOMIC) || "0";
@@ -48,6 +54,7 @@ function getCodeGenerators(arduino: Arduino) {
 	};
 
 	arduino.forBlock.lists_replace = (block) => {
+		arduino.addDependency(Dependencies.LIST);
 		const list = listManager.getItem(block.getFieldValue("LIST")) as List;
 		const value =
 			arduino.valueToCode(block, "VALUE", arduino.ORDER_ATOMIC) || "0";
@@ -59,6 +66,7 @@ function getCodeGenerators(arduino: Arduino) {
 	};
 
 	arduino.forBlock.lists_length = (block) => {
+		arduino.addDependency(Dependencies.LIST);
 		const list = listManager.getItem(block.getFieldValue("LIST")) as List;
 
 		const name = list.name.replaceAll(" ", "_");
diff --git a/packages/blocks/src/msg/translations/en.ts b/packages/blocks/src/msg/translations/en.ts
@@ -130,6 +130,11 @@ messages.LEAPHY_DISPLAY_LARGE_CLEAR = "Clear large display";
 messages.LEAPHY_DISPLAY_LARGE_DISPLAY = "Show on large display";
 messages.LEAPHY_DISPLAY_LARGE_PRINT = "Large display - Set Ln.";
 messages.LEAPHY_DISPLAY_LARGE_SET_TEXT_SIZE = "Set text size for large display";
+messages.LEAPHY_LCD_CLEAR = "Clear LCD";
+messages.LEAPHY_LCD_PRINT = "LCD - Set Line";
+messages.LEAPHY_LCD_SET_BACKLIGHT = "Turn LCD backlight";
+messages.LEAPHY_LCD_BACKLIGHT_ON = "on";
+messages.LEAPHY_LCD_BACKLIGHT_OFF = "off";
 messages.LEAPHY_EXTRA_CATEGORY = "Leaphy Extra";
 messages.LEAPHY_FLITZ_CATEGORY = "Leaphy Flitz";
 messages.LEAPHY_FLITZ_LED = "Nose light - ";
diff --git a/packages/blocks/src/msg/translations/nl.ts b/packages/blocks/src/msg/translations/nl.ts
@@ -136,6 +136,11 @@ messages.LEAPHY_DISPLAY_LARGE_DISPLAY = "Toon op groot display";
 messages.LEAPHY_DISPLAY_LARGE_PRINT = "Stel groot display in - Rg.";
 messages.LEAPHY_DISPLAY_LARGE_SET_TEXT_SIZE =
 	"Zet tekstgrootte van groot display op";
+messages.LEAPHY_LCD_CLEAR = "Maak LCD leeg";
+messages.LEAPHY_LCD_PRINT = "Stel LCD in - Regel";
+messages.LEAPHY_LCD_SET_BACKLIGHT = "Zet LCD achtergrondlicht";
+messages.LEAPHY_LCD_BACKLIGHT_ON = "aan";
+messages.LEAPHY_LCD_BACKLIGHT_OFF = "uit";
 messages.LEAPHY_EXTRA_CATEGORY = "Leaphy Extra"; // untranslated
 messages.LEAPHY_FLITZ_CATEGORY = "Leaphy Flitz"; // untranslated
 messages.LEAPHY_FLITZ_LED = "Neuslamp -";
diff --git a/packages/blocks/src/msg/translations/ua.ts b/packages/blocks/src/msg/translations/ua.ts
@@ -130,6 +130,11 @@ messages.LEAPHY_DISPLAY_LARGE_DISPLAY = "Показати на великому
 messages.LEAPHY_DISPLAY_LARGE_PRINT = "Великий дисплей - Вст. рядок";
 messages.LEAPHY_DISPLAY_LARGE_SET_TEXT_SIZE =
 	"Встановити розмір тексту великого дисплея";
+messages.LEAPHY_LCD_CLEAR = "Очистити LCD";
+messages.LEAPHY_LCD_PRINT = "LCD - Вст. рядок";
+messages.LEAPHY_LCD_SET_BACKLIGHT = "Підсвітка LCD";
+messages.LEAPHY_LCD_BACKLIGHT_ON = "увімк";
+messages.LEAPHY_LCD_BACKLIGHT_OFF = "вимк";
 messages.LEAPHY_EXTRA_CATEGORY = "Leaphy Extra";
 messages.LEAPHY_FLITZ_CATEGORY = "Leaphy Flitz";
 messages.LEAPHY_FLITZ_LED = "Підсвітка носа - ";
diff --git a/packages/client/src/assets/translations/en.json b/packages/client/src/assets/translations/en.json
@@ -266,6 +266,7 @@
 	"LED_STRIP_SECTION": "Led strip",
 	"STANDARD_DISPLAY_SECTION": "Standard display",
 	"LARGE_DISPLAY_SECTION": "Large display",
+	"LCD_DISPLAY_SECTION": "LCD display",
 	"MATRIX_DISPLAY_SECTION": "Matrix display",
 	"SEGMENT_DISPLAY_SECTION": "Segment display",
 	"AUDIO_SECTION": "Audio",
diff --git a/packages/client/src/assets/translations/nl.json b/packages/client/src/assets/translations/nl.json
@@ -266,6 +266,7 @@
 	"LED_STRIP_SECTION": "Led strip",
 	"STANDARD_DISPLAY_SECTION": "Standaard scherm",
 	"LARGE_DISPLAY_SECTION": "Groot scherm",
+	"LCD_DISPLAY_SECTION": "LCD scherm",
 	"MATRIX_DISPLAY_SECTION": "Matrix scherm",
 	"SEGMENT_DISPLAY_SECTION": "Segment scherm",
 	"AUDIO_SECTION": "Geluid",
diff --git a/packages/client/src/assets/translations/ua.json b/packages/client/src/assets/translations/ua.json
@@ -266,6 +266,7 @@
 	"LED_STRIP_SECTION": "LED-стрічка",
 	"STANDARD_DISPLAY_SECTION": "Стандартний дисплей",
 	"LARGE_DISPLAY_SECTION": "Великий дисплей",
+	"LCD_DISPLAY_SECTION": "LCD дисплей",
 	"MATRIX_DISPLAY_SECTION": "Матричний дисплей",
 	"SEGMENT_DISPLAY_SECTION": "Сегментний дисплей",
 	"AUDIO_SECTION": "Аудіо",
diff --git a/packages/client/src/lib/components/core/popups/popups/SerialMonitor.svelte b/packages/client/src/lib/components/core/popups/popups/SerialMonitor.svelte
@@ -8,7 +8,6 @@ import {
 } from "@fortawesome/free-solid-svg-icons";
 import { format } from "date-fns";
 import { tick } from "svelte";
-import Fa from "svelte-fa";
 import { _ } from "svelte-i18n";
 import SensorState from "$components/core/popups/popups/debugger/SensorState.svelte";
 import ErrorPopup from "$components/core/popups/popups/Error.svelte";
@@ -21,10 +20,10 @@ import SerialState, { Prompt } from "$state/serial.svelte";
 import { track } from "$state/utils";
 import Windowed from "../Windowed.svelte";
 
-enum Mode {
-	TEXT = 0,
-	CHART = 1,
-}
+const Mode = {
+	TEXT: 0,
+	CHART: 1,
+};
 
 let mode = $state(Mode.TEXT);
 let input = $state<HTMLInputElement>();
diff --git a/packages/client/src/lib/domain/blockly/toolbox.ts b/packages/client/src/lib/domain/blockly/toolbox.ts
@@ -456,6 +456,35 @@ export default [
 					},
 				],
 			},
+			{
+				label: "LCD_DISPLAY_SECTION",
+				defaultExpanded: false,
+				blocks: [
+					{
+						type: "leaphy_lcd_clear",
+						robots: [...robotGroups.ALL, -RobotType.L_FLITZ_NANO],
+					},
+					{
+						type: "leaphy_lcd_print_line",
+						robots: [...robotGroups.ALL, -RobotType.L_FLITZ_NANO],
+						inputs: {
+							VALUE: text("text"),
+						},
+					},
+					{
+						type: "leaphy_lcd_print_value",
+						robots: [...robotGroups.ALL, -RobotType.L_FLITZ_NANO],
+						inputs: {
+							NAME: text("text"),
+							VALUE: number(0),
+						},
+					},
+					{
+						type: "leaphy_lcd_set_backlight",
+						robots: [...robotGroups.ALL, -RobotType.L_FLITZ_NANO],
+					},
+				],
+			},
 			{
 				label: "MATRIX_DISPLAY_SECTION",
 				defaultExpanded: false,
diff --git a/packages/client/tests/code_tests/big/snake.l_nano_libraries b/packages/client/tests/code_tests/big/snake.l_nano_libraries
@@ -1 +1,2 @@
-Leaphy Extensions
+Leaphy Extensions
+List
diff --git a/packages/client/tests/code_tests/general/list_with_spaces.l_uno_libraries b/packages/client/tests/code_tests/general/list_with_spaces.l_uno_libraries
@@ -0,0 +1 @@
+List
diff --git a/packages/client/tests/serial_monitor.spec.ts b/packages/client/tests/serial_monitor.spec.ts
@@ -0,0 +1,29 @@
+import { expect, test } from "@playwright/test";
+import { goToHomePage, selectRobot, setupArduino } from "./utils";
+
+test.beforeEach(setupArduino);
+test.beforeEach(goToHomePage);
+
+test("Serial Monitor - Open and basic interactions", async ({ page }) => {
+	await selectRobot(page, "Arduino Nano");
+
+	// Open the Serial Monitor
+	// The tooltip/span contains the translated text for "SERIAL_OUTPUT"
+	// and it's inside a button.
+	// "SERIAL_OUTPUT": "Show output on screen" in en.json
+	await page
+		.getByRole("button")
+		.filter({ hasText: "Show output on screen" })
+		.click();
+
+	// Check if the Serial Monitor window is visible
+	// It should have a title "Show output on screen"
+	const windowTitle = page.locator("div.text-lg", {
+		hasText: "Show output on screen",
+	});
+	await expect(windowTitle).toBeVisible();
+
+	// Check if it shows "Not connected" since we haven't connected yet
+	// "NOT_CONNECTED": "Not connected" in en.json
+	await expect(page.getByText("Not connected", { exact: true })).toBeVisible();
+});
