Final tweaks after successful profile testing

8 years ago · c1acdfdb5b
parent 8ef6dba587
commit c1acdfdb5b
3 changed files with 221 additions and 223 deletions
--- a/microbit.html
+++ b/microbit.html
@ -94,6 +94,9 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>
 	  <div class="characteristic_hdg">
 	   	<div class="characteristic_summary"><p>Appearance : 00002A0100001000800000805F9B34FB</p></div>
 	  </div>
+	  <div class="characteristic_hdg">
+	   	<div class="characteristic_summary"><p>Peripheral Preferred Connection Parameters : 00002A0400001000800000805F9B34FB</p></div>
+	  </div>

 <!-- Service Block -->
  <div class="service_hdg">
@ -127,10 +130,7 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>
 	   	<div class="characteristic_summary"><p>Firmware Revision String : 00002A2600001000800000805F9B34FB</p></div>
 	  </div>
 	  <div class="characteristic_hdg">
-	   	<div class="characteristic_summary"><p>Software Revision String : 2A28</p></div>
-	  </div>
-	  <div class="characteristic_hdg">
-	   	<div class="characteristic_summary"><p>Peripheral Preferred Connection Parameters : 2A04</p></div>
+	   	<div class="characteristic_summary"><p>Software Revision String : 00002A2800001000800000805F9B34FB</p></div>
 	  </div>

 <!-- Service Block -->
@ -246,7 +246,7 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>
  </div>

 	  <div class="characteristic_hdg">
-	   	<div class="characteristic_summary"><p>Temperature : E95D8A38251D470AA062FA1922DFA9A8</p></div>
+	   	<div class="characteristic_summary"><p>Temperature : E95D9250251D470AA062FA1922DFA9A8</p></div>
 	  </div>

 </div>
--- a/microbit.html
+++ b/microbit.html
@ -342,73 +342,14 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>



-
-<!-- Service Block -->
-  <div class="service_hdg">
-   	<div class="service_hdg_text"><p>Generic Attribute</p></div>
-  </div>
-
-<!-- Service Block -->
-
-	<div class="service_item">
-	  <div class="service_label">UUID</div>
-	  <div class="service_value">0000180100001000800000805F9B34FB</div>
-	</div>
-
-	<div class="service_item">
-	  <div class="service_label">Declaration</div>
-	  <div class="service_value">Primary</div>
-	</div>
-
-	<div class="service_item">
-	  <div class="service_label">Requirement</div>
-		  <div class="mandatory_property">Mandatory</div>
-	</div>
-
-	<div class="service_item">
-	  <div class="service_label">Server Role</div>
-	  <div class="service_value"></div>
-	</div>
-
-	<div class="service_item">
-	  <div class="service_label">Client Role</div>
-	  <div class="service_value"></div>
-	</div>
-
-	<div class="service_item">
-	  <div class="service_label">Abstract:</div>
-	</div>
-	<div class="service_item">
-	  <div class="text_block"><pre></pre></div>
-	</div>
-
-	<div class="service_item">
-	  <div class="service_label">Summary:</div>
-	</div>
-	<div class="service_item">
-	  <div class="text_block"><pre></pre></div>
-	</div>
-
-	<div class="service_item">
-	  <div class="service_label">Examples:</div>
-	</div>
-	<div class="service_item">
-	  <div class="text_block"><pre></pre></div>
-	</div>
-
-  <div class="characteristics_section_hdg">
-   	<div class="characteristics_hdg_text"><p>Generic Attribute - CHARACTERISTICS</p></div>
-  </div>
-
-
 <!-- Characteristic Block -->
 	  <div class="characteristic_hdg">
-	   	<div class="characteristic_hdg_text"><p>Service Changed</p></div>
+	   	<div class="characteristic_hdg_text"><p>Peripheral Preferred Connection Parameters</p></div>
 	  </div>
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">UUID</div>
-		  <div class="characteristic_value">2A05</div>
+		  <div class="characteristic_value">00002A0400001000800000805F9B34FB</div>
 	  </div>

  	<div class="characteristic_item">
@ -418,7 +359,7 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>

  	<div class="characteristic_item">
 		  <div class="characteristic_label">Requirement</div>
-		  <div class="characteristic_value">Optional</div>
+		  <div class="mandatory_property">Mandatory</div>
 	  </div>
 	  
  	<div class="characteristic_item">
@ -474,7 +415,7 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>

  	<div class="characteristic_item">
 		  <div class="characteristic_label">Indicate</div>
-		  <div class="mandatory_property">Mandatory</div>
+		  <div class="characteristic_value">Excluded</div>
 	  </div>

  	<div class="characteristic_item">
