Skip to content

Commit 92b08f5

Browse files
authored
Merge branch 'main' into publish-debugging
2 parents 13bba06 + e62d0d6 commit 92b08f5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+9362
-156
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ else()
4141
cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
4242
endif()
4343

44-
set(CMAKE_PROJECT_VERSION 0.20.1)
44+
set(CMAKE_PROJECT_VERSION 0.21.0)
4545

4646
# Identify the project.
4747
project(viam-cpp-sdk

codesamples/apis.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@
33
"client": "Arm",
44
"func": "get_end_position",
55
"args": []
6+
},
7+
"audio_in": {
8+
"client": "AudioIn",
9+
"func": "get_properties",
10+
"args": []
11+
},
12+
"audio_out": {
13+
"client": "AudioOut",
14+
"func": "get_properties",
15+
"args": []
616
},
717
"button": {
818
"client": "Button",

src/viam/api/CMakeLists.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,14 @@ if (VIAMCPPSDK_USE_DYNAMIC_PROTOS)
132132
${PROTO_GEN_DIR}/component/arm/v1/arm.grpc.pb.h
133133
${PROTO_GEN_DIR}/component/arm/v1/arm.pb.cc
134134
${PROTO_GEN_DIR}/component/arm/v1/arm.pb.h
135+
${PROTO_GEN_DIR}/component/audioin/v1/audioin.grpc.pb.cc
136+
${PROTO_GEN_DIR}/component/audioin/v1/audioin.grpc.pb.h
137+
${PROTO_GEN_DIR}/component/audioin/v1/audioin.pb.cc
138+
${PROTO_GEN_DIR}/component/audioin/v1/audioin.pb.h
139+
${PROTO_GEN_DIR}/component/audioout/v1/audioout.grpc.pb.cc
140+
${PROTO_GEN_DIR}/component/audioout/v1/audioout.grpc.pb.h
141+
${PROTO_GEN_DIR}/component/audioout/v1/audioout.pb.cc
142+
${PROTO_GEN_DIR}/component/audioout/v1/audioout.pb.h
135143
${PROTO_GEN_DIR}/component/base/v1/base.grpc.pb.cc
136144
${PROTO_GEN_DIR}/component/base/v1/base.grpc.pb.h
137145
${PROTO_GEN_DIR}/component/base/v1/base.pb.cc
@@ -294,6 +302,10 @@ target_sources(viamapi
294302
${PROTO_GEN_DIR}/common/v1/common.pb.cc
295303
${PROTO_GEN_DIR}/component/arm/v1/arm.grpc.pb.cc
296304
${PROTO_GEN_DIR}/component/arm/v1/arm.pb.cc
305+
${PROTO_GEN_DIR}/component/audioin/v1/audioin.grpc.pb.cc
306+
${PROTO_GEN_DIR}/component/audioin/v1/audioin.pb.cc
307+
${PROTO_GEN_DIR}/component/audioout/v1/audioout.grpc.pb.cc
308+
${PROTO_GEN_DIR}/component/audioout/v1/audioout.pb.cc
297309
${PROTO_GEN_DIR}/component/base/v1/base.grpc.pb.cc
298310
${PROTO_GEN_DIR}/component/base/v1/base.pb.cc
299311
${PROTO_GEN_DIR}/component/board/v1/board.grpc.pb.cc
@@ -358,6 +370,10 @@ target_sources(viamapi
358370
${PROTO_GEN_DIR}/../../viam/api/common/v1/common.pb.h
359371
${PROTO_GEN_DIR}/../../viam/api/component/arm/v1/arm.grpc.pb.h
360372
${PROTO_GEN_DIR}/../../viam/api/component/arm/v1/arm.pb.h
373+
${PROTO_GEN_DIR}/../../viam/api/component/audioin/v1/audioin.grpc.pb.h
374+
${PROTO_GEN_DIR}/../../viam/api/component/audioin/v1/audioin.pb.h
375+
${PROTO_GEN_DIR}/../../viam/api/component/audioout/v1/audioout.grpc.pb.h
376+
${PROTO_GEN_DIR}/../../viam/api/component/audioout/v1/audioout.pb.h
361377
${PROTO_GEN_DIR}/../../viam/api/component/base/v1/base.grpc.pb.h
362378
${PROTO_GEN_DIR}/../../viam/api/component/base/v1/base.pb.h
363379
${PROTO_GEN_DIR}/../../viam/api/component/board/v1/board.grpc.pb.h

src/viam/api/api_proto_tag.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.1.479
1+
v0.1.482

src/viam/api/app/v1/billing.pb.cc

Lines changed: 107 additions & 69 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/viam/api/app/v1/billing.pb.h

Lines changed: 31 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)