Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump third_party/pigweed/repo from 9640cde to 0380161 #31589

Merged
merged 14 commits into from
Jan 24, 2024
Merged

Bump third_party/pigweed/repo from 9640cde to 0380161 #31589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f7febe0
Bump third_party/pigweed/repo from `9640cde` to `0380161`
dependabot[bot] Jan 22, 2024
9cbf02c
Remove pw_hdlc::pw_rpc dependency
andy31415 Jan 24, 2024
b117265
Remove bug report comment
andy31415 Jan 24, 2024
6421204
Restyle
andy31415 Jan 24, 2024
526355c
Add dependency to pw_hdlc:default_addresses
andy31415 Jan 24, 2024
53c1f0f
Add assert header to binary
andy31415 Jan 24, 2024
4aad281
Also update chef example
andy31415 Jan 24, 2024
b87fe79
Restyle
andy31415 Jan 24, 2024
bc4d340
Add a few more dependencies on default_addresses
andy31415 Jan 24, 2024
0642b95
restyle
andy31415 Jan 24, 2024
a0344cb
add decoder header
andy31415 Jan 24, 2024
52e6d56
Drop a few more rpc_packets includes and add default_addresses
andy31415 Jan 24, 2024
78df44d
Fix wrong dependency from copy&paster for efr32 test drives
andy31415 Jan 24, 2024
9336dcc
Add another dependency for efr32 ... not sure why we have several cop…
andy31415 Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion config/ameba/lib/pw_rpc/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ static_library("pw_rpc") {
"$dir_pw_rpc:server",
"$dir_pw_rpc/nanopb:echo_service",
"${chip_root}/examples/platform/ameba/pw_sys_io:pw_sys_io_ameba",
"${dir_pigweed}/pw_hdlc:pw_rpc",
dir_pw_assert,
dir_pw_hdlc,
dir_pw_log,
Expand Down
1 change: 0 additions & 1 deletion config/bouffalolab/common/lib/pw_rpc/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ static_library("pw_rpc") {
"$dir_pw_rpc:server",
"$dir_pw_rpc/nanopb:echo_service",
"${chip_root}/examples/platform/bouffalolab/common/rpc/pw_sys_io:pw_sys_io",
"${dir_pigweed}/pw_hdlc:pw_rpc",
dir_pw_assert,
dir_pw_checksum,
dir_pw_hdlc,
Expand Down
1 change: 0 additions & 1 deletion config/efr32/lib/pw_rpc/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ static_library("pw_rpc") {
"$dir_pw_rpc:server",
"$dir_pw_rpc/nanopb:echo_service",
"${chip_root}/examples/platform/silabs/pw_sys_io:pw_sys_io_silabs",
"${dir_pigweed}/pw_hdlc:pw_rpc",
dir_pw_assert,
dir_pw_checksum,
dir_pw_hdlc,
Expand Down
1 change: 0 additions & 1 deletion config/esp32/lib/pw_rpc/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ static_library("pw_rpc") {
"$dir_pw_rpc:server",
"$dir_pw_rpc/nanopb:echo_service",
"${chip_root}/examples/platform/esp32/pw_sys_io:pw_sys_io_esp32",
"${dir_pigweed}/pw_hdlc:pw_rpc",
dir_pw_assert,
dir_pw_hdlc,
dir_pw_log,
Expand Down
1 change: 0 additions & 1 deletion config/linux/lib/pw_rpc/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ static_library("pw_rpc") {
public_configs = [ "${dir_pigweed}/pw_hdlc:default_config" ]
deps = [
"$dir_pw_hdlc:encoder",
"$dir_pw_hdlc:pw_rpc",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_rpc/system_server:facade",
"$dir_pw_stream:socket_stream",
Expand Down
1 change: 0 additions & 1 deletion config/mbed/chip-gn/lib/pw_rpc/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ static_library("pw_rpc") {
deps = [
"$dir_pw_rpc:server",
"${chip_root}/examples/platform/mbed/pw_sys_io:pw_sys_io_mbed",
"${dir_pigweed}/pw_hdlc:pw_rpc",
dir_pw_assert,
dir_pw_hdlc,
dir_pw_log,
Expand Down
1 change: 0 additions & 1 deletion config/qpg/lib/pw_rpc/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ static_library("pw_rpc") {
"$dir_pw_rpc:server",
"$dir_pw_rpc/nanopb:echo_service",
"${chip_root}/examples/platform/qpg/pw_sys_io:pw_sys_io_qpg",
"${dir_pigweed}/pw_hdlc:pw_rpc",
dir_pw_assert,
dir_pw_checksum,
dir_pw_hdlc,
Expand Down
2 changes: 1 addition & 1 deletion examples/chef/linux/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ executable("${sample_name}") {
]

deps += [
"$dir_pw_hdlc:pw_rpc",
"$dir_pw_hdlc:default_addresses",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_log",
"$dir_pw_rpc:server",
Expand Down
1 change: 0 additions & 1 deletion examples/chef/nrfconnect/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@ target_link_libraries(app PRIVATE
thread_service.nanopb_rpc
pw_checksum
pw_hdlc
pw_hdlc.pw_rpc
pw_log
pw_rpc.server
pw_sys_io
Expand Down
1 change: 1 addition & 0 deletions examples/chef/silabs/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ silabs_executable("chef_app") {
]

deps += [
"$dir_pw_hdlc:default_addresses",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_stream:sys_io_stream",
"$dir_pw_trace",
Expand Down
1 change: 0 additions & 1 deletion examples/chef/telink/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ target_link_libraries(app PRIVATE
thread_service.nanopb_rpc
pw_checksum
pw_hdlc
pw_hdlc.pw_rpc
pw_log
pw_rpc.server
pw_sys_io
Expand Down
2 changes: 1 addition & 1 deletion examples/common/pigweed/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ pw_source_set("system_rpc_server") {
]

public_deps = [
"$dir_pw_hdlc:pw_rpc",
"$dir_pw_hdlc:default_addresses",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_stream:sys_io_stream",
]
Expand Down
23 changes: 21 additions & 2 deletions examples/common/pigweed/RpcService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@
#include <array>
#include <string_view>

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

Logging::Log(Logging::kLogModule_NotSpecified, Logging::kLogCategory_Detail, "Starting pw_rpc server");
pw::hdlc::ReadAndProcessPackets(server, input_buffer);

pw::hdlc::Decoder decoder(input_buffer);
while (true)
{
std::byte data;
if (!pw::sys_io::ReadByte(&data).ok())
{
// TODO: should we log?
return;
}
if (auto result = decoder.Process(data); result.ok())
{
pw::hdlc::Frame & frame = result.value();
if (frame.address() == pw::hdlc::kDefaultRpcAddress)
{
server.ProcessPacket(frame.data()).IgnoreError();
}
}
}
}

} // namespace rpc
Expand Down
1 change: 0 additions & 1 deletion examples/common/pigweed/mbed/Rpc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include "pigweed/RpcService.h"

#include "pw_hdlc/rpc_channel.h"
#include "pw_hdlc/rpc_packets.h"
#include "pw_rpc/server.h"
#include "pw_stream/sys_io_stream.h"
#include "pw_sys_io/sys_io.h"
Expand Down
3 changes: 2 additions & 1 deletion examples/common/pigweed/system_rpc_server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@

#include <cstddef>

#include "pw_hdlc/decoder.h"
#include "pw_hdlc/default_addresses.h"
#include "pw_hdlc/rpc_channel.h"
#include "pw_hdlc/rpc_packets.h"
#include "pw_log/log.h"
#include "pw_rpc_system_server/rpc_server.h"
#include "pw_stream/sys_io_stream.h"
Expand Down
2 changes: 1 addition & 1 deletion examples/energy-management-app/linux/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ executable("chip-energy-management-app") {
]

deps += [
"$dir_pw_hdlc:pw_rpc",
"$dir_pw_hdlc:default_addresses",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_log",
"$dir_pw_rpc:server",
Expand Down
1 change: 1 addition & 0 deletions examples/light-switch-app/qpg/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ qpg_executable("light_switch_app") {
]

deps += [
"$dir_pw_hdlc:default_addresses",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_stream:sys_io_stream",
"${chip_root}/config/qpg/lib/pw_rpc:pw_rpc",
Expand Down
1 change: 1 addition & 0 deletions examples/light-switch-app/silabs/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ silabs_executable("light_switch_app") {
]

deps += [
"$dir_pw_hdlc:default_addresses",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_stream:sys_io_stream",
"${chip_root}/config/efr32/lib/pw_rpc:pw_rpc",
Expand Down
1 change: 0 additions & 1 deletion examples/light-switch-app/telink/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ target_link_libraries(app PRIVATE
thread_service.nanopb_rpc
pw_checksum
pw_hdlc
pw_hdlc.pw_rpc
pw_log
pw_rpc.server
pw_sys_io
Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/bouffalolab/bl602/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ bouffalolab_executable("lighting_app") {
]

deps += [
"$dir_pw_hdlc:default_addresses",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_kvs:crc16",
"$dir_pw_log",
Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/bouffalolab/bl702/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ bouffalolab_executable("lighting_app") {
]

deps += [
"$dir_pw_hdlc:default_addresses",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_stream:sys_io_stream",

Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/bouffalolab/bl702l/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ bouffalolab_executable("lighting_app") {
]

deps += [
"$dir_pw_hdlc:default_addresses",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_stream:sys_io_stream",

Expand Down
2 changes: 1 addition & 1 deletion examples/lighting-app/linux/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ executable("chip-lighting-app") {
]

deps += [
"$dir_pw_hdlc:pw_rpc",
"$dir_pw_hdlc:default_addresses",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_log",
"$dir_pw_rpc:server",
Expand Down
1 change: 0 additions & 1 deletion examples/lighting-app/nrfconnect/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ target_link_libraries(app PRIVATE
thread_service.nanopb_rpc
pw_checksum
pw_hdlc
pw_hdlc.pw_rpc
pw_log
pw_rpc.server
pw_sys_io
Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/qpg/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ qpg_executable("lighting_app") {
]

deps += [
"$dir_pw_hdlc:default_addresses",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_stream:sys_io_stream",
"${chip_root}/config/qpg/lib/pw_rpc:pw_rpc",
Expand Down
1 change: 1 addition & 0 deletions examples/lighting-app/silabs/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ silabs_executable("lighting_app") {
]

deps += [
"$dir_pw_hdlc:default_addresses",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_stream:sys_io_stream",
"$dir_pw_trace",
Expand Down
1 change: 0 additions & 1 deletion examples/lighting-app/telink/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@ target_link_libraries(app PRIVATE
thread_service.nanopb_rpc
pw_checksum
pw_hdlc
pw_hdlc.pw_rpc
pw_log
pw_rpc.server
pw_sys_io
Expand Down
1 change: 1 addition & 0 deletions examples/lit-icd-app/silabs/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ silabs_executable("lit_icd_app") {
]

deps += [
"$dir_pw_hdlc:default_addresses",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_stream:sys_io_stream",
"${chip_root}/config/efr32/lib/pw_rpc:pw_rpc",
Expand Down
1 change: 1 addition & 0 deletions examples/lock-app/qpg/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ qpg_executable("lock_app") {
]

deps += [
"$dir_pw_hdlc:default_addresses",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_stream:sys_io_stream",
"${chip_root}/config/qpg/lib/pw_rpc:pw_rpc",
Expand Down
1 change: 1 addition & 0 deletions examples/lock-app/silabs/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ silabs_executable("lock_app") {
]

deps += [
"$dir_pw_hdlc:default_addresses",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_stream:sys_io_stream",
"${chip_root}/config/efr32/lib/pw_rpc:pw_rpc",
Expand Down
3 changes: 2 additions & 1 deletion examples/platform/linux/system_rpc_server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@
#include <cstdio>

#include "pw_assert/check.h"
#include "pw_hdlc/decoder.h"
#include "pw_hdlc/default_addresses.h"
#include "pw_hdlc/rpc_channel.h"
#include "pw_hdlc/rpc_packets.h"
#include "pw_log/log.h"
#include "pw_rpc_system_server/rpc_server.h"
#include "pw_stream/socket_stream.h"
Expand Down
1 change: 1 addition & 0 deletions examples/platform/mbed/util/PigweedLogger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <pw_stream/sys_io_stream.h>
#include <pw_sys_io_mbed/init.h>

#include <assert.h>
#include <rtos/Mutex.h>

namespace PigweedLogger {
Expand Down
1 change: 1 addition & 0 deletions examples/pump-app/silabs/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ silabs_executable("pump_app") {
]

deps += [
"$dir_pw_hdlc:default_addresses",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_stream:sys_io_stream",
"$dir_pw_trace",
Expand Down
1 change: 1 addition & 0 deletions examples/smoke-co-alarm-app/silabs/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ silabs_executable("smoke_co_alarm_app") {
]

deps += [
"$dir_pw_hdlc:default_addresses",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_stream:sys_io_stream",
"${chip_root}/config/efr32/lib/pw_rpc:pw_rpc",
Expand Down
1 change: 1 addition & 0 deletions examples/thermostat/qpg/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ qpg_executable("thermostat") {
]

deps += [
"$dir_pw_hdlc:default_addresses",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_stream:sys_io_stream",
"${chip_root}/config/qpg/lib/pw_rpc:pw_rpc",
Expand Down
1 change: 1 addition & 0 deletions examples/thermostat/silabs/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ silabs_executable("thermostat_app") {
]

deps += [
"$dir_pw_hdlc:default_addresses",
"$dir_pw_hdlc:rpc_channel_output",
"$dir_pw_stream:sys_io_stream",
"${chip_root}/config/efr32/lib/pw_rpc:pw_rpc",
Expand Down
2 changes: 1 addition & 1 deletion third_party/pigweed/repo
Open in desktop
Submodule repo updated 186 files
Loading