@ -497,7 +438,6 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>
 		  <div class="characteristic_field_label">Descriptors</div>
 	   	<div class="characteristic_field_value">
 <table>
-			<tr><td>1. Client Characteristic Configuration&nbsp;:&nbsp;2902</td></tr>
 </table></div>
 	  </div>

@ -506,14 +446,14 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>

 <!-- Service Block -->
  <div class="service_hdg">
-   	<div class="service_hdg_text"><p>Device Information</p></div>
+   	<div class="service_hdg_text"><p>Generic Attribute</p></div>
  </div>

 <!-- Service Block -->

 	<div class="service_item">
 	  <div class="service_label">UUID</div>
-	  <div class="service_value">0000180A00001000800000805F9B34FB</div>
+	  <div class="service_value">0000180100001000800000805F9B34FB</div>
 	</div>

 	<div class="service_item">
@ -540,18 +480,14 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>
 	  <div class="service_label">Abstract:</div>
 	</div>
 	<div class="service_item">
-	  <div class="text_block"><pre>The Device Information Service exposes manufacturer and/or vendor information about a device.            
-		</pre></div>
+	  <div class="text_block"><pre></pre></div>
 	</div>

 	<div class="service_item">
 	  <div class="service_label">Summary:</div>
 	</div>
 	<div class="service_item">
-	  <div class="text_block"><pre>This service exposes manufacturer information about a device.
-The Device Information Service is instantiated as a Primary Service.
-Only one instance of the Device Information Service is exposed on a device.
-		</pre></div>
+	  <div class="text_block"><pre></pre></div>
 	</div>

 	<div class="service_item">
@ -562,18 +498,18 @@ Only one instance of the Device Information Service is exposed on a device.
 	</div>

  <div class="characteristics_section_hdg">
-   	<div class="characteristics_hdg_text"><p>Device Information - CHARACTERISTICS</p></div>
+   	<div class="characteristics_hdg_text"><p>Generic Attribute - CHARACTERISTICS</p></div>
  </div>


 <!-- Characteristic Block -->
 	  <div class="characteristic_hdg">
-	   	<div class="characteristic_hdg_text"><p>Manufacturer Name String</p></div>
+	   	<div class="characteristic_hdg_text"><p>Service Changed</p></div>
 	  </div>
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">UUID</div>
-		  <div class="characteristic_value">00002A2900001000800000805F9B34FB</div>
+		  <div class="characteristic_value">2A05</div>
 	  </div>

  	<div class="characteristic_item">
@ -590,7 +526,7 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_label">Abstract:</div>
    </div>
  	<div class="characteristic_item">
-		  <div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the name of the manufacturer of the device.</pre></div>
+		  <div class="char_text_block"><pre></pre></div>
    </div>

 	<div class="characteristic_item">
@ -639,7 +575,7 @@ Only one instance of the Device Information Service is exposed on a device.

  	<div class="characteristic_item">
 		  <div class="characteristic_label">Indicate</div>
-		  <div class="characteristic_value">Excluded</div>
+		  <div class="mandatory_property">Mandatory</div>
 	  </div>

  	<div class="characteristic_item">
@ -662,19 +598,83 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_field_label">Descriptors</div>
 	   	<div class="characteristic_field_value">
 <table>
+			<tr><td>1. Client Characteristic Configuration&nbsp;:&nbsp;2902</td></tr>
 </table></div>
 	  </div>



+
+<!-- Service Block -->
+  <div class="service_hdg">
+   	<div class="service_hdg_text"><p>Device Information</p></div>
+  </div>
+
+<!-- Service Block -->
+
+	<div class="service_item">
+	  <div class="service_label">UUID</div>
+	  <div class="service_value">0000180A00001000800000805F9B34FB</div>
+	</div>
+
+	<div class="service_item">
+	  <div class="service_label">Declaration</div>
+	  <div class="service_value">Primary</div>
+	</div>
+
+	<div class="service_item">
+	  <div class="service_label">Requirement</div>
+		  <div class="mandatory_property">Mandatory</div>
+	</div>
+
+	<div class="service_item">
+	  <div class="service_label">Server Role</div>
+	  <div class="service_value"></div>
+	</div>
+
+	<div class="service_item">
+	  <div class="service_label">Client Role</div>
+	  <div class="service_value"></div>
+	</div>
+
+	<div class="service_item">
+	  <div class="service_label">Abstract:</div>
+	</div>
+	<div class="service_item">
+	  <div class="text_block"><pre>The Device Information Service exposes manufacturer and/or vendor information about a device.            
+		</pre></div>
+	</div>
+
+	<div class="service_item">
+	  <div class="service_label">Summary:</div>
+	</div>
+	<div class="service_item">
+	  <div class="text_block"><pre>This service exposes manufacturer information about a device.
+The Device Information Service is instantiated as a Primary Service.
+Only one instance of the Device Information Service is exposed on a device.
+		</pre></div>
+	</div>
+
+	<div class="service_item">
+	  <div class="service_label">Examples:</div>
+	</div>
+	<div class="service_item">
+	  <div class="text_block"><pre></pre></div>
+	</div>
+
+  <div class="characteristics_section_hdg">
+   	<div class="characteristics_hdg_text"><p>Device Information - CHARACTERISTICS</p></div>
+  </div>
+
+
 <!-- Characteristic Block -->
 	  <div class="characteristic_hdg">
-	   	<div class="characteristic_hdg_text"><p>Model Number String</p></div>
+	   	<div class="characteristic_hdg_text"><p>Manufacturer Name String</p></div>
 	  </div>
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">UUID</div>
-		  <div class="characteristic_value">00002A2400001000800000805F9B34FB</div>
+		  <div class="characteristic_value">00002A2900001000800000805F9B34FB</div>
 	  </div>

  	<div class="characteristic_item">
@ -691,7 +691,7 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_label">Abstract:</div>
    </div>
  	<div class="characteristic_item">
-		  <div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the model number assigned by the device vendor. </pre></div>
+		  <div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the name of the manufacturer of the device.</pre></div>
    </div>

 	<div class="characteristic_item">
@ -770,12 +770,12 @@ Only one instance of the Device Information Service is exposed on a device.

 <!-- Characteristic Block -->
 	  <div class="characteristic_hdg">
-	   	<div class="characteristic_hdg_text"><p>Serial Number String</p></div>
+	   	<div class="characteristic_hdg_text"><p>Model Number String</p></div>
 	  </div>
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">UUID</div>
-		  <div class="characteristic_value">00002A2500001000800000805F9B34FB</div>
+		  <div class="characteristic_value">00002A2400001000800000805F9B34FB</div>
 	  </div>

  	<div class="characteristic_item">
@ -792,7 +792,7 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_label">Abstract:</div>
    </div>
  	<div class="characteristic_item">
-		  <div class="char_text_block"><pre>The value of this characteristic is a variable-length UTF-8 string representing the serial number for a particular instance of the device.</pre></div>
+		  <div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the model number assigned by the device vendor. </pre></div>
    </div>

 	<div class="characteristic_item">
@ -871,12 +871,12 @@ Only one instance of the Device Information Service is exposed on a device.

 <!-- Characteristic Block -->
 	  <div class="characteristic_hdg">
-	   	<div class="characteristic_hdg_text"><p>Hardware Revision String</p></div>
+	   	<div class="characteristic_hdg_text"><p>Serial Number String</p></div>
 	  </div>
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">UUID</div>
-		  <div class="characteristic_value">00002A2700001000800000805F9B34FB</div>
+		  <div class="characteristic_value">00002A2500001000800000805F9B34FB</div>
 	  </div>

  	<div class="characteristic_item">
@ -893,14 +893,14 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_label">Abstract:</div>
    </div>
  	<div class="characteristic_item">
-		  <div class="char_text_block"><pre></pre></div>
+		  <div class="char_text_block"><pre>The value of this characteristic is a variable-length UTF-8 string representing the serial number for a particular instance of the device.</pre></div>
    </div>

 	<div class="characteristic_item">
 		  <div class="characteristic_label">Summary:</div>
 	</div>
 	<div class="characteristic_item">
-		  <div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the hardware revision for the hardware within the device.</pre></div>
+		  <div class="char_text_block"><pre></pre></div>
 	</div>

   	<div class="characteristic_item">
@ -972,12 +972,12 @@ Only one instance of the Device Information Service is exposed on a device.

 <!-- Characteristic Block -->
 	  <div class="characteristic_hdg">
-	   	<div class="characteristic_hdg_text"><p>Firmware Revision String</p></div>
+	   	<div class="characteristic_hdg_text"><p>Hardware Revision String</p></div>
 	  </div>
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">UUID</div>
-		  <div class="characteristic_value">00002A2600001000800000805F9B34FB</div>
+		  <div class="characteristic_value">00002A2700001000800000805F9B34FB</div>
 	  </div>

  	<div class="characteristic_item">
@ -1001,7 +1001,7 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_label">Summary:</div>
 	</div>
 	<div class="characteristic_item">
-		  <div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the firmware revision for the firmware within the device.</pre></div>
+		  <div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the hardware revision for the hardware within the device.</pre></div>
 	</div>

   	<div class="characteristic_item">
