]> granicus.if.org Git - esp-idf/commitdiff
Update blufi.rst
authorJin Fang Cheng Cheng <jinfangchengcheng@espressif.com>
Thu, 24 May 2018 06:33:14 +0000 (14:33 +0800)
committerJin Fang Cheng Cheng <jinfangchengcheng@espressif.com>
Fri, 25 May 2018 07:09:34 +0000 (15:09 +0800)
docs/zh_CN/api-guides/blufi.rst

index 027d40e00ae2b9500088fb79c75a2c7386ef3ef7..50b8d41f3100ae5b04122c046150977460bd208b 100644 (file)
@@ -1,43 +1,43 @@
 BluFi
-*****
+^^^^^
 
 概览
-====
-ESP32 的蓝牙配网功能称为 BluFi
+-----
+BluFi 是一款基于蓝牙通道的 Wi-Fi 网络配置功能,适用于 ESP32。它通过安全协议将 Wi-Fi 配置和证书传输到 ESP32,然后 ESP32 可基于这些信息连接到 AP 或建立 SoftAP
 
-ESP32 BluFi 功能基于 GATT 协议构建,定义了 ESP32 作为 GATT Server 接收 GATT Client(手机等设备)的 Wi-Fi 连接信息,实现 ESP32 通过 Wi-Fi 连接 AP 或配置使用 SoftAP Profile 的过程。必要功能包含 BluFi 层上的分片、数据加密、校验和确认等
+BluFi 流程的关键部分包括数据的分片、加密、校验和验证
 
-你可以自定义 BluFi 配网过程中使用的对称加密、非对称加密以及校验算法。 BluFi 提供的示例程序默认将使用 DH 算法进行密钥协商,使用 128-AES 算法进行数据加密,使用 CRC16 进行进行数据校验
+用户可按需自定义用于对称加密、非对称加密和校验的算法。这里我们采用 DH 算法进行密钥协商、128-AES 算法用于数据加密、CRC16 算法用于校验和验证
 
-流程:
------
+BluFi 流程
+----------
 BluFi 配网功能包含配置 SoftAP 和 Station 两部分。
 
 下面以配置 Station 为例说明配置步骤。
 BluFi 配网的配置 Station 包含广播、连接、服务发现、协商共享密钥、传输数据、回传连接状态等步骤。
 
-完整的配网过程如下:
--------------------
+ESP32 配网流程
+--------------
 
 1. ESP32 开启 GATT Server 功能,发送带有特定 *adv data* 的广播。你可以自定义该广播,该广播不属于 BluFi Profile。
 
 2. 使用手机 APP 搜索到该特定广播,手机作为 GATT Client 连接 ESP32。你可以决定使用哪款手机 APP。
 
-3. GATT 连接建立成功后,手机向 ESP32 发送『协商过程』数据帧(详情见 BluFi 传输格式)。
+3. GATT 连接建立成功后,手机向 ESP32 发送“协商过程”数据帧(详情见 :ref:`frame_formats` )。
 
-4. ESP32 收到『协商过程』数据帧后,会按照使用者自定义的协商过程来解析。
+4. ESP32 收到“协商过程”数据帧后,会按照使用者自定义的协商过程来解析。
 
 5. 手机与 ESP32 进行密钥协商。协商过程可使用 DH/RSA/ECC 等加密算法进行。
 
-6. 协商结束后,手机端向 ESP32 发送『设置安全模式』控制帧。
+6. 协商结束后,手机端向 ESP32 发送“设置安全模式”控制帧。
 
-7. ESP32 收到『设置安全模式』控制帧后,使用经过协商的共享密钥以及配置的安全策略对通信数据进行加密和解密。
+7. ESP32 收到“设置安全模式”控制帧后,使用经过协商的共享密钥以及配置的安全策略对通信数据进行加密和解密。
 
-8. 手机向 ESP32 发送『BluFi 传输格式』定义的 SSID、Password 等用于 Wi-Fi 连接的必要信息。
+8. 手机向 ESP32 发送“BluFi 传输格式”定义的 SSID、Password 等用于 Wi-Fi 连接的必要信息。
 
