Skip to content

Commit 0643486

Browse files
committedAug 16, 2024
Merge remote-tracking branch 'andy31415/fix_cancellation' into telink_image_update
2 parents bd64023 + 209b0bc commit 0643486

File tree

48 files changed

+4641
-306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+4641
-306
lines changed
 

‎config/telink/chip-module/Kconfig.defaults

-3
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,6 @@ config CHIP_WIFI
304304
select NET_IPV6_ND # enable Neighbor Discovery to handle Router Advertisements
305305
select NET_IPV6_NBR_CACHE
306306
select NET_STATISTICS_USER_API
307-
# select NET_IPV4 # TODO: remove IPv4 when IPv6 will be ready (see CHIP_IPV4)
308-
# select NET_CONFIG_NEED_IPV4
309-
# select NET_DHCPV4
310307

311308
if CHIP_WIFI
312309

‎docs/guides/fabric_synchronization_guide.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ KVS
127127
Pair the Light Example with node ID 3 using its payload number:
128128

129129
```
130-
pairing already-discovered 3 20202021 <ip> 5540
130+
pairing already-discovered 3 20202021 <ip> 5543
131131
```
132132

133133
After the device is successfully added, you will observe the following on

0 commit comments

Comments
 (0)