Fully abstracted out to BLEDevice

2019-02-06 09:54:28 -08:00 · 2019-02-06 09:54:28 -08:00 · f9b99e0481
commit f9b99e0481
parent 79542acef1
25 changed files with 413 additions and 361 deletions
--- a/docs/BoostMoveHub.html
+++ b/docs/BoostMoveHub.html
@ -327,7 +327,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-73">line 73</a>
+				 <a href="hub.js.html#sunlight-1-line-68">line 68</a>
 			</li>
 		</ul>
 	</dd>
@ -460,7 +460,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-52">line 52</a>
+				 <a href="hub.js.html#sunlight-1-line-47">line 47</a>
 			</li>
 		</ul>
 	</dd>
@ -593,7 +593,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-45">line 45</a>
+				 <a href="hub.js.html#sunlight-1-line-40">line 40</a>
 			</li>
 		</ul>
 	</dd>
@ -726,7 +726,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-66">line 66</a>
+				 <a href="hub.js.html#sunlight-1-line-61">line 61</a>
 			</li>
 		</ul>
 	</dd>
@ -859,7 +859,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-59">line 59</a>
+				 <a href="hub.js.html#sunlight-1-line-54">line 54</a>
 			</li>
 		</ul>
 	</dd>
@ -992,7 +992,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-80">line 80</a>
+				 <a href="hub.js.html#sunlight-1-line-75">line 75</a>
 			</li>
 		</ul>
 	</dd>
@ -1124,7 +1124,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="boostmovehub.js.html">boostmovehub.js</a>,
-				 <a href="boostmovehub.js.html#sunlight-1-line-183">line 183</a>
+				 <a href="boostmovehub.js.html#sunlight-1-line-185">line 185</a>
 			</li>
 		</ul>
 	</dd>
@ -1250,7 +1250,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-90">line 90</a>
+				 <a href="hub.js.html#sunlight-1-line-85">line 85</a>
 			</li>
 		</ul>
 	</dd>
@ -1376,7 +1376,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-139">line 139</a>
+				 <a href="hub.js.html#sunlight-1-line-147">line 147</a>
 			</li>
 		</ul>
 	</dd>
@ -1502,7 +1502,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-207">line 207</a>
+				 <a href="hub.js.html#sunlight-1-line-211">line 211</a>
 			</li>
 		</ul>
 	</dd>
@ -1674,7 +1674,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-215">line 215</a>
+				 <a href="hub.js.html#sunlight-1-line-219">line 219</a>
 			</li>
 		</ul>
 	</dd>
@ -1904,7 +1904,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="boostmovehub.js.html">boostmovehub.js</a>,
-				 <a href="boostmovehub.js.html#sunlight-1-line-129">line 129</a>
+				 <a href="boostmovehub.js.html#sunlight-1-line-131">line 131</a>
 			</li>
 		</ul>
 	</dd>
@ -2075,7 +2075,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-75">line 75</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-76">line 76</a>
 			</li>
 		</ul>
 	</dd>
@ -2294,7 +2294,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-93">line 93</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-94">line 94</a>
 			</li>
 		</ul>
 	</dd>
@ -2532,7 +2532,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="boostmovehub.js.html">boostmovehub.js</a>,
-				 <a href="boostmovehub.js.html#sunlight-1-line-192">line 192</a>
+				 <a href="boostmovehub.js.html#sunlight-1-line-194">line 194</a>
 			</li>
 		</ul>
 	</dd>
@ -2789,7 +2789,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="boostmovehub.js.html">boostmovehub.js</a>,
-				 <a href="boostmovehub.js.html#sunlight-1-line-149">line 149</a>
+				 <a href="boostmovehub.js.html#sunlight-1-line-151">line 151</a>
 			</li>
 		</ul>
 	</dd>
@ -3030,7 +3030,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="boostmovehub.js.html">boostmovehub.js</a>,
-				 <a href="boostmovehub.js.html#sunlight-1-line-51">line 51</a>
+				 <a href="boostmovehub.js.html#sunlight-1-line-53">line 53</a>
 			</li>
 		</ul>
 	</dd>
@ -3201,7 +3201,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-55">line 55</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-56">line 56</a>
 			</li>
 		</ul>
 	</dd>
@ -3322,7 +3322,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-43">line 43</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-44">line 44</a>
 			</li>
 		</ul>
 	</dd>
@ -3499,7 +3499,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-183">line 183</a>
+				 <a href="hub.js.html#sunlight-1-line-187">line 187</a>
 			</li>
 		</ul>
 	</dd>
@ -3719,7 +3719,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-151">line 151</a>
+				 <a href="hub.js.html#sunlight-1-line-155">line 155</a>
 			</li>
 		</ul>
 	</dd>
@ -3895,7 +3895,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-169">line 169</a>
+				 <a href="hub.js.html#sunlight-1-line-173">line 173</a>
 			</li>
 		</ul>
 	</dd>
@ -4072,7 +4072,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-196">line 196</a>
+				 <a href="hub.js.html#sunlight-1-line-200">line 200</a>
 			</li>
 		</ul>
 	</dd>
@ -4280,7 +4280,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-252">line 252</a>
+				 <a href="hub.js.html#sunlight-1-line-256">line 256</a>
 			</li>
 		</ul>
 	</dd>
@ -4451,7 +4451,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-171">line 171</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-169">line 169</a>
 			</li>
 		</ul>
 	</dd>
@ -4622,7 +4622,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-271">line 271</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-269">line 269</a>
 			</li>
 		</ul>
 	</dd>
@ -4817,7 +4817,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-287">line 287</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-285">line 285</a>
 			</li>
 		</ul>
 	</dd>
@ -4969,7 +4969,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-264">line 264</a>
+				 <a href="hub.js.html#sunlight-1-line-268">line 268</a>
 			</li>
 		</ul>
 	</dd>
@ -5140,7 +5140,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-261">line 261</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-259">line 259</a>
 			</li>
 		</ul>
 	</dd>
@ -5311,7 +5311,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-316">line 316</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-314">line 314</a>
 			</li>
 		</ul>
 	</dd>
@ -5506,7 +5506,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-304">line 304</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-302">line 302</a>
 			</li>
 		</ul>
 	</dd>
@ -5585,7 +5585,7 @@
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/docs/DuploTrainBase.html
+++ b/docs/DuploTrainBase.html
@ -327,7 +327,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-73">line 73</a>
+				 <a href="hub.js.html#sunlight-1-line-68">line 68</a>
 			</li>
 		</ul>
 	</dd>
@ -460,7 +460,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-52">line 52</a>
+				 <a href="hub.js.html#sunlight-1-line-47">line 47</a>
 			</li>
 		</ul>
 	</dd>
@ -593,7 +593,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-45">line 45</a>
+				 <a href="hub.js.html#sunlight-1-line-40">line 40</a>
 			</li>
 		</ul>
 	</dd>
@ -726,7 +726,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-66">line 66</a>
+				 <a href="hub.js.html#sunlight-1-line-61">line 61</a>
 			</li>
 		</ul>
 	</dd>
@ -859,7 +859,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-59">line 59</a>
+				 <a href="hub.js.html#sunlight-1-line-54">line 54</a>
 			</li>
 		</ul>
 	</dd>
@ -992,7 +992,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-80">line 80</a>
+				 <a href="hub.js.html#sunlight-1-line-75">line 75</a>
 			</li>
 		</ul>
 	</dd>
@ -1124,7 +1124,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="duplotrainbase.js.html">duplotrainbase.js</a>,
-				 <a href="duplotrainbase.js.html#sunlight-1-line-146">line 146</a>
+				 <a href="duplotrainbase.js.html#sunlight-1-line-148">line 148</a>
 			</li>
 		</ul>
 	</dd>
@ -1250,7 +1250,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-90">line 90</a>
+				 <a href="hub.js.html#sunlight-1-line-85">line 85</a>
 			</li>
 		</ul>
 	</dd>
@ -1376,7 +1376,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-139">line 139</a>
+				 <a href="hub.js.html#sunlight-1-line-147">line 147</a>
 			</li>
 		</ul>
 	</dd>
@ -1502,7 +1502,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-207">line 207</a>
+				 <a href="hub.js.html#sunlight-1-line-211">line 211</a>
 			</li>
 		</ul>
 	</dd>
@ -1674,7 +1674,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-215">line 215</a>
+				 <a href="hub.js.html#sunlight-1-line-219">line 219</a>
 			</li>
 		</ul>
 	</dd>
@ -1832,7 +1832,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="duplotrainbase.js.html">duplotrainbase.js</a>,
-				 <a href="duplotrainbase.js.html#sunlight-1-line-155">line 155</a>
+				 <a href="duplotrainbase.js.html#sunlight-1-line-157">line 157</a>
 			</li>
 		</ul>
 	</dd>
@ -2066,7 +2066,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="duplotrainbase.js.html">duplotrainbase.js</a>,
-				 <a href="duplotrainbase.js.html#sunlight-1-line-126">line 126</a>
+				 <a href="duplotrainbase.js.html#sunlight-1-line-128">line 128</a>
 			</li>
 		</ul>
 	</dd>
