Mercurial > mbsePi-apps / file comparison
comparison: www/js/fermenter.js
www/js/fermenter.js
- changeset 719
- a9c278202b59
- parent 718
- 39a68509b138
- child 722
- 1ff860e407f2
equal
deleted
inserted
replaced
| 718:39a68509b138 | 719:a9c278202b59 |
|---|---|
| 450 | 450 |
| 451 websocket.onmessage = function(evt) { | 451 websocket.onmessage = function(evt) { |
| 452 var msg = evt.data; | 452 var msg = evt.data; |
| 453 var obj = JSON.parse(msg); | 453 var obj = JSON.parse(msg); |
| 454 | 454 |
| 455 // console.log('ws got ' + msg); | |
| 456 | |
| 457 if (obj.ping) { | 455 if (obj.ping) { |
| 458 websocket.send('{"pong":' + obj.ping + '}'); | 456 websocket.send('{"pong":' + obj.ping + '}'); |
| 459 } | 457 } |
| 460 | 458 |
| 461 if (obj.type == 'global') { | 459 if (obj.type == 'global') { |
| 506 record.fan_address = ''; | 504 record.fan_address = ''; |
| 507 } | 505 } |
| 508 if (obj.metric.door) { | 506 if (obj.metric.door) { |
| 509 record.door_address = obj.metric.door.address; | 507 record.door_address = obj.metric.door.address; |
| 510 record.door_state = obj.metric.door.state; | 508 record.door_state = obj.metric.door.state; |
| 511 } | 509 } else { |
| 512 if (obj.metric.light) | 510 record.door_address = ''; |
| 513 record.light_state = obj.metric.light.state; | 511 } |
| 514 if (obj.metric.psu) | 512 if (obj.metric.light) { |
| 515 record.psu_state = obj.metric.psu.state; | 513 record.light_address = obj.metric.light.address; |
| 514 record.light_state = obj.metric.light.state; | |
| 515 } else { | |
| 516 record.light_address = ''; | |
| 517 } | |
| 518 if (obj.metric.psu) { | |
| 519 record.psu_address = obj.metric.psu.address; | |
| 520 record.psu_state = obj.metric.psu.state; | |
| 521 } else { | |
| 522 record.psu_address = ''; | |
| 523 } | |
| 516 record.mode = obj.metric.mode; | 524 record.mode = obj.metric.mode; |
| 517 record.stage = obj.metric.stage; | 525 record.stage = obj.metric.stage; |
| 518 record.alarm = obj.metric.alarm; | 526 record.alarm = obj.metric.alarm; |
| 519 record.setpoint_low = obj.metric.setpoint.low; | 527 record.setpoint_low = obj.metric.setpoint.low; |
| 520 record.setpoint_high = obj.metric.setpoint.high; | 528 record.setpoint_high = obj.metric.setpoint.high; |
| 521 if (obj.metric.profile) { | 529 if (obj.metric.profile) { |
| 522 record.profile_uuid = obj.metric.profile.uuid; | 530 record.profile_uuid = obj.metric.profile.uuid; |
| 523 record.profile_name = obj.metric.profile.name; | 531 record.profile_name = obj.metric.profile.name; |
| 524 record.profile_state = obj.metric.profile.state; | 532 record.profile_state = obj.metric.profile.state; |
| 525 record.profile_percent = obj.metric.profile.percent; | 533 record.profile_percent = obj.metric.profile.percent; |
| 526 record.profile_inittemp_high = obj.metric.profile.inittemp.high; | 534 record.profile_inittemp_high = obj.metric.profile.inittemp.high; |
| 527 record.profile_inittemp_low = obj.metric.profile.inittemp.low; | 535 record.profile_inittemp_low = obj.metric.profile.inittemp.low; |
| 528 } else { | 536 } else { |
| 529 record.profile_uuid = ''; | 537 record.profile_uuid = ''; |
| 530 record.profile_name = ''; | 538 record.profile_name = ''; |
| 531 record.profile_state = ''; | 539 record.profile_state = ''; |
| 532 record.profile_percent = 0; | 540 record.profile_percent = 0; |
| 533 } | 541 } |
| 534 updateScreen(); | 542 updateScreen(); |
| 535 } | 543 } |
| 536 } | 544 } |
| 537 }); | 545 }); |
