diff options
| author | Bruce Beare <bruce.j.beare@intel.com> | 2016-04-13 20:10:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-13 20:10:05 +0000 |
| commit | e3064aa2b62176a936c5749dea1a364fcf04c203 (patch) | |
| tree | c0fe98af6d70398728ea132eec065c4a9e4f3db2 | |
| parent | 7a83f27532e26559ef292d2e012f1cd6aeee0dbb (diff) | |
| parent | b090a8e3e3cf2559b418109db3fd68de907444c8 (diff) | |
| download | edison-e3064aa2b62176a936c5749dea1a364fcf04c203.tar.gz | |
Merge "Set model_id"
am: b090a8e
* commit 'b090a8e3e3cf2559b418109db3fd68de907444c8':
Set model_id
Change-Id: Iac9714f273f07c8c57a881b6b8ece4a8bf82c477
| -rw-r--r-- | base_product/weaved.conf | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/base_product/weaved.conf b/base_product/weaved.conf index 979e5f1..fd8f73d 100644 --- a/base_product/weaved.conf +++ b/base_product/weaved.conf @@ -1,5 +1,5 @@ # -# Copyright 2015 The Android Open Source Project +# Copyright 2015-2016 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -24,17 +24,17 @@ # api_key= # Human readable name of the device. -name=Edison Starter Board +name=Intel Edison Starter Board # Human readable description of the device. # Defaults to empty string" -description=Intel Edison Board +description=Intel Edison Brillo Starter Board # Location of the device. # location= # Manufacturer of the device. -oem_name=Intel +oem_name=Intel Corporation # Model of the device. # Defaults to Brillo. @@ -42,7 +42,7 @@ model_name=Edison # Five character code assigned by the cloud registry of device models. # Defaults to "AAAAA" (Unregistered model). -model_id=AAAAA +model_id=ABPHb # Maximum role for local anonymous user. # local_anonymous_access_role=viewer @@ -65,7 +65,7 @@ model_id=AAAAA # wifi_auto_setup_enabled=true # List of pairing modes supported by device. -# Values can be one of: pinCode, embeddedCode. +# See Weave documentation for supported pairing modes # Defaults to pinCode if embedded_code_path is empty, or embeddedCode otherwise. pairing_modes=embeddedCode |