@ -2233,7 +2233,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="duplotrainbase.js.html">duplotrainbase.js</a>,
-				 <a href="duplotrainbase.js.html#sunlight-1-line-72">line 72</a>
+				 <a href="duplotrainbase.js.html#sunlight-1-line-74">line 74</a>
 			</li>
 		</ul>
 	</dd>
@ -2452,7 +2452,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-93">line 93</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-94">line 94</a>
 			</li>
 		</ul>
 	</dd>
@ -2693,7 +2693,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="duplotrainbase.js.html">duplotrainbase.js</a>,
-				 <a href="duplotrainbase.js.html#sunlight-1-line-88">line 88</a>
+				 <a href="duplotrainbase.js.html#sunlight-1-line-90">line 90</a>
 			</li>
 		</ul>
 	</dd>
@ -2864,7 +2864,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-55">line 55</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-56">line 56</a>
 			</li>
 		</ul>
 	</dd>
@ -2985,7 +2985,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-43">line 43</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-44">line 44</a>
 			</li>
 		</ul>
 	</dd>
@ -3162,7 +3162,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-183">line 183</a>
+				 <a href="hub.js.html#sunlight-1-line-187">line 187</a>
 			</li>
 		</ul>
 	</dd>
@ -3382,7 +3382,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-151">line 151</a>
+				 <a href="hub.js.html#sunlight-1-line-155">line 155</a>
 			</li>
 		</ul>
 	</dd>
@ -3558,7 +3558,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-169">line 169</a>
+				 <a href="hub.js.html#sunlight-1-line-173">line 173</a>
 			</li>
 		</ul>
 	</dd>
@ -3735,7 +3735,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-196">line 196</a>
+				 <a href="hub.js.html#sunlight-1-line-200">line 200</a>
 			</li>
 		</ul>
 	</dd>
@ -3938,7 +3938,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-271">line 271</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-269">line 269</a>
 			</li>
 		</ul>
 	</dd>
@ -4109,7 +4109,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-364">line 364</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-362">line 362</a>
 			</li>
 		</ul>
 	</dd>
@ -4188,7 +4188,7 @@
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/docs/Hub.html
+++ b/docs/Hub.html
@ -307,7 +307,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-73">line 73</a>
+				 <a href="hub.js.html#sunlight-1-line-68">line 68</a>
 			</li>
 		</ul>
 	</dd>
@ -426,7 +426,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-52">line 52</a>
+				 <a href="hub.js.html#sunlight-1-line-47">line 47</a>
 			</li>
 		</ul>
 	</dd>
@ -545,7 +545,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-45">line 45</a>
+				 <a href="hub.js.html#sunlight-1-line-40">line 40</a>
 			</li>
 		</ul>
 	</dd>
@ -664,7 +664,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-66">line 66</a>
+				 <a href="hub.js.html#sunlight-1-line-61">line 61</a>
 			</li>
 		</ul>
 	</dd>
@ -783,7 +783,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-59">line 59</a>
+				 <a href="hub.js.html#sunlight-1-line-54">line 54</a>
 			</li>
 		</ul>
 	</dd>
@ -902,7 +902,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-80">line 80</a>
+				 <a href="hub.js.html#sunlight-1-line-75">line 75</a>
 			</li>
 		</ul>
 	</dd>
@ -984,7 +984,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-90">line 90</a>
+				 <a href="hub.js.html#sunlight-1-line-85">line 85</a>
 			</li>
 		</ul>
 	</dd>
@ -1096,7 +1096,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-139">line 139</a>
+				 <a href="hub.js.html#sunlight-1-line-147">line 147</a>
 			</li>
 		</ul>
 	</dd>
@ -1208,7 +1208,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-207">line 207</a>
+				 <a href="hub.js.html#sunlight-1-line-211">line 211</a>
 			</li>
 		</ul>
 	</dd>
@ -1366,7 +1366,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-215">line 215</a>
+				 <a href="hub.js.html#sunlight-1-line-219">line 219</a>
 			</li>
 		</ul>
 	</dd>
@ -1525,7 +1525,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-183">line 183</a>
+				 <a href="hub.js.html#sunlight-1-line-187">line 187</a>
 			</li>
 		</ul>
 	</dd>
@ -1731,7 +1731,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-151">line 151</a>
+				 <a href="hub.js.html#sunlight-1-line-155">line 155</a>
 			</li>
 		</ul>
 	</dd>
@ -1893,7 +1893,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-169">line 169</a>
+				 <a href="hub.js.html#sunlight-1-line-173">line 173</a>
 			</li>
 		</ul>
 	</dd>
@ -2056,7 +2056,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-196">line 196</a>
+				 <a href="hub.js.html#sunlight-1-line-200">line 200</a>
 			</li>
 		</ul>
 	</dd>
@ -2250,7 +2250,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-252">line 252</a>
+				 <a href="hub.js.html#sunlight-1-line-256">line 256</a>
 			</li>
 		</ul>
 	</dd>
@ -2388,7 +2388,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-264">line 264</a>
+				 <a href="hub.js.html#sunlight-1-line-268">line 268</a>
 			</li>
 		</ul>
 	</dd>
@ -2467,7 +2467,7 @@
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/docs/LPF2Hub.html
+++ b/docs/LPF2Hub.html
@ -316,7 +316,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-73">line 73</a>
+				 <a href="hub.js.html#sunlight-1-line-68">line 68</a>
 			</li>
 		</ul>
 	</dd>
@ -444,7 +444,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-52">line 52</a>
+				 <a href="hub.js.html#sunlight-1-line-47">line 47</a>
 			</li>
 		</ul>
 	</dd>
@ -572,7 +572,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-45">line 45</a>
+				 <a href="hub.js.html#sunlight-1-line-40">line 40</a>
 			</li>
 		</ul>
 	</dd>
@ -700,7 +700,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-66">line 66</a>
+				 <a href="hub.js.html#sunlight-1-line-61">line 61</a>
 			</li>
 		</ul>
 	</dd>
@ -828,7 +828,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-59">line 59</a>
+				 <a href="hub.js.html#sunlight-1-line-54">line 54</a>
 			</li>
 		</ul>
 	</dd>
@ -956,7 +956,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-80">line 80</a>
+				 <a href="hub.js.html#sunlight-1-line-75">line 75</a>
 			</li>
 		</ul>
 	</dd>
@ -1052,7 +1052,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-90">line 90</a>
+				 <a href="hub.js.html#sunlight-1-line-85">line 85</a>
 			</li>
 		</ul>
 	</dd>
@ -1173,7 +1173,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-139">line 139</a>
+				 <a href="hub.js.html#sunlight-1-line-147">line 147</a>
 			</li>
 		</ul>
 	</dd>
@ -1294,7 +1294,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-207">line 207</a>
+				 <a href="hub.js.html#sunlight-1-line-211">line 211</a>
 			</li>
 		</ul>
 	</dd>
@ -1461,7 +1461,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-215">line 215</a>
+				 <a href="hub.js.html#sunlight-1-line-219">line 219</a>
 			</li>
 		</ul>
 	</dd>
@ -1619,7 +1619,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-75">line 75</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-76">line 76</a>
 			</li>
 		</ul>
 	</dd>
@ -1829,7 +1829,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-93">line 93</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-94">line 94</a>
 			</li>
 		</ul>
 	</dd>
@ -1991,7 +1991,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-55">line 55</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-56">line 56</a>
 			</li>
 		</ul>
 	</dd>
@ -2103,7 +2103,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-43">line 43</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-44">line 44</a>
 			</li>
 		</ul>
 	</dd>
@ -2275,7 +2275,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-183">line 183</a>
+				 <a href="hub.js.html#sunlight-1-line-187">line 187</a>
 			</li>
 		</ul>
 	</dd>
@ -2490,7 +2490,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-151">line 151</a>
+				 <a href="hub.js.html#sunlight-1-line-155">line 155</a>
 			</li>
 		</ul>
 	</dd>
@ -2661,7 +2661,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-169">line 169</a>
+				 <a href="hub.js.html#sunlight-1-line-173">line 173</a>
 			</li>
 		</ul>
 	</dd>
@ -2833,7 +2833,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-196">line 196</a>
+				 <a href="hub.js.html#sunlight-1-line-200">line 200</a>
 			</li>
 		</ul>
 	</dd>
@ -3036,7 +3036,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-252">line 252</a>
+				 <a href="hub.js.html#sunlight-1-line-256">line 256</a>
 			</li>
 		</ul>
 	</dd>
@ -3198,7 +3198,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-171">line 171</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-169">line 169</a>
 			</li>
 		</ul>
 	</dd>
@ -3360,7 +3360,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-271">line 271</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-269">line 269</a>
 			</li>
 		</ul>
 	</dd>
@ -3546,7 +3546,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-287">line 287</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-285">line 285</a>
 			</li>
 		</ul>
 	</dd>
@ -3693,7 +3693,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-264">line 264</a>
+				 <a href="hub.js.html#sunlight-1-line-268">line 268</a>
 			</li>
 		</ul>
 	</dd>
@ -3855,7 +3855,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-261">line 261</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-259">line 259</a>
 			</li>
 		</ul>
 	</dd>
@ -4017,7 +4017,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-316">line 316</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-314">line 314</a>
 			</li>
 		</ul>
 	</dd>
