Skip to content

Commit

Permalink
Roll up Pigweed to 444f6d0 (#12648)
Browse files Browse the repository at this point in the history
* Roll up Pigweed to 444f6d0

Fix a linking error with building with pw_trace.

* update constraints.txt to 3.0.21 for pw_console

* Modify namespace of rpc services.

This is due to a recent pw_rpc change.

* Modify namespaces for rpc services
  • Loading branch information
yyzhong-g authored and pull[bot] committed Mar 2, 2022
1 parent 5794cc0 commit 2662873
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion examples/common/pigweed/rpc_services/Attributes.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace chip {
namespace rpc {

// Implementation class for chip.rpc.Attributes.
class Attributes : public generated::Attributes<Attributes>
class Attributes : public pw_rpc::nanopb::Attributes::Service<Attributes>
{
public:
::pw::Status Write(const chip_rpc_AttributeWrite & request, pw_protobuf_Empty & response)
Expand Down
2 changes: 1 addition & 1 deletion examples/common/pigweed/rpc_services/Button.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
namespace chip {
namespace rpc {

class Button : public generated::Button<Button>
class Button : public pw_rpc::nanopb::Button::Service<Button>
{
public:
virtual ~Button() = default;
Expand Down
2 changes: 1 addition & 1 deletion examples/common/pigweed/rpc_services/Device.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
namespace chip {
namespace rpc {

class Device : public generated::Device<Device>
class Device : public pw_rpc::nanopb::Device::Service<Device>
{
public:
virtual ~Device() = default;
Expand Down
2 changes: 1 addition & 1 deletion examples/common/pigweed/rpc_services/Lighting.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
namespace chip {
namespace rpc {

class Lighting : public generated::Lighting<Lighting>
class Lighting : public pw_rpc::nanopb::Lighting::Service<Lighting>
{
public:
Lighting(bool support_level = true, bool support_color = true) : mSupportLevel(support_level), mSupportColor(support_color) {}
Expand Down
2 changes: 1 addition & 1 deletion examples/common/pigweed/rpc_services/Locking.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
namespace chip {
namespace rpc {

class Locking final : public generated::Locking<Locking>
class Locking final : public pw_rpc::nanopb::Locking::Service<Locking>
{
public:
virtual ~Locking() = default;
Expand Down
2 changes: 1 addition & 1 deletion examples/ipv6only-app/esp32/include/wifi_service.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
namespace chip {
namespace rpc {

class Wifi final : public generated::Wifi<Wifi>
class Wifi final : public pw_rpc::nanopb::Wifi::Service<Wifi>
{
public:
// Singleton
Expand Down
2 changes: 1 addition & 1 deletion scripts/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ prettytable==2.2.1
# via
# mbed-ls
# mbed-os-tools
prompt-toolkit==3.0.20
prompt-toolkit==3.0.21
# via ipython
protobuf==3.17.3
# via -r requirements.txt
Expand Down
2 changes: 1 addition & 1 deletion src/test_driver/efr32/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ extern "C" int printf(const char * format, ...)

namespace chip::rpc {

class NlTest : public generated::NlTest<NlTest>
class NlTest : public pw_rpc::nanopb::NlTest::Service<NlTest>
{
public:
void Run(const pw_protobuf_Empty & request, ServerWriter<chip_rpc_Event> & writer)
Expand Down
2 changes: 1 addition & 1 deletion third_party/pigweed/repo
Submodule repo updated 95 files
+1 −0 docs/BUILD.gn
+6 −0 docs/_static/css/pigweed.css
+10 −0 docs/conf.py
+1 −0 docs/index.rst
+637 −0 docs/size_optimizations.rst
+30 −30 pw_allocator/docs.rst
+1 −6 pw_assert/assert_backend_compile_test.cc
+1 −5 pw_assert/assert_backend_compile_test_c.c
+8 −0 pw_assert/docs.rst
+0 −7 pw_assert/public/pw_assert/check.h
+7 −0 pw_assert/public/pw_assert/config.h
+66 −32 pw_assert/public/pw_assert/internal/check_impl.h
+489 −17 pw_chrono/docs.rst
+2 −0 pw_console/py/log_store_test.py
+8 −7 pw_console/py/log_view_test.py
+9 −8 pw_console/py/pw_console/__main__.py
+110 −22 pw_console/py/pw_console/console_app.py
+27 −2 pw_console/py/pw_console/console_prefs.py
+14 −26 pw_console/py/pw_console/embed.py
+0 −47 pw_console/py/pw_console/key_bindings.py
+5 −0 pw_console/py/pw_console/log_line.py
+3 −2 pw_console/py/pw_console/log_view.py
+52 −1 pw_console/py/pw_console/python_logging.py
+4 −1 pw_console/py/pw_console/repl_pane.py
+19 −4 pw_console/py/pw_console/style.py
+22 −20 pw_console/py/pw_console/widgets/table.py
+4 −3 pw_console/py/pw_console/widgets/window_pane.py
+48 −5 pw_console/py/pw_console/widgets/window_pane_toolbar.py
+236 −28 pw_console/py/pw_console/window_list.py
+78 −16 pw_console/py/pw_console/window_manager.py
+1 −1 pw_console/py/setup.cfg
+8 −3 pw_console/py/table_test.py
+123 −29 pw_console/py/window_manager_test.py
+31 −0 pw_console/testing.rst
+4 −4 pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json
+7 −7 pw_env_setup/py/pw_env_setup/virtualenv_setup/constraint.list
+1 −1 pw_env_setup/pypi_common_setup.cfg
+2 −0 pw_env_setup/util.sh
+5 −3 pw_file/flat_file_system.cc
+1 −1 pw_file/public/pw_file/flat_file_system.h
+14 −22 pw_log/public/pw_log/log.h
+1 −1 pw_log_rpc/public/pw_log_rpc/log_service.h
+6 −6 pw_log_rpc/rpc_log_drain_test.cc
+2 −1 pw_metric/public/pw_metric/metric_service_nanopb.h
+4 −3 pw_presubmit/py/pw_presubmit/build.py
+2 −2 pw_presubmit/py/pw_presubmit/cpp_checks.py
+8 −4 pw_presubmit/py/pw_presubmit/format_code.py
+6 −1 pw_presubmit/py/pw_presubmit/git_repo.py
+6 −13 pw_presubmit/py/pw_presubmit/presubmit.py
+14 −0 pw_protobuf/message.cc
+17 −0 pw_protobuf/message_test.cc
+19 −0 pw_protobuf/public/pw_protobuf/message.h
+1 −1 pw_rpc/client_integration_test.cc
+3 −3 pw_rpc/docs.rst
+1 −1 pw_rpc/nanopb/client_integration_test.cc
+3 −2 pw_rpc/nanopb/codegen_test.cc
+7 −3 pw_rpc/nanopb/docs.rst
+4 −2 pw_rpc/nanopb/method_lookup_test.cc
+2 −1 pw_rpc/nanopb/public/pw_rpc/echo_service_nanopb.h
+0 −1 pw_rpc/nanopb/public/pw_rpc/nanopb/server_reader_writer.h
+1 −1 pw_rpc/nanopb/server_reader_writer_test.cc
+2 −1 pw_rpc/public/pw_rpc/benchmark.h
+2 −12 pw_rpc/public/pw_rpc/channel.h
+1 −6 pw_rpc/public/pw_rpc/client.h
+0 −7 pw_rpc/public/pw_rpc/internal/call.h
+0 −5 pw_rpc/public/pw_rpc/internal/channel.h
+28 −64 pw_rpc/py/pw_rpc/codegen.py
+1 −33 pw_rpc/py/pw_rpc/codegen_nanopb.py
+1 −1 pw_rpc/py/pw_rpc/codegen_raw.py
+2 −1 pw_rpc/raw/codegen_test.cc
+1 −1 pw_rpc/raw/method_info_test.cc
+0 −2 pw_rpc/raw/public/pw_rpc/raw/server_reader_writer.h
+1 −1 pw_rpc/raw/server_reader_writer_test.cc
+40 −31 pw_software_update/bundled_update_service.cc
+6 −1 pw_software_update/public/pw_software_update/bundled_update_service.h
+3 −16 pw_software_update/py/dev_sign_test.py
+1 −10 pw_software_update/py/pw_software_update/dev_sign.py
+6 −6 pw_stream/public/pw_stream/std_file_stream.h
+1 −0 pw_stream/std_file_stream.cc
+1 −1 pw_string/public/pw_string/string_builder.h
+1 −3 pw_string/string_builder.cc
+14 −2 pw_string/string_builder_test.cc
+1 −1 pw_thread_embos/public/pw_thread_embos/id_inline.h
+1 −1 pw_thread_embos/public/pw_thread_embos/yield_inline.h
+1 −0 pw_thread_freertos/BUILD.gn
+1 −1 pw_thread_freertos/thread.cc
+2 −1 pw_trace_tokenized/CMakeLists.txt
+2 −1 pw_trace_tokenized/public/pw_trace_tokenized/trace_rpc_service_nanopb.h
+30 −23 pw_transfer/context.cc
+5 −1 pw_transfer/docs.rst
+1 −11 pw_transfer/public/pw_transfer/internal/context.h
+1 −1 pw_transfer/public/pw_transfer/transfer.h
+2 −1 pw_transfer/test_rpc_server.cc
+27 −5 pw_transfer/transfer_test.cc
+2 −1 pw_unit_test/public/pw_unit_test/unit_test_service.h

0 comments on commit 2662873

Please sign in to comment.