Issue #5 Plugin doesn't work properly in non-US locales. (#8)

* Switch comma to period as decimal separator

* Changed memory utilization to use /proc/meminfo as it is less sensitive to different locales

* Fix to work correctly in other locales

index.js

@@ -29,7 +29,7 @@ const spawn = require('child_process').spawn
 const gpu_temp_command = 'vcgencmd measure_temp'
 const cpu_temp_command = 'cat /sys/class/thermal/thermal_zone0/temp'
 const cpu_util_mpstat_command = 'S_TIME_FORMAT=\'ISO\' mpstat -P ALL 5 1 | sed -n 4,8p'
-const mem_util_command = 'free'
+const mem_util_command = 'cat /proc/meminfo'
 const sd_util_command = 'df --output=pcent \/\| tail -1 \| awk \'gsub\(\"\%\",\"\"\)\''
 
 module.exports = function(app) {
@@ -204,7 +204,7 @@ module.exports = function(app) {
               }
               newPath = newPath + "core." + (Number(spl_line[1])+1).toString()
               newPath = newPath + "." + pathArray[(pathArray.length-1)]
-              var cpu_util_core = ((100 - Number(spl_line[11]))/100).toFixed(2)
+		var cpu_util_core = ((100 - Number(spl_line[11].replace(/,/, '.')))/100).toFixed(2)
               app.handleMessage(plugin.id, {
                 updates: [
                   {
@@ -218,7 +218,7 @@ module.exports = function(app) {
             }
             else {
               debug(`cpu utilisation is ${spl_line[11]}`)
-              cpu_util_all = ((100 - Number(spl_line[11]))/100).toFixed(2)
+		cpu_util_all = ((100 - Number(spl_line[11].replace(/,/, '.')))/100).toFixed(2)
               app.handleMessage(plugin.id, {
                 updates: [
                   {
@@ -249,24 +249,44 @@ module.exports = function(app) {
       memutil.stdout.on('data', (data) => {
         debug(`got memory  ${data}`)
         var mem_util = data.toString().replace(/(\n|\r)+$/, '').split('\n')
-        mem_util.forEach(function(mem_util_line){
+        var mem_total
+        var mem_free
+        var buffers
+        var cached
+        var slab
+        mem_util.forEach(function(mem_util_line) {
           var splm_line = mem_util_line.replace(/ +/g, ' ').split(' ')
-          if (splm_line[0].toString() === "Mem:"){
-            var mem_util_per = (Number(splm_line[2])/Number(splm_line[1])).toFixed(2)
-            app.handleMessage(plugin.id, {
-              updates: [
-                {
-                  values: [ {
-                    path: options.path_mem_util,
-                    value: Number(mem_util_per)
-                  }]
-                }
-              ]
-            })
-          }
+          if (splm_line[0].toString() === "MemTotal:") {
+            mem_total = Number(splm_line[1])
+            debug(`got mem_total = ${mem_total}`)
+	  } else if (splm_line[0].toString() === "MemFree:") {
+	    mem_free = Number(splm_line[1])
+	    debug(`got mem_free = ${mem_free}`)
+          } else if (splm_line[0].toString() === "Buffers:") {
+            buffers = Number(splm_line[1])
+            debug(`got buffers = ${buffers}`)
+          } else if (splm_line[0].toString() === "Cached:") {
+            cached = Number(splm_line[1])
+            debug(`got cached = ${cached}`)
+          } else if (splm_line[0].toString() === "Slab:") {
+            slab = Number(splm_line[1])
+            debug(`got slab = ${slab}`)
+	  }
+	})
+	var mem_util_per = ((mem_total - (mem_free + buffers + cached + slab))/mem_total).toFixed(2)
+	debug(`mem_util_per: ${mem_util_per}`)
+
+        app.handleMessage(plugin.id, {
+          updates: [
+            {
+              values: [ {
+                path: options.path_mem_util,
+                value: Number(mem_util_per)
+              }]
+            }
+          ]
         })
       })
-
       memutil.on('error', (error) => {
         console.error(error.toString())
       })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "signalk-rpi-monitor",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Signal K Node Server Plugin for Raspberry PI monitoring",
   "homepage": "https://github.com/sberl/signalk-rpi-monitor#readme",
   "keywords": [