@ -1073,12 +1073,12 @@ Only one instance of the Device Information Service is exposed on a device.

 <!-- Characteristic Block -->
 	  <div class="characteristic_hdg">
-	   	<div class="characteristic_hdg_text"><p>Software Revision String</p></div>
+	   	<div class="characteristic_hdg_text"><p>Firmware Revision String</p></div>
 	  </div>
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">UUID</div>
-		  <div class="characteristic_value">2A28</div>
+		  <div class="characteristic_value">00002A2600001000800000805F9B34FB</div>
 	  </div>

  	<div class="characteristic_item">
@ -1088,23 +1088,21 @@ Only one instance of the Device Information Service is exposed on a device.

  	<div class="characteristic_item">
 		  <div class="characteristic_label">Requirement</div>
-		  <div class="mandatory_property">Mandatory</div>
+		  <div class="characteristic_value">Optional</div>
 	  </div>
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">Abstract:</div>
    </div>
  	<div class="characteristic_item">
-		  <div class="char_text_block"><pre>            
-      The value of this characteristic is a UTF-8 string representing the software revision for the software within the device.
-		</pre></div>
+		  <div class="char_text_block"><pre></pre></div>
    </div>

 	<div class="characteristic_item">
 		  <div class="characteristic_label">Summary:</div>
 	</div>
 	<div class="characteristic_item">
-		  <div class="char_text_block"><pre></pre></div>
+		  <div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the firmware revision for the firmware within the device.</pre></div>
 	</div>

   	<div class="characteristic_item">
@ -1116,7 +1114,7 @@ Only one instance of the Device Information Service is exposed on a device.

  	<div class="characteristic_item">
 		  <div class="characteristic_label">Read</div>
-		  <div class="characteristic_value">Excluded</div>
+		  <div class="mandatory_property">Mandatory</div>
 	  </div>

  	<div class="characteristic_item">
@ -1176,12 +1174,12 @@ Only one instance of the Device Information Service is exposed on a device.

 <!-- Characteristic Block -->
 	  <div class="characteristic_hdg">
-	   	<div class="characteristic_hdg_text"><p>Peripheral Preferred Connection Parameters</p></div>
+	   	<div class="characteristic_hdg_text"><p>Software Revision String</p></div>
 	  </div>
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">UUID</div>
-		  <div class="characteristic_value">2A04</div>
+		  <div class="characteristic_value">00002A2800001000800000805F9B34FB</div>
 	  </div>

  	<div class="characteristic_item">
@ -1198,7 +1196,8 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_label">Abstract:</div>
    </div>
  	<div class="characteristic_item">
-		  <div class="char_text_block"><pre></pre></div>
+		  <div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the software revision for the software within the device.
+		</pre></div>
    </div>

 	<div class="characteristic_item">
@ -1217,7 +1216,7 @@ Only one instance of the Device Information Service is exposed on a device.

  	<div class="characteristic_item">
 		  <div class="characteristic_label">Read</div>
-		  <div class="characteristic_value">Excluded</div>
+		  <div class="mandatory_property">Mandatory</div>
 	  </div>

  	<div class="characteristic_item">
@ -3739,7 +3738,7 @@ Notifications are used to deliver the flash code to a client during the initial
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">UUID</div>
-		  <div class="characteristic_value">E95D8A38251D470AA062FA1922DFA9A8</div>
+		  <div class="characteristic_value">E95D9250251D470AA062FA1922DFA9A8</div>
 	  </div>

  	<div class="characteristic_item">
--- a/microbit.html
+++ b/microbit.html
@ -360,73 +360,14 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>



-
-<!-- Service Block -->
-  <div class="service_hdg">
-   	<div class="service_hdg_text"><p>Generic Attribute</p></div>
-  </div>
-
-<!-- Service Block -->
-
-	<div class="service_item">
-	  <div class="service_label">UUID</div>
-	  <div class="service_value">0000180100001000800000805F9B34FB</div>
-	</div>
-
-	<div class="service_item">
-	  <div class="service_label">Declaration</div>
-	  <div class="service_value">Primary</div>
-	</div>
-
-	<div class="service_item">
-	  <div class="service_label">Requirement</div>
-		  <div class="mandatory_property">Mandatory</div>
-	</div>
-
-	<div class="service_item">
-	  <div class="service_label">Server Role</div>
-	  <div class="service_value"></div>
-	</div>
-
-	<div class="service_item">
-	  <div class="service_label">Client Role</div>
-	  <div class="service_value"></div>
-	</div>
-
-	<div class="service_item">
-	  <div class="service_label">Abstract:</div>
-	</div>
-	<div class="service_item">
-	  <div class="text_block"><pre></pre></div>
-	</div>
-
-	<div class="service_item">
-	  <div class="service_label">Summary:</div>
-	</div>
-	<div class="service_item">
-	  <div class="text_block"><pre></pre></div>
-	</div>
-
-	<div class="service_item">
-	  <div class="service_label">Examples:</div>
-	</div>
-	<div class="service_item">
-	  <div class="text_block"><pre></pre></div>
-	</div>
-
-  <div class="characteristics_section_hdg">
-   	<div class="characteristics_hdg_text"><p>Generic Attribute - CHARACTERISTICS</p></div>
-  </div>
-
-
 <!-- Characteristic Block -->
 	  <div class="characteristic_hdg">
