Merge branch 'master' into esp8266

MightyPork · Mar 25, 2016 · 50e9973 · 50e9973
2 parents ec540e6 + f6aa14c
commit 50e9973
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/spec/DATAGRAMS.md b/spec/DATAGRAMS.md
@@ -2,7 +2,7 @@
 
 <i>
 Simple Binary Messaging Protocol specification <br>
-rev. 1.4, 22 March 2016
+rev. 1.4, 26 March 2016
 </i>
 
 ## Datagram types
@@ -15,7 +15,7 @@ rev. 1.4, 22 March 2016
 | 0x01          | Handshake confirmation (origin request accepted)
 | 0x02          | Handshake conflict
 
-The handshake payload structure is specified in 
+The handshake payload structure is specified in
 [SESSION_LAYER.md](SESSION_LAYER.md).
 
 Both request and confirmation datagrams have the same structure, the conflict
@@ -59,7 +59,7 @@ It's recommended to use the "session listener" feature of the reference library
 This datagram's payload starts with the total data length in bytes, as a 4-byte
 (32-bit) unsigned integer.
 
-The rest of the datagram is unspecified and can be used for user data 
+The rest of the datagram is unspecified and can be used for user data
 (implementation specific).
 
 ```none
@@ -68,21 +68,21 @@ The rest of the datagram is unspecified and can be used for user data
 +------------+- - - - - - -+
 ```
 
-The *Bulk transfer offer* packet can be sent as a response to a request (user 
-datagram), or to announce that data is ready (so the receiver knows it can 
+The *Bulk transfer offer* packet can be sent as a response to a request (user
+datagram), or to announce that data is ready (so the receiver knows it can
 read it if needed). In the latter case, the "user data" field can be used
 to describe what kind of data is available.
 
 
 #### 0x05 - Bulk transfer data request
 
-This datagram is a response to the 0x04 (*Bulk transfer offer*), and must have 
+This datagram is a response to the 0x04 (*Bulk transfer offer*), and must have
 the same session number, so the peer knows what data is requested.
 
 The payload consists of a data offset, and a chunk size.
 
-If the peer does not support seeking, and the offset is discontinuous 
-(ie., offset 0 is requested after offset 100 has already been read), then the 
+If the peer does not support seeking, and the offset is discontinuous
+(ie., offset 0 is requested after offset 100 has already been read), then the
 peer should abort the transfer using 0x07 (*Bulk transfer abort*).
 
 ```none

diff --git a/spec/FRAMING_LAYER.md b/spec/FRAMING_LAYER.md
@@ -2,7 +2,7 @@
 
 <i>
 Simple Binary Messaging Protocol specification <br>
-rev. 1.4, 22 March 2016
+rev. 1.4, 26 March 2016
 </i>
 
 SBMP is designed for use on USART-based interfaces, such as simple TTL U(S)ART

diff --git a/spec/README.md b/spec/README.md
@@ -2,7 +2,7 @@
 
 <i>
 Simple Binary Messaging Protocol specification <br>
-rev. 1.4, 22 March 2016
+rev. 1.4, 26 March 2016
 </i>
 
 ## Conventions

diff --git a/spec/SESSION_LAYER.md b/spec/SESSION_LAYER.md
@@ -2,7 +2,7 @@
 
 <i>
 Simple Binary Messaging Protocol specification <br>
-rev. 1.4, 22 March 2016
+rev. 1.4, 26 March 2016
 </i>
 
 The messaging protocol uses a simple session system, which allows to perform