Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Specify a Bluetooth Scanning API. #239

Merged
merged 6 commits into from
Aug 2, 2016
Merged

Specify a Bluetooth Scanning API. #239

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1970217
Specify a Bluetooth Scanning API.
jyasskin Mar 8, 2016
d0bb493
Add an explicit no-filters option.
jyasskin Jul 21, 2016
b9ebe34
Remove filtering on connectability, which doesn't exist on Android.
jyasskin Jul 28, 2016
96e7fe2
Rename {manufacturer,service}Data to reflect that they only take the …
jyasskin Aug 1, 2016
59cf40e
Add name and namePrefix filters,
jyasskin Aug 1, 2016
ced43f2
Add an issue to limit scan periods.
jyasskin Aug 1, 2016
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove filtering on connectability, which doesn't exist on Android.
  • Loading branch information
@jyasskin
jyasskin committed Jul 28, 2016
commit b9ebe3446194f6136b7b63556bc94a9858e8f172
12 changes: 0 additions & 12 deletions scanning.bs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,6 @@ spec: html
BluetoothServiceUUID serviceUUID;
unsigned short manufacturerData;
BluetoothServiceUUID serviceData;
boolean connectable;
};

dictionary BluetoothLEScanOptions {
Expand Down Expand Up @@ -421,7 +420,6 @@ spec: html
readonly attribute UUID? serviceUUID;
readonly attribute unsigned short? manufacturerData;
readonly attribute UUID? serviceData;
readonly attribute boolean? connectable;
};

interface BluetoothLEScan {
Expand Down Expand Up @@ -701,16 +699,6 @@ spec: html
it is the 128-bit UUID representation of the UUID
in some <a>Service Data</a> in |event|.
</li>
<li>
If <code>|filter|.connectable</code> is `true`,
|event| has either the <a>ADV_IND</a>
or the <a>ADV_DIRECT_IND</a> type.
</li>
<li>
If <code>|filter|.connectable</code> is `false`,
|event| has either the <a>ADV_NONCONN_IND</a>
or the <a>ADV_SCAN_IND</a> type.
</li>
</ul>
</div>
</section>
Expand Down
46 changes: 5 additions & 41 deletions scanning.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,7 @@
<div class="head">
<p data-fill-with="logo"></p>
<h1 class="p-name no-ref" id="title">Web Bluetooth Scanning</h1>
<h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Draft Community Group Report, <time class="dt-updated" datetime="2016-07-21">21 July 2016</time></span></h2>
<h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Draft Community Group Report, <time class="dt-updated" datetime="2016-07-28">28 July 2016</time></span></h2>
<div data-fill-with="spec-metadata">
<dl>
<dt>This version:
Expand Down Expand Up @@ -1583,7 +1583,6 @@ <h2 class="heading settled" data-level="4" id="scanning"><span class="secno">4.
<a class="n" data-link-type="idl-name" href="https://webbluetoothcg.github.io/web-bluetooth/#typedefdef-bluetoothserviceuuid">BluetoothServiceUUID</a> <dfn class="nv idl-code" data-dfn-for="BluetoothLEScanFilterInit" data-dfn-type="dict-member" data-export="" data-type="BluetoothServiceUUID " id="dom-bluetoothlescanfilterinit-serviceuuid">serviceUUID<a class="self-link" href="#dom-bluetoothlescanfilterinit-serviceuuid"></a></dfn>;
<span class="kt">unsigned</span> <span class="kt">short</span> <dfn class="nv idl-code" data-dfn-for="BluetoothLEScanFilterInit" data-dfn-type="dict-member" data-export="" data-type="unsigned short " id="dom-bluetoothlescanfilterinit-manufacturerdata">manufacturerData<a class="self-link" href="#dom-bluetoothlescanfilterinit-manufacturerdata"></a></dfn>;
<a class="n" data-link-type="idl-name" href="https://webbluetoothcg.github.io/web-bluetooth/#typedefdef-bluetoothserviceuuid">BluetoothServiceUUID</a> <dfn class="nv idl-code" data-dfn-for="BluetoothLEScanFilterInit" data-dfn-type="dict-member" data-export="" data-type="BluetoothServiceUUID " id="dom-bluetoothlescanfilterinit-servicedata">serviceData<a class="self-link" href="#dom-bluetoothlescanfilterinit-servicedata"></a></dfn>;
<span class="kt">boolean</span> <dfn class="nv idl-code" data-dfn-for="BluetoothLEScanFilterInit" data-dfn-type="dict-member" data-export="" data-type="boolean " id="dom-bluetoothlescanfilterinit-connectable">connectable<a class="self-link" href="#dom-bluetoothlescanfilterinit-connectable"></a></dfn>;
};