-	   	<div class="characteristic_hdg_text"><p>Service Changed</p></div>
+	   	<div class="characteristic_hdg_text"><p>Peripheral Preferred Connection Parameters</p></div>
 	  </div>
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">UUID</div>
-		  <div class="characteristic_value">2A05</div>
+		  <div class="characteristic_value">00002A0400001000800000805F9B34FB</div>
 	  </div>

  	<div class="characteristic_item">
@ -436,7 +377,7 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>

  	<div class="characteristic_item">
 		  <div class="characteristic_label">Requirement</div>
-		  <div class="characteristic_value">Optional</div>
+		  <div class="mandatory_property">Mandatory</div>
 	  </div>
 	  
  	<div class="characteristic_item">
@ -492,7 +433,7 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>

  	<div class="characteristic_item">
 		  <div class="characteristic_label">Indicate</div>
-		  <div class="mandatory_property">Mandatory</div>
+		  <div class="characteristic_value">Excluded</div>
 	  </div>

  	<div class="characteristic_item">
@ -515,8 +456,10 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>
 		  <div class="characteristic_field_label">Fields</div>
 	   	<div class="characteristic_field_value">
 <table>
-			<tr><td>1. Start of Affected Attribute Handle Range&nbsp;:&nbsp;uint16</td></tr>
-			<tr><td>2. End of Affected Attribute Handle Range&nbsp;:&nbsp;uint16</td></tr>
+			<tr><td>1. Minimum Connection Interval&nbsp;:&nbsp;uint16</td></tr>
+			<tr><td>2. Maximum Connection Interval&nbsp;:&nbsp;uint16</td></tr>
+			<tr><td>3. Slave Latency&nbsp;:&nbsp;uint16</td></tr>
+			<tr><td>4. Connection Supervision Timeout Multiplier&nbsp;:&nbsp;uint16</td></tr>
 </table></div>
 	  </div>

@ -526,7 +469,6 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>
 		  <div class="characteristic_field_label">Descriptors</div>
 	   	<div class="characteristic_field_value">
 <table>
-			<tr><td>1. Client Characteristic Configuration&nbsp;:&nbsp;2902</td></tr>
 </table></div>
 	  </div>

@ -535,14 +477,14 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>

 <!-- Service Block -->
  <div class="service_hdg">
-   	<div class="service_hdg_text"><p>Device Information</p></div>
+   	<div class="service_hdg_text"><p>Generic Attribute</p></div>
  </div>

 <!-- Service Block -->

 	<div class="service_item">
 	  <div class="service_label">UUID</div>
-	  <div class="service_value">0000180A00001000800000805F9B34FB</div>
+	  <div class="service_value">0000180100001000800000805F9B34FB</div>
 	</div>

 	<div class="service_item">
@ -569,18 +511,14 @@ Removed Write property from MicroBit Requirements characteristic.</pre></div>
 	  <div class="service_label">Abstract:</div>
 	</div>
 	<div class="service_item">
-	  <div class="text_block"><pre>The Device Information Service exposes manufacturer and/or vendor information about a device.            
-		</pre></div>
+	  <div class="text_block"><pre></pre></div>
 	</div>

 	<div class="service_item">
 	  <div class="service_label">Summary:</div>
 	</div>
 	<div class="service_item">
-	  <div class="text_block"><pre>This service exposes manufacturer information about a device.
-The Device Information Service is instantiated as a Primary Service.
-Only one instance of the Device Information Service is exposed on a device.
-		</pre></div>
+	  <div class="text_block"><pre></pre></div>
 	</div>

 	<div class="service_item">
@ -591,18 +529,18 @@ Only one instance of the Device Information Service is exposed on a device.
 	</div>

  <div class="characteristics_section_hdg">
-   	<div class="characteristics_hdg_text"><p>Device Information - CHARACTERISTICS</p></div>
+   	<div class="characteristics_hdg_text"><p>Generic Attribute - CHARACTERISTICS</p></div>
  </div>


 <!-- Characteristic Block -->
 	  <div class="characteristic_hdg">
