comparison: www/js/global.js
www/js/global.js
- changeset 652
- a5d9ec7e2239
- parent 648
- ee69b01fcb0e
- child 655
- f4e00869f39f
equal
deleted
inserted
replaced
| 651:6e89cb158153 | 652:a5d9ec7e2239 |
|---|---|
| 1047 } | 1047 } |
| 1048 | 1048 |
| 1049 | 1049 |
| 1050 | 1050 |
| 1051 function sg_to_plato(sg) { | 1051 function sg_to_plato(sg) { |
| 1052 return ((135.997 * sg - 630.272) * sg + 1111.14) * sg - 616.868; | 1052 // return ((135.997 * sg - 630.272) * sg + 1111.14) * sg - 616.868; |
| 1053 return -668.962 + (1262.45 * sg) - (776.43 * sg * sg) + (182.94 * sg * sg * sg); | |
| 1053 } | 1054 } |
| 1054 | 1055 |
| 1055 | 1056 |
| 1056 | 1057 |
| 1057 function plato_to_sg(plato) { | 1058 function plato_to_sg(plato) { |
| 1058 return 1 + (plato / (258.6 - ((plato / 258.2) * 227.1))); | 1059 // return 1 + (plato / (258.6 - ((plato / 258.2) * 227.1))); |
| 1060 return 1.00001 + (0.0038661 * plato) + (1.3488e-5 * plato * plato) + (4.3074e-8 * plato * plato * plato); | |
| 1059 } | 1061 } |
| 1060 | 1062 |
| 1061 | 1063 |
| 1062 | 1064 |
| 1063 function brix_to_sg(brix) { | 1065 function brix_to_sg(brix) { |