-9. 手机向 ESP32 发送『Wi-Fi 连接请求』控制帧,ESP32 收到之后,识别为手机已将必要的信息传输完毕,准备连接 Wi-Fi。
+9. 手机向 ESP32 发送“Wi-Fi 连接请求”控制帧,ESP32 收到之后,识别为手机已将必要的信息传输完毕,准备连接 Wi-Fi。
 
-10. ESP32 连接到 Wi-Fi 后,发送『Wi-Fi 连接状态报告』控制帧到手机,以报告连接状态。至此配网结束。
+10. ESP32 连接到 Wi-Fi 后,发送“Wi-Fi 连接状态报告”控制帧到手机,以报告连接状态。至此配网结束。
 
 .. note::
 
@@ -45,14 +45,37 @@ BluFi 配网的配置 Station 包含广播、连接、服务发现、协商共
 
     2. 进行对称加密和解密时,加密和解密前后的数据长度必须一致,支持原地加密和解密。
 
-配网流程图请参考下图:
+配网流程图
+-----------
 
-.. figure:: ../../_static/api-guides_blufi.png
+.. seqdiag::
+    :caption: BluFi Flow Chart
     :align: center
-    :figclass: align-center
 
-BLUFI 传输格式
-**************
+    seqdiag blufi {
+        activation = none;
+        node_width = 80;
+        node_height = 60;
+        edge_length = 380;
+        span_height = 10;
+        default_fontsize = 12; 
+
+        Phone <- ESP32 [label="广播"];
+        Phone -> ESP32 [label="建立 GATT 链接"];
+        Phone <- ESP32 [label="协商密钥"];
+        Phone -> ESP32 [label="协商密钥"];
+        Phone -> ESP32 [label="CTRL: 设置 ESP32 手机安全模式"];
+        Phone -> ESP32 [label="DATA: SSID"];
+        Phone -> ESP32 [label="DATA: Password"];
+        Phone -> ESP32 [label="DATA: 其他信息,如 CA 认证"];
+        Phone -> ESP32 [label="CTRL: 连接到 AP"];
+        Phone <- ESP32 [label="DATA: 连接状态报告"];
+    }
+
+.. _frame_formats:
+
+BluFi 传输格式
+--------------
 
 手机 APP 与 ESP32 之间的 BluFi 通信格式定义如下:
 
@@ -70,7 +93,7 @@ BLUFI 传输格式
 
 +------------+--------------------+----------------+------------+-------------------------------------------+----------------+
 | LSB - Type | FrameControl(Frag) | SequenceNumber | DataLength | Data                                      | MSB - CheckSum |
-+            +                    +                +            +-------------------------------------------+                +
++            +                    +                +            +----------------------+--------------------+                +
 |            |                    |                |            | Total Content Length | Content            |                |
 +------------+--------------------+----------------+------------+----------------------+--------------------+----------------+
 | 1          | 1                  | 1              | 1          | 2                    | ${Data Length} - 2 | 2              |
@@ -90,107 +113,83 @@ Ack 帧格式(8 bit):
 
 1. Type
 
  类型域,占 1 Byte。分为 Type 和 Subtype(子类型域)两部分, Type 占低 2 bit,Subtype 占高 6 bit。
  类型域,占 1 Byte。分为 Type 和 Subtype(子类型域)两部分, Type 占低 2 bit,Subtype 占高 6 bit。
    
  * 控制帧,暂不进行加密,可校验;
  * 控制帧,暂不进行加密,可校验;
    