<span class="kt">dictionary</span> <dfn class="nv dfn-paneled idl-code" data-dfn-type="dictionary" data-export="" id="dictdef-bluetoothlescanoptions">BluetoothLEScanOptions</dfn> {
Expand Down Expand Up @@ -1693,7 +1692,6 @@ <h3 class="heading settled" data-level="4.1" id="scan-control"><span class="secn
<span class="kt">readonly</span> <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="https://webbluetoothcg.github.io/web-bluetooth/#typedefdef-uuid">UUID</a>? <dfn class="nv idl-code" data-dfn-for="BluetoothLEScanFilter" data-dfn-type="attribute" data-export="" data-readonly="" data-type="UUID?" id="dom-bluetoothlescanfilter-serviceuuid">serviceUUID<a class="self-link" href="#dom-bluetoothlescanfilter-serviceuuid"></a></dfn>;
<span class="kt">readonly</span> <span class="kt">attribute</span> <span class="kt">unsigned</span> <span class="kt">short</span>? <dfn class="nv idl-code" data-dfn-for="BluetoothLEScanFilter" data-dfn-type="attribute" data-export="" data-readonly="" data-type="unsigned short?" id="dom-bluetoothlescanfilter-manufacturerdata">manufacturerData<a class="self-link" href="#dom-bluetoothlescanfilter-manufacturerdata"></a></dfn>;
<span class="kt">readonly</span> <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="https://webbluetoothcg.github.io/web-bluetooth/#typedefdef-uuid">UUID</a>? <dfn class="nv idl-code" data-dfn-for="BluetoothLEScanFilter" data-dfn-type="attribute" data-export="" data-readonly="" data-type="UUID?" id="dom-bluetoothlescanfilter-servicedata">serviceData<a class="self-link" href="#dom-bluetoothlescanfilter-servicedata"></a></dfn>;
<span class="kt">readonly</span> <span class="kt">attribute</span> <span class="kt">boolean</span>? <dfn class="nv idl-code" data-dfn-for="BluetoothLEScanFilter" data-dfn-type="attribute" data-export="" data-readonly="" data-type="boolean?" id="dom-bluetoothlescanfilter-connectable">connectable<a class="self-link" href="#dom-bluetoothlescanfilter-connectable"></a></dfn>;
};

<span class="kt">interface</span> <dfn class="nv dfn-paneled idl-code" data-dfn-type="interface" data-export="" id="bluetoothlescan">BluetoothLEScan</dfn> {
Expand Down Expand Up @@ -1855,8 +1853,6 @@ <h3 class="heading settled" data-level="5.1" id="advertising-events"><span class
<li> If <code><var>filter</var>.serviceData</code> is non-<code>null</code>,
it is the 128-bit UUID representation of the UUID
in some <a data-link-type="dfn" href="#service-data" id="ref-for-service-data-1">Service Data</a> in <var>event</var>.
<li> If <code><var>filter</var>.connectable</code> is <code>true</code>, <var>event</var> has either the <a data-link-type="dfn" href="#adv_ind" id="ref-for-adv_ind-1">ADV_IND</a> or the <a data-link-type="dfn" href="#adv_direct_ind" id="ref-for-adv_direct_ind-1">ADV_DIRECT_IND</a> type.
<li> If <code><var>filter</var>.connectable</code> is <code>false</code>, <var>event</var> has either the <a data-link-type="dfn" href="#adv_nonconn_ind" id="ref-for-adv_nonconn_ind-1">ADV_NONCONN_IND</a> or the <a data-link-type="dfn" href="#adv_scan_ind" id="ref-for-adv_scan_ind-1">ADV_SCAN_IND</a> type.
</ul>
</div>
</section>
Expand Down Expand Up @@ -1965,10 +1961,10 @@ <h2 class="heading settled" data-level="7" id="terminology"><span class="secno">
<li value="1">
Advertising PDUs
<ol>
<li value="1"><dfn class="dfn-paneled" data-dfn-type="dfn" data-noexport="" id="adv_ind">ADV_IND</dfn>
<li value="2"><dfn class="dfn-paneled" data-dfn-type="dfn" data-noexport="" id="adv_direct_ind">ADV_DIRECT_IND</dfn>
<li value="3"><dfn class="dfn-paneled" data-dfn-type="dfn" data-noexport="" id="adv_nonconn_ind">ADV_NONCONN_IND</dfn>
<li value="4"><dfn class="dfn-paneled" data-dfn-type="dfn" data-noexport="" id="adv_scan_ind">ADV_SCAN_IND</dfn>
<li value="1"><dfn data-dfn-type="dfn" data-noexport="" id="adv_ind">ADV_IND<a class="self-link" href="#adv_ind"></a></dfn>
<li value="2"><dfn data-dfn-type="dfn" data-noexport="" id="adv_direct_ind">ADV_DIRECT_IND<a class="self-link" href="#adv_direct_ind"></a></dfn>
<li value="3"><dfn data-dfn-type="dfn" data-noexport="" id="adv_nonconn_ind">ADV_NONCONN_IND<a class="self-link" href="#adv_nonconn_ind"></a></dfn>
<li value="4"><dfn data-dfn-type="dfn" data-noexport="" id="adv_scan_ind">ADV_SCAN_IND<a class="self-link" href="#adv_scan_ind"></a></dfn>
</ol>
</ol>
</ol>
Expand Down Expand Up @@ -2180,12 +2176,6 @@ <h3 class="no-num no-ref heading settled" id="index-defined-here"><span class="c
<li><a href="#dictdef-bluetoothlescanoptions">BluetoothLEScanOptions</a><span>, in §4</span>
<li><a href="#dictdef-bluetoothlescanpermissiondescriptor">BluetoothLEScanPermissionDescriptor</a><span>, in §4.2</span>
<li><a href="#bluetoothlescanpermissionresult">BluetoothLEScanPermissionResult</a><span>, in §4.2</span>
<li>
connectable
<ul>
<li><a href="#dom-bluetoothlescanfilterinit-connectable">dict-member for BluetoothLEScanFilterInit</a><span>, in §4</span>
<li><a href="#dom-bluetoothlescanfilter-connectable">attribute for BluetoothLEScanFilter</a><span>, in §4.1</span>
</ul>
<li><a href="#device-address">Device Address</a><span>, in §7</span>
<li>
filters
Expand Down Expand Up @@ -2345,7 +2335,6 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
<a class="n" data-link-type="idl-name" href="https://webbluetoothcg.github.io/web-bluetooth/#typedefdef-bluetoothserviceuuid">BluetoothServiceUUID</a> <a class="nv" data-type="BluetoothServiceUUID " href="#dom-bluetoothlescanfilterinit-serviceuuid">serviceUUID</a>;
<span class="kt">unsigned</span> <span class="kt">short</span> <a class="nv" data-type="unsigned short " href="#dom-bluetoothlescanfilterinit-manufacturerdata">manufacturerData</a>;
<a class="n" data-link-type="idl-name" href="https://webbluetoothcg.github.io/web-bluetooth/#typedefdef-bluetoothserviceuuid">BluetoothServiceUUID</a> <a class="nv" data-type="BluetoothServiceUUID " href="#dom-bluetoothlescanfilterinit-servicedata">serviceData</a>;
<span class="kt">boolean</span> <a class="nv" data-type="boolean " href="#dom-bluetoothlescanfilterinit-connectable">connectable</a>;
};

