diff --git a/index.js b/index.js index 29b1373..b8a8f91 100644 --- a/index.js +++ b/index.js @@ -64,6 +64,7 @@ P1Reader.prototype.parsePackage = function(rawData) { var data = { "electricity": {}, "gas": {} }; data.electricity.date = new Date(); + data.electricity.timestamp = Math.floor(data.electricity.date.getTime() / 1000); var lines = rawData.split("\r\n"); // Not a full package (not enough lines) if(lines.length < 19) { @@ -98,7 +99,10 @@ P1Reader.prototype.parsePackage = function(rawData) { data.electricity.currentlyReturning = parseInt(res[2].replace('.', '') + '0'); break; case '24.3.0': - data.gas.date = new Date("20" + res[2].substring(0,2), res[2].substring(2,4), res[2].substring(4,6), res[2].substring(6,8), res[2].substring(8,10), res[2].substring(10,12), 0); + var dateString = "20" + res[2].substring(0,2) + "-" + res[2].substring(2,4) + "-" + res[2].substring(4,6) + " "; + dateString += res[2].substring(6,8) + ":" + res[2].substring(8,10) + ":" + res[2].substring(10,12); + data.gas.date = new Date(dateString); + data.gas.timestamp = Math.floor(data.gas.date.getTime() / 1000); data.gas.used = lines[l+1].replace(/[\(\)]/g, '').trim(); break; }