-	   	<div class="characteristic_hdg_text"><p>Manufacturer Name String</p></div>
+	   	<div class="characteristic_hdg_text"><p>Service Changed</p></div>
 	  </div>
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">UUID</div>
-		  <div class="characteristic_value">00002A2900001000800000805F9B34FB</div>
+		  <div class="characteristic_value">2A05</div>
 	  </div>

  	<div class="characteristic_item">
@ -619,7 +557,7 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_label">Abstract:</div>
    </div>
  	<div class="characteristic_item">
-		  <div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the name of the manufacturer of the device.</pre></div>
+		  <div class="char_text_block"><pre></pre></div>
    </div>

 	<div class="characteristic_item">
@ -668,7 +606,7 @@ Only one instance of the Device Information Service is exposed on a device.

  	<div class="characteristic_item">
 		  <div class="characteristic_label">Indicate</div>
-		  <div class="characteristic_value">Excluded</div>
+		  <div class="mandatory_property">Mandatory</div>
 	  </div>

  	<div class="characteristic_item">
@ -691,7 +629,8 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_field_label">Fields</div>
 	   	<div class="characteristic_field_value">
 <table>
-			<tr><td>1. Manufacturer Name&nbsp;:&nbsp;utf8s</td></tr>
+			<tr><td>1. Start of Affected Attribute Handle Range&nbsp;:&nbsp;uint16</td></tr>
+			<tr><td>2. End of Affected Attribute Handle Range&nbsp;:&nbsp;uint16</td></tr>
 </table></div>
 	  </div>

@ -701,19 +640,83 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_field_label">Descriptors</div>
 	   	<div class="characteristic_field_value">
 <table>
+			<tr><td>1. Client Characteristic Configuration&nbsp;:&nbsp;2902</td></tr>
 </table></div>
 	  </div>



+
+<!-- Service Block -->
+  <div class="service_hdg">
+   	<div class="service_hdg_text"><p>Device Information</p></div>
+  </div>
+
+<!-- Service Block -->
+
+	<div class="service_item">
+	  <div class="service_label">UUID</div>
+	  <div class="service_value">0000180A00001000800000805F9B34FB</div>
+	</div>
+
+	<div class="service_item">
+	  <div class="service_label">Declaration</div>
+	  <div class="service_value">Primary</div>
+	</div>
+
+	<div class="service_item">
+	  <div class="service_label">Requirement</div>
+		  <div class="mandatory_property">Mandatory</div>
+	</div>
+
+	<div class="service_item">
+	  <div class="service_label">Server Role</div>
+	  <div class="service_value"></div>
+	</div>
+
+	<div class="service_item">
+	  <div class="service_label">Client Role</div>
+	  <div class="service_value"></div>
+	</div>
+
+	<div class="service_item">
+	  <div class="service_label">Abstract:</div>
+	</div>
+	<div class="service_item">
+	  <div class="text_block"><pre>The Device Information Service exposes manufacturer and/or vendor information about a device.            
+		</pre></div>
+	</div>
+
+	<div class="service_item">
+	  <div class="service_label">Summary:</div>
+	</div>
+	<div class="service_item">
+	  <div class="text_block"><pre>This service exposes manufacturer information about a device.
+The Device Information Service is instantiated as a Primary Service.
+Only one instance of the Device Information Service is exposed on a device.
+		</pre></div>
+	</div>
+
+	<div class="service_item">
+	  <div class="service_label">Examples:</div>
+	</div>
+	<div class="service_item">
+	  <div class="text_block"><pre></pre></div>
+	</div>
+
+  <div class="characteristics_section_hdg">
+   	<div class="characteristics_hdg_text"><p>Device Information - CHARACTERISTICS</p></div>
+  </div>
+
+
 <!-- Characteristic Block -->
 	  <div class="characteristic_hdg">
-	   	<div class="characteristic_hdg_text"><p>Model Number String</p></div>
+	   	<div class="characteristic_hdg_text"><p>Manufacturer Name String</p></div>
 	  </div>
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">UUID</div>
-		  <div class="characteristic_value">00002A2400001000800000805F9B34FB</div>
+		  <div class="characteristic_value">00002A2900001000800000805F9B34FB</div>
 	  </div>

  	<div class="characteristic_item">
@ -730,7 +733,7 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_label">Abstract:</div>
    </div>
  	<div class="characteristic_item">
-		  <div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the model number assigned by the device vendor. </pre></div>
+		  <div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the name of the manufacturer of the device.</pre></div>
    </div>

 	<div class="characteristic_item">
@ -802,7 +805,7 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_field_label">Fields</div>
 	   	<div class="characteristic_field_value">
 <table>
