From f96bef5065285bae3a52c6677d8a82b4ba3f1014 Mon Sep 17 00:00:00 2001 From: Ing-Dom Date: Tue, 23 Apr 2024 18:12:16 +0200 Subject: [PATCH] fix merge error --- src/knx/ip_data_link_layer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/knx/ip_data_link_layer.cpp b/src/knx/ip_data_link_layer.cpp index 23f6b4c6..e62c526a 100644 --- a/src/knx/ip_data_link_layer.cpp +++ b/src/knx/ip_data_link_layer.cpp @@ -420,7 +420,7 @@ void IpDataLinkLayer::loopHandleSearchRequestExtended(uint8_t* buffer, uint16_t #endif #endif - //defaults: “Device Information DIB”, “Extended Device Information DIB” and “Supported Services DIB”. + //defaults: "Device Information DIB", "Extended Device Information DIB" and "Supported Services DIB". int dibLength = LEN_DEVICE_INFORMATION_DIB + LEN_SERVICE_DIB + LEN_EXTENDED_DEVICE_INFORMATION_DIB; if(searchRequest.srpByService) @@ -612,7 +612,7 @@ void IpDataLinkLayer::loopHandleConnectRequest(uint8_t* buffer, uint16_t length) addrbuffer[i*2+1] = i+1; addrbuffer[i*2] = _deviceObject.individualAddress() / 0x0100; } - count = KNX_TUNNELING; + uint8_t count = KNX_TUNNELING; _ipParameters.writeProperty(PID_ADDITIONAL_INDIVIDUAL_ADDRESSES, 1, addrbuffer, count); #ifdef KNX_LOG_TUNNELING println("no Tunnel-PAs configured, using own subnet");