Clarified device name / server thing parameter

seime · Jun 27, 2024 · 5b76740 · 5b76740
1 parent f7ea34b
commit 5b76740
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/no/seime/openhab/binding/esphome/internal/comm/CommunicationError.java b/src/main/java/no/seime/openhab/binding/esphome/internal/comm/CommunicationError.java
@@ -7,7 +7,7 @@ public enum CommunicationError {
     ENCRYPTION_KEY_INVALID("Invalid api encryption key"),
     INVALID_PROTOCOL_PREAMBLE(
             "Invalid protocol preamble - this indicates a new major protocol change has arrived, but this binding does not support it yet"),
-    DEVICE_NAME_MISMATCH("ESPHome device reported a different name than configured for the thing");
+    DEVICE_NAME_MISMATCH("ESPHome device reported a different esphome.name than configured for the thing");
 
     private final String text;
 

diff --git a/src/main/java/no/seime/openhab/binding/esphome/internal/comm/EncryptedFrameHelper.java b/src/main/java/no/seime/openhab/binding/esphome/internal/comm/EncryptedFrameHelper.java
@@ -124,7 +124,7 @@ private void handleHello(byte[] packetData) throws ProtocolAPIError, ShortBuffer
             byte[] serverName = Arrays.copyOfRange(packetData, 1, packetData.length - 1);
             String server = new String(serverName, StandardCharsets.US_ASCII);
 
-            if (expectedServername != null && !server.equals(expectedServername)) {
+            if (expectedServername != null && !expectedServername.equals(server)) {
                 listener.onParseError(CommunicationError.DEVICE_NAME_MISMATCH);
                 return;
             }

diff --git a/src/main/resources/OH-INF/thing/thing-types.xml b/src/main/resources/OH-INF/thing/thing-types.xml
@@ -37,8 +37,10 @@
 			</parameter>
 
 			<parameter name="server" type="text" required="false">
-				<label>ESPHome device server name</label>
-				<description>Used to verify that we're talking to the correct device</description>
+				<label>ESPHome device name (not hostname)</label>
+				<description>Used to verify that we're talking to the correct device. Use the esphome: -> name: value from the
+					ESPHome
+					device configuration yaml</description>
 			</parameter>
 
 			<parameter name="pingInterval" type="integer" min="1" max="600" required="false">