-			<tr><td>1. Model Number&nbsp;:&nbsp;utf8s</td></tr>
+			<tr><td>1. Manufacturer Name&nbsp;:&nbsp;utf8s</td></tr>
 </table></div>
 	  </div>

@ -819,12 +822,12 @@ Only one instance of the Device Information Service is exposed on a device.

 <!-- Characteristic Block -->
 	  <div class="characteristic_hdg">
-	   	<div class="characteristic_hdg_text"><p>Serial Number String</p></div>
+	   	<div class="characteristic_hdg_text"><p>Model Number String</p></div>
 	  </div>
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">UUID</div>
-		  <div class="characteristic_value">00002A2500001000800000805F9B34FB</div>
+		  <div class="characteristic_value">00002A2400001000800000805F9B34FB</div>
 	  </div>

  	<div class="characteristic_item">
@ -841,7 +844,7 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_label">Abstract:</div>
    </div>
  	<div class="characteristic_item">
-		  <div class="char_text_block"><pre>The value of this characteristic is a variable-length UTF-8 string representing the serial number for a particular instance of the device.</pre></div>
+		  <div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the model number assigned by the device vendor. </pre></div>
    </div>

 	<div class="characteristic_item">
@ -913,7 +916,7 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_field_label">Fields</div>
 	   	<div class="characteristic_field_value">
 <table>
-			<tr><td>1. Serial Number&nbsp;:&nbsp;utf8s</td></tr>
+			<tr><td>1. Model Number&nbsp;:&nbsp;utf8s</td></tr>
 </table></div>
 	  </div>

@ -930,12 +933,12 @@ Only one instance of the Device Information Service is exposed on a device.

 <!-- Characteristic Block -->
 	  <div class="characteristic_hdg">
-	   	<div class="characteristic_hdg_text"><p>Hardware Revision String</p></div>
+	   	<div class="characteristic_hdg_text"><p>Serial Number String</p></div>
 	  </div>
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">UUID</div>
-		  <div class="characteristic_value">00002A2700001000800000805F9B34FB</div>
+		  <div class="characteristic_value">00002A2500001000800000805F9B34FB</div>
 	  </div>

  	<div class="characteristic_item">
@ -952,14 +955,14 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_label">Abstract:</div>
    </div>
  	<div class="characteristic_item">
-		  <div class="char_text_block"><pre></pre></div>
+		  <div class="char_text_block"><pre>The value of this characteristic is a variable-length UTF-8 string representing the serial number for a particular instance of the device.</pre></div>
    </div>

 	<div class="characteristic_item">
 		  <div class="characteristic_label">Summary:</div>
 	</div>
 	<div class="characteristic_item">
-		  <div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the hardware revision for the hardware within the device.</pre></div>
+		  <div class="char_text_block"><pre></pre></div>
 	</div>

   	<div class="characteristic_item">
@ -1024,7 +1027,7 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_field_label">Fields</div>
 	   	<div class="characteristic_field_value">
 <table>
-			<tr><td>1. Hardware Revision&nbsp;:&nbsp;utf8s</td></tr>
+			<tr><td>1. Serial Number&nbsp;:&nbsp;utf8s</td></tr>
 </table></div>
 	  </div>

@ -1041,12 +1044,12 @@ Only one instance of the Device Information Service is exposed on a device.

 <!-- Characteristic Block -->
 	  <div class="characteristic_hdg">
-	   	<div class="characteristic_hdg_text"><p>Firmware Revision String</p></div>
+	   	<div class="characteristic_hdg_text"><p>Hardware Revision String</p></div>
 	  </div>
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">UUID</div>
-		  <div class="characteristic_value">00002A2600001000800000805F9B34FB</div>
+		  <div class="characteristic_value">00002A2700001000800000805F9B34FB</div>
 	  </div>

  	<div class="characteristic_item">
@ -1070,7 +1073,7 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_label">Summary:</div>
 	</div>
 	<div class="characteristic_item">
-		  <div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the firmware revision for the firmware within the device.</pre></div>
+		  <div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the hardware revision for the hardware within the device.</pre></div>
 	</div>

   	<div class="characteristic_item">
@ -1135,7 +1138,7 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_field_label">Fields</div>
 	   	<div class="characteristic_field_value">
 <table>
-			<tr><td>1. Firmware Revision&nbsp;:&nbsp;utf8s</td></tr>
+			<tr><td>1. Hardware Revision&nbsp;:&nbsp;utf8s</td></tr>
 </table></div>
 	  </div>

@ -1152,12 +1155,12 @@ Only one instance of the Device Information Service is exposed on a device.

 <!-- Characteristic Block -->
 	  <div class="characteristic_hdg">
