diff -r f1a7c14d5601 -r a42166cbb19a www/js/mon_ispindel.js --- a/www/js/mon_ispindel.js Sat Mar 07 21:05:49 2020 +0100 +++ b/www/js/mon_ispindel.js Sun Mar 08 17:11:18 2020 +0100 @@ -100,7 +100,8 @@ { name: 'battery', type: 'float' }, { name: 'gravity', type: 'float' }, { name: 'up_interval', type: 'int' }, - { name: 'mode', type: 'string' } + { name: 'mode', type: 'string' }, + { name: 'og_gravity', type: 'float' } ], id: 'record', url: url @@ -137,10 +138,21 @@ $('#gaugeContainer_temperature').jqxGauge({ caption: { value: record.temperature.toFixed(3) + '°C' }}); $('#gaugeContainer_temperature').jqxGauge({ value: record.temperature }); + var og = plato_to_sg(record.og_gravity); + var sg = plato_to_sg(record.gravity); + var svg = 100 * (og - sg) / (og - 1); + $('#info_battery').val(record.battery); $('#info_tilt').val(record.angle); $('#info_plato').val(record.gravity); - $('#info_sg').val(plato_to_sg(record.gravity)); + $('#info_sg').val(sg); + + $('#vg_og1').html(og.toFixed(4)); + $('#vg_og2').html(record.og_gravity.toFixed(1) + '°P'); + $('#vg_sg1').html(sg.toFixed(4)); + $('#vg_sg2').html(record.gravity.toFixed(1) + '°P'); + $('#vg_svg').html(svg.toFixed(1) + '%') + $('#vg_abv').html(abvol(og, sg).toFixed(2) + '%'); var gravity = plato_to_sg(record.gravity) * 1000; $('#gaugeContainer_gravity').jqxLinearGauge({ value: gravity });