node-red-contrib-antenna-genius 0.2.3-beta → 0.2.4-beta
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -29,7 +29,7 @@ module.exports = (RED) => {
|
|
|
29
29
|
this.status({ fill: "red", shape: "ring", text: "disconnected" });
|
|
30
30
|
});
|
|
31
31
|
|
|
32
|
-
this.server.updatesEventEmitter.on("status", () => {
|
|
32
|
+
this.server.updatesEventEmitter.on("status", (forceUpdate) => {
|
|
33
33
|
|
|
34
34
|
let maxNumberOfAntennas = this.server.status.stackReach * 8;
|
|
35
35
|
if(this.antennaNumber < 1 || this.antennaNumber > maxNumberOfAntennas || this.antennaNumber > this.server.antennas.length) {
|
|
@@ -37,7 +37,7 @@ module.exports = (RED) => {
|
|
|
37
37
|
return;
|
|
38
38
|
}
|
|
39
39
|
|
|
40
|
-
let changed =
|
|
40
|
+
let changed = forceUpdate;
|
|
41
41
|
|
|
42
42
|
// Selected?
|
|
43
43
|
let radioAselected = this.antennaNumber == this.server.status.portA_antenna;
|
|
@@ -18,7 +18,7 @@ module.exports = (RED) => {
|
|
|
18
18
|
this.status({ fill: "red", shape: "ring", text: "disconnected" });
|
|
19
19
|
});
|
|
20
20
|
|
|
21
|
-
this.server.updatesEventEmitter.on("status", () => {
|
|
21
|
+
this.server.updatesEventEmitter.on("status", (forceUpdate) => {
|
|
22
22
|
let bandIndexA = this.server.status.portA_band;
|
|
23
23
|
let bandIndexB = this.server.status.portB_band;
|
|
24
24
|
|
|
@@ -39,7 +39,7 @@ module.exports = (RED) => {
|
|
|
39
39
|
let bandNameA = this.server.bands[bandIndexA].band_name;
|
|
40
40
|
let bandNameB = this.server.bands[bandIndexB].band_name;
|
|
41
41
|
|
|
42
|
-
let changed =
|
|
42
|
+
let changed = forceUpdate;
|
|
43
43
|
if (bandNameA !== this.bandNameA) {
|
|
44
44
|
changed = true;
|
|
45
45
|
this.bandNameA = bandNameA;
|
package/antenna-genius-server.js
CHANGED
|
@@ -22,6 +22,7 @@ module.exports = (RED) => {
|
|
|
22
22
|
this.bands = [];
|
|
23
23
|
this.interval = null;
|
|
24
24
|
this.timer = null;
|
|
25
|
+
this.refresh = 0;
|
|
25
26
|
|
|
26
27
|
this.updatesEventEmitter = new UpdatesEventEmitter();
|
|
27
28
|
this.updatesEventEmitter.setMaxListeners(0);
|
|
@@ -88,7 +89,8 @@ module.exports = (RED) => {
|
|
|
88
89
|
let decoded = Utils.decode(packet);
|
|
89
90
|
if(decoded.command == 401) {
|
|
90
91
|
this.status = { ...this.status, ...Utils.decode(packet) };
|
|
91
|
-
this.
|
|
92
|
+
this.refresh = (this.refresh + 1) % 1500;
|
|
93
|
+
this.updatesEventEmitter.emit("status", this.refresh == 0);
|
|
92
94
|
}
|
|
93
95
|
});
|
|
94
96
|
|
package/package.json
CHANGED
|
@@ -68,7 +68,7 @@ describe('antenna-genius-antenna-status Node', () => {
|
|
|
68
68
|
n2.server.info = { name: "Name" };
|
|
69
69
|
n2.server.status = { portA_antenna: 1, portA_band: 0, portB_antenna: 2, portB_band: 1 };
|
|
70
70
|
n2.server.antennas = [{ antenna_name: "Antenna0", antenna_bands: [1, 1] }, { antenna_name: "Antenna1", antenna_bands: [1, 1] }];
|
|
71
|
-
n2.server.updatesEventEmitter.emit("status");
|
|
71
|
+
n2.server.updatesEventEmitter.emit("status", false);
|
|
72
72
|
expect(n2.send.calledOnce).toBeTruthy();
|
|
73
73
|
expect(n2.status.calledOnceWithExactly({ fill: "green", shape: "dot", text: "Name - Antenna1" })).toBeTruthy();
|
|
74
74
|
|
|
@@ -97,7 +97,7 @@ describe('antenna-genius-antenna-status Node', () => {
|
|
|
97
97
|
n2.server.info = { name: "Name" };
|
|
98
98
|
n2.server.status = { portA_antenna: 1, portA_band: 0, portB_antenna: 2, portB_band: 1 };
|
|
99
99
|
n2.server.antennas = [{ antenna_name: "Antenna0", antenna_bands: [1, 1] }, { antenna_name: "Antenna1", antenna_bands: [1, 1] }];
|
|
100
|
-
n2.server.updatesEventEmitter.emit("status");
|
|
100
|
+
n2.server.updatesEventEmitter.emit("status", false);
|
|
101
101
|
expect(n2.send.calledOnce).toBeTruthy();
|
|
102
102
|
expect(n2.status.calledOnceWithExactly({ fill: "green", shape: "dot", text: "Name - Antenna1" })).toBeTruthy();
|
|
103
103
|
|
|
@@ -39,7 +39,7 @@ describe('antenna-genius-band-labels Node', () => {
|
|
|
39
39
|
it('should provide no output with no input', done => {
|
|
40
40
|
helper.load(nodes, flow, () => {
|
|
41
41
|
var n2 = helper.getNode("n2");
|
|
42
|
-
n2.server.updatesEventEmitter.emit("status");
|
|
42
|
+
n2.server.updatesEventEmitter.emit("status", false);
|
|
43
43
|
expect(n2.send.notCalled).toBeTruthy();
|
|
44
44
|
done();
|
|
45
45
|
});
|
|
@@ -49,7 +49,7 @@ describe('antenna-genius-band-labels Node', () => {
|
|
|
49
49
|
helper.load(nodes, flow, () => {
|
|
50
50
|
var n2 = helper.getNode("n2");
|
|
51
51
|
n2.server.status = { portA_band: 0, portB_band: 1 };
|
|
52
|
-
n2.server.updatesEventEmitter.emit("status");
|
|
52
|
+
n2.server.updatesEventEmitter.emit("status", false);
|
|
53
53
|
expect(n2.send.notCalled).toBeTruthy();
|
|
54
54
|
done();
|
|
55
55
|
});
|
|
@@ -74,7 +74,7 @@ describe('antenna-genius-band-labels Node', () => {
|
|
|
74
74
|
}
|
|
75
75
|
});
|
|
76
76
|
|
|
77
|
-
n2.server.updatesEventEmitter.emit("status");
|
|
77
|
+
n2.server.updatesEventEmitter.emit("status", false);
|
|
78
78
|
});
|
|
79
79
|
});
|
|
80
80
|
|