get everything to compile again

Author: penguinland

src/viam/sdk/components/private/board_client.cpp

@@ -85,8 +85,8 @@ AttributeMap BoardClient::do_command(const AttributeMap& command) {
 
 // TODO(RSDK-6048) update `client_wrapper` to allow for requests without a `mutable_name()` method,
 // then wrap here.
-Board::analog_result BoardClient::read_analog(const std::string& analog_reader_name,
-                                             const AttributeMap& extra) {
+Board::analog_response BoardClient::read_analog(const std::string& analog_reader_name,
+                                                const AttributeMap& extra) {
     viam::component::board::v1::ReadAnalogReaderRequest request;
     viam::component::board::v1::ReadAnalogReaderResponse response;
     ClientContext ctx;
@@ -99,7 +99,8 @@ Board::analog_result BoardClient::read_analog(const std::string& analog_reader_n
     if (!status.ok()) {
         throw GRPCException(status);
     }
-    return {response.value(), response.min_range(), response.max_range, response.step_size()};
+    return Board::analog_response{
+		response.value(), response.min_range(), response.max_range(), response.step_size()};
 }
 
 void BoardClient::write_analog(const std::string& pin, int value, const AttributeMap& extra) {

src/viam/sdk/components/private/board_client.hpp

@@ -34,8 +34,8 @@ class BoardClient : public Board {
     void set_pwm_frequency(const std::string& pin,
                            uint64_t frequency_hz,
                            const AttributeMap& extra) override;
-    analog_result read_analog(const std::string& analog_reader_name,
-                              const AttributeMap& extra) override;
+    analog_response read_analog(const std::string& analog_reader_name,
+                                const AttributeMap& extra) override;
     void write_analog(const std::string& pin, int value, const AttributeMap& extra) override;
     digital_value read_digital_interrupt(const std::string& digital_interrupt_name,
                                          const AttributeMap& extra) override;

src/viam/sdk/tests/mocks/mock_board.cpp

@@ -50,8 +50,8 @@ AttributeMap MockBoard::do_command(const AttributeMap& command) {
     return command;
 }
 
-Board::analog_value MockBoard::read_analog(const std::string& analog_reader_name,
-                                           const AttributeMap&) {
+Board::analog_response MockBoard::read_analog(const std::string& analog_reader_name,
+                                              const AttributeMap&) {
     this->peek_analog_reader_name = analog_reader_name;
     return this->peek_read_analog_ret;
 }

src/viam/sdk/tests/mocks/mock_board.hpp

@@ -22,8 +22,8 @@ class MockBoard : public viam::sdk::Board {
                            uint64_t frequency_hz,
                            const sdk::AttributeMap& extra) override;
     viam::sdk::AttributeMap do_command(const viam::sdk::AttributeMap& command) override;
-    Board::analog_value read_analog(const std::string& analog_reader_name,
-                                    const sdk::AttributeMap& extra) override;
+    Board::analog_response read_analog(const std::string& analog_reader_name,
+                                       const sdk::AttributeMap& extra) override;
     void write_analog(const std::string& pin, int value, const sdk::AttributeMap& extra) override;
     Board::digital_value read_digital_interrupt(const std::string& digital_interrupt_name,
                                                 const sdk::AttributeMap& extra) override;
@@ -44,7 +44,7 @@ class MockBoard : public viam::sdk::Board {
     double peek_set_pwm_duty_cycle_pct;
     uint64_t peek_get_pwm_frequency_ret;
     uint64_t peek_set_pwm_frequency_hz;
-    Board::analog_value peek_read_analog_ret;
+    Board::analog_response peek_read_analog_ret;
     Board::digital_value peek_read_digital_interrupt_ret;
     Board::power_mode peek_set_power_mode_power_mode;
     boost::optional<std::chrono::microseconds> peek_set_power_mode_duration;

src/viam/sdk/tests/test_board.cpp

@@ -107,13 +107,9 @@ BOOST_AUTO_TEST_CASE(test_do_command) {
 BOOST_AUTO_TEST_CASE(test_read_analog) {
     const auto mock = std::make_shared<MockBoard>("mock_board");
     client_to_mock_pipeline<Board>(mock, [&](Board& client) {
-        sdk::Board::analog_value expected_result;
-        expected_result.value = 5150;
-        expected_result.min_range = 1.0;
-        expected_result.max_range = 5.0;
-        expected_result.step_size = 0.01;
+        sdk::Board::analog_response expected_result = {5150, 1.0, 5.0, 0.01};
         mock->peek_read_analog_ret = expected_result;
-        sdk::Board::analog_value result = client.read_analog("t1");
+        sdk::Board::analog_response result = client.read_analog("t1");
         BOOST_CHECK_EQUAL(expected_result.value, result.value);
         BOOST_CHECK_EQUAL(expected_result.min_range, result.min_range);
         BOOST_CHECK_EQUAL(expected_result.max_range, result.max_range);