diff --git a/Arduino/CanGrow/CanGrow_HTML.h b/Arduino/CanGrow/CanGrow_HTML.h index 9d4f3e6..87fb112 100644 --- a/Arduino/CanGrow/CanGrow_HTML.h +++ b/Arduino/CanGrow/CanGrow_HTML.h @@ -76,6 +76,9 @@ a:active { .helpbox { font-size: 0.8em; + margin-left: 15px; + margin-top: 5px; + margin-bottom: 5px; } .nav { background: #333; diff --git a/Arduino/CanGrow/CanGrow_Init.h b/Arduino/CanGrow/CanGrow_Init.h index 160810f..80a4e68 100644 --- a/Arduino/CanGrow/CanGrow_Init.h +++ b/Arduino/CanGrow/CanGrow_Init.h @@ -110,6 +110,8 @@ char Esp32CamIP[16]; // PumpLastOn (long) timestamp unsigned long PumpLastOn; bool OutputInvert; +byte SoilmoistureWet; +byte SoilmoistureDry; diff --git a/Arduino/CanGrow/CanGrow_SysFunctions.h b/Arduino/CanGrow/CanGrow_SysFunctions.h index 127afbd..2d3edef 100644 --- a/Arduino/CanGrow/CanGrow_SysFunctions.h +++ b/Arduino/CanGrow/CanGrow_SysFunctions.h @@ -108,7 +108,9 @@ bool loadEEPROM() { * 241 PumpIntervalVeg (1 byte) * 242 PumpIntervalBloom (1 byte) * 243 OutputInvert (1 byte) - * 244 ... + * 244 SoilmoistureWet (1 byte) + * 245 SoilmoistureDry (1 byte) + * 246 ... * */ @@ -176,7 +178,10 @@ bool loadEEPROM() { EEPROM.get(237, PumpLastOn); // size is 1 byte EEPROM.get(243, OutputInvert); - + // size is 1 byte + EEPROM.get(244, SoilmoistureWet); + // size is 1 byte + EEPROM.get(245, SoilmoistureDry); } // TODO auth does not work atm // EEPROM.get(160, WebUiUsername); @@ -257,6 +262,10 @@ bool loadEEPROM() { Serial.println(PumpLastOn); Serial.print("OutputInvert: "); Serial.println(OutputInvert); + Serial.print("SoilmoistureWet: "); + Serial.println(SoilmoistureWet); + Serial.print("SoilmoistureDry: "); + Serial.println(SoilmoistureDry); Serial.println("---- Grow values ----"); Serial.print("GrowName: "); diff --git a/Arduino/CanGrow/CanGrow_Version.h b/Arduino/CanGrow/CanGrow_Version.h index 674c1d7..1ada704 100644 --- a/Arduino/CanGrow/CanGrow_Version.h +++ b/Arduino/CanGrow/CanGrow_Version.h @@ -1,5 +1,5 @@ /* CanGrow_Version.h gets generated from cangrow.sh */ const char* CanGrowVer = "0.1-dev"; -const char* CanGrowBuild = "3c14910-20241205024405"; +const char* CanGrowBuild = "c178191-20241205031352"; diff --git a/Arduino/CanGrow/CanGrow_WebFunctions.h b/Arduino/CanGrow/CanGrow_WebFunctions.h index c22584b..da4846d 100644 --- a/Arduino/CanGrow/CanGrow_WebFunctions.h +++ b/Arduino/CanGrow/CanGrow_WebFunctions.h @@ -637,7 +637,21 @@ void WEBsystemSettings() { // SoilmoistureLow byte body += "Soilmoisture low: %
\n"; + body += "' required> %
\n"; + + // SoilmoistureWet byte + body += "Soilmoisture wet: \n"; + body += "

Analog capacitive: 160
\ +I2C Chirp: 485

"; + + // SoilmoistureDry byte + body += "Soilmoisture dry: \n"; + body += "

Analog capacitive: 360
\ +I2C Chirp: 250

"; // TemperatureSensor_Type byte body += "Temperature sensor: