Skip to content

Commit 84b0124

Browse files
authored
Merge pull request #60 from david-cermak/feat/eppp_as_custom_impl
[eppp]: Make EPPP-lib option custom impl
2 parents 2416420 + 5016368 commit 84b0124

15 files changed

+37
-1100
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ jobs:
3535
with:
3636
key: ${{ matrix.idf_ver }}
3737
- name: Build ${{ matrix.test.app }} with IDF-${{ matrix.idf_ver }}
38-
env:
39-
EXPECTED_WARNING: "DeprecationWarning: 'MultiCommand' is deprecated and will be removed\nCryptographyDeprecationWarning: Parsed a serial number which wasn't positive"
4038
shell: bash
4139
run: |
4240
. ${IDF_PATH}/export.sh
@@ -69,7 +67,7 @@ jobs:
6967
path: protocols
7068
- name: Build ${{ matrix.example.app }} with IDF-${{ matrix.idf_ver }}
7169
env:
72-
EXPECTED_WARNING: "DeprecationWarning: 'MultiCommand' is deprecated and will be removed\nWarning: The smallest app partition is nearly full\nCryptographyDeprecationWarning: Parsed a serial number which wasn't positive"
70+
EXPECTED_WARNING: "Warning: The smallest app partition is nearly full"
7371
shell: bash
7472
run: |
7573
. ${IDF_PATH}/export.sh

.github/workflows/build_eppp.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ jobs:
3535
with:
3636
key: ${{ matrix.idf_ver }}
3737
- name: Build ${{ matrix.test.app }} with IDF-${{ matrix.idf_ver }}
38-
env:
39-
EXPECTED_WARNING: "DeprecationWarning: 'MultiCommand' is deprecated and will be removed\nCryptographyDeprecationWarning: Parsed a serial number which wasn't positive"
4038
shell: bash
4139
run: |
4240
. ${IDF_PATH}/export.sh

components/esp_wifi_remote/.cz.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ commitizen:
33
bump_message: 'bump(wifi_remote): $current_version -> $new_version'
44
pre_bump_hooks: python ../../ci/changelog.py esp_wifi_remote
55
tag_format: wifi_remote-v$version
6-
version: 0.15.3
6+
version: 0.16.0
77
version_files:
88
- idf_component.yml

