From 2dad466f4e6bb546f9fe322b5522200a0ab23288 Mon Sep 17 00:00:00 2001 From: Alan Davidson Date: Tue, 30 Apr 2024 14:47:27 -0400 Subject: [PATCH 01/19] update CMakeLists.txt for newer version of .protos in api repo --- src/viam/api/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/viam/api/CMakeLists.txt b/src/viam/api/CMakeLists.txt index 12efd2bc0..3ea9a7333 100644 --- a/src/viam/api/CMakeLists.txt +++ b/src/viam/api/CMakeLists.txt @@ -19,6 +19,7 @@ if (VIAMCPPSDK_USE_DYNAMIC_PROTOS) endif() set(BUF_PROTO_COMPONENTS + app/mltraining app/packages app/v1 common @@ -124,6 +125,8 @@ if (VIAMCPPSDK_USE_DYNAMIC_PROTOS) # it sanely? We would need to filter out (or add in) the headers. # This list is needed for the core library. + ${PROTO_GEN_DIR}/app/mltraining/v1/ml_training.pb.cc + ${PROTO_GEN_DIR}/app/mltraining/v1/ml_training.pb.h ${PROTO_GEN_DIR}/app/packages/v1/packages.pb.cc ${PROTO_GEN_DIR}/app/packages/v1/packages.pb.h ${PROTO_GEN_DIR}/app/v1/app.grpc.pb.cc @@ -257,6 +260,7 @@ add_library(viam-cpp-sdk::viamapi ALIAS viamapi) target_sources(viamapi PRIVATE + ${PROTO_GEN_DIR}/app/mltraining/v1/ml_training.pb.cc ${PROTO_GEN_DIR}/app/packages/v1/packages.pb.cc ${PROTO_GEN_DIR}/app/v1/app.grpc.pb.cc ${PROTO_GEN_DIR}/app/v1/app.pb.cc @@ -303,6 +307,7 @@ target_sources(viamapi BASE_DIRS ${PROTO_GEN_DIR}/../.. FILES + ${PROTO_GEN_DIR}/../../viam/api/app/mltraining/v1/ml_training.pb.h ${PROTO_GEN_DIR}/../../viam/api/app/packages/v1/packages.pb.h ${PROTO_GEN_DIR}/../../viam/api/app/v1/app.grpc.pb.h ${PROTO_GEN_DIR}/../../viam/api/app/v1/app.pb.h From 8bc17ddfefe371e4ba8f2693c44f3c3ef3055f1e Mon Sep 17 00:00:00 2001 From: Alan Davidson Date: Tue, 30 Apr 2024 14:47:41 -0400 Subject: [PATCH 02/19] buf.lock was changed automatically. Is this needed? --- src/viam/examples/modules/complex/proto/buf.lock | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/viam/examples/modules/complex/proto/buf.lock b/src/viam/examples/modules/complex/proto/buf.lock index 05bb0713a..62c9dfad4 100644 --- a/src/viam/examples/modules/complex/proto/buf.lock +++ b/src/viam/examples/modules/complex/proto/buf.lock @@ -4,5 +4,4 @@ deps: - remote: buf.build owner: googleapis repository: googleapis - commit: ee48893a270147348e3edc6c1a03de0e - digest: shake256:a35b0576a2b55dad72747e786af05c03539c2b96be236c9de39fe10d551931ac252eb68445c0cef6bbd27fa20e8c26eee5b8a9fe9c2fde6f63a03e18f8cf980d + commit: 4ed3bc159a8b4ac68fe253218760d035 From e95f8da7dceaed52f0b707775bc8d1002e3bf409 Mon Sep 17 00:00:00 2001 From: Alan Davidson Date: Tue, 30 Apr 2024 16:51:42 -0400 Subject: [PATCH 03/19] Add vim's .swp files to the gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 8110b0703..e10a34ae6 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ # ignore doxygen output /etc/docs/api/* + +# Vim temporary swap files +*.swp From d467a24d538a5bf4f617f754e2bd8a7b61af79da Mon Sep 17 00:00:00 2001 From: Alan Davidson Date: Tue, 30 Apr 2024 16:54:40 -0400 Subject: [PATCH 04/19] remove conversion functions for removed AnalogStatus and InterruptStatus --- src/viam/sdk/components/board.cpp | 20 -------------------- src/viam/sdk/components/board.hpp | 12 ------------ 2 files changed, 32 deletions(-) diff --git a/src/viam/sdk/components/board.cpp b/src/viam/sdk/components/board.cpp index 6a1b7e934..e405ac19c 100644 --- a/src/viam/sdk/components/board.cpp +++ b/src/viam/sdk/components/board.cpp @@ -31,14 +31,6 @@ Board::status Board::from_proto(const viam::common::v1::BoardStatus& proto) { return status; } -Board::analog_value Board::from_proto(const viam::common::v1::AnalogStatus& proto) { - return proto.value(); -} - -Board::digital_value Board::from_proto(const viam::common::v1::DigitalInterruptStatus& proto) { - return proto.value(); -} - Board::power_mode Board::from_proto(viam::component::board::v1::PowerMode proto) { switch (proto) { case viam::component::board::v1::POWER_MODE_NORMAL: { @@ -67,18 +59,6 @@ viam::common::v1::BoardStatus Board::to_proto(const status& status) { return proto; } -viam::common::v1::AnalogStatus Board::to_proto(analog_value analog_value) { - viam::common::v1::AnalogStatus proto; - proto.set_value(analog_value); - return proto; -} - -viam::common::v1::DigitalInterruptStatus Board::to_proto(digital_value digital_value) { - viam::common::v1::DigitalInterruptStatus proto; - proto.set_value(digital_value); - return proto; -} - viam::component::board::v1::PowerMode Board::to_proto(Board::power_mode power_mode) { switch (power_mode) { case Board::power_mode::normal: { diff --git a/src/viam/sdk/components/board.hpp b/src/viam/sdk/components/board.hpp index ee8ec9d1e..4ea382be5 100644 --- a/src/viam/sdk/components/board.hpp +++ b/src/viam/sdk/components/board.hpp @@ -68,24 +68,12 @@ class Board : public Component { /// @brief Creates a `status` struct from its proto representation. static status from_proto(const viam::common::v1::BoardStatus& proto); - /// @brief Creates a `analog_value` struct from its proto representation. - static analog_value from_proto(const viam::common::v1::AnalogStatus& proto); - - /// @brief Creates a `digital_value` struct from its proto representation. - static digital_value from_proto(const viam::common::v1::DigitalInterruptStatus& proto); - /// @brief Creates a `power_mode` enum from its proto representation. static power_mode from_proto(viam::component::board::v1::PowerMode proto); /// @brief Converts a `status` struct to its proto representation. static viam::common::v1::BoardStatus to_proto(const status& status); - /// @brief Converts a `analog_value` struct to its proto representation. - static viam::common::v1::AnalogStatus to_proto(analog_value analog_value); - - /// @brief Converts a `digital_value` struct to its proto representation. - static viam::common::v1::DigitalInterruptStatus to_proto(digital_value digital_value); - /// @brief Converts a `power_mode` enum to its proto representation. static viam::component::board::v1::PowerMode to_proto(power_mode power_mode); From 9f7cf6d5882199451ba9de92e621646e2e2a19b1 Mon Sep 17 00:00:00 2001 From: Alan Davidson Date: Tue, 30 Apr 2024 17:01:47 -0400 Subject: [PATCH 05/19] switch to new Status message for converting board status to/from protos --- src/viam/sdk/components/board.cpp | 14 +++++++------- src/viam/sdk/components/board.hpp | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/viam/sdk/components/board.cpp b/src/viam/sdk/components/board.cpp index e405ac19c..3b6a5fee7 100644 --- a/src/viam/sdk/components/board.cpp +++ b/src/viam/sdk/components/board.cpp @@ -20,13 +20,13 @@ API API::traits::api() { return {kRDK, kComponent, "board"}; } -Board::status Board::from_proto(const viam::common::v1::BoardStatus& proto) { +Board::status Board::from_proto(const viam::component::board::v1::Status& proto) { Board::status status; for (const auto& analog : proto.analogs()) { - status.analog_reader_values.emplace(analog.first, analog.second.value()); + status.analog_reader_values.emplace(analog.first, analog.second); } for (const auto& digital : proto.digital_interrupts()) { - status.digital_interrupt_values.emplace(digital.first, digital.second.value()); + status.digital_interrupt_values.emplace(digital.first, digital.second); } return status; } @@ -47,14 +47,14 @@ Board::power_mode Board::from_proto(viam::component::board::v1::PowerMode proto) } } -viam::common::v1::BoardStatus Board::to_proto(const status& status) { - viam::common::v1::BoardStatus proto; +viam::component::board::v1::Status Board::to_proto(const status& status) { + viam::component::board::v1::Status proto; for (const auto& analog : status.analog_reader_values) { - proto.mutable_analogs()->insert({analog.first, to_proto(analog.second)}); + proto.mutable_analogs()->insert({analog.first, analog.second}); } for (const auto& digital : status.digital_interrupt_values) { - proto.mutable_digital_interrupts()->insert({digital.first, to_proto(digital.second)}); + proto.mutable_digital_interrupts()->insert({digital.first, digital.second}); } return proto; } diff --git a/src/viam/sdk/components/board.hpp b/src/viam/sdk/components/board.hpp index 4ea382be5..382c8d6cc 100644 --- a/src/viam/sdk/components/board.hpp +++ b/src/viam/sdk/components/board.hpp @@ -66,13 +66,13 @@ class Board : public Component { API api() const override; /// @brief Creates a `status` struct from its proto representation. - static status from_proto(const viam::common::v1::BoardStatus& proto); + static status from_proto(const viam::component::board::v1::Status& proto); /// @brief Creates a `power_mode` enum from its proto representation. static power_mode from_proto(viam::component::board::v1::PowerMode proto); /// @brief Converts a `status` struct to its proto representation. - static viam::common::v1::BoardStatus to_proto(const status& status); + static viam::component::board::v1::Status to_proto(const status& status); /// @brief Converts a `power_mode` enum to its proto representation. static viam::component::board::v1::PowerMode to_proto(power_mode power_mode); From 4145c5998a332cb8d5845dff47443e81c785aed3 Mon Sep 17 00:00:00 2001 From: Alan Davidson Date: Tue, 30 Apr 2024 17:13:34 -0400 Subject: [PATCH 06/19] remove status from board server --- src/viam/sdk/components/private/board_server.cpp | 12 ------------ src/viam/sdk/components/private/board_server.hpp | 4 ---- 2 files changed, 16 deletions(-) diff --git a/src/viam/sdk/components/private/board_server.cpp b/src/viam/sdk/components/private/board_server.cpp index 6dff9b735..2f8d9381a 100644 --- a/src/viam/sdk/components/private/board_server.cpp +++ b/src/viam/sdk/components/private/board_server.cpp @@ -14,18 +14,6 @@ namespace impl { BoardServer::BoardServer(std::shared_ptr manager) : ResourceServer(std::move(manager)){}; -::grpc::Status BoardServer::Status( - ::grpc::ServerContext*, - const ::viam::component::board::v1::StatusRequest* request, - ::viam::component::board::v1::StatusResponse* response) noexcept { - return make_service_helper( - "BoardServer::Status", this, request)([&](auto& helper, auto& board) { - const viam::common::v1::BoardStatus status = - Board::to_proto(board->get_status(helper.getExtra())); - *response->mutable_status() = status; - }); -} - ::grpc::Status BoardServer::SetGPIO(::grpc::ServerContext*, const ::viam::component::board::v1::SetGPIORequest* request, ::viam::component::board::v1::SetGPIOResponse*) noexcept { diff --git a/src/viam/sdk/components/private/board_server.hpp b/src/viam/sdk/components/private/board_server.hpp index 2e275d28e..d3cf89e09 100644 --- a/src/viam/sdk/components/private/board_server.hpp +++ b/src/viam/sdk/components/private/board_server.hpp @@ -24,10 +24,6 @@ class BoardServer : public ResourceServer, using interface_type = Board; explicit BoardServer(std::shared_ptr manager); - ::grpc::Status Status(::grpc::ServerContext* context, - const ::viam::component::board::v1::StatusRequest* request, - ::viam::component::board::v1::StatusResponse* response) noexcept override; - ::grpc::Status SetGPIO( ::grpc::ServerContext* context, const ::viam::component::board::v1::SetGPIORequest* request, From 974965815fe199cb6785cd20c40df2c7c18c587e Mon Sep 17 00:00:00 2001 From: Alan Davidson Date: Tue, 30 Apr 2024 17:15:57 -0400 Subject: [PATCH 07/19] remove get_status from board_client --- src/viam/sdk/components/private/board_client.cpp | 6 ------ src/viam/sdk/components/private/board_client.hpp | 2 -- 2 files changed, 8 deletions(-) diff --git a/src/viam/sdk/components/private/board_client.cpp b/src/viam/sdk/components/private/board_client.cpp index eec8bfe60..40a1d9f8a 100644 --- a/src/viam/sdk/components/private/board_client.cpp +++ b/src/viam/sdk/components/private/board_client.cpp @@ -25,12 +25,6 @@ BoardClient::BoardClient(std::string name, std::shared_ptr channe stub_(viam::component::board::v1::BoardService::NewStub(channel)), channel_(std::move(channel)){}; -Board::status BoardClient::get_status(const AttributeMap& extra) { - return make_client_helper(this, *stub_, &StubType::Status) - .with(extra) - .invoke([](auto& response) { return from_proto(response.status()); }); -} - void BoardClient::set_gpio(const std::string& pin, bool high, const AttributeMap& extra) { return make_client_helper(this, *stub_, &StubType::SetGPIO) .with(extra, diff --git a/src/viam/sdk/components/private/board_client.hpp b/src/viam/sdk/components/private/board_client.hpp index 6a18c63fe..b5aa7e7dc 100644 --- a/src/viam/sdk/components/private/board_client.hpp +++ b/src/viam/sdk/components/private/board_client.hpp @@ -24,7 +24,6 @@ class BoardClient : public Board { using interface_type = Board; BoardClient(std::string name, std::shared_ptr channel); AttributeMap do_command(const AttributeMap& command) override; - status get_status(const AttributeMap& extra) override; void set_gpio(const std::string& pin, bool high, const AttributeMap& extra) override; bool get_gpio(const std::string& pin, const AttributeMap& extra) override; double get_pwm_duty_cycle(const std::string& pin, const AttributeMap& extra) override; @@ -62,7 +61,6 @@ class BoardClient : public Board { using Board::get_gpio; using Board::get_pwm_duty_cycle; using Board::get_pwm_frequency; - using Board::get_status; using Board::read_analog; using Board::read_digital_interrupt; using Board::set_gpio; From 5d2af7a7ec8495227692d83130a4b14ffa75a1c6 Mon Sep 17 00:00:00 2001 From: Alan Davidson Date: Wed, 1 May 2024 11:15:10 -0400 Subject: [PATCH 08/19] remove status from mock board --- src/viam/sdk/tests/mocks/mock_board.cpp | 4 ---- src/viam/sdk/tests/mocks/mock_board.hpp | 2 -- 2 files changed, 6 deletions(-) diff --git a/src/viam/sdk/tests/mocks/mock_board.cpp b/src/viam/sdk/tests/mocks/mock_board.cpp index 140557bcb..44f934cd8 100644 --- a/src/viam/sdk/tests/mocks/mock_board.cpp +++ b/src/viam/sdk/tests/mocks/mock_board.cpp @@ -12,10 +12,6 @@ using namespace viam::sdk; MockBoard::MockBoard(std::string name) : Board(std::move(name)){}; -Board::status MockBoard::get_status(const AttributeMap&) { - return this->peek_get_status_ret; -} - void MockBoard::set_gpio(const std::string& pin, bool high, const AttributeMap&) { this->peek_pin = pin; this->peek_set_gpio_high = high; diff --git a/src/viam/sdk/tests/mocks/mock_board.hpp b/src/viam/sdk/tests/mocks/mock_board.hpp index 7ff57852a..4fef88dec 100644 --- a/src/viam/sdk/tests/mocks/mock_board.hpp +++ b/src/viam/sdk/tests/mocks/mock_board.hpp @@ -11,7 +11,6 @@ namespace board { class MockBoard : public viam::sdk::Board { public: MockBoard(std::string name); - Board::status get_status(const sdk::AttributeMap& extra) override; void set_gpio(const std::string& pin, bool high, const sdk::AttributeMap& extra) override; bool get_gpio(const std::string& pin, const sdk::AttributeMap& extra) override; double get_pwm_duty_cycle(const std::string& pin, const sdk::AttributeMap& extra) override; @@ -39,7 +38,6 @@ class MockBoard : public viam::sdk::Board { std::string peek_pin, peek_analog_reader_name, peek_digital_interrupt_name; int peek_pin_value; std::map> peek_callbacks; - Board::status peek_get_status_ret; bool peek_set_gpio_high; bool peek_get_gpio_ret; double peek_get_pwm_duty_cycle_ret; From 0a944f7a0bf1a9c0f51a60fb70ea10fe9da6c238 Mon Sep 17 00:00:00 2001 From: Alan Davidson Date: Wed, 1 May 2024 11:16:11 -0400 Subject: [PATCH 09/19] remove status from board.hpp --- src/viam/sdk/components/board.hpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/viam/sdk/components/board.hpp b/src/viam/sdk/components/board.hpp index 382c8d6cc..8d68cb4e1 100644 --- a/src/viam/sdk/components/board.hpp +++ b/src/viam/sdk/components/board.hpp @@ -77,15 +77,6 @@ class Board : public Component { /// @brief Converts a `power_mode` enum to its proto representation. static viam::component::board::v1::PowerMode to_proto(power_mode power_mode); - /// @brief Get the status of all of the registered analog readers and digital interrupt readers - inline status get_status() { - return get_status({}); - } - - /// @brief Get the status of all of the registered analog readers and digital interrupt readers - /// @param extra Any additional arguments to the method - virtual status get_status(const AttributeMap& extra) = 0; - /// @brief Get the names of the defined analog readers defined for this board /// This information comes from calling `get_status()` std::vector get_analog_reader_names(); From f0f66ddfc0b61da1f8ff8cb94e37c1ddb4aebbef Mon Sep 17 00:00:00 2001 From: Alan Davidson Date: Wed, 1 May 2024 11:33:40 -0400 Subject: [PATCH 10/19] remove get_analog_reader_names() and get_digital_interrupt_names() --- src/viam/sdk/components/board.cpp | 20 -------------------- src/viam/sdk/components/board.hpp | 8 -------- 2 files changed, 28 deletions(-) diff --git a/src/viam/sdk/components/board.cpp b/src/viam/sdk/components/board.cpp index 3b6a5fee7..984cefa29 100644 --- a/src/viam/sdk/components/board.cpp +++ b/src/viam/sdk/components/board.cpp @@ -73,26 +73,6 @@ viam::component::board::v1::PowerMode Board::to_proto(Board::power_mode power_mo } } -std::vector Board::get_analog_reader_names() { - std::vector names; - auto status = this->get_status(); - names.reserve(status.analog_reader_values.size()); - for (const auto& kv : status.analog_reader_values) { - names.push_back(kv.first); - } - return names; -} - -std::vector Board::get_digital_interrupt_names() { - std::vector names; - auto status = this->get_status(); - names.reserve(status.digital_interrupt_values.size()); - for (const auto& kv : status.digital_interrupt_values) { - names.push_back(kv.first); - } - return names; -} - std::unordered_map Board::get_analog_readers() { return this->get_status().analog_reader_values; } diff --git a/src/viam/sdk/components/board.hpp b/src/viam/sdk/components/board.hpp index 8d68cb4e1..92dd9ff44 100644 --- a/src/viam/sdk/components/board.hpp +++ b/src/viam/sdk/components/board.hpp @@ -77,14 +77,6 @@ class Board : public Component { /// @brief Converts a `power_mode` enum to its proto representation. static viam::component::board::v1::PowerMode to_proto(power_mode power_mode); - /// @brief Get the names of the defined analog readers defined for this board - /// This information comes from calling `get_status()` - std::vector get_analog_reader_names(); - - /// @brief Get the names of the defined digital interrupts for this board - /// This information comes from calling `get_status()` - std::vector get_digital_interrupt_names(); - /// @brief Get all defined analog readers defined for this board /// This information comes from calling `get_status()` std::unordered_map get_analog_readers(); From 779784612db9c27e6f38c23c5bbdeef22f29ff83 Mon Sep 17 00:00:00 2001 From: Alan Davidson Date: Wed, 1 May 2024 11:51:33 -0400 Subject: [PATCH 11/19] remove get_analog_readers() and get_digital_interrupts() --- src/viam/sdk/components/board.cpp | 7 ------- src/viam/sdk/components/board.hpp | 8 -------- 2 files changed, 15 deletions(-) diff --git a/src/viam/sdk/components/board.cpp b/src/viam/sdk/components/board.cpp index 984cefa29..4b80d386b 100644 --- a/src/viam/sdk/components/board.cpp +++ b/src/viam/sdk/components/board.cpp @@ -73,13 +73,6 @@ viam::component::board::v1::PowerMode Board::to_proto(Board::power_mode power_mo } } -std::unordered_map Board::get_analog_readers() { - return this->get_status().analog_reader_values; -} - -std::unordered_map Board::get_digital_interrupts() { - return this->get_status().digital_interrupt_values; -} Board::Board(std::string name) : Component(std::move(name)){}; bool operator==(const Board::status& lhs, const Board::status& rhs) { diff --git a/src/viam/sdk/components/board.hpp b/src/viam/sdk/components/board.hpp index 92dd9ff44..650edaa7e 100644 --- a/src/viam/sdk/components/board.hpp +++ b/src/viam/sdk/components/board.hpp @@ -77,14 +77,6 @@ class Board : public Component { /// @brief Converts a `power_mode` enum to its proto representation. static viam::component::board::v1::PowerMode to_proto(power_mode power_mode); - /// @brief Get all defined analog readers defined for this board - /// This information comes from calling `get_status()` - std::unordered_map get_analog_readers(); - - /// @brief Get all defined digital interrupts for this board - /// This information comes from calling `get_status()` - std::unordered_map get_digital_interrupts(); - /// @brief Gets the high/low state of the given pin on a board. /// @param pin board pin name /// @return high/low state of the given pin. High = on, low = off From de9ab92ee4fd6598473a599d17aa7395cc3c799a Mon Sep 17 00:00:00 2001 From: Alan Davidson Date: Wed, 1 May 2024 11:56:24 -0400 Subject: [PATCH 12/19] remove tests of removed functions --- src/viam/sdk/tests/test_board.cpp | 41 ------------------------------- 1 file changed, 41 deletions(-) diff --git a/src/viam/sdk/tests/test_board.cpp b/src/viam/sdk/tests/test_board.cpp index c9efa8e22..f01dd7029 100644 --- a/src/viam/sdk/tests/test_board.cpp +++ b/src/viam/sdk/tests/test_board.cpp @@ -33,19 +33,6 @@ BOOST_AUTO_TEST_CASE(mock_get_api) { BOOST_CHECK_EQUAL(static_api.resource_subtype(), "board"); } -BOOST_AUTO_TEST_CASE(test_status) { - const auto mock = std::make_shared("mock_board"); - client_to_mock_pipeline(mock, [&](Board& client) { - std::unordered_map analogs; - analogs.emplace("analog", 1); - std::unordered_map digitals; - digitals.emplace("digital", 2); - mock->peek_get_status_ret = Board::status{analogs, digitals}; - - BOOST_CHECK(client.get_status() == mock->peek_get_status_ret); - }); -} - BOOST_AUTO_TEST_CASE(test_set_gpio) { const auto mock = std::make_shared("mock_board"); client_to_mock_pipeline(mock, [&](Board& client) { @@ -162,34 +149,6 @@ BOOST_AUTO_TEST_CASE(test_stream_ticks) { }); } -BOOST_AUTO_TEST_CASE(test_get_analog_reader_names) { - const auto mock = std::make_shared("mock_board"); - client_to_mock_pipeline(mock, [&](Board& client) { - std::unordered_map analogs; - analogs.emplace("analog1", 2); - analogs.emplace("analog2", 2); - mock->peek_get_status_ret = Board::status{analogs, {}}; - auto ret = client.get_analog_reader_names(); - std::sort(ret.begin(), ret.end()); - BOOST_CHECK_EQUAL(ret[0], "analog1"); - BOOST_CHECK_EQUAL(ret[1], "analog2"); - }); -} - -BOOST_AUTO_TEST_CASE(test_get_digital_interrupt_names) { - const auto mock = std::make_shared("mock_board"); - client_to_mock_pipeline(mock, [&](Board& client) { - std::unordered_map digitals; - digitals.emplace("digital1", 2); - digitals.emplace("digital2", 2); - mock->peek_get_status_ret = Board::status{{}, digitals}; - auto ret = client.get_digital_interrupt_names(); - std::sort(ret.begin(), ret.end()); - BOOST_CHECK_EQUAL(ret[0], "digital1"); - BOOST_CHECK_EQUAL(ret[1], "digital2"); - }); -} - BOOST_AUTO_TEST_CASE(test_get_geometries) { const auto mock = std::make_shared("mock_board"); client_to_mock_pipeline(mock, [](Board& client) { From d18b7308cdd3369e23465daae5f1458afe61b99e Mon Sep 17 00:00:00 2001 From: Alan Davidson Date: Thu, 2 May 2024 17:33:09 -0400 Subject: [PATCH 13/19] get things to build again --- src/viam/api/CMakeLists.txt | 135 +++++++++++++++++++++++++++++++++++- 1 file changed, 133 insertions(+), 2 deletions(-) diff --git a/src/viam/api/CMakeLists.txt b/src/viam/api/CMakeLists.txt index 3ea9a7333..7c2569f2c 100644 --- a/src/viam/api/CMakeLists.txt +++ b/src/viam/api/CMakeLists.txt @@ -181,12 +181,98 @@ if (VIAMCPPSDK_USE_DYNAMIC_PROTOS) ${PROTO_GEN_DIR}/component/servo/v1/servo.grpc.pb.h ${PROTO_GEN_DIR}/component/servo/v1/servo.pb.cc ${PROTO_GEN_DIR}/component/servo/v1/servo.pb.h + ${PROTO_GEN_DIR}/google/api/annotations.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/annotations.grpc.pb.h ${PROTO_GEN_DIR}/google/api/annotations.pb.cc ${PROTO_GEN_DIR}/google/api/annotations.pb.h - ${PROTO_GEN_DIR}/google/api/httpbody.pb.cc - ${PROTO_GEN_DIR}/google/api/httpbody.pb.h + ${PROTO_GEN_DIR}/google/api/client.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/client.grpc.pb.h + ${PROTO_GEN_DIR}/google/api/client.pb.cc + ${PROTO_GEN_DIR}/google/api/client.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/checked.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/checked.grpc.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/checked.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/checked.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/eval.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/eval.grpc.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/eval.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/eval.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/explain.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/explain.grpc.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/explain.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/explain.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/syntax.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/syntax.grpc.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/syntax.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/syntax.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/value.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/value.grpc.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/value.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/value.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/decl.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/decl.grpc.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/decl.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/decl.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/eval.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/eval.grpc.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/eval.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/eval.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/expr.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/expr.grpc.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/expr.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/expr.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/source.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/source.grpc.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/source.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/source.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/value.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/value.grpc.pb.h + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/value.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/value.pb.h + ${PROTO_GEN_DIR}/google/api/field_behavior.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/field_behavior.grpc.pb.h + ${PROTO_GEN_DIR}/google/api/field_behavior.pb.cc + ${PROTO_GEN_DIR}/google/api/field_behavior.pb.h + ${PROTO_GEN_DIR}/google/api/field_info.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/field_info.grpc.pb.h + ${PROTO_GEN_DIR}/google/api/field_info.pb.cc + ${PROTO_GEN_DIR}/google/api/field_info.pb.h + ${PROTO_GEN_DIR}/google/api/http.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/http.grpc.pb.h ${PROTO_GEN_DIR}/google/api/http.pb.cc ${PROTO_GEN_DIR}/google/api/http.pb.h + ${PROTO_GEN_DIR}/google/api/httpbody.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/httpbody.grpc.pb.h + ${PROTO_GEN_DIR}/google/api/httpbody.pb.cc + ${PROTO_GEN_DIR}/google/api/httpbody.pb.h + ${PROTO_GEN_DIR}/google/api/launch_stage.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/launch_stage.grpc.pb.h + ${PROTO_GEN_DIR}/google/api/launch_stage.pb.cc + ${PROTO_GEN_DIR}/google/api/launch_stage.pb.h + ${PROTO_GEN_DIR}/google/api/resource.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/resource.grpc.pb.h + ${PROTO_GEN_DIR}/google/api/resource.pb.cc + ${PROTO_GEN_DIR}/google/api/resource.pb.h + ${PROTO_GEN_DIR}/google/api/visibility.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/visibility.grpc.pb.h + ${PROTO_GEN_DIR}/google/api/visibility.pb.cc + ${PROTO_GEN_DIR}/google/api/visibility.pb.h + ${PROTO_GEN_DIR}/google/rpc/code.grpc.pb.cc + ${PROTO_GEN_DIR}/google/rpc/code.grpc.pb.h + ${PROTO_GEN_DIR}/google/rpc/code.pb.cc + ${PROTO_GEN_DIR}/google/rpc/code.pb.h + ${PROTO_GEN_DIR}/google/rpc/context/attribute_context.grpc.pb.cc + ${PROTO_GEN_DIR}/google/rpc/context/attribute_context.grpc.pb.h + ${PROTO_GEN_DIR}/google/rpc/context/attribute_context.pb.cc + ${PROTO_GEN_DIR}/google/rpc/context/attribute_context.pb.h + ${PROTO_GEN_DIR}/google/rpc/error_details.grpc.pb.cc + ${PROTO_GEN_DIR}/google/rpc/error_details.grpc.pb.h + ${PROTO_GEN_DIR}/google/rpc/error_details.pb.cc + ${PROTO_GEN_DIR}/google/rpc/error_details.pb.h + ${PROTO_GEN_DIR}/google/rpc/status.grpc.pb.cc + ${PROTO_GEN_DIR}/google/rpc/status.grpc.pb.h + ${PROTO_GEN_DIR}/google/rpc/status.pb.cc + ${PROTO_GEN_DIR}/google/rpc/status.pb.h ${PROTO_GEN_DIR}/module/v1/module.grpc.pb.cc ${PROTO_GEN_DIR}/module/v1/module.grpc.pb.h ${PROTO_GEN_DIR}/module/v1/module.pb.cc @@ -288,9 +374,52 @@ target_sources(viamapi ${PROTO_GEN_DIR}/component/sensor/v1/sensor.pb.cc ${PROTO_GEN_DIR}/component/servo/v1/servo.grpc.pb.cc ${PROTO_GEN_DIR}/component/servo/v1/servo.pb.cc + ${PROTO_GEN_DIR}/google/api/annotations.grpc.pb.cc ${PROTO_GEN_DIR}/google/api/annotations.pb.cc + ${PROTO_GEN_DIR}/google/api/client.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/client.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/checked.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/checked.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/eval.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/eval.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/explain.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/explain.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/syntax.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/syntax.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/value.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/value.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/decl.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/decl.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/eval.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/eval.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/expr.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/expr.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/source.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/source.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/value.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/expr/v1beta1/value.pb.cc + ${PROTO_GEN_DIR}/google/api/field_behavior.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/field_behavior.pb.cc + ${PROTO_GEN_DIR}/google/api/field_info.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/field_info.pb.cc + ${PROTO_GEN_DIR}/google/api/http.grpc.pb.cc ${PROTO_GEN_DIR}/google/api/http.pb.cc + ${PROTO_GEN_DIR}/google/api/httpbody.grpc.pb.cc ${PROTO_GEN_DIR}/google/api/httpbody.pb.cc + ${PROTO_GEN_DIR}/google/api/launch_stage.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/launch_stage.pb.cc + ${PROTO_GEN_DIR}/google/api/resource.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/resource.pb.cc + ${PROTO_GEN_DIR}/google/api/visibility.grpc.pb.cc + ${PROTO_GEN_DIR}/google/api/visibility.pb.cc + ${PROTO_GEN_DIR}/google/rpc/code.grpc.pb.cc + ${PROTO_GEN_DIR}/google/rpc/code.pb.cc + ${PROTO_GEN_DIR}/google/rpc/context/attribute_context.grpc.pb.cc + ${PROTO_GEN_DIR}/google/rpc/context/attribute_context.pb.cc + ${PROTO_GEN_DIR}/google/rpc/error_details.grpc.pb.cc + ${PROTO_GEN_DIR}/google/rpc/error_details.pb.cc + ${PROTO_GEN_DIR}/google/rpc/status.grpc.pb.cc + ${PROTO_GEN_DIR}/google/rpc/status.pb.cc ${PROTO_GEN_DIR}/module/v1/module.grpc.pb.cc ${PROTO_GEN_DIR}/module/v1/module.pb.cc ${PROTO_GEN_DIR}/robot/v1/robot.grpc.pb.cc @@ -358,6 +487,8 @@ set_target_properties( VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} ) +target_link_options(viamapi PRIVATE "LINKER:-z,defs") + target_include_directories(viamapi PUBLIC # Unfortunately, the generated protos don't say 'viam/api' at From 11c31ae63afe480ef38097b50ecd83d1d673e738 Mon Sep 17 00:00:00 2001 From: Alan Davidson Date: Mon, 6 May 2024 11:24:40 -0400 Subject: [PATCH 14/19] undo linker debugging in cmake --- src/viam/api/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/viam/api/CMakeLists.txt b/src/viam/api/CMakeLists.txt index 7c2569f2c..d004de571 100644 --- a/src/viam/api/CMakeLists.txt +++ b/src/viam/api/CMakeLists.txt @@ -487,8 +487,6 @@ set_target_properties( VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH} ) -target_link_options(viamapi PRIVATE "LINKER:-z,defs") - target_include_directories(viamapi PUBLIC # Unfortunately, the generated protos don't say 'viam/api' at From 9857886fb5dac32bc83740b11b89a64b2004cf09 Mon Sep 17 00:00:00 2001 From: Alan Davidson Date: Mon, 6 May 2024 11:25:18 -0400 Subject: [PATCH 15/19] undo changes to .gitignore --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index e10a34ae6..8110b0703 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,3 @@ # ignore doxygen output /etc/docs/api/* - -# Vim temporary swap files -*.swp From 22610da19e8feb2202806b2c23f88c94b137af74 Mon Sep 17 00:00:00 2001 From: Alan Davidson Date: Mon, 6 May 2024 11:50:30 -0400 Subject: [PATCH 16/19] prune google/expr/ from CMakeLists.txt --- src/viam/api/CMakeLists.txt | 60 ------------------- .../examples/modules/complex/proto/buf.lock | 2 +- 2 files changed, 1 insertion(+), 61 deletions(-) diff --git a/src/viam/api/CMakeLists.txt b/src/viam/api/CMakeLists.txt index d004de571..2ed57b7fd 100644 --- a/src/viam/api/CMakeLists.txt +++ b/src/viam/api/CMakeLists.txt @@ -189,46 +189,6 @@ if (VIAMCPPSDK_USE_DYNAMIC_PROTOS) ${PROTO_GEN_DIR}/google/api/client.grpc.pb.h ${PROTO_GEN_DIR}/google/api/client.pb.cc ${PROTO_GEN_DIR}/google/api/client.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/checked.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/checked.grpc.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/checked.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/checked.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/eval.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/eval.grpc.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/eval.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/eval.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/explain.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/explain.grpc.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/explain.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/explain.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/syntax.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/syntax.grpc.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/syntax.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/syntax.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/value.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/value.grpc.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/value.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/value.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/decl.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/decl.grpc.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/decl.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/decl.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/eval.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/eval.grpc.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/eval.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/eval.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/expr.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/expr.grpc.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/expr.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/expr.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/source.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/source.grpc.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/source.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/source.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/value.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/value.grpc.pb.h - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/value.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/value.pb.h ${PROTO_GEN_DIR}/google/api/field_behavior.grpc.pb.cc ${PROTO_GEN_DIR}/google/api/field_behavior.grpc.pb.h ${PROTO_GEN_DIR}/google/api/field_behavior.pb.cc @@ -378,26 +338,6 @@ target_sources(viamapi ${PROTO_GEN_DIR}/google/api/annotations.pb.cc ${PROTO_GEN_DIR}/google/api/client.grpc.pb.cc ${PROTO_GEN_DIR}/google/api/client.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/checked.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/checked.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/eval.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/eval.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/explain.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/explain.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/syntax.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/syntax.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/value.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1alpha1/value.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/decl.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/decl.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/eval.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/eval.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/expr.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/expr.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/source.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/source.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/value.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/expr/v1beta1/value.pb.cc ${PROTO_GEN_DIR}/google/api/field_behavior.grpc.pb.cc ${PROTO_GEN_DIR}/google/api/field_behavior.pb.cc ${PROTO_GEN_DIR}/google/api/field_info.grpc.pb.cc diff --git a/src/viam/examples/modules/complex/proto/buf.lock b/src/viam/examples/modules/complex/proto/buf.lock index 62c9dfad4..187a28e7e 100644 --- a/src/viam/examples/modules/complex/proto/buf.lock +++ b/src/viam/examples/modules/complex/proto/buf.lock @@ -4,4 +4,4 @@ deps: - remote: buf.build owner: googleapis repository: googleapis - commit: 4ed3bc159a8b4ac68fe253218760d035 + commit: 74015a8aeb8445aa9e3e1454cb54bc35 From 5ea608077ec6e8cb985a160b0d9ed531a21a7cef Mon Sep 17 00:00:00 2001 From: Alan Davidson Date: Mon, 6 May 2024 12:30:09 -0400 Subject: [PATCH 17/19] prune google/api/ from CMakeLists.txt, back to the old version plus annotations.* --- src/viam/api/CMakeLists.txt | 49 ++----------------------------------- 1 file changed, 2 insertions(+), 47 deletions(-) diff --git a/src/viam/api/CMakeLists.txt b/src/viam/api/CMakeLists.txt index 2ed57b7fd..b1ef69874 100644 --- a/src/viam/api/CMakeLists.txt +++ b/src/viam/api/CMakeLists.txt @@ -181,42 +181,12 @@ if (VIAMCPPSDK_USE_DYNAMIC_PROTOS) ${PROTO_GEN_DIR}/component/servo/v1/servo.grpc.pb.h ${PROTO_GEN_DIR}/component/servo/v1/servo.pb.cc ${PROTO_GEN_DIR}/component/servo/v1/servo.pb.h - ${PROTO_GEN_DIR}/google/api/annotations.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/annotations.grpc.pb.h ${PROTO_GEN_DIR}/google/api/annotations.pb.cc ${PROTO_GEN_DIR}/google/api/annotations.pb.h - ${PROTO_GEN_DIR}/google/api/client.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/client.grpc.pb.h - ${PROTO_GEN_DIR}/google/api/client.pb.cc - ${PROTO_GEN_DIR}/google/api/client.pb.h - ${PROTO_GEN_DIR}/google/api/field_behavior.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/field_behavior.grpc.pb.h - ${PROTO_GEN_DIR}/google/api/field_behavior.pb.cc - ${PROTO_GEN_DIR}/google/api/field_behavior.pb.h - ${PROTO_GEN_DIR}/google/api/field_info.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/field_info.grpc.pb.h - ${PROTO_GEN_DIR}/google/api/field_info.pb.cc - ${PROTO_GEN_DIR}/google/api/field_info.pb.h - ${PROTO_GEN_DIR}/google/api/http.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/http.grpc.pb.h - ${PROTO_GEN_DIR}/google/api/http.pb.cc - ${PROTO_GEN_DIR}/google/api/http.pb.h - ${PROTO_GEN_DIR}/google/api/httpbody.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/httpbody.grpc.pb.h ${PROTO_GEN_DIR}/google/api/httpbody.pb.cc ${PROTO_GEN_DIR}/google/api/httpbody.pb.h - ${PROTO_GEN_DIR}/google/api/launch_stage.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/launch_stage.grpc.pb.h - ${PROTO_GEN_DIR}/google/api/launch_stage.pb.cc - ${PROTO_GEN_DIR}/google/api/launch_stage.pb.h - ${PROTO_GEN_DIR}/google/api/resource.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/resource.grpc.pb.h - ${PROTO_GEN_DIR}/google/api/resource.pb.cc - ${PROTO_GEN_DIR}/google/api/resource.pb.h - ${PROTO_GEN_DIR}/google/api/visibility.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/visibility.grpc.pb.h - ${PROTO_GEN_DIR}/google/api/visibility.pb.cc - ${PROTO_GEN_DIR}/google/api/visibility.pb.h + ${PROTO_GEN_DIR}/google/api/http.pb.cc + ${PROTO_GEN_DIR}/google/api/http.pb.h ${PROTO_GEN_DIR}/google/rpc/code.grpc.pb.cc ${PROTO_GEN_DIR}/google/rpc/code.grpc.pb.h ${PROTO_GEN_DIR}/google/rpc/code.pb.cc @@ -334,24 +304,9 @@ target_sources(viamapi ${PROTO_GEN_DIR}/component/sensor/v1/sensor.pb.cc ${PROTO_GEN_DIR}/component/servo/v1/servo.grpc.pb.cc ${PROTO_GEN_DIR}/component/servo/v1/servo.pb.cc - ${PROTO_GEN_DIR}/google/api/annotations.grpc.pb.cc ${PROTO_GEN_DIR}/google/api/annotations.pb.cc - ${PROTO_GEN_DIR}/google/api/client.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/client.pb.cc - ${PROTO_GEN_DIR}/google/api/field_behavior.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/field_behavior.pb.cc - ${PROTO_GEN_DIR}/google/api/field_info.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/field_info.pb.cc - ${PROTO_GEN_DIR}/google/api/http.grpc.pb.cc ${PROTO_GEN_DIR}/google/api/http.pb.cc - ${PROTO_GEN_DIR}/google/api/httpbody.grpc.pb.cc ${PROTO_GEN_DIR}/google/api/httpbody.pb.cc - ${PROTO_GEN_DIR}/google/api/launch_stage.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/launch_stage.pb.cc - ${PROTO_GEN_DIR}/google/api/resource.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/resource.pb.cc - ${PROTO_GEN_DIR}/google/api/visibility.grpc.pb.cc - ${PROTO_GEN_DIR}/google/api/visibility.pb.cc ${PROTO_GEN_DIR}/google/rpc/code.grpc.pb.cc ${PROTO_GEN_DIR}/google/rpc/code.pb.cc ${PROTO_GEN_DIR}/google/rpc/context/attribute_context.grpc.pb.cc From 3efb93e321ca06788a952915893867166c11ee6a Mon Sep 17 00:00:00 2001 From: Alan Davidson Date: Mon, 6 May 2024 12:38:28 -0400 Subject: [PATCH 18/19] remove unnecessary mentions of google/rpc/ from cmakelists.txt --- src/viam/api/CMakeLists.txt | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/src/viam/api/CMakeLists.txt b/src/viam/api/CMakeLists.txt index b1ef69874..56abccd74 100644 --- a/src/viam/api/CMakeLists.txt +++ b/src/viam/api/CMakeLists.txt @@ -187,20 +187,6 @@ if (VIAMCPPSDK_USE_DYNAMIC_PROTOS) ${PROTO_GEN_DIR}/google/api/httpbody.pb.h ${PROTO_GEN_DIR}/google/api/http.pb.cc ${PROTO_GEN_DIR}/google/api/http.pb.h - ${PROTO_GEN_DIR}/google/rpc/code.grpc.pb.cc - ${PROTO_GEN_DIR}/google/rpc/code.grpc.pb.h - ${PROTO_GEN_DIR}/google/rpc/code.pb.cc - ${PROTO_GEN_DIR}/google/rpc/code.pb.h - ${PROTO_GEN_DIR}/google/rpc/context/attribute_context.grpc.pb.cc - ${PROTO_GEN_DIR}/google/rpc/context/attribute_context.grpc.pb.h - ${PROTO_GEN_DIR}/google/rpc/context/attribute_context.pb.cc - ${PROTO_GEN_DIR}/google/rpc/context/attribute_context.pb.h - ${PROTO_GEN_DIR}/google/rpc/error_details.grpc.pb.cc - ${PROTO_GEN_DIR}/google/rpc/error_details.grpc.pb.h - ${PROTO_GEN_DIR}/google/rpc/error_details.pb.cc - ${PROTO_GEN_DIR}/google/rpc/error_details.pb.h - ${PROTO_GEN_DIR}/google/rpc/status.grpc.pb.cc - ${PROTO_GEN_DIR}/google/rpc/status.grpc.pb.h ${PROTO_GEN_DIR}/google/rpc/status.pb.cc ${PROTO_GEN_DIR}/google/rpc/status.pb.h ${PROTO_GEN_DIR}/module/v1/module.grpc.pb.cc @@ -307,13 +293,6 @@ target_sources(viamapi ${PROTO_GEN_DIR}/google/api/annotations.pb.cc ${PROTO_GEN_DIR}/google/api/http.pb.cc ${PROTO_GEN_DIR}/google/api/httpbody.pb.cc - ${PROTO_GEN_DIR}/google/rpc/code.grpc.pb.cc - ${PROTO_GEN_DIR}/google/rpc/code.pb.cc - ${PROTO_GEN_DIR}/google/rpc/context/attribute_context.grpc.pb.cc - ${PROTO_GEN_DIR}/google/rpc/context/attribute_context.pb.cc - ${PROTO_GEN_DIR}/google/rpc/error_details.grpc.pb.cc - ${PROTO_GEN_DIR}/google/rpc/error_details.pb.cc - ${PROTO_GEN_DIR}/google/rpc/status.grpc.pb.cc ${PROTO_GEN_DIR}/google/rpc/status.pb.cc ${PROTO_GEN_DIR}/module/v1/module.grpc.pb.cc ${PROTO_GEN_DIR}/module/v1/module.pb.cc From 6b5e39faebe07500e7a9329b18b06a480c81cd6a Mon Sep 17 00:00:00 2001 From: Alan Davidson Date: Mon, 6 May 2024 15:08:15 -0400 Subject: [PATCH 19/19] add rpc/status.pb.h to cmakelists.txt again --- src/viam/api/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/viam/api/CMakeLists.txt b/src/viam/api/CMakeLists.txt index 56abccd74..31b3d88e6 100644 --- a/src/viam/api/CMakeLists.txt +++ b/src/viam/api/CMakeLists.txt @@ -341,6 +341,7 @@ target_sources(viamapi ${PROTO_GEN_DIR}/../../viam/api/google/api/annotations.pb.h ${PROTO_GEN_DIR}/../../viam/api/google/api/http.pb.h ${PROTO_GEN_DIR}/../../viam/api/google/api/httpbody.pb.h + ${PROTO_GEN_DIR}/../../viam/api/google/rpc/status.pb.h ${PROTO_GEN_DIR}/../../viam/api/module/v1/module.grpc.pb.h ${PROTO_GEN_DIR}/../../viam/api/module/v1/module.pb.h ${PROTO_GEN_DIR}/../../viam/api/robot/v1/robot.grpc.pb.h