# HG changeset patch # User Michiel Broek # Date 1673280199 -3600 # Node ID c4c5d02131be8515d431c10dfef58a9a87a94069 # Parent ccf00788bccc0c68c4c74b0304b0d3980a0f9dc5 Limit mash steptime to 240 minutes. Limit mash steps to 82 degrees celsius. In estimate_fg limit total mash time to 240 minutes and increased the water/grain ration from 5.5 to 6 l/kg. diff -r ccf00788bccc -r c4c5d02131be src/EditProductTab7.cpp --- a/src/EditProductTab7.cpp Mon Jan 09 15:35:04 2023 +0100 +++ b/src/EditProductTab7.cpp Mon Jan 09 17:03:19 2023 +0100 @@ -586,6 +586,9 @@ steptempEdit->setGeometry(QRect(160, 70, 121, 24)); steptempEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); steptempEdit->setDecimals(1); + steptempEdit->setAccelerated(true); + steptempEdit->setSingleStep(0.5); + steptempEdit->setMaximum(82); steptempEdit->setValue(product->mashs.at(product->mashs_row).step_temp); QLabel *endLabel = new QLabel(dialog); @@ -598,6 +601,9 @@ endtempEdit->setGeometry(QRect(510, 70, 121, 24)); endtempEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); endtempEdit->setDecimals(1); + endtempEdit->setAccelerated(true); + endtempEdit->setSingleStep(0.5); + endtempEdit->setMaximum(82); endtempEdit->setValue(product->mashs.at(product->mashs_row).end_temp); QLabel *timeLabel = new QLabel(dialog); @@ -610,6 +616,8 @@ steptimeEdit->setGeometry(QRect(160, 100, 121, 24)); steptimeEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); steptimeEdit->setDecimals(0); + steptimeEdit->setAccelerated(true); + steptimeEdit->setMaximum(240.0); steptimeEdit->setValue(product->mashs.at(product->mashs_row).step_time); QLabel *rampLabel = new QLabel(dialog); diff -r ccf00788bccc -r c4c5d02131be src/EditRecipeTab6.cpp --- a/src/EditRecipeTab6.cpp Mon Jan 09 15:35:04 2023 +0100 +++ b/src/EditRecipeTab6.cpp Mon Jan 09 17:03:19 2023 +0100 @@ -481,6 +481,9 @@ steptempEdit->setGeometry(QRect(160, 70, 121, 24)); steptempEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); steptempEdit->setDecimals(1); + steptempEdit->setAccelerated(true); + steptempEdit->setSingleStep(0.5); + steptempEdit->setMaximum(82); steptempEdit->setValue(recipe->mashs.at(recipe->mashs_row).step_temp); QLabel *endLabel = new QLabel(dialog); @@ -493,6 +496,9 @@ endtempEdit->setGeometry(QRect(510, 70, 121, 24)); endtempEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); endtempEdit->setDecimals(1); + endtempEdit->setAccelerated(true); + endtempEdit->setSingleStep(0.5); + endtempEdit->setMaximum(82); endtempEdit->setValue(recipe->mashs.at(recipe->mashs_row).end_temp); QLabel *timeLabel = new QLabel(dialog); @@ -505,6 +511,8 @@ steptimeEdit->setGeometry(QRect(160, 100, 121, 24)); steptimeEdit->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter); steptimeEdit->setDecimals(0); + steptimeEdit->setAccelerated(true); + steptimeEdit->setMaximum(240.0); steptimeEdit->setValue(recipe->mashs.at(recipe->mashs_row).step_time); QLabel *rampLabel = new QLabel(dialog); diff -r ccf00788bccc -r c4c5d02131be src/Utils.cpp --- a/src/Utils.cpp Mon Jan 09 15:35:04 2023 +0100 +++ b/src/Utils.cpp Mon Jan 09 17:03:19 2023 +0100 @@ -296,8 +296,8 @@ BD = wgratio; if (BD < 2) BD = 2; - if (BD > 5.5) - BD = 5.5; + if (BD > 6) + BD = 6; } else { BD = 3.5; mashtemp = 67; @@ -305,17 +305,19 @@ } if (svg < 30) svg = 77; + if (mashtime > 240) + mashtime = 240; /* * Original from brouwhulp: - * 0.00825 Attenuation factor yeast (Real to apparant ??) - * 0.00817 Attenuation factor water/grain ratio + * 0.00825 Attenuation factor yeast (Real to apparant ??) + * 0.00817 Attenuation factor water/grain ratio * -0.00684 Attenuation factor mash temperature - * 0.00026 Attenuation factor total mash time + * 0.00026 Attenuation factor total mash time * -0.00356 Attenuation factor percentage crystal malt - * 0.00553 Attenuation factor percentage simple sugars - * 0.547 Attenuation factor constant - * 0.597 Attenuation factor constant when STA1 gen is true. + * 0.00553 Attenuation factor percentage simple sugars + * 0.547 Attenuation factor constant + * 0.597 Attenuation factor constant when STA1 gen is true. */ double top_mashtemp = 66.11; /* Highest fermentable at 151 degrees fahrenheit */ /* @@ -323,15 +325,15 @@ */ if (mashtemp > top_mashtemp) { /* Above optimum mash temperature decrease attenuation */ - att_mashtemp = - 0.00684 * mashtemp; + att_mashtemp = -0.00684 * mashtemp; } else { /* Below optimum mash temperature decrease slowly attenuation */ - att_mashtemp = - 0.00684 * (top_mashtemp + (top_mashtemp - mashtemp) / 4); + att_mashtemp = -0.00684 * (top_mashtemp + (top_mashtemp - mashtemp) / 4); } double AttBeer = 0.00825 * svg + 0.00817 * BD + att_mashtemp + 0.00026 * mashtime - 0.00356 * pcara + 0.00553 * psugar; AttBeer += (sta1) ? 0.597:0.547; - qDebug() << "estimate_fg(" << psugar << pcara << wgratio << mashtime << mashtemp << svg << og << sta1 << ") AttBeer:" << AttBeer; + qDebug() << "estimate_fg(" << psugar << pcara << BD << mashtime << mashtemp << svg << og << sta1 << ") AttBeer:" << AttBeer; return round((1 + (1 - AttBeer) * (og -1)) * 10000) / 10000; } diff -r ccf00788bccc -r c4c5d02131be translations/bmsapp_en.ts --- a/translations/bmsapp_en.ts Mon Jan 09 15:35:04 2023 +0100 +++ b/translations/bmsapp_en.ts Mon Jan 09 17:03:19 2023 +0100 @@ -3464,14 +3464,14 @@ - + Measured pH: - + Measured SG: @@ -4692,32 +4692,32 @@ - + Step end temp: - + Step rest time: - + Step ramp time: - + Measured Brix: - + Infusion volume: - + Infusion Temperature: @@ -6196,7 +6196,7 @@ - + Mash @@ -6732,12 +6732,12 @@ - + Delete fermentable - + @@ -6747,46 +6747,46 @@ - + Current ingredient: - + Supplier: - + Amount in kg: - + Percentage in batch: - + Auto fill to 100%: - + Use at: - + Select ingredient: - + @@ -6794,35 +6794,35 @@ - + Max in batch: - - - - Boil - - - - - Fermentation - - - - - Lagering - - - - - Bottle + + + Boil + Fermentation + + + + + Lagering + + + + + + Bottle + + + + Kegs @@ -7185,27 +7185,27 @@ - + Step end temp: - + Step rest time: - + Step ramp time: - + Infusion volume: - + Infusion Temperature: diff -r ccf00788bccc -r c4c5d02131be translations/bmsapp_nl.ts --- a/translations/bmsapp_nl.ts Mon Jan 09 15:35:04 2023 +0100 +++ b/translations/bmsapp_nl.ts Mon Jan 09 17:03:19 2023 +0100 @@ -5119,46 +5119,46 @@ Start temperatuur: - + Step end temp: Eind temperatuur: - + Step rest time: Rust tijd: - + Step ramp time: Verwarm tijd: - + Measured pH: Gemeten pH: - + Measured Brix: Gemeten Brix: - + Measured SG: Gemeten SG: - + Infusion volume: Infusie volume: - + Infusion Temperature: Infusie temperatuur: @@ -6715,7 +6715,7 @@ - + Mash @@ -7359,12 +7359,12 @@ Wijzig - + Delete fermentable Verwijder vergistbaar ingredient - + @@ -7374,46 +7374,46 @@ Verwijder %1 - + Current ingredient: Huidig ingredient: - + Supplier: Leverancier: - + Amount in kg: Gewicht in kg: - + Percentage in batch: Percentage in stort: - + Auto fill to 100%: Aanvullen tot 100%: - + Use at: Toevoegen bij: - + Select ingredient: Kies ingredient: - + @@ -7421,35 +7421,35 @@ In voorraad: - + Max in batch: Max. in stort: - + Boil Koken - + Fermentation Hoofdvergisting - + Lagering Nagisting/lagering - + Bottle Bottelen - + Kegs Fusten @@ -7816,27 +7816,27 @@ Start temperatuur: - + Step end temp: Eind temperatuur: - + Step rest time: Rust tijd: - + Step ramp time: Verwarm tijd: - + Infusion volume: Infusie volume: - + Infusion Temperature: Infusie temperatuur: