Skip to content

Commit c01c482

Browse files
shengyuanshengyuan
committed
0.5.3
1 parent 9b6b8e5 commit c01c482

16 files changed

+237
-98
lines changed

‎dist/webduino-all.js‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2496,7 +2496,7 @@ Paho.MQTT = (function (global) {
24962496
})(window);
24972497

24982498
var webduino = webduino || {
2499-
version: '0.5.2'
2499+
version: '0.5.3'
25002500
};
25012501

25022502
if (typeof exports !== 'undefined') {
@@ -3154,34 +3154,40 @@ if (typeof exports !== 'undefined') {
31543154
proto;
31553155

31563156
var TransportEvent = {
3157-
31583157
/**
31593158
* Fires when a transport is opened.
3160-
*
3159+
*
31613160
* @event TransportEvent.OPEN
31623161
*/
3163-
OPEN: 'open',
3162+
OPEN: "open",
31643163

31653164
/**
31663165
* Fires when a transport receives a message.
3167-
*
3166+
*
31683167
* @event TransportEvent.MESSAGE
31693168
*/
3170-
MESSAGE: 'message',
3169+
MESSAGE: "message",
31713170

31723171
/**
31733172
* Fires when a transport get an error.
3174-
*
3173+
*
31753174
* @event TransportEvent.ERROR
31763175
*/
3177-
ERROR: 'error',
3176+
ERROR: "error",
31783177

31793178
/**
31803179
* Fires when a transport is closed.
3181-
*
3180+
*
31823181
* @event TransportEvent.CLOSE
31833182
*/
3184-
CLOSE: 'close'
3183+
CLOSE: "close",
3184+
3185+
/**
3186+
* Fires when a transport is re-opened.
3187+
*
3188+
* @event TransportEvent.REOPEN
3189+
*/
3190+
REOPEN: "reopen"
31853191
};
31863192

31873193
/**
@@ -3348,6 +3354,10 @@ if (typeof exports !== 'undefined') {
33483354

33493355
function detectStatusChange(self, newStatus, oldStatus) {
33503356
if (newStatus === oldStatus) {
3357+
if (newStatus === STATUS.OK) {
3358+
// Device reconnected
3359+
self.emit(TransportEvent.REOPEN);
3360+
}
33513361
return;
33523362
}
33533363

@@ -4039,7 +4049,8 @@ if (typeof exports !== 'undefined') {
40394049
READY: 'ready',
40404050
ERROR: 'error',
40414051
BEFOREDISCONNECT: 'beforeDisconnect',
4042-
DISCONNECT: 'disconnect'
4052+
DISCONNECT: 'disconnect',
4053+
RECONNECT: 'reconnect'
40434054
};
40444055

40454056
/**
@@ -4110,6 +4121,7 @@ if (typeof exports !== 'undefined') {
41104121

41114122
this._initialVersionResultHandler = onInitialVersionResult.bind(this);
41124123
this._openHandler = onOpen.bind(this);
4124+
this._reOpenHandler = onReOpen.bind(this);
41134125
this._messageHandler = onMessage.bind(this);
41144126
this._errorHandler = onError.bind(this);
41154127
this._closeHandler = onClose.bind(this);
@@ -4137,6 +4149,11 @@ if (typeof exports !== 'undefined') {
41374149
this.begin();
41384150
}
41394151

4152+
function onReOpen() {
4153+
this._logger.info("onReOpen", "Device re-online");
4154+
this.emit(BoardEvent.RECONNECT);
4155+
}
4156+
41404157
function onMessage(data) {
41414158
try {
41424159
this._logger.info('onMessage', data);
@@ -4568,7 +4585,7 @@ if (typeof exports !== 'undefined') {
45684585
proto.sendDigitalData = function (pin, value) {
45694586
try {
45704587
var portNum = Math.floor(pin / 8);
4571-
4588+
45724589
if (value === Pin.HIGH) {
45734590
// Set the bit
45744591
this._digitalPort[portNum] |= (value << (pin % 8));
@@ -4626,6 +4643,7 @@ if (typeof exports !== 'undefined') {
46264643
trsp.on(TransportEvent.MESSAGE, this._messageHandler);
46274644
trsp.on(TransportEvent.ERROR, this._errorHandler);
46284645
trsp.on(TransportEvent.CLOSE, this._closeHandler);
4646+
trsp.on(TransportEvent.REOPEN, this._reOpenHandler);
46294647
this._transport = trsp;
46304648
}
46314649
};

‎dist/webduino-all.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/webduino-base.js‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2496,7 +2496,7 @@ Paho.MQTT = (function (global) {
24962496
})(window);
24972497

24982498
var webduino = webduino || {
2499-
version: '0.5.2'
2499+
version: '0.5.3'
25002500
};
25012501

25022502
if (typeof exports !== 'undefined') {
@@ -3154,34 +3154,40 @@ if (typeof exports !== 'undefined') {
31543154
proto;
31553155

31563156
var TransportEvent = {
3157-
31583157
/**
31593158
* Fires when a transport is opened.
3160-
*
3159+
*
31613160
* @event TransportEvent.OPEN
31623161
*/
3163-
OPEN: 'open',
3162+
OPEN: "open",
31643163

31653164
/**
31663165
* Fires when a transport receives a message.
3167-
*
3166+
*
31683167
* @event TransportEvent.MESSAGE
31693168
*/
3170-
MESSAGE: 'message',
3169+
MESSAGE: "message",
31713170

31723171
/**
31733172
* Fires when a transport get an error.
3174-
*
3173+
*
31753174
* @event TransportEvent.ERROR
31763175
*/
3177-
ERROR: 'error',
3176+
ERROR: "error",
31783177

31793178
/**
31803179
* Fires when a transport is closed.
3181-
*
3180+
*
31823181
* @event TransportEvent.CLOSE
31833182
*/
3184-
CLOSE: 'close'
3183+
CLOSE: "close",
3184+
3185+
/**
3186+
* Fires when a transport is re-opened.
3187+
*
3188+
* @event TransportEvent.REOPEN
3189+
*/
3190+
REOPEN: "reopen"
31853191
};
31863192

31873193
/**
@@ -3348,6 +3354,10 @@ if (typeof exports !== 'undefined') {
33483354

33493355
function detectStatusChange(self, newStatus, oldStatus) {
33503356
if (newStatus === oldStatus) {
3357+
if (newStatus === STATUS.OK) {
3358+
// Device reconnected
3359+
self.emit(TransportEvent.REOPEN);
3360+
}
33513361
return;
33523362
}
33533363

@@ -4039,7 +4049,8 @@ if (typeof exports !== 'undefined') {
40394049
READY: 'ready',
40404050
ERROR: 'error',
40414051
BEFOREDISCONNECT: 'beforeDisconnect',
4042-
DISCONNECT: 'disconnect'
4052+
DISCONNECT: 'disconnect',
4053+
RECONNECT: 'reconnect'
40434054
};
40444055

40454056
/**
@@ -4110,6 +4121,7 @@ if (typeof exports !== 'undefined') {
41104121

41114122
this._initialVersionResultHandler = onInitialVersionResult.bind(this);
41124123
this._openHandler = onOpen.bind(this);
4124+
this._reOpenHandler = onReOpen.bind(this);
41134125
this._messageHandler = onMessage.bind(this);
41144126
this._errorHandler = onError.bind(this);
41154127
this._closeHandler = onClose.bind(this);
@@ -4137,6 +4149,11 @@ if (typeof exports !== 'undefined') {
41374149
this.begin();
41384150
}
41394151

4152+
function onReOpen() {
4153+
this._logger.info("onReOpen", "Device re-online");
4154+
this.emit(BoardEvent.RECONNECT);
4155+
}
4156+
41404157
function onMessage(data) {
41414158
try {
41424159
this._logger.info('onMessage', data);
@@ -4568,7 +4585,7 @@ if (typeof exports !== 'undefined') {
45684585
proto.sendDigitalData = function (pin, value) {
45694586
try {
45704587
var portNum = Math.floor(pin / 8);
4571-
4588+
45724589
if (value === Pin.HIGH) {
45734590
// Set the bit
45744591
this._digitalPort[portNum] |= (value << (pin % 8));
@@ -4626,6 +4643,7 @@ if (typeof exports !== 'undefined') {
46264643
trsp.on(TransportEvent.MESSAGE, this._messageHandler);
46274644
trsp.on(TransportEvent.ERROR, this._errorHandler);
46284645
trsp.on(TransportEvent.CLOSE, this._closeHandler);
4646+
trsp.on(TransportEvent.REOPEN, this._reOpenHandler);
46294647
this._transport = trsp;
46304648
}
46314649
};

‎dist/webduino-base.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/classes/webduino.Board.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ <h2>Constructor</h2>
159159
<div class="meta">
160160
<p>
161161
Defined in
162-
<a href="../files/src_core_Board.js.html#l66"><code>src&#x2F;core&#x2F;Board.js:66</code></a>
162+
<a href="../files/src_core_Board.js.html#l67"><code>src&#x2F;core&#x2F;Board.js:67</code></a>
163163
</p>
164164

165165

‎docs/classes/webduino.Transport.html‎

Lines changed: 34 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ <h2>Constructor</h2>
168168
<div class="meta">
169169
<p>
170170
Defined in
171-
<a href="../files/src_core_Transport.js.html#l46"><code>src&#x2F;core&#x2F;Transport.js:46</code></a>
171+
<a href="../files/src_core_Transport.js.html#l52"><code>src&#x2F;core&#x2F;Transport.js:52</code></a>
172172
</p>
173173

174174

@@ -276,7 +276,7 @@ <h4>Parameters:</h4>
276276
<div class="meta">
277277
<p>
278278
Defined in
279-
<a href="../files/src_core_Transport.js.html#l88"><code>src&#x2F;core&#x2F;Transport.js:88</code></a>
279+
<a href="../files/src_core_Transport.js.html#l94"><code>src&#x2F;core&#x2F;Transport.js:94</code></a>
280280
</p>
281281

282282

@@ -366,7 +366,7 @@ <h4>Parameters:</h4>
366366
<div class="meta">
367367
<p>
368368
Defined in
369-
<a href="../files/src_core_Transport.js.html#l97"><code>src&#x2F;core&#x2F;Transport.js:97</code></a>
369+
<a href="../files/src_core_Transport.js.html#l103"><code>src&#x2F;core&#x2F;Transport.js:103</code></a>
370370
</p>
371371

372372

@@ -681,7 +681,7 @@ <h4>Parameters:</h4>
681681
<div class="meta">
682682
<p>
683683
Defined in
684-
<a href="../files/src_core_Transport.js.html#l78"><code>src&#x2F;core&#x2F;Transport.js:78</code></a>
684+
<a href="../files/src_core_Transport.js.html#l84"><code>src&#x2F;core&#x2F;Transport.js:84</code></a>
685685
</p>
686686

687687

@@ -781,7 +781,7 @@ <h3 class="name"><code>isOpen</code></h3>
781781
<div class="meta">
782782
<p>
783783
Defined in
784-
<a href="../files/src_core_Transport.js.html#l65"><code>src&#x2F;core&#x2F;Transport.js:65</code></a>
784+
<a href="../files/src_core_Transport.js.html#l71"><code>src&#x2F;core&#x2F;Transport.js:71</code></a>
785785
</p>
786786

787787

@@ -812,7 +812,7 @@ <h3 class="name"><code>TransportEvent.CLOSE</code></h3>
812812
<div class="meta">
813813
<p>
814814
Defined in
815-
<a href="../files/src_core_Transport.js.html#l38"><code>src&#x2F;core&#x2F;Transport.js:38</code></a>
815+
<a href="../files/src_core_Transport.js.html#l37"><code>src&#x2F;core&#x2F;Transport.js:37</code></a>
816816
</p>
817817

818818

@@ -837,7 +837,7 @@ <h3 class="name"><code>TransportEvent.ERROR</code></h3>
837837
<div class="meta">
838838
<p>
839839
Defined in
840-
<a href="../files/src_core_Transport.js.html#l31"><code>src&#x2F;core&#x2F;Transport.js:31</code></a>
840+
<a href="../files/src_core_Transport.js.html#l30"><code>src&#x2F;core&#x2F;Transport.js:30</code></a>
841841
</p>
842842

843843

@@ -862,7 +862,7 @@ <h3 class="name"><code>TransportEvent.MESSAGE</code></h3>
862862
<div class="meta">
863863
<p>
864864
Defined in
865-
<a href="../files/src_core_Transport.js.html#l24"><code>src&#x2F;core&#x2F;Transport.js:24</code></a>
865+
<a href="../files/src_core_Transport.js.html#l23"><code>src&#x2F;core&#x2F;Transport.js:23</code></a>
866866
</p>
867867

868868

@@ -887,7 +887,7 @@ <h3 class="name"><code>TransportEvent.OPEN</code></h3>
887887
<div class="meta">
888888
<p>
889889
Defined in
890-
<a href="../files/src_core_Transport.js.html#l17"><code>src&#x2F;core&#x2F;Transport.js:17</code></a>
890+
<a href="../files/src_core_Transport.js.html#l16"><code>src&#x2F;core&#x2F;Transport.js:16</code></a>
891891
</p>
892892

893893

@@ -900,6 +900,31 @@ <h3 class="name"><code>TransportEvent.OPEN</code></h3>
900900

901901

902902

903+
</div>
904+
<div id="event_TransportEvent.REOPEN" class="events item">
905+
<h3 class="name"><code>TransportEvent.REOPEN</code></h3>
906+
<span class="type"></span>
907+
908+
909+
910+
911+
912+
<div class="meta">
913+
<p>
914+
Defined in
915+
<a href="../files/src_core_Transport.js.html#l44"><code>src&#x2F;core&#x2F;Transport.js:44</code></a>
916+
</p>
917+
918+
919+
</div>
920+
921+
<div class="description">
922+
<p>Fires when a transport is re-opened.</p>
923+
924+
</div>
925+
926+
927+
903928
</div>
904929
</div>
905930
</div>

0 commit comments

Comments
 (0)