diff options
| author | Chris Weir <chrisweir@google.com> | 2022-04-30 00:55:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-30 00:55:06 +0000 |
| commit | 825458b9c49fe470932f0f7af6ba9df263b136ad (patch) | |
| tree | 7bc11a67e284905868b3b137cb54a7447c990b77 | |
| parent | ba163b31f92523eb51b8314ee40752b647270540 (diff) | |
| parent | 895844c1acd42868e12caf34cdad180883f02b89 (diff) | |
| download | car-825458b9c49fe470932f0f7af6ba9df263b136ad.tar.gz | |
Merge "Also configure CCAN for GSI" into tm-dev am: 895844c1ac
Original change: https://googleplex-android-review.googlesource.com/c/device/generic/car/+/18055685
Change-Id: I6d7442905d998d36ac4e9674ad63e7b6818a7a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | emulator/usbpt/protocan/canbus_config.pb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/emulator/usbpt/protocan/canbus_config.pb b/emulator/usbpt/protocan/canbus_config.pb index 333d081..2e3599d 100644 --- a/emulator/usbpt/protocan/canbus_config.pb +++ b/emulator/usbpt/protocan/canbus_config.pb @@ -12,12 +12,17 @@ # See the License for the specific language governing permissions and # limitations under the License. buses: [ - { + { name: "BCAN" virtual { ifname: "vcan0" } bitrate: 125000 - }, - { + }, + { + name: "CCAN" + virtual { ifname: "vcan0" } + bitrate: 250000 + }, + { name: "aae" native { ifname: "can0" } bitrate: 250000 |