Brewery/gravitymon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #84

Browse Source
This commit is contained in:
Magnus Persson
2022-07-03 13:20:24 +02:00
parent 8b4b89ba20
commit a992e90bc3
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/calc.cpp
View File

@ -175,16 +175,15 @@ double calculateGravity(double angle, double temp, const char *tempFormula) {
// //
// Source: https://homebrewacademy.com/hydrometer-temperature-correction/ // Source: https://homebrewacademy.com/hydrometer-temperature-correction/
// //
double gravityTemperatureCorrectionC(double gravity, double tempC, double gravityTemperatureCorrectionC(double gravitySG, double tempC,
double calTempC) { double calTempC) {
#if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING) #if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING)
Log.verbose(F("CALC: Adjusting gravity based on temperature, gravity %F, " Log.verbose(F("CALC: Adjusting gravity based on temperature, gravity %F, "
"temp %F, calTemp %F." CR), "temp %F, calTemp %F." CR),
gravity, tempC, calTempC); gravitySG, tempC, calTempC);
#endif #endif
// float tempF = convertCtoF(tempC); double tempF = convertCtoF(tempC);
// float calTempF = convertCtoF(calTempC); double calTempF = convertCtoF(calTempC);
const char *formula = const char *formula =
"gravity*((1.00130346-0.000134722124*temp+0.00000204052596*temp^2-0." "gravity*((1.00130346-0.000134722124*temp+0.00000204052596*temp^2-0."
"00000000232820948*temp^3)/" "00000000232820948*temp^3)/"
@ -193,7 +192,7 @@ double gravityTemperatureCorrectionC(double gravity, double tempC,
// Store variable names and pointers. // Store variable names and pointers.
te_variable vars[] = { te_variable vars[] = {
{"gravity", &gravity}, {"temp", &tempC}, {"cal", &calTempC}}; {"gravity", &gravitySG}, {"temp", &tempF}, {"cal", &calTempF}};
int err; int err;
// Compile the expression with variables. // Compile the expression with variables.
@ -203,11 +202,10 @@ double gravityTemperatureCorrectionC(double gravity, double tempC,
double g = te_eval(expr); double g = te_eval(expr);
te_free(expr); te_free(expr);
#if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING) char s[80];
char s[10]; snprintf(&s[0], sizeof(s), "Corrected gravity=%.8f, input gravity=%.8f", g,
snprintf(&s[0], sizeof(s), "%.8f", g); gravitySG);
Log.verbose(F("CALC: Corrected gravity is %s." CR), &s[0]); Log.notice(F("CALC: %s." CR), &s[0]);
#endif
return g; return g;
} }
@ -215,7 +213,7 @@ double gravityTemperatureCorrectionC(double gravity, double tempC,
errLog.addEntry( errLog.addEntry(
"CALC: Failed to parse expression for gravity temperature correction " + "CALC: Failed to parse expression for gravity temperature correction " +
String(err)); String(err));
return gravity; return gravitySG;
} }
// EOF // EOF