Merge pull request #1 from OctoPrint/master

Merging fix in display of WLAN quality

Author: Gallore

README.md

@@ -1,3 +1,11 @@
+---
+
+Provided as-is, currently not actively maintained.
+
+[OctoPrint](http://octoprint.org) is eating up too much of my time and I don't find myself at liberty to actively maintain this project for the foreseeable future. If it works for you, great. If it doesn't, sorry, I can't look into it.
+
+---
+
 # netconnectd plugin for OctoPrint
 
 ![netconnectd plugin: Overview with list of available wifis](https://i.imgur.com/Yjmxypvl.png)

octoprint_netconnectd/__init__.py

@@ -79,7 +79,7 @@ def on_api_get(self, request):
 			else:
 				wifis = []
 		except Exception as e:
-			return jsonify(dict(error=e.message))
+			return jsonify(dict(error=str(e)))
 
 		return jsonify(dict(
 			wifis=wifis,
@@ -235,7 +235,7 @@ def _send_message(self, message, data):
 				return False, output
 
 		except Exception as e:
-			output = "Error while talking to netconnectd: {}".format(e.message)
+			output = "Error while talking to netconnectd: {}".format(e)
 			self._logger.warn(output)
 			return False, output
 

octoprint_netconnectd/static/js/netconnectd.js

@@ -208,9 +208,6 @@ $(function() {
                 var qualityInt = parseInt(wifi.quality);
                 var quality = undefined;
                 if (!isNaN(qualityInt)) {
-                    if (qualityInt <= 0) {
-                        qualityInt = (-1) * qualityInt;
-                    }
                     quality = qualityInt;
                 }
 
@@ -219,7 +216,7 @@ $(function() {
                     address: wifi.address,
                     encrypted: wifi.encrypted,
                     quality: quality,
-                    qualityText: (quality != undefined) ? "" + quality + "%" : undefined
+                    qualityText: (quality != undefined) ? "" + quality + " dBm" : undefined
                 });
             });