Skip to content

Commit

Permalink
fix merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
Ing-Dom committed Apr 23, 2024
1 parent bb93146 commit f96bef5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/knx/ip_data_link_layer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit f96bef5

Please sign in to comment.