@ -4179,7 +4179,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-364">line 364</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-362">line 362</a>
 			</li>
 		</ul>
 	</dd>
@ -4365,7 +4365,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-304">line 304</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-302">line 302</a>
 			</li>
 		</ul>
 	</dd>
@ -4444,7 +4444,7 @@
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/docs/PUPHub.html
+++ b/docs/PUPHub.html
@ -327,7 +327,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-73">line 73</a>
+				 <a href="hub.js.html#sunlight-1-line-68">line 68</a>
 			</li>
 		</ul>
 	</dd>
@ -460,7 +460,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-52">line 52</a>
+				 <a href="hub.js.html#sunlight-1-line-47">line 47</a>
 			</li>
 		</ul>
 	</dd>
@ -593,7 +593,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-45">line 45</a>
+				 <a href="hub.js.html#sunlight-1-line-40">line 40</a>
 			</li>
 		</ul>
 	</dd>
@ -726,7 +726,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-66">line 66</a>
+				 <a href="hub.js.html#sunlight-1-line-61">line 61</a>
 			</li>
 		</ul>
 	</dd>
@ -859,7 +859,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-59">line 59</a>
+				 <a href="hub.js.html#sunlight-1-line-54">line 54</a>
 			</li>
 		</ul>
 	</dd>
@ -992,7 +992,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-80">line 80</a>
+				 <a href="hub.js.html#sunlight-1-line-75">line 75</a>
 			</li>
 		</ul>
 	</dd>
@ -1124,7 +1124,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="puphub.js.html">puphub.js</a>,
-				 <a href="puphub.js.html#sunlight-1-line-140">line 140</a>
+				 <a href="puphub.js.html#sunlight-1-line-142">line 142</a>
 			</li>
 		</ul>
 	</dd>
@ -1250,7 +1250,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-90">line 90</a>
+				 <a href="hub.js.html#sunlight-1-line-85">line 85</a>
 			</li>
 		</ul>
 	</dd>
@ -1376,7 +1376,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-139">line 139</a>
+				 <a href="hub.js.html#sunlight-1-line-147">line 147</a>
 			</li>
 		</ul>
 	</dd>
@ -1502,7 +1502,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-207">line 207</a>
+				 <a href="hub.js.html#sunlight-1-line-211">line 211</a>
 			</li>
 		</ul>
 	</dd>
@ -1674,7 +1674,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-215">line 215</a>
+				 <a href="hub.js.html#sunlight-1-line-219">line 219</a>
 			</li>
 		</ul>
 	</dd>
@ -1904,7 +1904,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="puphub.js.html">puphub.js</a>,
-				 <a href="puphub.js.html#sunlight-1-line-120">line 120</a>
+				 <a href="puphub.js.html#sunlight-1-line-122">line 122</a>
 			</li>
 		</ul>
 	</dd>
@ -2075,7 +2075,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-75">line 75</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-76">line 76</a>
 			</li>
 		</ul>
 	</dd>
@ -2294,7 +2294,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-93">line 93</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-94">line 94</a>
 			</li>
 		</ul>
 	</dd>
@ -2532,7 +2532,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="puphub.js.html">puphub.js</a>,
-				 <a href="puphub.js.html#sunlight-1-line-149">line 149</a>
+				 <a href="puphub.js.html#sunlight-1-line-151">line 151</a>
 			</li>
 		</ul>
 	</dd>
@ -2773,7 +2773,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="puphub.js.html">puphub.js</a>,
-				 <a href="puphub.js.html#sunlight-1-line-52">line 52</a>
+				 <a href="puphub.js.html#sunlight-1-line-54">line 54</a>
 			</li>
 		</ul>
 	</dd>
@ -2944,7 +2944,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-55">line 55</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-56">line 56</a>
 			</li>
 		</ul>
 	</dd>
@ -3065,7 +3065,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-43">line 43</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-44">line 44</a>
 			</li>
 		</ul>
 	</dd>
@ -3242,7 +3242,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-183">line 183</a>
+				 <a href="hub.js.html#sunlight-1-line-187">line 187</a>
 			</li>
 		</ul>
 	</dd>
@ -3462,7 +3462,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-151">line 151</a>
+				 <a href="hub.js.html#sunlight-1-line-155">line 155</a>
 			</li>
 		</ul>
 	</dd>
@ -3638,7 +3638,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-169">line 169</a>
+				 <a href="hub.js.html#sunlight-1-line-173">line 173</a>
 			</li>
 		</ul>
 	</dd>
@ -3815,7 +3815,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-196">line 196</a>
+				 <a href="hub.js.html#sunlight-1-line-200">line 200</a>
 			</li>
 		</ul>
 	</dd>
@ -4023,7 +4023,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-252">line 252</a>
+				 <a href="hub.js.html#sunlight-1-line-256">line 256</a>
 			</li>
 		</ul>
 	</dd>
@ -4194,7 +4194,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-171">line 171</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-169">line 169</a>
 			</li>
 		</ul>
 	</dd>
@ -4365,7 +4365,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-271">line 271</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-269">line 269</a>
 			</li>
 		</ul>
 	</dd>
@ -4560,7 +4560,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-287">line 287</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-285">line 285</a>
 			</li>
 		</ul>
 	</dd>
@ -4712,7 +4712,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-264">line 264</a>
+				 <a href="hub.js.html#sunlight-1-line-268">line 268</a>
 			</li>
 		</ul>
 	</dd>
@ -4883,7 +4883,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-261">line 261</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-259">line 259</a>
 			</li>
 		</ul>
 	</dd>
@ -5078,7 +5078,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-304">line 304</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-302">line 302</a>
 			</li>
 		</ul>
 	</dd>
@ -5157,7 +5157,7 @@
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/docs/PUPRemote.html
+++ b/docs/PUPRemote.html
@ -327,7 +327,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-73">line 73</a>
+				 <a href="hub.js.html#sunlight-1-line-68">line 68</a>
 			</li>
 		</ul>
 	</dd>
@ -460,7 +460,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-52">line 52</a>
+				 <a href="hub.js.html#sunlight-1-line-47">line 47</a>
 			</li>
 		</ul>
 	</dd>
@ -593,7 +593,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-45">line 45</a>
+				 <a href="hub.js.html#sunlight-1-line-40">line 40</a>
 			</li>
 		</ul>
 	</dd>
@ -726,7 +726,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-66">line 66</a>
+				 <a href="hub.js.html#sunlight-1-line-61">line 61</a>
 			</li>
 		</ul>
 	</dd>
@ -859,7 +859,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-59">line 59</a>
+				 <a href="hub.js.html#sunlight-1-line-54">line 54</a>
 			</li>
 		</ul>
 	</dd>
@ -992,7 +992,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-80">line 80</a>
+				 <a href="hub.js.html#sunlight-1-line-75">line 75</a>
 			</li>
 		</ul>
 	</dd>
@ -1088,7 +1088,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-90">line 90</a>
+				 <a href="hub.js.html#sunlight-1-line-85">line 85</a>
 			</li>
 		</ul>
 	</dd>
@ -1214,7 +1214,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-139">line 139</a>
+				 <a href="hub.js.html#sunlight-1-line-147">line 147</a>
 			</li>
 		</ul>
 	</dd>
@ -1340,7 +1340,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-207">line 207</a>
+				 <a href="hub.js.html#sunlight-1-line-211">line 211</a>
 			</li>
 		</ul>
 	</dd>
@ -1512,7 +1512,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-215">line 215</a>
+				 <a href="hub.js.html#sunlight-1-line-219">line 219</a>
 			</li>
 		</ul>
 	</dd>
@ -1675,7 +1675,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="pupremote.js.html">pupremote.js</a>,
-				 <a href="pupremote.js.html#sunlight-1-line-71">line 71</a>
+				 <a href="pupremote.js.html#sunlight-1-line-73">line 73</a>
 			</li>
 		</ul>
 	</dd>
@ -1890,7 +1890,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="pupremote.js.html">pupremote.js</a>,
-				 <a href="pupremote.js.html#sunlight-1-line-89">line 89</a>
+				 <a href="pupremote.js.html#sunlight-1-line-91">line 91</a>
 			</li>
 		</ul>
 	</dd>
@ -2061,7 +2061,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-55">line 55</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-56">line 56</a>
 			</li>
 		</ul>
 	</dd>
@ -2182,7 +2182,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-43">line 43</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-44">line 44</a>
 			</li>
 		</ul>
 	</dd>
@ -2359,7 +2359,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-183">line 183</a>
+				 <a href="hub.js.html#sunlight-1-line-187">line 187</a>
 			</li>
 		</ul>
 	</dd>
@ -2579,7 +2579,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-151">line 151</a>
+				 <a href="hub.js.html#sunlight-1-line-155">line 155</a>
 			</li>
 		</ul>
 	</dd>
@ -2755,7 +2755,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-169">line 169</a>
+				 <a href="hub.js.html#sunlight-1-line-173">line 173</a>
 			</li>
 		</ul>
 	</dd>
@ -2932,7 +2932,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-196">line 196</a>
+				 <a href="hub.js.html#sunlight-1-line-200">line 200</a>
 			</li>
 		</ul>
 	</dd>
