Karl/Drayton_MiGenie_HASS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

working temp

Browse Source
This commit is contained in:
Karl 2020-05-08 09:43:01 +01:00
parent 939e853ea0
commit 7e68b0b9f3
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/common.js
View File

@ -3,8 +3,8 @@ module.exports = {
updateTemp: async (heating) => { updateTemp: async (heating) => {
try { try {
let mrt = String(heating.measuredRoomTemp) let mrt = String(heating.measuredRoomTemp)
mrt = mrt.split(/(?=(?:..)*$)/) mrt = mrt.match(new RegExp('.{1,' + 2 + '}', 'g'));
mrt = parseFloat(mrt[1] + "." + mrt[0]) mrt = mrt[0] + "." + mrt[1]
return mrt return mrt
} catch (error) { } catch (error) {
console.log('Error') console.log('Error')

5
package-lock.json generated
View File

@ -419,6 +419,11 @@
"resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
"integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==" "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="
}, },
"numeral": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/numeral/-/numeral-2.0.6.tgz",
"integrity": "sha1-StCAk21EPCVhrtnyGX7//iX05QY="
},
"on-finished": { "on-finished": {
"version": "2.3.0", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",

9
routes/heating.js
View File

@ -15,13 +15,12 @@ module.exports = function (app) {
const on = await common.heatingOn(heating) const on = await common.heatingOn(heating)
let heatingStatus = { let heatingStatus = {
"heatingOn": on, "heatingOn": JSON.stringify(on),
"measuredRoomTemp": mrt, "measuredRoomTemp": mrt,
"currentSetpoint": heating.currentSetpoint, "currentSetpoint": JSON.stringify(heating.currentSetpoint),
"lastTimerSetPoint": heating.lastTimerSetPoint, "lastTimerSetPoint": JSON.stringify(heating.lastTimerSetPoint),
"lastTimerDurationMinutes": heating.lastTimerDurationMinutes "lastTimerDurationMinutes": JSON.stringify(heating.lastTimerDurationMinutes)
} }
res.json(heatingStatus) res.json(heatingStatus)
}); });