use connectivity value in percent

ffulm · Feb 7, 2019 · 97f6154 · 97f6154
1 parent 2589cc6
commit 97f6154
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/files/usr/sbin/print_map.sh b/files/usr/sbin/print_map.sh
@@ -38,7 +38,9 @@ print_basic() {
 	echo -n "\"model\" : \"$(cat /tmp/sysinfo/model)\", "
 	echo -n "\"links\" : ["
 
-	printLink() { echo -n "{ \"smac\" : \"$(cat /sys/class/net/$3/address)\", \"dmac\" : \"$1\", \"qual\" : $2 }"; }
+	# Calculate bandwidth as percent value
+	calcQual() { echo "$1" "40" | awk '{ printf("%.1f", ($1 > $2) ? 100 : (100 * $1 / $2)) }'; }
+	printLink() { echo -n "{ \"smac\" : \"$(cat /sys/class/net/$3/address)\", \"dmac\" : \"$1\", \"qual\" : $(calcQual $2) }"; }
 	IFS="
 "
 	nd=0

diff --git a/files/www/freifunk/cgi-bin/status b/files/www/freifunk/cgi-bin/status
@@ -145,7 +145,7 @@ Array.prototype.forEach.call(neighbors, function(el) {
 		}
 
 		if (qual >= 0) {
-			var e = document.createTextNode(" (" + (100. * qual / 255.).toFixed(0) + "%)");
+			var e = document.createTextNode(" (" + qual.toFixed(0) + "%)");
 			el.parentNode.appendChild(e);
 		}
 	};