@ -3135,7 +3135,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-171">line 171</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-169">line 169</a>
 			</li>
 		</ul>
 	</dd>
@ -3330,7 +3330,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-287">line 287</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-285">line 285</a>
 			</li>
 		</ul>
 	</dd>
@ -3409,7 +3409,7 @@
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/docs/PoweredUP.html
+++ b/docs/PoweredUP.html
@ -149,7 +149,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="poweredup.js.html">poweredup.js</a>,
-				 <a href="poweredup.js.html#sunlight-1-line-44">line 44</a>
+				 <a href="poweredup.js.html#sunlight-1-line-45">line 45</a>
 			</li>
 		</ul>
 	</dd>
@ -316,7 +316,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="poweredup.js.html">poweredup.js</a>,
-				 <a href="poweredup.js.html#sunlight-1-line-90">line 90</a>
+				 <a href="poweredup.js.html#sunlight-1-line-91">line 91</a>
 			</li>
 		</ul>
 	</dd>
@ -427,7 +427,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="poweredup.js.html">poweredup.js</a>,
-				 <a href="poweredup.js.html#sunlight-1-line-82">line 82</a>
+				 <a href="poweredup.js.html#sunlight-1-line-83">line 83</a>
 			</li>
 		</ul>
 	</dd>
@ -585,7 +585,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="poweredup.js.html">poweredup.js</a>,
-				 <a href="poweredup.js.html#sunlight-1-line-99">line 99</a>
+				 <a href="poweredup.js.html#sunlight-1-line-100">line 100</a>
 			</li>
 		</ul>
 	</dd>
@ -693,7 +693,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="poweredup.js.html">poweredup.js</a>,
-				 <a href="poweredup.js.html#sunlight-1-line-55">line 55</a>
+				 <a href="poweredup.js.html#sunlight-1-line-56">line 56</a>
 			</li>
 		</ul>
 	</dd>
@ -781,7 +781,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="poweredup.js.html">poweredup.js</a>,
-				 <a href="poweredup.js.html#sunlight-1-line-70">line 70</a>
+				 <a href="poweredup.js.html#sunlight-1-line-71">line 71</a>
 			</li>
 		</ul>
 	</dd>
@ -939,7 +939,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="poweredup.js.html">poweredup.js</a>,
-				 <a href="poweredup.js.html#sunlight-1-line-146">line 146</a>
+				 <a href="poweredup.js.html#sunlight-1-line-148">line 148</a>
 			</li>
 		</ul>
 	</dd>
@ -1018,7 +1018,7 @@
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/docs/WeDo2SmartHub.html
+++ b/docs/WeDo2SmartHub.html
@ -320,7 +320,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-73">line 73</a>
+				 <a href="hub.js.html#sunlight-1-line-68">line 68</a>
 			</li>
 		</ul>
 	</dd>
@ -448,7 +448,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-52">line 52</a>
+				 <a href="hub.js.html#sunlight-1-line-47">line 47</a>
 			</li>
 		</ul>
 	</dd>
@ -576,7 +576,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-45">line 45</a>
+				 <a href="hub.js.html#sunlight-1-line-40">line 40</a>
 			</li>
 		</ul>
 	</dd>
@ -704,7 +704,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-66">line 66</a>
+				 <a href="hub.js.html#sunlight-1-line-61">line 61</a>
 			</li>
 		</ul>
 	</dd>
@ -832,7 +832,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-59">line 59</a>
+				 <a href="hub.js.html#sunlight-1-line-54">line 54</a>
 			</li>
 		</ul>
 	</dd>
@ -960,7 +960,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-80">line 80</a>
+				 <a href="hub.js.html#sunlight-1-line-75">line 75</a>
 			</li>
 		</ul>
 	</dd>
@ -1092,7 +1092,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="wedo2smarthub.js.html">wedo2smarthub.js</a>,
-				 <a href="wedo2smarthub.js.html#sunlight-1-line-183">line 183</a>
+				 <a href="wedo2smarthub.js.html#sunlight-1-line-195">line 195</a>
 			</li>
 		</ul>
 	</dd>
@ -1218,7 +1218,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-90">line 90</a>
+				 <a href="hub.js.html#sunlight-1-line-85">line 85</a>
 			</li>
 		</ul>
 	</dd>
@ -1339,7 +1339,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-139">line 139</a>
+				 <a href="hub.js.html#sunlight-1-line-147">line 147</a>
 			</li>
 		</ul>
 	</dd>
@ -1460,7 +1460,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-207">line 207</a>
+				 <a href="hub.js.html#sunlight-1-line-211">line 211</a>
 			</li>
 		</ul>
 	</dd>
@ -1627,7 +1627,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-215">line 215</a>
+				 <a href="hub.js.html#sunlight-1-line-219">line 219</a>
 			</li>
 		</ul>
 	</dd>
@ -1809,7 +1809,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="wedo2smarthub.js.html">wedo2smarthub.js</a>,
-				 <a href="wedo2smarthub.js.html#sunlight-1-line-192">line 192</a>
+				 <a href="wedo2smarthub.js.html#sunlight-1-line-204">line 204</a>
 			</li>
 		</ul>
 	</dd>
@ -2043,7 +2043,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="wedo2smarthub.js.html">wedo2smarthub.js</a>,
-				 <a href="wedo2smarthub.js.html#sunlight-1-line-163">line 163</a>
+				 <a href="wedo2smarthub.js.html#sunlight-1-line-175">line 175</a>
 			</li>
 		</ul>
 	</dd>
@ -2205,7 +2205,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="wedo2smarthub.js.html">wedo2smarthub.js</a>,
-				 <a href="wedo2smarthub.js.html#sunlight-1-line-82">line 82</a>
+				 <a href="wedo2smarthub.js.html#sunlight-1-line-94">line 94</a>
 			</li>
 		</ul>
 	</dd>
@ -2415,7 +2415,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="wedo2smarthub.js.html">wedo2smarthub.js</a>,
-				 <a href="wedo2smarthub.js.html#sunlight-1-line-112">line 112</a>
+				 <a href="wedo2smarthub.js.html#sunlight-1-line-124">line 124</a>
 			</li>
 		</ul>
 	</dd>
@ -2653,7 +2653,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="wedo2smarthub.js.html">wedo2smarthub.js</a>,
-				 <a href="wedo2smarthub.js.html#sunlight-1-line-208">line 208</a>
+				 <a href="wedo2smarthub.js.html#sunlight-1-line-220">line 220</a>
 			</li>
 		</ul>
 	</dd>
@ -2891,7 +2891,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="wedo2smarthub.js.html">wedo2smarthub.js</a>,
-				 <a href="wedo2smarthub.js.html#sunlight-1-line-129">line 129</a>
+				 <a href="wedo2smarthub.js.html#sunlight-1-line-141">line 141</a>
 			</li>
 		</ul>
 	</dd>
@ -3053,7 +3053,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="wedo2smarthub.js.html">wedo2smarthub.js</a>,
-				 <a href="wedo2smarthub.js.html#sunlight-1-line-63">line 63</a>
+				 <a href="wedo2smarthub.js.html#sunlight-1-line-75">line 75</a>
 			</li>
 		</ul>
 	</dd>
@ -3165,7 +3165,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="wedo2smarthub.js.html">wedo2smarthub.js</a>,
-				 <a href="wedo2smarthub.js.html#sunlight-1-line-100">line 100</a>
+				 <a href="wedo2smarthub.js.html#sunlight-1-line-112">line 112</a>
 			</li>
 		</ul>
 	</dd>
@ -3337,7 +3337,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-183">line 183</a>
+				 <a href="hub.js.html#sunlight-1-line-187">line 187</a>
 			</li>
 		</ul>
 	</dd>
@ -3552,7 +3552,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-151">line 151</a>
+				 <a href="hub.js.html#sunlight-1-line-155">line 155</a>
 			</li>
 		</ul>
 	</dd>
@ -3723,7 +3723,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-169">line 169</a>
+				 <a href="hub.js.html#sunlight-1-line-173">line 173</a>
 			</li>
 		</ul>
 	</dd>
@ -3895,7 +3895,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-196">line 196</a>
+				 <a href="hub.js.html#sunlight-1-line-200">line 200</a>
 			</li>
 		</ul>
 	</dd>
@ -4098,7 +4098,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-252">line 252</a>
+				 <a href="hub.js.html#sunlight-1-line-256">line 256</a>
 			</li>
 		</ul>
 	</dd>
@ -4260,7 +4260,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="wedo2smarthub.js.html">wedo2smarthub.js</a>,
-				 <a href="wedo2smarthub.js.html#sunlight-1-line-292">line 292</a>
+				 <a href="wedo2smarthub.js.html#sunlight-1-line-301">line 301</a>
 			</li>
 		</ul>
 	</dd>
@ -4422,7 +4422,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="wedo2smarthub.js.html">wedo2smarthub.js</a>,
-				 <a href="wedo2smarthub.js.html#sunlight-1-line-337">line 337</a>
+				 <a href="wedo2smarthub.js.html#sunlight-1-line-346">line 346</a>
 			</li>
 		</ul>
 	</dd>
@ -4569,7 +4569,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-264">line 264</a>
+				 <a href="hub.js.html#sunlight-1-line-268">line 268</a>
 			</li>
 		</ul>
 	</dd>
@ -4731,7 +4731,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="wedo2smarthub.js.html">wedo2smarthub.js</a>,
-				 <a href="wedo2smarthub.js.html#sunlight-1-line-326">line 326</a>
+				 <a href="wedo2smarthub.js.html#sunlight-1-line-335">line 335</a>
 			</li>
 		</ul>
 	</dd>
@ -4893,7 +4893,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="wedo2smarthub.js.html">wedo2smarthub.js</a>,
-				 <a href="wedo2smarthub.js.html#sunlight-1-line-367">line 367</a>
+				 <a href="wedo2smarthub.js.html#sunlight-1-line-376">line 376</a>
 			</li>
 		</ul>
 	</dd>
@ -5079,7 +5079,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="wedo2smarthub.js.html">wedo2smarthub.js</a>,
-				 <a href="wedo2smarthub.js.html#sunlight-1-line-355">line 355</a>
+				 <a href="wedo2smarthub.js.html#sunlight-1-line-364">line 364</a>
 			</li>
 		</ul>
 	</dd>
@ -5158,7 +5158,7 @@
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/docs/boostmovehub.js.html
+++ b/docs/boostmovehub.js.html
@ -111,7 +111,9 @@ class BoostMoveHub extends lpf2hub_1.LPF2Hub {
     * @ignore
     */
    static IsBoostMoveHub(peripheral) {
-        return (peripheral.advertisement.serviceUuids.indexOf(Consts.BLEService.LPF2_HUB.replace(/-/g, "")) >= 0 &amp;&amp; peripheral.advertisement.manufacturerData[3] === Consts.BLEManufacturerData.BOOST_MOVE_HUB_ID);
+        return (peripheral.advertisement &amp;&amp;
            peripheral.advertisement.serviceUuids &amp;&amp;
            peripheral.advertisement.serviceUuids.indexOf(Consts.BLEService.LPF2_HUB.replace(/-/g, "")) >= 0 &amp;&amp; peripheral.advertisement.manufacturerData[3] === Consts.BLEManufacturerData.BOOST_MOVE_HUB_ID);
    }
    constructor(peripheral, autoSubscribe = true) {
        super(peripheral, autoSubscribe);
@ -349,7 +351,7 @@ exports.BoostMoveHub = BoostMoveHub;
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/docs/classes.list.html
+++ b/docs/classes.list.html
@ -335,7 +335,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-252">line 252</a>
+				 <a href="hub.js.html#sunlight-1-line-256">line 256</a>
 			</li>
 		</ul>
 	</dd>
@ -506,7 +506,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-171">line 171</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-169">line 169</a>
 			</li>
 		</ul>
 	</dd>
@ -677,7 +677,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-271">line 271</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-269">line 269</a>
 			</li>
 		</ul>
 	</dd>
@ -872,7 +872,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-287">line 287</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-285">line 285</a>
 			</li>
 		</ul>
 	</dd>
@ -1024,7 +1024,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-264">line 264</a>
+				 <a href="hub.js.html#sunlight-1-line-268">line 268</a>
 			</li>
 		</ul>
 	</dd>
@ -1195,7 +1195,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-261">line 261</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-259">line 259</a>
 			</li>
 		</ul>
 	</dd>
@ -1366,7 +1366,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-316">line 316</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-314">line 314</a>
 			</li>
 		</ul>
 	</dd>
@ -1561,7 +1561,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-304">line 304</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-302">line 302</a>
 			</li>
 		</ul>
 	</dd>
@ -1732,7 +1732,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-271">line 271</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-269">line 269</a>
 			</li>
 		</ul>
 	</dd>
@ -1903,7 +1903,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-364">line 364</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-362">line 362</a>
 			</li>
 		</ul>
 	</dd>
@ -2065,7 +2065,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-252">line 252</a>
+				 <a href="hub.js.html#sunlight-1-line-256">line 256</a>
 			</li>
 		</ul>
 	</dd>
@ -2203,7 +2203,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-264">line 264</a>
+				 <a href="hub.js.html#sunlight-1-line-268">line 268</a>
 			</li>
 		</ul>
 	</dd>
@ -2374,7 +2374,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-252">line 252</a>
+				 <a href="hub.js.html#sunlight-1-line-256">line 256</a>
 			</li>
 		</ul>
 	</dd>
@ -2536,7 +2536,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-171">line 171</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-169">line 169</a>
 			</li>
 		</ul>
 	</dd>
@ -2698,7 +2698,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-271">line 271</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-269">line 269</a>
 			</li>
 		</ul>
 	</dd>
@ -2884,7 +2884,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-287">line 287</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-285">line 285</a>
 			</li>
 		</ul>
 	</dd>
@ -3031,7 +3031,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-264">line 264</a>
+				 <a href="hub.js.html#sunlight-1-line-268">line 268</a>
 			</li>
 		</ul>
 	</dd>
@ -3193,7 +3193,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-261">line 261</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-259">line 259</a>
 			</li>
 		</ul>
 	</dd>
@ -3355,7 +3355,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-316">line 316</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-314">line 314</a>
 			</li>
 		</ul>
 	</dd>
@ -3517,7 +3517,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-364">line 364</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-362">line 362</a>
 			</li>
 		</ul>
 	</dd>
@ -3703,7 +3703,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-304">line 304</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-302">line 302</a>
 			</li>
 		</ul>
 	</dd>
@ -3853,7 +3853,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="poweredup.js.html">poweredup.js</a>,
-				 <a href="poweredup.js.html#sunlight-1-line-146">line 146</a>
+				 <a href="poweredup.js.html#sunlight-1-line-148">line 148</a>
 			</li>
 		</ul>
 	</dd>
@ -4029,7 +4029,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-252">line 252</a>
+				 <a href="hub.js.html#sunlight-1-line-256">line 256</a>
 			</li>
 		</ul>
 	</dd>
@ -4200,7 +4200,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-171">line 171</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-169">line 169</a>
 			</li>
 		</ul>
 	</dd>
@ -4371,7 +4371,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-271">line 271</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-269">line 269</a>
 			</li>
 		</ul>
 	</dd>
@ -4566,7 +4566,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-287">line 287</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-285">line 285</a>
 			</li>
 		</ul>
 	</dd>
@ -4718,7 +4718,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-264">line 264</a>
+				 <a href="hub.js.html#sunlight-1-line-268">line 268</a>
 			</li>
 		</ul>
 	</dd>
@ -4889,7 +4889,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-261">line 261</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-259">line 259</a>
 			</li>
 		</ul>
 	</dd>
@ -5084,7 +5084,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-304">line 304</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-302">line 302</a>
 			</li>
 		</ul>
 	</dd>
@ -5255,7 +5255,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-171">line 171</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-169">line 169</a>
 			</li>
 		</ul>
 	</dd>
@ -5450,7 +5450,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="lpf2hub.js.html">lpf2hub.js</a>,
-				 <a href="lpf2hub.js.html#sunlight-1-line-287">line 287</a>
+				 <a href="lpf2hub.js.html#sunlight-1-line-285">line 285</a>
 			</li>
 		</ul>
 	</dd>
@ -5621,7 +5621,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-252">line 252</a>
+				 <a href="hub.js.html#sunlight-1-line-256">line 256</a>
 			</li>
 		</ul>
 	</dd>
@ -5783,7 +5783,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="wedo2smarthub.js.html">wedo2smarthub.js</a>,
-				 <a href="wedo2smarthub.js.html#sunlight-1-line-292">line 292</a>
+				 <a href="wedo2smarthub.js.html#sunlight-1-line-301">line 301</a>
 			</li>
 		</ul>
 	</dd>
@ -5945,7 +5945,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="wedo2smarthub.js.html">wedo2smarthub.js</a>,
-				 <a href="wedo2smarthub.js.html#sunlight-1-line-337">line 337</a>
+				 <a href="wedo2smarthub.js.html#sunlight-1-line-346">line 346</a>
 			</li>
 		</ul>
 	</dd>
@ -6092,7 +6092,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="hub.js.html">hub.js</a>,
-				 <a href="hub.js.html#sunlight-1-line-264">line 264</a>
+				 <a href="hub.js.html#sunlight-1-line-268">line 268</a>
 			</li>
 		</ul>
 	</dd>
@ -6254,7 +6254,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="wedo2smarthub.js.html">wedo2smarthub.js</a>,
-				 <a href="wedo2smarthub.js.html#sunlight-1-line-326">line 326</a>
+				 <a href="wedo2smarthub.js.html#sunlight-1-line-335">line 335</a>
 			</li>
 		</ul>
 	</dd>
@ -6416,7 +6416,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="wedo2smarthub.js.html">wedo2smarthub.js</a>,
-				 <a href="wedo2smarthub.js.html#sunlight-1-line-367">line 367</a>
+				 <a href="wedo2smarthub.js.html#sunlight-1-line-376">line 376</a>
 			</li>
 		</ul>
 	</dd>
@ -6602,7 +6602,7 @@
 		<ul class="dummy">
 			<li>
 				<a href="wedo2smarthub.js.html">wedo2smarthub.js</a>,
-				 <a href="wedo2smarthub.js.html#sunlight-1-line-355">line 355</a>
+				 <a href="wedo2smarthub.js.html#sunlight-1-line-364">line 364</a>
 			</li>
 		</ul>
 	</dd>
@ -6681,7 +6681,7 @@
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/docs/consts.js.html
+++ b/docs/consts.js.html
@ -214,6 +214,10 @@ var BLEManufacturerData;
 var BLEService;
 (function (BLEService) {
    BLEService["WEDO2_SMART_HUB"] = "00001523-1212-efde-1523-785feabcd123";
    BLEService["WEDO2_SMART_HUB_2"] = "00004f0e-1212-efde-1523-785feabcd123";
    BLEService["WEDO2_SMART_HUB_3"] = "2a19";
    BLEService["WEDO2_SMART_HUB_4"] = "180f";
    BLEService["WEDO2_SMART_HUB_5"] = "180a";
    BLEService["LPF2_HUB"] = "00001623-1212-efde-1623-785feabcd123";
 })(BLEService = exports.BLEService || (exports.BLEService = {}));
 var BLECharacteristic;
@ -278,7 +282,7 @@ var BLECharacteristic;
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/docs/duplotrainbase.js.html
+++ b/docs/duplotrainbase.js.html
@ -135,7 +135,9 @@ class DuploTrainBase extends lpf2hub_1.LPF2Hub {
     * @ignore
     */
    static IsDuploTrainBase(peripheral) {
-        return (peripheral.advertisement.serviceUuids.indexOf(Consts.BLEService.LPF2_HUB.replace(/-/g, "")) >= 0 &amp;&amp; peripheral.advertisement.manufacturerData[3] === Consts.BLEManufacturerData.DUPLO_TRAIN_HUB_ID);
+        return (peripheral.advertisement &amp;&amp;
            peripheral.advertisement.serviceUuids &amp;&amp;
            peripheral.advertisement.serviceUuids.indexOf(Consts.BLEService.LPF2_HUB.replace(/-/g, "")) >= 0 &amp;&amp; peripheral.advertisement.manufacturerData[3] === Consts.BLEManufacturerData.DUPLO_TRAIN_HUB_ID);
    }
    constructor(peripheral, autoSubscribe = true) {
        super(peripheral, autoSubscribe);
@ -298,7 +300,7 @@ exports.DuploTrainBase = DuploTrainBase;
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/docs/global.html
+++ b/docs/global.html
@ -3272,7 +3272,7 @@
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/docs/hub.js.html
+++ b/docs/hub.js.html
@ -102,34 +102,29 @@ const debug = Debug("hub");
 * @extends EventEmitter
 */
 class Hub extends events_1.EventEmitter {
-    constructor(peripheral, autoSubscribe = true) {
+    constructor(device, autoSubscribe = true) {
        super();
        this.autoSubscribe = true;
        this.useSpeedMap = true;
        this.type = Consts.HubType.UNKNOWN;
        this._ports = {};
        this._characteristics = {};
        this._name = "";
        this._firmwareInfo = { major: 0, minor: 0, bugFix: 0, build: 0 };
        this._batteryLevel = 100;
        this._voltage = 0;
        this._current = 0;
        this._rssi = -100;
        this._isConnecting = false;
        this._isConnected = false;
        this.autoSubscribe = !!autoSubscribe;
-        this._peripheral = peripheral;
+        this._bleDevice = device;
        this._uuid = peripheral.uuid;
        // NK: This hack allows LPF2.0 hubs to send a second advertisement packet consisting of the hub name before we try to read it
        setTimeout(() => {
            this._name = peripheral.advertisement.localName;
            this.emit("discoverComplete");
        }, 1000);
    }
    /**
     * @readonly
     * @property {string} name Name of the hub
     */
    get name() {
-        return this._name;
+        return this._bleDevice.name;
    }
    /**
     * @readonly
@ -143,7 +138,7 @@ class Hub extends events_1.EventEmitter {
     * @property {string} uuid UUID of the hub
     */
    get uuid() {
-        return this._uuid;
+        return this._bleDevice.uuid;
    }
    /**
     * @readonly
@ -179,47 +174,60 @@ class Hub extends events_1.EventEmitter {
     * @returns {Promise} Resolved upon successful connect.
     */
    connect() {
-        return new Promise((connectResolve, connectReject) => {
+        return new Promise(async (connectResolve, connectReject) => {
            const self = this;
-            this._peripheral.connect((err) => {
+            if (this._isConnecting) {
-                this._rssi = this._peripheral.rssi;
+                return connectReject("Already connecting");
-                const rssiUpdateInterval = setInterval(() => {
+            }
-                    this._peripheral.updateRssi((err, rssi) => {
+            else if (this._isConnected) {
-                        if (!err) {
+                return connectReject("Already connected");
-                            if (this._rssi !== rssi) {
+            }
-                                this._rssi = rssi;
+            this._isConnecting = true;
-                            }
+            await this._bleDevice.connect();
-                        }
+            return connectResolve();
-                    });
+            // this._peripheral.connect((err: string) => {
-                }, 2000);
+            //     this._rssi = this._peripheral.rssi;
-                self._peripheral.on("disconnect", () => {
+            //     const rssiUpdateInterval = setInterval(() => {
-                    clearInterval(rssiUpdateInterval);
+            //         this._peripheral.updateRssi((err: string, rssi: number) => {
-                    this.emit("disconnect");
+            //             if (!err) {
-                });
+            //                 if (this._rssi !== rssi) {
-                self._peripheral.discoverServices([], (err, services) => {
+            //                     this._rssi = rssi;
-                    if (err) {
+            //                 }
-                        this.emit("error", err);
+            //             }
-                        return;
+            //         });
-                    }
+            //     }, 2000);
-                    debug("Service/characteristic discovery started");
+            //     self._peripheral.on("disconnect", () => {
-                    const servicePromises = [];
+            //         clearInterval(rssiUpdateInterval);
-                    services.forEach((service) => {
+            //         this._isConnecting = false;
-                        servicePromises.push(new Promise((resolve, reject) => {
+            //         this._isConnected = false;
-                            service.discoverCharacteristics([], (err, characteristics) => {
+            //         this.emit("disconnect");
-                                characteristics.forEach((characteristic) => {
+            //     });
-                                    this._characteristics[characteristic.uuid] = characteristic;
+            //     self._peripheral.discoverServices([], (err: string, services: Service[]) => {
-                                });
+            //         if (err) {
-                                return resolve();
+            //             this.emit("error", err);
-                            });
+            //             return;
-                        }));
+            //         }
-                    });
+            //         debug("Service/characteristic discovery started");
-                    Promise.all(servicePromises).then(() => {
+            //         const servicePromises: Array&lt;Promise&lt;null>> = [];
-                        debug("Service/characteristic discovery finished");
+            //         services.forEach((service) => {
-                        this.emit("connect");
+            //             servicePromises.push(new Promise((resolve, reject) => {
-                        return connectResolve();
+            //                 service.discoverCharacteristics([], (err, characteristics) => {
-                    });
+            //                     characteristics.forEach((characteristic) => {
-                });
+            //                         this._characteristics[characteristic.uuid] = characteristic;
-            });
+            //                     });
            //                     return resolve();
            //                 });
            //             }));
            //         });
            //         Promise.all(servicePromises).then(() => {
            //             debug("Service/characteristic discovery finished");
            //             this._isConnecting = false;
            //             this._isConnected = true;
            //             this.emit("connect");
            //             return connectResolve();
            //         });
            //     });
            // });
        });
    }
    /**
@ -227,12 +235,8 @@ class Hub extends events_1.EventEmitter {
     * @method Hub#disconnect
     * @returns {Promise} Resolved upon successful disconnect.
     */
-    disconnect() {
+    async disconnect() {
-        return new Promise((resolve, reject) => {
+        await this._bleDevice.disconnect();
            this._peripheral.disconnect(() => {
                return resolve();
            });
        });
    }
    /**
     * Subscribe to sensor notifications on a given port.
@ -307,19 +311,19 @@ class Hub extends events_1.EventEmitter {
    getPortDeviceType(port) {
        return this._portLookup(port).type;
    }
-    _getCharacteristic(uuid) {
+    // protected _getCharacteristic (uuid: string) {
-        return this._characteristics[uuid.replace(/-/g, "")];
+    //     return this._characteristics[uuid.replace(/-/g, "")];
-    }
+    // }
-    _subscribeToCharacteristic(characteristic, callback) {
+    // protected _subscribeToCharacteristic (characteristic: Characteristic, callback: (data: Buffer) => void) {
-        characteristic.on("data", (data) => {
+    //     characteristic.on("data", (data: Buffer) => {
-            return callback(data);
+    //         return callback(data);
-        });
+    //     });
-        characteristic.subscribe((err) => {
+    //     characteristic.subscribe((err) => {
-            if (err) {
+    //         if (err) {
-                this.emit("error", err);
+    //             this.emit("error", err);
-            }
+    //         }
-        });
+    //     });
-    }
+    // }
    _activatePortDevice(port, type, mode, format, callback) {
        if (callback) {
            callback();
@ -485,7 +489,7 @@ exports.Hub = Hub;
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/docs/index.html
+++ b/docs/index.html
@ -314,7 +314,7 @@ poweredUP.scan(); // Start scanning for Hubs</code></pre><p>More examples are av
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/docs/lpf2hub.js.html
+++ b/docs/lpf2hub.js.html
@ -111,8 +111,8 @@ class LPF2Hub extends hub_1.Hub {
    connect() {
        return new Promise(async (resolve, reject) => {
            await super.connect();
-            const characteristic = this._getCharacteristic(Consts.BLECharacteristic.LPF2_ALL);
+            await this._bleDevice.discoverCharacteristicsForService(Consts.BLEService.LPF2_HUB);
-            this._subscribeToCharacteristic(characteristic, this._parseMessage.bind(this));
+            this._bleDevice.subscribeToCharacteristic(Consts.BLECharacteristic.LPF2_ALL, this._parseMessage.bind(this));
            setTimeout(() => {
                this._writeMessage(Consts.BLECharacteristic.LPF2_ALL, Buffer.from([0x01, 0x02, 0x02])); // Activate button reports
                this._writeMessage(Consts.BLECharacteristic.LPF2_ALL, Buffer.from([0x01, 0x03, 0x05])); // Request firmware version
@ -122,8 +122,9 @@ class LPF2Hub extends hub_1.Hub {
                if (this.type === Consts.HubType.DUPLO_TRAIN_HUB) {
                    this._writeMessage(Consts.BLECharacteristic.LPF2_ALL, Buffer.from([0x41, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01]));
                }
                this.emit("connect");
                return resolve();
            }, 1000);
            return resolve();
        });
    }
    /**
@ -207,13 +208,10 @@ class LPF2Hub extends hub_1.Hub {
        this._writeMessage(Consts.BLECharacteristic.LPF2_ALL, Buffer.from([0x41, port, mode, 0x01, 0x00, 0x00, 0x00, 0x00]), callback);
    }
    _writeMessage(uuid, message, callback) {
-        const characteristic = this._getCharacteristic(uuid);
+        message = Buffer.concat([Buffer.alloc(2), message]);
-        if (characteristic) {
+        message[0] = message.length;
-            message = Buffer.concat([Buffer.alloc(2), message]);
+        debug("Sent Message (LPF2_ALL)", message);
-            message[0] = message.length;
+        this._bleDevice.writeToCharacteristic(uuid, message, callback);
            debug("Sent Message (LPF2_ALL)", message);
            characteristic.write(message, false, callback);
        }
    }
    _parseMessage(data) {
        if (data) {
@ -507,7 +505,7 @@ exports.LPF2Hub = LPF2Hub;
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/docs/poweredup.js.html
+++ b/docs/poweredup.js.html
@ -93,6 +93,7 @@ var __importStar = (this &amp;&amp; this.__importStar) || function (mod) {
    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const bledevice_1 = require("./bledevice");
 const boostmovehub_1 = require("./boostmovehub");
 const duplotrainbase_1 = require("./duplotrainbase");
 const puphub_1 = require("./puphub");
@ -192,21 +193,22 @@ class PoweredUP extends events_1.EventEmitter {
        return Object.keys(this._connectedHubs).map((uuid) => this._connectedHubs[uuid]).filter((hub) => hub.name === name);
    }
    async _discoveryEventHandler(peripheral) {
        const device = new bledevice_1.BLEDevice(peripheral);
        let hub;
        if (await wedo2smarthub_1.WeDo2SmartHub.IsWeDo2SmartHub(peripheral)) {
-            hub = new wedo2smarthub_1.WeDo2SmartHub(peripheral, this.autoSubscribe);
+            hub = new wedo2smarthub_1.WeDo2SmartHub(device, this.autoSubscribe);
        }
        else if (await boostmovehub_1.BoostMoveHub.IsBoostMoveHub(peripheral)) {
-            hub = new boostmovehub_1.BoostMoveHub(peripheral, this.autoSubscribe);
+            hub = new boostmovehub_1.BoostMoveHub(device, this.autoSubscribe);
        }
        else if (await puphub_1.PUPHub.IsPUPHub(peripheral)) {
-            hub = new puphub_1.PUPHub(peripheral, this.autoSubscribe);
+            hub = new puphub_1.PUPHub(device, this.autoSubscribe);
        }
        else if (await pupremote_1.PUPRemote.IsPUPRemote(peripheral)) {
-            hub = new pupremote_1.PUPRemote(peripheral, this.autoSubscribe);
+            hub = new pupremote_1.PUPRemote(device, this.autoSubscribe);
        }
        else if (await duplotrainbase_1.DuploTrainBase.IsDuploTrainBase(peripheral)) {
-            hub = new duplotrainbase_1.DuploTrainBase(peripheral, this.autoSubscribe);
+            hub = new duplotrainbase_1.DuploTrainBase(device, this.autoSubscribe);
        }
        else {
            return;
@ -216,7 +218,7 @@ class PoweredUP extends events_1.EventEmitter {
        // if (!isBrowserContext) {
        //     startScanning();
        // }
-        hub.on("discoverComplete", () => {
+        device.on("discoverComplete", () => {
            hub.on("connect", () => {
                debug(`Hub ${hub.uuid} connected`);
                this._connectedHubs[hub.uuid] = hub;
@ -284,7 +286,7 @@ exports.PoweredUP = PoweredUP;
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/docs/puphub.js.html
+++ b/docs/puphub.js.html
@ -115,7 +115,9 @@ class PUPHub extends lpf2hub_1.LPF2Hub {
     * @ignore
     */
    static IsPUPHub(peripheral) {
-        return (peripheral.advertisement.serviceUuids.indexOf(Consts.BLEService.LPF2_HUB.replace(/-/g, "")) >= 0 &amp;&amp; peripheral.advertisement.manufacturerData[3] === Consts.BLEManufacturerData.POWERED_UP_HUB_ID);
+        return (peripheral.advertisement &amp;&amp;
            peripheral.advertisement.serviceUuids &amp;&amp;
            peripheral.advertisement.serviceUuids.indexOf(Consts.BLEService.LPF2_HUB.replace(/-/g, "")) >= 0 &amp;&amp; peripheral.advertisement.manufacturerData[3] === Consts.BLEManufacturerData.POWERED_UP_HUB_ID);
    }
    constructor(peripheral, autoSubscribe = true) {
        super(peripheral, autoSubscribe);
@ -306,7 +308,7 @@ exports.PUPHub = PUPHub;
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/docs/pupremote.js.html
+++ b/docs/pupremote.js.html
@ -135,7 +135,9 @@ class PUPRemote extends lpf2hub_1.LPF2Hub {
     * @ignore
     */
    static IsPUPRemote(peripheral) {
-        return (peripheral.advertisement.serviceUuids.indexOf(Consts.BLEService.LPF2_HUB.replace(/-/g, "")) >= 0 &amp;&amp; peripheral.advertisement.manufacturerData[3] === Consts.BLEManufacturerData.POWERED_UP_REMOTE_ID);
+        return (peripheral.advertisement &amp;&amp;
            peripheral.advertisement.serviceUuids &amp;&amp;
            peripheral.advertisement.serviceUuids.indexOf(Consts.BLEService.LPF2_HUB.replace(/-/g, "")) >= 0 &amp;&amp; peripheral.advertisement.manufacturerData[3] === Consts.BLEManufacturerData.POWERED_UP_REMOTE_ID);
    }
    constructor(peripheral, autoSubscribe = true) {
        super(peripheral, autoSubscribe);
@ -236,7 +238,7 @@ exports.PUPRemote = PUPRemote;
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/docs/quicksearch.html
+++ b/docs/quicksearch.html
--- a/docs/wedo2smarthub.js.html
+++ b/docs/wedo2smarthub.js.html
@ -121,29 +121,41 @@ class WeDo2SmartHub extends hub_1.Hub {
     * @ignore
     */
    static IsWeDo2SmartHub(peripheral) {
-        return (peripheral.advertisement.serviceUuids.indexOf(Consts.BLEService.WEDO2_SMART_HUB.replace(/-/g, "")) >= 0);
+        return (peripheral.advertisement &amp;&amp;
            peripheral.advertisement.serviceUuids &amp;&amp;
            peripheral.advertisement.serviceUuids.indexOf(Consts.BLEService.WEDO2_SMART_HUB.replace(/-/g, "")) >= 0);
    }
    connect() {
        return new Promise(async (resolve, reject) => {
            debug("Connecting to WeDo 2.0 Smart Hub");
            await super.connect();
-            this._subscribeToCharacteristic(this._getCharacteristic(Consts.BLECharacteristic.WEDO2_PORT_TYPE), this._parsePortMessage.bind(this));
+            await this._bleDevice.discoverCharacteristicsForService(Consts.BLEService.WEDO2_SMART_HUB);
-            this._subscribeToCharacteristic(this._getCharacteristic(Consts.BLECharacteristic.WEDO2_SENSOR_VALUE), this._parseSensorMessage.bind(this));
+            await this._bleDevice.discoverCharacteristicsForService(Consts.BLEService.WEDO2_SMART_HUB_2);
-            this._subscribeToCharacteristic(this._getCharacteristic(Consts.BLECharacteristic.WEDO2_BUTTON), this._parseSensorMessage.bind(this));
+            await this._bleDevice.discoverCharacteristicsForService(Consts.BLEService.WEDO2_SMART_HUB_3);
-            this._subscribeToCharacteristic(this._getCharacteristic(Consts.BLECharacteristic.WEDO2_BATTERY), this._parseBatteryMessage.bind(this));
+            await this._bleDevice.discoverCharacteristicsForService(Consts.BLEService.WEDO2_SMART_HUB_4);
-            this._subscribeToCharacteristic(this._getCharacteristic(Consts.BLECharacteristic.WEDO2_HIGH_CURRENT_ALERT), this._parseHighCurrentAlert.bind(this));
+            await this._bleDevice.discoverCharacteristicsForService(Consts.BLEService.WEDO2_SMART_HUB_5);
-            this._getCharacteristic(Consts.BLECharacteristic.WEDO2_BATTERY).read((err, data) => {
+            this._bleDevice.subscribeToCharacteristic(Consts.BLECharacteristic.WEDO2_PORT_TYPE, this._parsePortMessage.bind(this));
-                this._parseBatteryMessage(data);
+            this._bleDevice.subscribeToCharacteristic(Consts.BLECharacteristic.WEDO2_SENSOR_VALUE, this._parseSensorMessage.bind(this));
            this._bleDevice.subscribeToCharacteristic(Consts.BLECharacteristic.WEDO2_BUTTON, this._parseSensorMessage.bind(this));
            this._bleDevice.subscribeToCharacteristic(Consts.BLECharacteristic.WEDO2_BATTERY, this._parseBatteryMessage.bind(this));
            this._bleDevice.subscribeToCharacteristic(Consts.BLECharacteristic.WEDO2_HIGH_CURRENT_ALERT, this._parseHighCurrentAlert.bind(this));
            this._bleDevice.readFromCharacteristic(Consts.BLECharacteristic.WEDO2_BATTERY, (err, data) => {
                if (data) {
                    this._parseBatteryMessage(data);
                }
            });
-            this._getCharacteristic(Consts.BLECharacteristic.WEDO2_FIRMWARE_REVISION).read((err, data) => {
+            this._bleDevice.readFromCharacteristic(Consts.BLECharacteristic.WEDO2_FIRMWARE_REVISION, (err, data) => {
-                this._parseFirmwareRevisionString(data);
+                if (data) {
                    this._parseFirmwareRevisionString(data);
                }
            });
            setTimeout(() => {
                this._activatePortDevice(0x03, 0x15, 0x00, 0x00); // Activate voltage reports
                this._activatePortDevice(0x04, 0x14, 0x00, 0x00); // Activate current reports
                debug("Connect completed");
                this.emit("connect");
                return resolve();
            }, 1000);
            debug("Connect completed");
            return resolve();
        });
    }
    /**
@ -332,13 +344,10 @@ class WeDo2SmartHub extends hub_1.Hub {
        this._writeMessage(Consts.BLECharacteristic.WEDO2_PORT_TYPE_WRITE, Buffer.from([0x01, 0x02, port, type, mode, 0x01, 0x00, 0x00, 0x00, format, 0x00]), callback);
    }
    _writeMessage(uuid, message, callback) {
-        const characteristic = this._getCharacteristic(uuid);
+        if (debug.enabled) {
-        if (characteristic) {
+            debug(`Sent Message (${this._getCharacteristicNameFromUUID(uuid)})`, message);
            if (debug.enabled) {
                debug(`Sent Message (${this._getCharacteristicNameFromUUID(uuid)})`, message);
            }
            characteristic.write(message, false, callback);
        }
        this._bleDevice.writeToCharacteristic(uuid, message, callback);
    }
    _getCharacteristicNameFromUUID(uuid) {
        const keys = Object.keys(Consts.BLECharacteristic);
@ -508,7 +517,7 @@ exports.WeDo2SmartHub = WeDo2SmartHub;
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a>
-		on Mon Feb 4th 2019
+		on Wed Feb 6th 2019
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>
--- a/src/bledevice.ts
+++ b/src/bledevice.ts
@ -29,7 +29,9 @@ export class BLEDevice extends EventEmitter {
            }, 1000);
        } else {
            this._webBLEServer = device;
-            this._uuid = device.uuid;
+            this._uuid = device.id;
            this._name = device.name;
            this.emit("discoverComplete");
        }
    }
@ -135,7 +137,26 @@ export class BLEDevice extends EventEmitter {
    }
-    public writeDataToCharacteristic (uuid: string, data: Buffer, callback?: () => void) {
+    public readFromCharacteristic (uuid: string, callback: (err: string | null, data: Buffer | null) => void) {
        uuid = this._sanitizeUUID(uuid);
        if (this._noblePeripheral) {
            this._characteristics[uuid].read((err: string, data: Buffer) => {
                return callback(err, data);
            });
        } else if (this._webBLEServer) {
            try {
                // @ts-ignore
                this._characteristics[uuid].readValue().then((data) => {
                    callback(null, data);
                });
            } catch (err) {
                callback(err, null);
            }
        }
    }
    public writeToCharacteristic (uuid: string, data: Buffer, callback?: () => void) {
        uuid = this._sanitizeUUID(uuid);
        if (this._noblePeripheral) {
            this._characteristics[uuid].write(data, false, callback);
--- a/src/consts.ts
+++ b/src/consts.ts
@ -134,6 +134,7 @@ export enum BLEService {
    WEDO2_SMART_HUB_2 = "00004f0e-1212-efde-1523-785feabcd123",
    WEDO2_SMART_HUB_3 = "2a19",
    WEDO2_SMART_HUB_4 = "180f",
    WEDO2_SMART_HUB_5 = "180a",
    LPF2_HUB = "00001623-1212-efde-1623-785feabcd123"
 }
--- a/src/lpf2hub.ts
+++ b/src/lpf2hub.ts
@ -140,7 +140,7 @@ export class LPF2Hub extends Hub {
        message = Buffer.concat([Buffer.alloc(2), message]);
        message[0] = message.length;
        debug("Sent Message (LPF2_ALL)", message);
-        this._bleDevice.writeDataToCharacteristic(uuid, message, callback);
+        this._bleDevice.writeToCharacteristic(uuid, message, callback);
    }
--- a/src/wedo2smarthub.ts
+++ b/src/wedo2smarthub.ts
@ -56,17 +56,22 @@ export class WeDo2SmartHub extends Hub {
            await this._bleDevice.discoverCharacteristicsForService(Consts.BLEService.WEDO2_SMART_HUB_2);
            await this._bleDevice.discoverCharacteristicsForService(Consts.BLEService.WEDO2_SMART_HUB_3);
            await this._bleDevice.discoverCharacteristicsForService(Consts.BLEService.WEDO2_SMART_HUB_4);
            await this._bleDevice.discoverCharacteristicsForService(Consts.BLEService.WEDO2_SMART_HUB_5);
            this._bleDevice.subscribeToCharacteristic(Consts.BLECharacteristic.WEDO2_PORT_TYPE, this._parsePortMessage.bind(this));
            this._bleDevice.subscribeToCharacteristic(Consts.BLECharacteristic.WEDO2_SENSOR_VALUE, this._parseSensorMessage.bind(this));
            this._bleDevice.subscribeToCharacteristic(Consts.BLECharacteristic.WEDO2_BUTTON, this._parseSensorMessage.bind(this));
            this._bleDevice.subscribeToCharacteristic(Consts.BLECharacteristic.WEDO2_BATTERY, this._parseBatteryMessage.bind(this));
            this._bleDevice.subscribeToCharacteristic(Consts.BLECharacteristic.WEDO2_HIGH_CURRENT_ALERT, this._parseHighCurrentAlert.bind(this));
-            // this._getCharacteristic(Consts.BLECharacteristic.WEDO2_BATTERY).read((err, data) => {
+            this._bleDevice.readFromCharacteristic(Consts.BLECharacteristic.WEDO2_BATTERY, (err, data) => {
-            //     this._parseBatteryMessage(data);
+                if (data) {
-            // });
+                    this._parseBatteryMessage(data);
-            // this._getCharacteristic(Consts.BLECharacteristic.WEDO2_FIRMWARE_REVISION).read((err, data) => {
+                }
-            //     this._parseFirmwareRevisionString(data);
+            });
-            // });
+            this._bleDevice.readFromCharacteristic(Consts.BLECharacteristic.WEDO2_FIRMWARE_REVISION, (err, data) => {
                if (data) {
                    this._parseFirmwareRevisionString(data);
                }
            });
            setTimeout(() => {
                this._activatePortDevice(0x03, 0x15, 0x00, 0x00); // Activate voltage reports
                this._activatePortDevice(0x04, 0x14, 0x00, 0x00); // Activate current reports
@ -289,7 +294,7 @@ export class WeDo2SmartHub extends Hub {
        if (debug.enabled) {
            debug(`Sent Message (${this._getCharacteristicNameFromUUID(uuid)})`, message);
        }
-        this._bleDevice.writeDataToCharacteristic(uuid, message, callback);
+        this._bleDevice.writeToCharacteristic(uuid, message, callback);
    }