Always set active emi type (usb connection needs it for emi type)

calimero-project · May 12, 2024 · 2193504 · 2193504
1 parent ad9f92c
commit 2193504
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/io/calimero/link/KNXNetworkLinkUsb.java b/src/io/calimero/link/KNXNetworkLinkUsb.java
@@ -230,11 +230,10 @@ private boolean trySetActiveEmi(final UsbConnection.EmiType active) throws KNXPo
 		KNXTimeoutException, InterruptedException
 	{
 		if (emiTypes.contains(active)) {
-			// set & get/response of EMI type is only mandatory if > 1 EMI types are supported
-			if (emiTypes.size() > 1) {
-				conn.setActiveEmiType(active);
+			conn.setActiveEmiType(active);
+			// getting response of EMI type is only mandatory if > 1 EMI types are supported
+			if (emiTypes.size() > 1)
 				activeEmi = conn.activeEmiType();
-			}
 			else
 				activeEmi = active;
 			return activeEmi == active;

diff --git a/src/io/calimero/link/KNXNetworkMonitorUsb.java b/src/io/calimero/link/KNXNetworkMonitorUsb.java
@@ -177,11 +177,10 @@ private boolean trySetActiveEmi(final UsbConnection.EmiType active)
 		throws KNXPortClosedException, KNXTimeoutException, InterruptedException
 	{
 		if (emiTypes.contains(active)) {
-			// set & get/response of EMI type is only mandatory if > 1 EMI types are supported
-			if (emiTypes.size() > 1) {
-				conn.setActiveEmiType(active);
+			conn.setActiveEmiType(active);
+			// getting response of EMI type is only mandatory if > 1 EMI types are supported
+			if (emiTypes.size() > 1)
 				activeEmi = conn.activeEmiType();
-			}
 			else
 				activeEmi = active;
 			return activeEmi == active;