<span class="kt">dictionary</span> <a class="nv" href="#dictdef-bluetoothlescanoptions">BluetoothLEScanOptions</a> {
Expand All @@ -2364,7 +2353,6 @@ <h2 class="no-num no-ref heading settled" id="idl-index"><span class="content">I
<span class="kt">readonly</span> <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="https://webbluetoothcg.github.io/web-bluetooth/#typedefdef-uuid">UUID</a>? <a class="nv" data-readonly="" data-type="UUID?" href="#dom-bluetoothlescanfilter-serviceuuid">serviceUUID</a>;
<span class="kt">readonly</span> <span class="kt">attribute</span> <span class="kt">unsigned</span> <span class="kt">short</span>? <a class="nv" data-readonly="" data-type="unsigned short?" href="#dom-bluetoothlescanfilter-manufacturerdata">manufacturerData</a>;
<span class="kt">readonly</span> <span class="kt">attribute</span> <a class="n" data-link-type="idl-name" href="https://webbluetoothcg.github.io/web-bluetooth/#typedefdef-uuid">UUID</a>? <a class="nv" data-readonly="" data-type="UUID?" href="#dom-bluetoothlescanfilter-servicedata">serviceData</a>;
<span class="kt">readonly</span> <span class="kt">attribute</span> <span class="kt">boolean</span>? <a class="nv" data-readonly="" data-type="boolean?" href="#dom-bluetoothlescanfilter-connectable">connectable</a>;
};

<span class="kt">interface</span> <a class="nv" href="#bluetoothlescan">BluetoothLEScan</a> {
Expand Down Expand Up @@ -2576,30 +2564,6 @@ <h2 class="no-num no-ref heading settled" id="issues-index"><span class="content
<li><a href="#ref-for-device-address-1">2. Privacy considerations</a>
</ul>
</aside>
<aside class="dfn-panel" data-for="adv_ind">
<b><a href="#adv_ind">#adv_ind</a></b><b>Referenced in:</b>
<ul>
<li><a href="#ref-for-adv_ind-1">5.1. Responding to advertising events</a>
</ul>
</aside>
<aside class="dfn-panel" data-for="adv_direct_ind">
<b><a href="#adv_direct_ind">#adv_direct_ind</a></b><b>Referenced in:</b>
<ul>
<li><a href="#ref-for-adv_direct_ind-1">5.1. Responding to advertising events</a>
</ul>
</aside>
<aside class="dfn-panel" data-for="adv_nonconn_ind">
<b><a href="#adv_nonconn_ind">#adv_nonconn_ind</a></b><b>Referenced in:</b>
<ul>
<li><a href="#ref-for-adv_nonconn_ind-1">5.1. Responding to advertising events</a>
</ul>
</aside>
<aside class="dfn-panel" data-for="adv_scan_ind">
<b><a href="#adv_scan_ind">#adv_scan_ind</a></b><b>Referenced in:</b>
<ul>
<li><a href="#ref-for-adv_scan_ind-1">5.1. Responding to advertising events</a>
</ul>
</aside>
<aside class="dfn-panel" data-for="passive-scanning">
<b><a href="#passive-scanning">#passive-scanning</a></b><b>Referenced in:</b>
<ul>
Expand Down