From 3308cad1b82560e12f618b1b3b165d3a84617676 Mon Sep 17 00:00:00 2001 From: Decent Espresso Date: Wed, 1 Apr 2020 02:04:04 +0000 Subject: [PATCH] 2020-04-01 01:45:37 UTC --- binary.tcl | 4 ++-- manifest.txt | 2 +- timestamp.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/binary.tcl b/binary.tcl index 418760f0..a3fa808e 100644 --- a/binary.tcl +++ b/binary.tcl @@ -1517,7 +1517,7 @@ proc append_live_data_to_espresso_chart {} { set resistance 0 catch { # main calculation, based on laminar flow. # linear adjustment - set resistance [round_to_two_digits [expr {$::de1(pressure) / ($::de1(flow) / $::settings(linear_resistance_adjustment) ) }]] + set resistance [round_to_two_digits [expr {$::de1(pressure) / pow($::de1(flow), 2) }]] } espresso_resistance append $resistance @@ -1532,7 +1532,7 @@ proc append_live_data_to_espresso_chart {} { catch { if {$::de1(pressure) != 0 && $::de1(scale_weight_rate) != "" && $::de1(scale_weight_rate) != 0} { # if the scale is available, use that instead of the flowmeter calculation, to determine resistance - set resistance_weight [round_to_two_digits [expr {$::de1(pressure) / ($::de1(scale_weight_rate) / $::settings(linear_resistance_adjustment) ) }]] + set resistance_weight [round_to_two_digits [expr {$::de1(pressure) / pow($::de1(scale_weight_rate), 2) }]] } } diff --git a/manifest.txt b/manifest.txt index 2b75557a..81709fdd 100644 --- a/manifest.txt +++ b/manifest.txt @@ -1,4 +1,4 @@ -"binary.tcl" 61759 1585439717 5e8100d0ceef9e5c2133a413353512009c5f372b95243dc260f20cd4f4149d26 +"binary.tcl" 61681 1585705423 62d9bcf2bf326506ee0dff3634516f45b712da1390f38f3c31f95a1df58ab6db "bluetooth.tcl" 81160 1585596422 84d26d68231fa91546d14784573cfa7dcfbf82c9b3036678d5a8461201b5a7b5 "translation.tcl" 377345 1585072943 a6e37ee94ef5483ca6902edb038d7e2a60c689d385d06ef103979ea5a80e84ae "de1plus.tcl" 170 1515060265 5fed814ddfcaeeb20317ebf4b554b4c88a5dac1f7e606c193adecc2388014687 diff --git a/timestamp.txt b/timestamp.txt index e927f1c7..dabeaca9 100644 --- a/timestamp.txt +++ b/timestamp.txt @@ -1 +1 @@ -1585596425 +1585705537