Mercurial > mbsePi-apps / file comparison
comparison: www/js/fermenter.js
www/js/fermenter.js
- changeset 682
- f82be2bd472f
- parent 681
- 1f81e52c5abf
- child 683
- d48733bf1529
equal
deleted
inserted
replaced
| 681:1f81e52c5abf | 682:f82be2bd472f |
|---|---|
| 438 var msg = evt.data; | 438 var msg = evt.data; |
| 439 var obj = JSON.parse(msg); | 439 var obj = JSON.parse(msg); |
| 440 | 440 |
| 441 // console.log('ws got ' + msg); | 441 // console.log('ws got ' + msg); |
| 442 | 442 |
| 443 if (obj.ping == 1) { | 443 if (obj.ping) { |
| 444 // console.log('ws got ping'); | 444 websocket.send('{"pong":' + obj.ping + '}'); |
| 445 websocket.send('{"pong":1}'); | |
| 446 } | 445 } |
| 447 | 446 |
| 448 if (obj.type == 'global') { | 447 if (obj.type == 'global') { |
| 449 console.log('ws got global ' + msg); | 448 console.log('ws got global ' + msg); |
| 450 global.name = obj.name; | 449 global.name = obj.name; |
| 453 global.os_version = obj.os_version; | 452 global.os_version = obj.os_version; |
| 454 global.FW = obj.FW; | 453 global.FW = obj.FW; |
| 455 global.room_temp = obj.THB.temperature; | 454 global.room_temp = obj.THB.temperature; |
| 456 global.room_hum = obj.THB.humidity; | 455 global.room_hum = obj.THB.humidity; |
| 457 updateScreen(); | 456 updateScreen(); |
| 458 } | 457 } else if (obj.type == 'fermenter' && obj.unit == record.unit) { |
| 459 | |
| 460 if (obj.type == 'fermenter' && obj.unit == record.unit) { | |
| 461 record.beeruuid = obj.metric.product.uuid; | 458 record.beeruuid = obj.metric.product.uuid; |
| 462 record.beercode = obj.metric.product.code; | 459 record.beercode = obj.metric.product.code; |
| 463 record.beername = obj.metric.product.name; | 460 record.beername = obj.metric.product.name; |
| 464 record.yeast_lo = obj.metric.product.yeast_lo; | 461 record.yeast_lo = obj.metric.product.yeast_lo; |
| 465 record.yeast_hi = obj.metric.product.yeast_hi; | 462 record.yeast_hi = obj.metric.product.yeast_hi; |