components/esp_wifi_remote/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## [0.16.0](https://github.com/espressif/esp-wifi-remote/commits/wifi_remote-v0.16.0)
4+
5+
### Features
6+
7+
- Decouple EPPP RPC into a sub-component ([96cba4a](https://github.com/espressif/esp-wifi-remote/commit/96cba4a))
8+
39
## [0.15.3](https://github.com/espressif/esp-wifi-remote/commits/wifi_remote-v0.15.3)
410

511
### Bug Fixes

components/esp_wifi_remote/CMakeLists.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,10 @@ if(NOT CONFIG_ESP_WIFI_ENABLED AND NOT CONFIG_ESP_HOST_WIFI_ENABLED)
22
set(src_wifi_is_remote esp_wifi_remote.c esp_wifi_remote_net.c)
33
endif()
44

5-
if(CONFIG_ESP_WIFI_REMOTE_LIBRARY_EPPP)
6-
set(src_wifi_remote_eppp eppp/wifi_remote_rpc_client.cpp eppp/wifi_remote_rpc_server.cpp eppp/eppp_init.c)
7-
endif()
8-
95
idf_component_register(INCLUDE_DIRS include
106
SRCS ${src_wifi_is_remote}
117
${src_wifi_remote_eppp}
128
dummy_src.c # Prevents making this component potentially INTERFACE only
13-
PRIV_INCLUDE_DIRS eppp
149
REQUIRES esp_event esp_netif
1510
PRIV_REQUIRES esp_wifi esp-tls vfs)
1611

@@ -64,3 +59,7 @@ target_link_libraries(${wifi} PUBLIC ${COMPONENT_LIB})
6459
if(CONFIG_ESP_WIFI_REMOTE_EAP_ENABLED)
6560
idf_component_optional_requires(PRIVATE wpa_supplicant)
6661
endif()
62+
63+
if(CONFIG_ESP_WIFI_REMOTE_LIBRARY_EPPP)
64+
idf_component_optional_requires(PRIVATE wifi_remote_over_eppp espressif__wifi_remote_over_eppp)
65+
endif()

components/esp_wifi_remote/Kconfig.rpc.in

Lines changed: 0 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -19,125 +19,3 @@ choice ESP_WIFI_REMOTE_LIBRARY
1919
bool "CUSTOM"
2020

2121
endchoice
22-
23-
if ESP_WIFI_REMOTE_LIBRARY_EPPP
24-
25-
if EPPP_LINK_DEVICE_UART
26-
27-
config ESP_WIFI_REMOTE_EPPP_UART_PORT
28-
int "UART port number"
29-
default 1
30-
range 0 3
31-
help
32-
UART Port number.
33-
34-
config ESP_WIFI_REMOTE_EPPP_UART_TX_PIN
35-
int "TXD Pin Number"
36-
default 10
37-
range 0 54
38-
help
39-
Pin number of UART TX.
40-
41-
config ESP_WIFI_REMOTE_EPPP_UART_RX_PIN
42-
int "RXD Pin Number"
43-
default 11
44-
range 0 54
45-
help
46-
Pin number of UART RX.
47-
48-
endif
49-
if EPPP_LINK_DEVICE_SPI
50-
51-
config ESP_WIFI_REMOTE_EPPP_SPI_HOST
52-
int "SPI host number"
53-
default 1
54-
range 0 3
55-
help
56-
SPI host number.
57-
58-
config ESP_WIFI_REMOTE_EPPP_SPI_MOSI_PIN
59-
int "MOSI Pin Number"
60-
default 23
61-
range 0 54
62-
help
63-
Pin number of SPI MOSI.
64-
65-
config ESP_WIFI_REMOTE_EPPP_SPI_MISO_PIN
66-
int "MISO Pin Number"
67-
default 19
68-
range 0 54
69-
help
70-
Pin number of SPI MISO.
71-
72-
config ESP_WIFI_REMOTE_EPPP_SPI_SCLK_PIN
73-
int "SCLK Pin Number"
74-
default 18
75-
range 0 54
76-
help
77-
Pin number of SPI SCLK.
78-
79-
config ESP_WIFI_REMOTE_EPPP_SPI_CS_PIN
80-
int "CS Pin Number"
81-
default 5
82-
range 0 54
83-
help
84-
Pin number of SPI CS.
85-
86-
config ESP_WIFI_REMOTE_EPPP_SPI_INTR_PIN
87-
int "Interrupt Pin Number"
88-
default 17
89-
range 0 54
90-
help
91-
Pin number of SPI interrupt.
92-
93-
config ESP_WIFI_REMOTE_EPPP_SPI_FREQ
94-
int "SPI frequency"
95-
default 4000000
96-
range 1000000 20000000
97-
help
98-
SPI frequency in Hz.
99-
100-
endif
101-
102-
config ESP_WIFI_REMOTE_EPPP_NETIF_PRIORITY
103-
int "Routing priority of eppp netif"
104-
default 100
105-
range 0 256
106-
help
107-
Set the priority of the wifi-remote netif.
108-
The bigger the number the higher the priority.
109-
The interface which is up and with the highest priority will act as a default GW.
110-
111-
config ESP_WIFI_REMOTE_EPPP_NETIF_DESCRIPTION
112-
string "eppp network interface description"
113-
default "example_netif_sta"
114-
help
115-
Textual description of the wifi remote network interface.
116-
By default it is set to "example_netif_sta" to be used in IDF protocol example
117-
as default wifi station substitution.
118-
119-
config ESP_WIFI_REMOTE_EPPP_SERVER_CA
120-
string "Servers CA certificate"
121-
default "--- Please copy content of the CA certificate ---"
122-
123-
config ESP_WIFI_REMOTE_EPPP_CLIENT_CRT
124-
string "Client certificate"
125-
default "--- Please copy content of the Client certificate ---"
126-
127-
config ESP_WIFI_REMOTE_EPPP_CLIENT_KEY
128-
string "Client key"
129-
default "--- Please copy content of the Client key ---"
130-
131-
config ESP_WIFI_REMOTE_EPPP_CLIENT_CA
132-
string "Clients CA certificate"
133-
default "--- Please copy content of the CA certificate ---"
134-
135-
config ESP_WIFI_REMOTE_EPPP_SERVER_CRT
136-
string "Server certificate"
137-
default "--- Please copy content of the Client certificate ---"
138-
139-
config ESP_WIFI_REMOTE_EPPP_SERVER_KEY
140-
string "Server key"
141-
default "--- Please copy content of the Client key ---"
142-
143-
endif

components/esp_wifi_remote/eppp/eppp_init.c

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)