-   * 数据帧,可加密,可校验。
-
-+---------+------------------------+--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| Type    | 帧类型                 | Subtype      | 含义                                                      | 解释                                                                                                                                                                                        | 备注                                                                                                                                                                           |
-+---------+------------------------+--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| 0x0b’00 | 控制帧 (Control Frame) | 0x0b’000000  | Ack                                                       | 用来回复对方发的帧,Ack 帧的 Data 域使用回复对象帧的 Sequence 值。                                                                                                                          | Data 域使用1 Byte Sequence 值,与恢复对象帧的Sequence 值相同。                                                                                                                 |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x1b’000001  | Set ESP32 to the security mode.                           | 通知 ESP32 发送数据时使用的安全模式,在该过程中可设置多次,每次设置后影响后续安全模式。在不设置的情况下,ESP32 默认控制帧和数据帧均为无校验、无加密。手机到 ESP32 方向依赖于帧 Control 域。 | Data 域占用 1 Byte,高 4 bit 为控制帧的安全模式,低 4bit 为数据帧的安全模式。                                                                                                  |
-|         |                        |              |                                                           |                                                                                                                                                                                             | b’0000:无校验、无加密;                                                                                                                                                       |
-|         |                        |              |                                                           |                                                                                                                                                                                             | b’0001:有校验、无加密;                                                                                                                                                       |
-|         |                        |              |                                                           |                                                                                                                                                                                             | b’0010:无校验、有加密;                                                                                                                                                       |
-|         |                        |              |                                                           |                                                                                                                                                                                             | b’0011:有校验、有加密。                                                                                                                                                       |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x2b’000010  | Set the Wi-Fi opmode of ESP32.                            | 设置 ESP32 的 Wi-Fi 模式,帧包含 opmode 信息。                                                                                                                                              | data[0] 用于表示 opmode 类型,包括:                                                                                                                                           |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x00: NULL;                                                                                                                                                                    |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x01: STA;                                                                                                                                                                     |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x02: SoftAP;                                                                                                                                                                  |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x03: SoftAP&STA.                                                                                                                                                              |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 如果设置有包含 AP,请尽量优先设置 AP 模式的 SSID/Password/Max Conn Number 等。                                                                                                 |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x3b’000011  | Connect ESP32 to the AP.                                  | 通知 ESP32,必要的信息已经发送完毕,可以连接 AP。                                                                                                                                           | 不包含 Data 域。                                                                                                                                                               |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x4b’000100  | Disconnect ESP32 from  the AP.                            | 通知 ESP32 断开与 AP 的连接                                                                                                                                                                 | 不包含 Data 域。                                                                                                                                                               |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x5b’000101  | Get the status of Wi-Fi.                                  | 获取 ESP32 的 Wi-Fi 模式和状态等信息。                                                                                                                                                      | 不包含 Data 域。                                                                                                                                                               |
-|         |                        |              |                                                           |                                                                                                                                                                                             | ESP32 收到此控制帧后,后续会通过 Wi-Fi 连接状态报告 (Wi-Fi Connection State Report) 数据帧来回复手机端当前所处的 opmode、连接状态、SSID 等信息。提供给手机端的信息由应用决定。 |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x6b’000110  | Disconnect the STA device from the SoftAP in SoftAP mode. | 处于 SoftAP 模式时,踢掉某个 STA 设备。                                                                                                                                                     | data[0~5] 为 STA 设备的 MAC 地址,如有多个 STA,则 [6-11] 为第二个,依次类推。                                                                                                 |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x7b'000111  | Get the version.                                          |                                                                                                                                                                                             |                                                                                                                                                                                |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x8b’001000  | Tell ESP32 to disconnect the BLE GATT link.               | 通知 ESP32 断开蓝牙连接。                                                                                                                                                                   | ESP32 收到该指令后主动断开蓝牙连接。                                                                                                                                           |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x9b’001001  | Tell ESP32 to get the Wi-Fi list.                         | 通知 ESP32 扫描周围的 Wi-Fi 热点                                                                                                                                                            | 不包含 Data 域。ESP32 收到此控制帧后,会发送包含 Wi-Fi 热点报告 (Wi-Fi List Report) 的数据帧回复手机端 ESP32 周围的 Wi-Fi 热点。                                               |
-+---------+------------------------+--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-| 0x1b’01 | 数据帧 (Data Frame)    | 0x0b’000000  | Negotiation data.                                         | 用来发送协商数据,传输到应用层注册的回调函数。                                                                                                                                              | 数据长度与 Length 域有关。                                                                                                                                                     |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x1b’000001  | BSSID for STA mode.                                       | STA 将要连接的 AP 的 BSSID(用于隐藏SSID)。                                                                                                                                                | 数据长度与 Length 域有关。当传输方向为 ESP32 到手机时,表示向手机端提供信息。                                                                                                  |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x2b’000010  | SSID for STA mode.                                        | STA 将要连接的 AP 的 SSID。                                                                                                                                                                 | 数据长度与 Length 域有关。当传输方向为 ESP32 到手机时,表示向手机端提供信息。                                                                                                  |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x3b’000011  | Password for STA mode.                                    | STA 将要连接的 AP 的密码。                                                                                                                                                                  | 数据长度与 Length 域有关。当传输方向为 ESP32 到手机时,表示向手机端提供信息。                                                                                                  |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x4b’000100  | SSID for SoftAP mode.                                     | SoftAP 模式使用的 SSID。                                                                                                                                                                    | 数据长度与 Length 域有关。当传输方向为ESP32 到手机时,表示向手机端提供信息。                                                                                                   |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x5b’000101  | Password for SoftAPmode.                                  | SoftAP 模式使用的密码。                                                                                                                                                                     | 数据长度与 Length 域有关。当传输方向为 ESP32 到手机时,表示向手机端提供信息。                                                                                                  |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x6b’000110  | Max connection number for SoftAP mode.                    | AP 模式的最大连接数。                                                                                                                                                                       | data[0] 表示连接数的值,范围 1~4。当传输方向为 ESP32 到手机时,表示向手机端提供信息。                                                                                          |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x7b’000111  | Authentication mode for SoftAP mode.                      | AP 模式的认证模式。                                                                                                                                                                         | data[0]:                                                                                                                                                                      |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x00: OPEN;                                                                                                                                                                    |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x01: WEP;                                                                                                                                                                     |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x02: WPA_PSK;                                                                                                                                                                 |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x03: WPA2_PSK;                                                                                                                                                                |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x04: WPA_WPA2_PSK.                                                                                                                                                            |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 当传输方向为 ESP32 到手机时,表示向手机端提供信息。                                                                                                                            |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x8b’001000  | Channel for SoftAP mode.                                  | SoftAP 模式的通道数量。                                                                                                                                                                     | data[0] 表示通道的数量,范围 1~14。当传输方向为 ESP32 到手机时,表示向手机端提供信息。                                                                                         |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x9b’001001  | Username.                                                 | 使用企业级加密时,Client 端的用户名。                                                                                                                                                       | 数据长度与 Length 域有关。                                                                                                                                                     |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0xab’001010  | CA certification.                                         | 进行企业级加密时使用的 CA 证书。                                                                                                                                                            | 数据长度与 Length 域有关,长度不够,可用分片。                                                                                                                                 |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0xbb’001011  | Client certification.                                     | 进行企业级加密时,Client 端的证书。可包含或不包含私钥,由证书内容决定。                                                                                                                     | 数据长度与 Length 域有关,长度不够,可用分片。                                                                                                                                 |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0xcb’001100  | Server certification.                                     | 进行企业级加密时,Server 端的证书。可包含或不包含私钥,由证书内容决定。                                                                                                                     | 数据长度与 Length 域有关,长度不够,可用分片。                                                                                                                                 |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0xdb’001101  | Client private key.                                       | 进行企业级加密时,Client 端的私钥。                                                                                                                                                         | 数据长度与 Length 域有关,长度不够,可用分片。                                                                                                                                 |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0xeb’001110  | Server private key.                                       | 进行企业级加密时,Server 端的私钥。                                                                                                                                                         | 数据长度与 Length 域有关,长度不够,可用分片。                                                                                                                                 |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0xfb’001111  | Wi-Fi connection state report.                            | 通知手机 ESP32 的 Wi-Fi 状态,包括 STA状态和 SoftAP 状态,用于手机配置 STA 连接时的通知,或有 STA 连接上 SoftAP 时的通知。但收到手机询问 Wi-Fi 状态时,除了回复此帧外,还可回复其他数据帧。 | data[0] 表示 opmode,包括:                                                                                                                                                    |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x00: NULL;                                                                                                                                                                    |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x01: STA;                                                                                                                                                                     |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x02: SoftAP;                                                                                                                                                                  |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x03: SoftAP&STA                                                                                                                                                               |
-|         |                        |              |                                                           |                                                                                                                                                                                             | data[1]:STA 的连接状态,0x0 表示处于连接状态, 其他表示处于非连接状态;                                                                                                       |
-|         |                        |              |                                                           |                                                                                                                                                                                             | data[2]:SoftAP 的连接状态,即表示有多少 STA 已经连接。                                                                                                                        |
-|         |                        |              |                                                           |                                                                                                                                                                                             | data[3] 及以后:为按照本协议格式 SSID\BSSID 等信息。                                                                                                                           |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x10b’010000 | Version.                                                  |                                                                                                                                                                                             | data[0]= great version                                                                                                                                                         |
-|         |                        |              |                                                           |                                                                                                                                                                                             | data[1]= sub version                                                                                                                                                           |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x11B’010001 | Wi-Fi list.                                               | 通知手机 ESP32 周围的 Wi-Fi 热点列表。                                                                                                                                                      | 数据帧数据格式为 Length + RSSI + SSID, 数据较长时可分片发送。                                                                                                                  |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x12B’010010 | Report error.                                             | 通知手机 BluFi 过程出现异常错误。                                                                                                                                                           | 0x00: sequence error;                                                                                                                                                          |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x01: checksum error;                                                                                                                                                          |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x02: decrypt error;                                                                                                                                                           |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x03: encrypt error;                                                                                                                                                           |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x04: init security error;                                                                                                                                                     |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x05: dh malloc error;                                                                                                                                                         |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x06: dh param error;                                                                                                                                                          |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x07: read param  error;                                                                                                                                                       |
-|         |                        |              |                                                           |                                                                                                                                                                                             | 0x08: make public error.                                                                                                                                                       |
-+         +                        +--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
-|         |                        | 0x13B’010011 | Custom data.                                              | 用户发送或者接收自定义数据。                                                                                                                                                                | 数据较长时可分片发送。                                                                                                                                                         |
-+---------+------------------------+--------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+   * 数据帧,可加密,可校验。
+
+ **1.1 控制帧 (0x0b’00)** 
+
++-------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 控制帧      | 含义                                                      | 解释                                                                                                                                                                                        | 备注                                                                                                                                                                                           |
++-------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x0b’000000 | Ack                                                       | 用来回复对方发的帧,Ack 帧的 Data 域使用回复对象帧的 Sequence 值。                                                                                                                          | Data 域使用1 Byte Sequence 值,与恢复对象帧的Sequence 值相同。                                                                                                                                 |
++-------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x1b’000001 | Set ESP32 to the security mode.                           | 通知 ESP32 发送数据时使用的安全模式,在该过程中可设置多次,每次设置后影响后续安全模式。在不设置的情况下,ESP32 默认控制帧和数据帧均为无校验、无加密。手机到 ESP32 方向依赖于帧 Control 域。 | Data 域占用 1 Byte。高 4 bit 为控制帧的安全模式,低 4bit 为数据帧的安全模式。b’0000:无校验、无加密;b’0001:有校验、无加密;b’0010:无校验、有加密;b’0011:有校验、有加密。                  |
++-------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x2b’000010 | Set the Wi-Fi opmode of ESP32.                            | 设置 ESP32 的 Wi-Fi 模式,帧包含 opmode 信息。                                                                                                                                              | data[0] 用于表示 opmode 类型,包括:0x00: NULL;0x01: STA;0x02: SoftAP;0x03: SoftAP&STA.如果设置有包含 AP,请尽量优先设置 AP 模式的SSID/Password/Max Conn Number 等。                           |
++-------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x3b’000011 | Connect ESP32 to the AP.                                  | 通知 ESP32,必要的信息已经发送完毕,可以连接 AP。                                                                                                                                           | 不包含 Data 域。                                                                                                                                                                               |
++-------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x4b’000100 | Disconnect ESP32 from  the AP.                            | 通知 ESP32 断开与 AP 的连接                                                                                                                                                                 | 不包含 Data 域。                                                                                                                                                                               |
++-------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x5b’000101 | Get the status of Wi-Fi.                                  | 获取 ESP32 的 Wi-Fi 模式和状态等信息。                                                                                                                                                      | 不包含 Data 域。ESP32 收到此控制帧后,后续会通过 Wi-Fi 连接状态报告 (Wi-Fi Connection State Report) 数据帧来回复手机端当前所处的 opmode、连接状态、SSID 等信息。提供给手机端的信息由应用决定。 |
++-------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x6b’000110 | Disconnect the STA device from the SoftAP in SoftAP mode. | 处于 SoftAP 模式时,踢掉某个 STA 设备。                                                                                                                                                     | data[0~5] 为 STA 设备的 MAC 地址,如有多个 STA,则 [6-11] 为第二个,依次类推。                                                                                                                 |
++-------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x7b'000111 | Get the version.                                          |                                                                                                                                                                                             |                                                                                                                                                                                                |
++-------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x8b’001000 | Tell ESP32 to disconnect the BLE GATT link.               | 通知 ESP32 断开蓝牙连接。                                                                                                                                                                   | ESP32 收到该指令后主动断开蓝牙连接。                                                                                                                                                           |
++-------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x9b’001001 | Tell ESP32 to get the Wi-Fi list.                         | 通知 ESP32 扫描周围的 Wi-Fi 热点                                                                                                                                                            | 不包含 Data 域。ESP32 收到此控制帧后,会发送包含 Wi-Fi 热点报告 (Wi-Fi List Report) 的数据帧回复手机端 ESP32 周围的 Wi-Fi 热点。                                                               |
++-------------+-----------------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+
+ **1.2 数据帧 (0x1b’01)**
+
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 数据帧       | 含义                                   | 解释                                                                                                                                                                                        | 备注                                                                                                                                                                                                                                                              |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x0b’000000  | Negotiation data.                      | 用来发送协商数据,传输到应用层注册的回调函数。                                                                                                                                              | 数据长度与 Length 域有关。                                                                                                                                                                                                                                        |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x1b’000001  | BSSID for STA mode.                    | STA 将要连接的 AP 的 BSSID(用于隐藏SSID)。                                                                                                                                                | 数据长度与 Length 域有关。当传输方向为 ESP32 到手机时,表示向手机端提供信息。                                                                                                                                                                                     |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x2b’000010  | SSID for STA mode.                     | STA 将要连接的 AP 的 SSID。                                                                                                                                                                 | 数据长度与 Length 域有关。当传输方向为 ESP32 到手机时,表示向手机端提供信息。                                                                                                                                                                                     |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x3b’000011  | Password for STA mode.                 | STA 将要连接的 AP 的密码。                                                                                                                                                                  | 数据长度与 Length 域有关。当传输方向为 ESP32 到手机时,表示向手机端提供信息。                                                                                                                                                                                     |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x4b’000100  | SSID for SoftAP mode.                  | SoftAP 模式使用的 SSID。                                                                                                                                                                    | 数据长度与 Length 域有关。当传输方向为ESP32 到手机时,表示向手机端提供信息。                                                                                                                                                                                      |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x5b’000101  | Password for SoftAPmode.               | SoftAP 模式使用的密码。                                                                                                                                                                     | 数据长度与 Length 域有关。当传输方向为 ESP32 到手机时,表示向手机端提供信息。                                                                                                                                                                                     |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x6b’000110  | Max connection number for SoftAP mode. | AP 模式的最大连接数。                                                                                                                                                                       | data[0] 表示连接数的值,范围 1~4。当传输方向为 ESP32 到手机时,表示向手机端提供信息。                                                                                                                                                                             |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x7b’000111  | Authentication mode for SoftAP mode.   | AP 模式的认证模式。                                                                                                                                                                         | data[0]:0x00: OPEN;0x01: WEP;0x02: WPA_PSK;0x03: WPA2_PSK;0x04: WPA_WPA2_PSK.当传输方向为 ESP32 到手机时,表示向手机端提供信息。                                                                                                                                 |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x8b’001000  | Channel for SoftAP mode.               | SoftAP 模式的通道数量。                                                                                                                                                                     | data[0] 表示通道的数量,范围 1~14。当传输方向为 ESP32 到手机时,表示向手机端提供信息。                                                                                                                                                                            |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x9b’001001  | Username.                              | 使用企业级加密时,Client 端的用户名。                                                                                                                                                       | 数据长度与 Length 域有关。                                                                                                                                                                                                                                        |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0xab’001010  | CA certification.                      | 进行企业级加密时使用的 CA 证书。                                                                                                                                                            | 数据长度与 Length 域有关,长度不够,可用分片。                                                                                                                                                                                                                    |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0xbb’001011  | Client certification.                  | 进行企业级加密时,Client 端的证书。可包含或不包含私钥,由证书内容决定。                                                                                                                     | 数据长度与 Length 域有关,长度不够,可用分片。                                                                                                                                                                                                                    |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0xcb’001100  | Server certification.                  | 进行企业级加密时,Server 端的证书。可包含或不包含私钥,由证书内容决定。                                                                                                                     | 数据长度与 Length 域有关,长度不够,可用分片。                                                                                                                                                                                                                    |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0xdb’001101  | Client private key.                    | 进行企业级加密时,Client 端的私钥。                                                                                                                                                         | 数据长度与 Length 域有关,长度不够,可用分片。                                                                                                                                                                                                                    |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0xeb’001110  | Server private key.                    | 进行企业级加密时,Server 端的私钥。                                                                                                                                                         | 数据长度与 Length 域有关,长度不够,可用分片。                                                                                                                                                                                                                    |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0xfb’001111  | Wi-Fi connection state report.         | 通知手机 ESP32 的 Wi-Fi 状态,包括 STA状态和 SoftAP 状态,用于手机配置 STA 连接时的通知,或有 STA 连接上 SoftAP 时的通知。但收到手机询问 Wi-Fi 状态时,除了回复此帧外,还可回复其他数据帧。 | data[0] 表示 opmode,包括:0x00: NULL;0x01: STA;0x02: SoftAP;0x03: SoftAP&STAdata[1]:STA 的连接状态,0x0 表示处于连接状态, 其他表示处于非连接状态;data[2]:SoftAP 的连接状态,即表示有多少 STA 已经连接。data[3] 及以后:为按照本协议格式 SSID\BSSID 等信息。 |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x10b’010000 | Version.                               |                                                                                                                                                                                             | data[0]= great versiondata[1]=sub version                                                                                                                                                                                                                         |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x11B’010001 | Wi-Fi list.                            | 通知手机 ESP32 周围的 Wi-Fi 热点列表。                                                                                                                                                      | 数据帧数据格式为 Length + RSSI + SSID, 数据较长时可分片发送。                                                                                                                                                                                                     |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x12B’010010 | Report error.                          | 通知手机 BluFi 过程出现异常错误。                                                                                                                                                           | 0x00: sequence error;0x01: checksum error;0x02: decrypt error;0x03: encrypt error;0x04: init security error;0x05: dh malloc error;0x06: dh param error;0x07: read param  error;0x08: make public error.                                                           |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 0x13B’010011 | Custom data.                           | 用户发送或者接收自定义数据。                                                                                                                                                                | 数据较长时可分片发送。                                                                                                                                                                                                                                            |
++--------------+----------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 
 2. Frame Control
 