-	   	<div class="characteristic_hdg_text"><p>Software Revision String</p></div>
+	   	<div class="characteristic_hdg_text"><p>Firmware Revision String</p></div>
 	  </div>
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">UUID</div>
-		  <div class="characteristic_value">2A28</div>
+		  <div class="characteristic_value">00002A2600001000800000805F9B34FB</div>
 	  </div>

  	<div class="characteristic_item">
@ -1167,23 +1170,21 @@ Only one instance of the Device Information Service is exposed on a device.

  	<div class="characteristic_item">
 		  <div class="characteristic_label">Requirement</div>
-		  <div class="mandatory_property">Mandatory</div>
+		  <div class="characteristic_value">Optional</div>
 	  </div>
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">Abstract:</div>
    </div>
  	<div class="characteristic_item">
-		  <div class="char_text_block"><pre>            
-      The value of this characteristic is a UTF-8 string representing the software revision for the software within the device.
-		</pre></div>
+		  <div class="char_text_block"><pre></pre></div>
    </div>

 	<div class="characteristic_item">
 		  <div class="characteristic_label">Summary:</div>
 	</div>
 	<div class="characteristic_item">
-		  <div class="char_text_block"><pre></pre></div>
+		  <div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the firmware revision for the firmware within the device.</pre></div>
 	</div>

   	<div class="characteristic_item">
@ -1195,7 +1196,7 @@ Only one instance of the Device Information Service is exposed on a device.

  	<div class="characteristic_item">
 		  <div class="characteristic_label">Read</div>
-		  <div class="characteristic_value">Excluded</div>
+		  <div class="mandatory_property">Mandatory</div>
 	  </div>

  	<div class="characteristic_item">
@ -1248,7 +1249,7 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_field_label">Fields</div>
 	   	<div class="characteristic_field_value">
 <table>
-			<tr><td>1. Software Revision&nbsp;:&nbsp;utf8s</td></tr>
+			<tr><td>1. Firmware Revision&nbsp;:&nbsp;utf8s</td></tr>
 </table></div>
 	  </div>

@ -1265,12 +1266,12 @@ Only one instance of the Device Information Service is exposed on a device.

 <!-- Characteristic Block -->
 	  <div class="characteristic_hdg">
-	   	<div class="characteristic_hdg_text"><p>Peripheral Preferred Connection Parameters</p></div>
+	   	<div class="characteristic_hdg_text"><p>Software Revision String</p></div>
 	  </div>
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">UUID</div>
-		  <div class="characteristic_value">2A04</div>
+		  <div class="characteristic_value">00002A2800001000800000805F9B34FB</div>
 	  </div>

  	<div class="characteristic_item">
@ -1287,7 +1288,8 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_label">Abstract:</div>
    </div>
  	<div class="characteristic_item">
-		  <div class="char_text_block"><pre></pre></div>
+		  <div class="char_text_block"><pre>The value of this characteristic is a UTF-8 string representing the software revision for the software within the device.
+		</pre></div>
    </div>

 	<div class="characteristic_item">
@ -1306,7 +1308,7 @@ Only one instance of the Device Information Service is exposed on a device.

  	<div class="characteristic_item">
 		  <div class="characteristic_label">Read</div>
-		  <div class="characteristic_value">Excluded</div>
+		  <div class="mandatory_property">Mandatory</div>
 	  </div>

  	<div class="characteristic_item">
@ -1359,10 +1361,7 @@ Only one instance of the Device Information Service is exposed on a device.
 		  <div class="characteristic_field_label">Fields</div>
 	   	<div class="characteristic_field_value">
 <table>
-			<tr><td>1. Minimum Connection Interval&nbsp;:&nbsp;uint16</td></tr>
-			<tr><td>2. Maximum Connection Interval&nbsp;:&nbsp;uint16</td></tr>
-			<tr><td>3. Slave Latency&nbsp;:&nbsp;uint16</td></tr>
-			<tr><td>4. Connection Supervision Timeout Multiplier&nbsp;:&nbsp;uint16</td></tr>
+			<tr><td>1. Software Revision&nbsp;:&nbsp;utf8s</td></tr>
 </table></div>
 	  </div>

@ -4035,7 +4034,7 @@ Notifications are used to deliver the flash code to a client during the initial
 	  
  	<div class="characteristic_item">
 		  <div class="characteristic_label">UUID</div>
-		  <div class="characteristic_value">E95D8A38251D470AA062FA1922DFA9A8</div>
+		  <div class="characteristic_value">E95D9250251D470AA062FA1922DFA9A8</div>
 	  </div>

  	<div class="characteristic_item">