Skip to content

Commit bb93146

Browse files
committedApr 23, 2024·
Merge remote-tracking branch 'rp2040_ip_routing' into rp2040_ip_routing_search_extended
2 parents ad66eec + 4cb4a17 commit bb93146

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed
 

‎examples/knx-usb/platformio-ci.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
; Please visit documentation for the other options and examples
99
; https://docs.platformio.org/page/projectconf.html
1010
[env:adafruit_feather_m0]
11-
platform = atmelsam@6.0.1
11+
platform = atmelsam
1212
board = adafruit_feather_m0
1313
framework = arduino
1414

‎library.properties

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name=knx
2-
version=1.2.0
3-
author=Thomas Kunze
4-
maintainer=Thomas Kunze
2+
version=2.0.0
3+
author=Thomas Kunze et al.
4+
maintainer=OpenKNX Team
55
sentence=knx stack
66
paragraph=
77
category=Communication
8-
url=https://github.com/thelsing/knx
8+
url=https://github.com/OpenKNX/knx
99
architectures=*
10-
includes=knx.h
10+
includes=knx.h

‎src/knx/ip_data_link_layer.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ void IpDataLinkLayer::loopHandleSearchRequestExtended(uint8_t* buffer, uint16_t
420420
#endif
421421
#endif
422422

423-
//defaults: Device Information DIB”, “Extended Device Information DIB and Supported Services DIB.
423+
//defaults: “Device Information DIB”, “Extended Device Information DIB” and “Supported Services DIB”.
424424
int dibLength = LEN_DEVICE_INFORMATION_DIB + LEN_SERVICE_DIB + LEN_EXTENDED_DEVICE_INFORMATION_DIB;
425425

426426
if(searchRequest.srpByService)
@@ -612,6 +612,8 @@ void IpDataLinkLayer::loopHandleConnectRequest(uint8_t* buffer, uint16_t length)
612612
addrbuffer[i*2+1] = i+1;
613613
addrbuffer[i*2] = _deviceObject.individualAddress() / 0x0100;
614614
}
615+
count = KNX_TUNNELING;
616+
_ipParameters.writeProperty(PID_ADDITIONAL_INDIVIDUAL_ADDRESSES, 1, addrbuffer, count);
615617
#ifdef KNX_LOG_TUNNELING
616618
println("no Tunnel-PAs configured, using own subnet");
617619
#endif

0 commit comments

Comments
 (0)
Please sign in to comment.