Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Config UI: clearer rs485 wording (#25918)

Browse source
This commit is contained in:
Michael Geers 2025-12-09 13:20:09 +01:00 • committed by GitHub
parent 3c7476762b
commit 2f164cd294
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
i18n/de.json
View file

@ -395,9 +395,9 @@
"baudrate": "Baudrate",
"comset": "ComSet",
"connection": "Modbus Verbindung",
"connectionHintSerial": "Das Gerät ist direkt an evcc über eine RS485 Schnittstelle angeschlossen.",
"connectionHintTcpip": "Das Gerät ist von evcc aus über LAN/Wifi erreichbar.",
"connectionValueSerial": "Seriell / USB",
"connectionHintSerial": "Das Gerät ist direkt über RS485 (oder USB-zu-RS485 Adapter) angeschlossen.",
"connectionHintTcpip": "Das Gerät ist über Netzwerk (LAN/WiFi) erreichbar.",
"connectionValueSerial": "RS485",
"connectionValueTcpip": "Netzwerk",
"device": "Gerätename",
"deviceHint": "Beispiel: /dev/ttyUSB0",

6
i18n/en.json
View file

@ -395,9 +395,9 @@
"baudrate": "Baud rate",
"comset": "ComSet",
"connection": "Modbus connection",
"connectionHintSerial": "The device is directly connected to evcc via a RS485 interface.",
"connectionHintTcpip": "The device is addressable from evcc via LAN/Wifi.",
"connectionValueSerial": "Serial / USB",
"connectionHintSerial": "The device is directly connected via RS485 (or USB-to-RS485 adapter).",
"connectionHintTcpip": "The device is reachable via network (LAN/WiFi).",
"connectionValueSerial": "RS485",
"connectionValueTcpip": "Network",
"device": "Device name",
"deviceHint": "Example: /dev/ttyUSB0",

2
tests/config-modbus-fields.spec.ts
View file

@ -48,7 +48,7 @@ test.describe("modbus fields", async () => {
test("rs485serial", async ({ page }) => {
const modal = await openMeterModal(page, "Serial Test");
await expect(page.getByLabel("Serial / USB")).toBeChecked();
await expect(page.getByLabel("RS485")).toBeChecked();
await expect(modal.getByLabel("Device name")).toHaveValue("/dev/ttyUSB5");
await expect(modal.getByLabel("Baud rate")).toHaveValue("19200");
await expect(modal.getByLabel("ComSet")).toHaveValue("8E1");

10
tests/config-modbusproxy.spec.ts
View file

@ -50,7 +50,7 @@ test.describe("modbusproxy", async () => {
await expect(evccBox.getByLabel("no")).toBeChecked();
await evccBox.getByLabel("error").click();
await expect(deviceBox.getByText("Network")).toBeChecked();
await expect(deviceBox.getByLabel("Network")).toBeChecked();
await deviceBox.getByLabel("IP address or hostname").fill("127.0.0.1");
const devicePort = deviceBox.getByLabel("Port");
@ -79,7 +79,7 @@ test.describe("modbusproxy", async () => {
await expect(evccBox.getByLabel("Port")).toHaveValue("501");
await expect(evccBox.getByLabel("error")).toBeChecked();
await expect(deviceBox.getByText("Network")).toBeChecked();
await expect(deviceBox.getByLabel("Network")).toBeChecked();
await deviceBox.getByLabel("IP address or hostname").fill("127.0.0.1");
await expect(deviceBox.getByLabel("Port")).toHaveValue("602");
await expect(deviceBox.getByText("RTU")).toBeChecked();
@ -109,7 +109,7 @@ test.describe("modbusproxy", async () => {
await expect(connection1).toContainText("Connection #1");
await expect(connection1.getByTestId("evcc-box").getByLabel("Port")).toHaveValue("5021");
const device1 = connection1.getByTestId("device-box");
await expect(device1.getByText("Network")).toBeChecked();
await expect(device1.getByLabel("Network")).toBeChecked();
await expect(device1.getByLabel("IP address or hostname")).toHaveValue("192.0.2.2");
await expect(device1.getByLabel("Port")).toHaveValue("502");
await expect(device1.getByText("TCP")).toBeChecked();
@ -121,7 +121,7 @@ test.describe("modbusproxy", async () => {
await expect(connection2.getByTestId("evcc-box").getByLabel("Port")).toBeVisible();
await expect(connection2.getByTestId("evcc-box").getByLabel("Port")).toHaveValue("5022");
const device2 = connection2.getByTestId("device-box");
await expect(device2.getByText("Serial")).toBeChecked();
await expect(device2.getByLabel("RS485")).toBeChecked();
await expect(device2.getByLabel("Device")).toHaveValue("/dev/ttyUSB0");
await expect(device2.getByLabel("Baud rate")).toHaveValue("9600");
await expect(device2.getByLabel("ComSet")).toHaveValue("8N1");
@ -131,7 +131,7 @@ test.describe("modbusproxy", async () => {
await expect(connection3).toContainText("Connection #3");
await expect(connection3.getByTestId("evcc-box").getByLabel("Port")).toHaveValue("5023");
const device3 = connection3.getByTestId("device-box");
await expect(device3.getByText("Network")).toBeChecked();
await expect(device3.getByLabel("Network")).toBeChecked();
await expect(device3.getByLabel("IP address or hostname")).toHaveValue("192.0.2.3");
await expect(device3.getByLabel("Port")).toHaveValue("502");
await expect(device3.getByText("RTU")).toBeChecked();