Skip to content

Commit f44eb6b

Browse files
dependabot[bot]andy31415
dependabot[bot]
and
andy31415
authored
Bump third_party/pigweed/repo from 9640cde to 0380161 (project-chip#31589)
* Bump third_party/pigweed/repo from `9640cde` to `0380161` Bumps [third_party/pigweed/repo](https://github.com/google/pigweed) from `9640cde` to `0380161`. - [Commits](google/pigweed@9640cde...0380161) --- updated-dependencies: - dependency-name: third_party/pigweed/repo dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Remove pw_hdlc::pw_rpc dependency * Remove bug report comment * Restyle * Add dependency to pw_hdlc:default_addresses * Add assert header to binary * Also update chef example * Restyle * Add a few more dependencies on default_addresses * restyle * add decoder header * Drop a few more rpc_packets includes and add default_addresses * Fix wrong dependency from copy&paster for efr32 test drives * Add another dependency for efr32 ... not sure why we have several copies of the same code :( --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrei Litvin <andy314@gmail.com>
1 parent 6a46dcd commit f44eb6b

File tree

37 files changed

+46
-22
lines changed

37 files changed

+46
-22
lines changed

‎config/ameba/lib/pw_rpc/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ static_library("pw_rpc") {
2424
"$dir_pw_rpc:server",
2525
"$dir_pw_rpc/nanopb:echo_service",
2626
"${chip_root}/examples/platform/ameba/pw_sys_io:pw_sys_io_ameba",
27-
"${dir_pigweed}/pw_hdlc:pw_rpc",
2827
dir_pw_assert,
2928
dir_pw_hdlc,
3029
dir_pw_log,

‎config/bouffalolab/common/lib/pw_rpc/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ static_library("pw_rpc") {
3636
"$dir_pw_rpc:server",
3737
"$dir_pw_rpc/nanopb:echo_service",
3838
"${chip_root}/examples/platform/bouffalolab/common/rpc/pw_sys_io:pw_sys_io",
39-
"${dir_pigweed}/pw_hdlc:pw_rpc",
4039
dir_pw_assert,
4140
dir_pw_checksum,
4241
dir_pw_hdlc,

‎config/efr32/lib/pw_rpc/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ static_library("pw_rpc") {
2525
"$dir_pw_rpc:server",
2626
"$dir_pw_rpc/nanopb:echo_service",
2727
"${chip_root}/examples/platform/silabs/pw_sys_io:pw_sys_io_silabs",
28-
"${dir_pigweed}/pw_hdlc:pw_rpc",
2928
dir_pw_assert,
3029
dir_pw_checksum,
3130
dir_pw_hdlc,

‎config/esp32/lib/pw_rpc/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ static_library("pw_rpc") {
2424
"$dir_pw_rpc:server",
2525
"$dir_pw_rpc/nanopb:echo_service",
2626
"${chip_root}/examples/platform/esp32/pw_sys_io:pw_sys_io_esp32",
27-
"${dir_pigweed}/pw_hdlc:pw_rpc",
2827
dir_pw_assert,
2928
dir_pw_hdlc,
3029
dir_pw_log,

‎config/linux/lib/pw_rpc/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ static_library("pw_rpc") {
2222
public_configs = [ "${dir_pigweed}/pw_hdlc:default_config" ]
2323
deps = [
2424
"$dir_pw_hdlc:encoder",
25-
"$dir_pw_hdlc:pw_rpc",
2625
"$dir_pw_hdlc:rpc_channel_output",
2726
"$dir_pw_rpc/system_server:facade",
2827
"$dir_pw_stream:socket_stream",

‎config/mbed/chip-gn/lib/pw_rpc/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ static_library("pw_rpc") {
3030
deps = [
3131
"$dir_pw_rpc:server",
3232
"${chip_root}/examples/platform/mbed/pw_sys_io:pw_sys_io_mbed",
33-
"${dir_pigweed}/pw_hdlc:pw_rpc",
3433
dir_pw_assert,
3534
dir_pw_hdlc,
3635
dir_pw_log,

‎config/qpg/lib/pw_rpc/BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ static_library("pw_rpc") {
3636
"$dir_pw_rpc:server",
3737
"$dir_pw_rpc/nanopb:echo_service",
3838
"${chip_root}/examples/platform/qpg/pw_sys_io:pw_sys_io_qpg",
39-
"${dir_pigweed}/pw_hdlc:pw_rpc",
4039
dir_pw_assert,
4140
dir_pw_checksum,
4241
dir_pw_hdlc,

‎examples/chef/linux/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ executable("${sample_name}") {
8282
]
8383

8484
deps += [
85-
"$dir_pw_hdlc:pw_rpc",
85+
"$dir_pw_hdlc:default_addresses",
8686
"$dir_pw_hdlc:rpc_channel_output",
8787
"$dir_pw_log",
8888
"$dir_pw_rpc:server",

‎examples/chef/nrfconnect/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,6 @@ target_link_libraries(app PRIVATE
214214
thread_service.nanopb_rpc
215215
pw_checksum
216216
pw_hdlc
217-
pw_hdlc.pw_rpc
218217
pw_log
219218
pw_rpc.server
220219
pw_sys_io

‎examples/chef/silabs/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ silabs_executable("chef_app") {
120120
]
121121

122122
deps += [
123+
"$dir_pw_hdlc:default_addresses",
123124
"$dir_pw_hdlc:rpc_channel_output",
124125
"$dir_pw_stream:sys_io_stream",
125126
"$dir_pw_trace",

‎examples/chef/telink/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ target_link_libraries(app PRIVATE
231231
thread_service.nanopb_rpc
232232
pw_checksum
233233
pw_hdlc
234-
pw_hdlc.pw_rpc
235234
pw_log
236235
pw_rpc.server
237236
pw_sys_io

‎examples/common/pigweed/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ pw_source_set("system_rpc_server") {
115115
]
116116

117117
public_deps = [
118-
"$dir_pw_hdlc:pw_rpc",
118+
"$dir_pw_hdlc:default_addresses",
119119
"$dir_pw_hdlc:rpc_channel_output",
120120
"$dir_pw_stream:sys_io_stream",
121121
]

‎examples/common/pigweed/RpcService.cpp

+21-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222
#include <array>
2323
#include <string_view>
2424

25+
#include "pw_hdlc/decoder.h"
26+
#include "pw_hdlc/default_addresses.h"
2527
#include "pw_hdlc/rpc_channel.h"
26-
#include "pw_hdlc/rpc_packets.h"
2728
#include "pw_log/log.h"
2829
#include "pw_rpc/channel.h"
2930
#include "pw_status/status.h"
@@ -116,7 +117,25 @@ void Start(void (*RegisterServices)(pw::rpc::Server &), ::chip::rpc::Mutex * uar
116117
std::array<std::byte, kMaxTransmissionUnit> input_buffer;
117118

118119
Logging::Log(Logging::kLogModule_NotSpecified, Logging::kLogCategory_Detail, "Starting pw_rpc server");
119-
pw::hdlc::ReadAndProcessPackets(server, input_buffer);
120+
121+
pw::hdlc::Decoder decoder(input_buffer);
122+
while (true)
123+
{
124+
std::byte data;
125+
if (!pw::sys_io::ReadByte(&data).ok())
126+
{
127+
// TODO: should we log?
128+
return;
129+
}
130+
if (auto result = decoder.Process(data); result.ok())
131+
{
132+
pw::hdlc::Frame & frame = result.value();
133+
if (frame.address() == pw::hdlc::kDefaultRpcAddress)
134+
{
135+
server.ProcessPacket(frame.data()).IgnoreError();
136+
}
137+
}
138+
}
120139
}
121140

122141
} // namespace rpc

‎examples/common/pigweed/mbed/Rpc.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "pigweed/RpcService.h"
2323

2424
#include "pw_hdlc/rpc_channel.h"
25-
#include "pw_hdlc/rpc_packets.h"
2625
#include "pw_rpc/server.h"
2726
#include "pw_stream/sys_io_stream.h"
2827
#include "pw_sys_io/sys_io.h"

‎examples/common/pigweed/system_rpc_server.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@
1717

1818
#include <cstddef>
1919

20+
#include "pw_hdlc/decoder.h"
21+
#include "pw_hdlc/default_addresses.h"
2022
#include "pw_hdlc/rpc_channel.h"
21-
#include "pw_hdlc/rpc_packets.h"
2223
#include "pw_log/log.h"
2324
#include "pw_rpc_system_server/rpc_server.h"
2425
#include "pw_stream/sys_io_stream.h"

‎examples/energy-management-app/linux/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ executable("chip-energy-management-app") {
8686
]
8787

8888
deps += [
89-
"$dir_pw_hdlc:pw_rpc",
89+
"$dir_pw_hdlc:default_addresses",
9090
"$dir_pw_hdlc:rpc_channel_output",
9191
"$dir_pw_log",
9292
"$dir_pw_rpc:server",

‎examples/light-switch-app/qpg/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ qpg_executable("light_switch_app") {
102102
]
103103

104104
deps += [
105+
"$dir_pw_hdlc:default_addresses",
105106
"$dir_pw_hdlc:rpc_channel_output",
106107
"$dir_pw_stream:sys_io_stream",
107108
"${chip_root}/config/qpg/lib/pw_rpc:pw_rpc",

‎examples/light-switch-app/silabs/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ silabs_executable("light_switch_app") {
157157
]
158158

159159
deps += [
160+
"$dir_pw_hdlc:default_addresses",
160161
"$dir_pw_hdlc:rpc_channel_output",
161162
"$dir_pw_stream:sys_io_stream",
162163
"${chip_root}/config/efr32/lib/pw_rpc:pw_rpc",

‎examples/light-switch-app/telink/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,6 @@ target_link_libraries(app PRIVATE
235235
thread_service.nanopb_rpc
236236
pw_checksum
237237
pw_hdlc
238-
pw_hdlc.pw_rpc
239238
pw_log
240239
pw_rpc.server
241240
pw_sys_io

‎examples/lighting-app/bouffalolab/bl602/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ bouffalolab_executable("lighting_app") {
182182
]
183183

184184
deps += [
185+
"$dir_pw_hdlc:default_addresses",
185186
"$dir_pw_hdlc:rpc_channel_output",
186187
"$dir_pw_kvs:crc16",
187188
"$dir_pw_log",

‎examples/lighting-app/bouffalolab/bl702/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ bouffalolab_executable("lighting_app") {
252252
]
253253

254254
deps += [
255+
"$dir_pw_hdlc:default_addresses",
255256
"$dir_pw_hdlc:rpc_channel_output",
256257
"$dir_pw_stream:sys_io_stream",
257258

‎examples/lighting-app/bouffalolab/bl702l/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ bouffalolab_executable("lighting_app") {
214214
]
215215

216216
deps += [
217+
"$dir_pw_hdlc:default_addresses",
217218
"$dir_pw_hdlc:rpc_channel_output",
218219
"$dir_pw_stream:sys_io_stream",
219220

‎examples/lighting-app/linux/BUILD.gn

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ executable("chip-lighting-app") {
7777
]
7878

7979
deps += [
80-
"$dir_pw_hdlc:pw_rpc",
80+
"$dir_pw_hdlc:default_addresses",
8181
"$dir_pw_hdlc:rpc_channel_output",
8282
"$dir_pw_log",
8383
"$dir_pw_rpc:server",

‎examples/lighting-app/nrfconnect/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@ target_link_libraries(app PRIVATE
218218
thread_service.nanopb_rpc
219219
pw_checksum
220220
pw_hdlc
221-
pw_hdlc.pw_rpc
222221
pw_log
223222
pw_rpc.server
224223
pw_sys_io

‎examples/lighting-app/qpg/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ qpg_executable("lighting_app") {
105105
]
106106

107107
deps += [
108+
"$dir_pw_hdlc:default_addresses",
108109
"$dir_pw_hdlc:rpc_channel_output",
109110
"$dir_pw_stream:sys_io_stream",
110111
"${chip_root}/config/qpg/lib/pw_rpc:pw_rpc",

‎examples/lighting-app/silabs/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ silabs_executable("lighting_app") {
173173
]
174174

175175
deps += [
176+
"$dir_pw_hdlc:default_addresses",
176177
"$dir_pw_hdlc:rpc_channel_output",
177178
"$dir_pw_stream:sys_io_stream",
178179
"$dir_pw_trace",

‎examples/lighting-app/telink/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ target_link_libraries(app PRIVATE
268268
thread_service.nanopb_rpc
269269
pw_checksum
270270
pw_hdlc
271-
pw_hdlc.pw_rpc
272271
pw_log
273272
pw_rpc.server
274273
pw_sys_io

‎examples/lit-icd-app/silabs/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@ silabs_executable("lit_icd_app") {
156156
]
157157

158158
deps += [
159+
"$dir_pw_hdlc:default_addresses",
159160
"$dir_pw_hdlc:rpc_channel_output",
160161
"$dir_pw_stream:sys_io_stream",
161162
"${chip_root}/config/efr32/lib/pw_rpc:pw_rpc",

‎examples/lock-app/qpg/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ qpg_executable("lock_app") {
102102
]
103103

104104
deps += [
105+
"$dir_pw_hdlc:default_addresses",
105106
"$dir_pw_hdlc:rpc_channel_output",
106107
"$dir_pw_stream:sys_io_stream",
107108
"${chip_root}/config/qpg/lib/pw_rpc:pw_rpc",

‎examples/lock-app/silabs/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ silabs_executable("lock_app") {
157157
]
158158

159159
deps += [
160+
"$dir_pw_hdlc:default_addresses",
160161
"$dir_pw_hdlc:rpc_channel_output",
161162
"$dir_pw_stream:sys_io_stream",
162163
"${chip_root}/config/efr32/lib/pw_rpc:pw_rpc",

‎examples/platform/linux/system_rpc_server.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,9 @@
2525
#include <cstdio>
2626

2727
#include "pw_assert/check.h"
28+
#include "pw_hdlc/decoder.h"
29+
#include "pw_hdlc/default_addresses.h"
2830
#include "pw_hdlc/rpc_channel.h"
29-
#include "pw_hdlc/rpc_packets.h"
3031
#include "pw_log/log.h"
3132
#include "pw_rpc_system_server/rpc_server.h"
3233
#include "pw_stream/socket_stream.h"

‎examples/platform/mbed/util/PigweedLogger.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include <pw_stream/sys_io_stream.h>
2929
#include <pw_sys_io_mbed/init.h>
3030

31+
#include <assert.h>
3132
#include <rtos/Mutex.h>
3233

3334
namespace PigweedLogger {

‎examples/pump-app/silabs/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@ silabs_executable("pump_app") {
171171
]
172172

173173
deps += [
174+
"$dir_pw_hdlc:default_addresses",
174175
"$dir_pw_hdlc:rpc_channel_output",
175176
"$dir_pw_stream:sys_io_stream",
176177
"$dir_pw_trace",

‎examples/smoke-co-alarm-app/silabs/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ silabs_executable("smoke_co_alarm_app") {
173173
]
174174

175175
deps += [
176+
"$dir_pw_hdlc:default_addresses",
176177
"$dir_pw_hdlc:rpc_channel_output",
177178
"$dir_pw_stream:sys_io_stream",
178179
"${chip_root}/config/efr32/lib/pw_rpc:pw_rpc",

‎examples/thermostat/qpg/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ qpg_executable("thermostat") {
101101
]
102102

103103
deps += [
104+
"$dir_pw_hdlc:default_addresses",
104105
"$dir_pw_hdlc:rpc_channel_output",
105106
"$dir_pw_stream:sys_io_stream",
106107
"${chip_root}/config/qpg/lib/pw_rpc:pw_rpc",

‎examples/thermostat/silabs/BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ silabs_executable("thermostat_app") {
185185
]
186186

187187
deps += [
188+
"$dir_pw_hdlc:default_addresses",
188189
"$dir_pw_hdlc:rpc_channel_output",
189190
"$dir_pw_stream:sys_io_stream",
190191
"${chip_root}/config/efr32/lib/pw_rpc:pw_rpc",

‎third_party/pigweed/repo

Submodule repo updated 186 files

0 commit comments

Comments
 (0)