@@ -214,22 +213,22 @@ Ack 帧格式(8 bit):
 
 3. Sequence Control
 
  序列控制域。帧发送时,无论帧的类型是什么,序列 (Sequence) 都会自动加 1,用来防止重放攻击 (Replay Attack)。每次重现连接后,序列清零。
  序列控制域。帧发送时,无论帧的类型是什么,序列 (Sequence) 都会自动加 1,用来防止重放攻击 (Replay Attack)。每次重现连接后,序列清零。
    
 4. Length
 
  Data 域的长度,不包含 CheckSum。
  Data 域的长度,不包含 CheckSum。
    
 5. Data
 
  不同的 Type 或 Subtype,Data 域的含义均不同。请参考上方表格。
  不同的 Type 或 Subtype,Data 域的含义均不同。请参考上方表格。
 
 6. CheckSum
 
  此域为 2 Byte 的校验,用来校验『序列 + 数据长度 + 明文数据』。
  此域为 2 Byte 的校验,用来校验『序列 + 数据长度 + 明文数据』。
    
-ESP32端的安全实现
-*****************
+ESP32 端的安全实现
+------------------
 
 1. 保证数据安全
 
@@ -245,57 +244,49 @@ ESP32端的安全实现
 
 4. 防止重放攻击 (Replay Attack)
 
  加入帧发送序列(Sequence),并且序列参与数据校验。
  加入帧发送序列(Sequence),并且序列参与数据校验。
 
  在 ESP32 端的代码中,你可以决定和开发密钥协商等安全处理的流程参考上述流程图)。手机应用向 ESP32 发送协商数据,将传送给应用层处理。如果应用层不处理,可使用 BluFi 提供的 DH 加密算法来磋商密钥。应用层需向 BluFi 注册以下几个与安全相关的函数:
  在 ESP32 端的代码中,你可以决定和开发密钥协商等安全处理的流程参考上述流程图)。手机应用向 ESP32 发送协商数据,将传送给应用层处理。如果应用层不处理,可使用 BluFi 提供的 DH 加密算法来磋商密钥。应用层需向 BluFi 注册以下几个与安全相关的函数:
 
