diff --git a/html/format.min.htm b/html/format.min.htm index 1566ca8..f8d0c55 100644 --- a/html/format.min.htm +++ b/html/format.min.htm @@ -1,2 +1,9 @@ -Beer Gravity Monitor

(C) Copyright 2021-22 Magnus Persson

\ No newline at end of file
+Beer Gravity Monitor
     
 
 
 
(C) Copyright 2021-22 Magnus Persson

\ No newline at end of file
diff --git a/src/calc.cpp b/src/calc.cpp
index 8642d46..0ce36a8 100644
--- a/src/calc.cpp
+++ b/src/calc.cpp
@@ -50,7 +50,7 @@ int createFormula(RawFormulaData &fd, char *formulaBuffer,
       order, noAngles);
 #endif
 
-  if (!noAngles) {
+  if (noAngles <3) {
     ErrorFileLog errLog;
     errLog.addEntry(F("CALC: Not enough values for deriving formula"));
     return ERR_FORMULA_NOTENOUGHVALUES;
@@ -96,11 +96,9 @@ int createFormula(RawFormulaData &fd, char *formulaBuffer,
 
         // If the deviation is more than 2 degress we mark it as failed.
         if (dev * 1000 > myHardwareConfig.getMaxFormulaCreationDeviation()) {
-#if LOG_LEVEL == 6 && !defined(CALC_DISABLE_LOGGING)
           char s[20];
           snprintf(&s[0], sizeof(s), "%.8f", dev);
-          Log.verbose(F("CALC: Deviation is: %s" CR), &s[0]);
-#endif
+          Log.error(F("CALC: Deviation to large: %s" CR), &s[0]);
           valid = false;
         }
       }
diff --git a/src/webserver.cpp b/src/webserver.cpp
index 48bb162..96d31ff 100644
--- a/src/webserver.cpp
+++ b/src/webserver.cpp
@@ -1013,6 +1013,8 @@ void WebServerHandler::webHandleFormulaWrite() {
   fd.a[5] = _server->arg("a6").toDouble();
   fd.a[6] = _server->arg("a7").toDouble();
   fd.a[7] = _server->arg("a8").toDouble();
+  fd.a[8] = _server->arg("a9").toDouble();
+  fd.a[9] = _server->arg("a10").toDouble();
 
   if (myConfig.isGravityPlato()) {
     fd.g[0] = convertToSG(_server->arg("g1").toDouble());
@@ -1023,6 +1025,8 @@ void WebServerHandler::webHandleFormulaWrite() {
     fd.g[5] = convertToSG(_server->arg("g6").toDouble());
     fd.g[6] = convertToSG(_server->arg("g7").toDouble());
     fd.g[7] = convertToSG(_server->arg("g8").toDouble());
+    fd.g[8] = convertToSG(_server->arg("g9").toDouble());
+    fd.g[9] = convertToSG(_server->arg("g10").toDouble());
   } else {
     fd.g[0] = _server->arg("g1").toDouble();
     fd.g[1] = _server->arg("g2").toDouble();
@@ -1032,6 +1036,8 @@ void WebServerHandler::webHandleFormulaWrite() {
     fd.g[5] = _server->arg("g6").toDouble();
     fd.g[6] = _server->arg("g7").toDouble();
     fd.g[7] = _server->arg("g8").toDouble();
+    fd.g[8] = _server->arg("g9").toDouble();
+    fd.g[9] = _server->arg("g10").toDouble();
   }
 
   myConfig.setFormulaData(fd);