Skip to content

Commit 95301c7

Browse files
author
Andy Werner
committed
v0.1.2: Wifi quality is shown in (correct) percentage
1 parent 84d73dd commit 95301c7

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

octoprint_netconnectd/static/js/netconnectd.js

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,15 +208,15 @@ $(function() {
208208
var qualityInt = parseInt(wifi.quality);
209209
var quality = undefined;
210210
if (!isNaN(qualityInt)) {
211-
quality = qualityInt;
211+
quality = self._convert_dbm_to_percent(qualityInt);
212212
}
213213

214214
wifis.push({
215215
ssid: wifi.ssid,
216216
address: wifi.address,
217217
encrypted: wifi.encrypted,
218218
quality: quality,
219-
qualityText: (quality != undefined) ? "" + quality + " dBm" : undefined
219+
qualityText: (quality != undefined) ? "" + quality + " %" : ""
220220
});
221221
});
222222

@@ -443,6 +443,21 @@ $(function() {
443443
return !self.reconnectInProgress;
444444
}
445445

446+
self._convert_dbm_to_percent = function(dbm) {
447+
var res = 0;
448+
var max = -40;
449+
var min = -90;
450+
dbm = parseInt(dbm);
451+
if (dbm > max) {
452+
res = 100;
453+
} else if (dbm < min) {
454+
res = 0;
455+
} else {
456+
res = Math.round(10-((dbm*-1 +max) / (max-min)) * 10)*10
457+
}
458+
return res;
459+
}
460+
446461
}
447462

448463
// view model class, parameters for constructor, container to bind to

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
setuptools.setup(**octoprint_setuptools.create_plugin_setup_parameters(
66
identifier="netconnectd",
77
name="OctoPrint-Netconnectd",
8-
version="0.1.1",
8+
version="0.1.2", # Gina's version ins master is "0.1" - April 2018
99
description="Client for netconnectd that allows configuration of netconnectd through OctoPrint's settings dialog. It's only available for Linux right now.",
1010
author="Gina Häußge",
1111

0 commit comments

Comments
 (0)