-.. highlight:: none
-
-::
+.. code-block:: c
 
    typedef void (*esp_blufi_negotiate_data_handler_t)(uint8_t *data, int len, uint8_t **output_data, int *output_len, bool *need_free);
 
-   该函数用来接收协商期间的正常数据 (normal data),处理完成后,需要将待发送的数据使用 output_data 和 output_len 传出。
+该函数用来接收协商期间的正常数据 (normal data),处理完成后,需要将待发送的数据使用 output_data 和 output_len 传出。
    
-   BluFi 会在调用完 negotiate_data_handler 后,发送 negotiate_data_handler 传出的 output_data。
+BluFi 会在调用完 negotiate_data_handler 后,发送 negotiate_data_handler 传出的 output_data。
    
-   这里的两个『*』,因为需要发出去的数据长度未知,所以需要函数自行分配 (malloc) 或者指向全局变量,通过 need_free 通知是否需要释放内存。
+这里的两个『*』,因为需要发出去的数据长度未知,所以需要函数自行分配 (malloc) 或者指向全局变量,通过 need_free 通知是否需要释放内存。
  
-.. highlight:: none
-
-::
+.. code-block:: c
 
    typedef int (* esp_blufi_encrypt_func_t)(uint8_t iv8, uint8_t *crypt_data, int cyprt_len);  
