Skip to content

Commit 2abe55c

Browse files
authored
Merge pull request #643 from david-cermak/feat/wifi_remote_with_hosted
[wifi_remote]: Make esp_hosted default RPC library
2 parents d6347a9 + eb7ea34 commit 2abe55c

File tree

3 files changed

+17
-37
lines changed

3 files changed

+17
-37
lines changed

ci/build_apps.py

Lines changed: 15 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
1+
# SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
22
# SPDX-License-Identifier: Apache-2.0
33
"""
44
This file is used in CI for esp-protocols build tests
@@ -10,8 +10,6 @@
1010

1111
from idf_build_apps import build_apps, find_apps, setup_logging
1212
from idf_build_apps.constants import SUPPORTED_TARGETS
13-
from packaging import version
14-
from pkg_resources import get_distribution
1513

1614
if __name__ == '__main__':
1715
parser = argparse.ArgumentParser(
@@ -51,43 +49,24 @@
5149
SUPPORTED_TARGETS.append('linux')
5250
ignore_warning = 'warning: ' # Ignore all common warnings on linux builds
5351
setup_logging(2)
54-
if version.parse(get_distribution('idf_build_apps').version) >= version.parse('2.0.0'):
55-
apps = find_apps(
56-
args.paths,
57-
recursive=args.recursive,
58-
target=args.target,
59-
build_dir='build_@t_@w',
60-
config_rules_str=args.rules,
61-
build_log_filename='build_log.txt',
62-
size_json_filename='size.json' if not args.linux else None,
63-
check_warnings=True,
64-
preserve=not args.delete,
65-
manifest_files=args.manifests,
66-
default_build_targets=SUPPORTED_TARGETS,
67-
manifest_rootpath='.',
68-
)
69-
else:
70-
apps = find_apps(
71-
args.paths,
72-
recursive=args.recursive,
73-
target=args.target,
74-
build_dir='build_@t_@w',
75-
config_rules_str=args.rules,
76-
build_log_path='build_log.txt',
77-
size_json_path='size.json' if not args.linux else None,
78-
check_warnings=True,
79-
preserve=not args.delete,
80-
manifest_files=args.manifests,
81-
default_build_targets=SUPPORTED_TARGETS,
82-
manifest_rootpath='.',
83-
)
84-
85-
for app in apps:
86-
print(app)
52+
apps = find_apps(
53+
args.paths,
54+
recursive=args.recursive,
55+
target=args.target,
56+
build_dir='build_@t_@w',
57+
config_rules_str=args.rules,
58+
build_log_filename='build_log.txt',
59+
size_json_filename='size.json' if not args.linux else None,
60+
check_warnings=True,
61+
manifest_files=args.manifests,
62+
default_build_targets=SUPPORTED_TARGETS,
63+
manifest_rootpath='.',
64+
)
8765

8866
sys.exit(
8967
build_apps(apps,
9068
dry_run=False,
9169
keep_going=False,
70+
no_preserve=args.delete,
9271
ignore_warning_strs=ignore_warning)
9372
)

components/esp_wifi_remote/Kconfig.rpc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
choice ESP_WIFI_REMOTE_LIBRARY
22
prompt "Choose WiFi-remote implementation"
3-
default ESP_WIFI_REMOTE_LIBRARY_EPPP
3+
default ESP_WIFI_REMOTE_LIBRARY_HOSTED
44
help
55
Select type of WiFi Remote implementation
66

components/esp_wifi_remote/examples/server/sdkconfig.defaults

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
CONFIG_ESP_WIFI_REMOTE_LIBRARY_EPPP=y
12
CONFIG_LWIP_IP_FORWARD=y
23
CONFIG_LWIP_IPV4_NAPT=y
34
CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=4096

0 commit comments

Comments
 (0)