From d58ddbf35ace3dee1d910912e1a71d33dadb80b2 Mon Sep 17 00:00:00 2001 From: Bluepr1nt Date: Wed, 29 Mar 2017 13:20:03 +0200 Subject: [PATCH] test --- mean-app/server/routes/thingapi.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mean-app/server/routes/thingapi.js b/mean-app/server/routes/thingapi.js index 344aaee..20a5afb 100644 --- a/mean-app/server/routes/thingapi.js +++ b/mean-app/server/routes/thingapi.js @@ -28,6 +28,8 @@ var parseTelegram = function(data, callback){ // }else { // console.log("No!!!!") //} + + //TOE1 regx = /1-0:1\.8\.1\((\d{5}\.\d{3})\*kWh\)/g found = str.match(regx); @@ -40,7 +42,7 @@ var parseTelegram = function(data, callback){ //TOE2 - regx = /1-0:1\.8\.2\((\d{6}\.\d{3})\*kWh\)/g; + regx = /1-0:1\.8\.2\((\d{5}\.\d{3})\*kWh\)/g; found = str.match(regx); if(found.length > 0) @@ -48,7 +50,7 @@ var parseTelegram = function(data, callback){ //TTE1 - regx = /1-0:2\.8\.1\((\d{6}\.\d{3})\*kWh\)/g; + regx = /1-0:2\.8\.1\((\d{5}\.\d{3})\*kWh\)/g; found = str.match(regx); if(found.length > 0) @@ -56,7 +58,7 @@ var parseTelegram = function(data, callback){ //TTE2 - regx = /1-0:2\.8\.2\((\d{6}\.\d{3})\*kWh\)/g; + regx = /1-0:2\.8\.2\((\d{5}\.\d{3})\*kWh\)/g; found = str.match(regx); if(found.length > 0)