-    
-   加密和解密的数据长度必须一致。其中 iv8 为帧的 8 bit 序列 (sequence),可作为 iv 的某 8 bit 来使用。
   
-.. highlight:: none
-
-::
+加密和解密的数据长度必须一致。其中 iv8 为帧的 8 bit 序列 (sequence),可作为 iv 的某 8 bit 来使用。
+  
+.. code-block:: c
    
    typedef int (* esp_blufi_decrypt_func_t)(uint8_t iv8, uint8_t *crypt_data, int crypt_len);
 
-   加密和解密的数据长度必须一致。其中 iv8 为帧的 8 bit 序列 (sequence),可作为 iv 的某 8 bit 来使用。
+加密和解密的数据长度必须一致。其中 iv8 为帧的 8 bit 序列 (sequence),可作为 iv 的某 8 bit 来使用。
    
-.. highlight:: none
-
-::
+.. code-block:: c
    
    typedef uint16_t (*esp_blufi_checksum_func_t)(uint8_t iv8, uint8_t *data, int len);
    
-   该函数用来计算 CheckSum,返回值为 CheckSum 的值。BluFi 会使用该函数返回值与包末尾的 CheckSum 做比较。
+该函数用来计算 CheckSum,返回值为 CheckSum 的值。BluFi 会使用该函数返回值与包末尾的 CheckSum 做比较。
       
 GATT 相关说明
-*************
+-------------
 
-UUID 相关:
-==========
+UUID
+>>>>>
 
 BluFi Service UUID: 0xFFFF,16 bit
 
-BluFi(手机 -> ESP32)特性:0xFF01,主要权限:可写
+BluFi (手机 -> ESP32) 特性:0xFF01,主要权限:可写
 
-BluFi(ESP32 -> 手机)特性:0xFF02,主要权限:可读可通知
+BluFi (ESP32 -> 手机) 特性:0xFF02,主要权限:可读可通知
 
 .. note::