From ebfd33af0c9c50205c73e3dc67fcda0baa9ea213 Mon Sep 17 00:00:00 2001 From: DeltaLima Date: Tue, 10 Dec 2024 23:50:23 +0100 Subject: [PATCH] firmware - some html cosmetics --- Arduino/CanGrow/CanGrow_WebFunctions.h | 116 +++++++++++++++---------- 1 file changed, 69 insertions(+), 47 deletions(-) diff --git a/Arduino/CanGrow/CanGrow_WebFunctions.h b/Arduino/CanGrow/CanGrow_WebFunctions.h index d9a31cd..2c8f813 100644 --- a/Arduino/CanGrow/CanGrow_WebFunctions.h +++ b/Arduino/CanGrow/CanGrow_WebFunctions.h @@ -220,10 +220,14 @@ void SysMaintenance() { MaintenanceMode = false; body += "
⏸️ Dimm LED Off
"; } else if(webserver.hasArg("PumpOnManual")) { - PumpOnManual = true; - body += "
💧 Pump manual activated for "; - body += PumpOnTime; - body += "s
"; + if(UsePump == true) { + PumpOnManual = true; + body += "
💧 Pump manual activated for "; + body += PumpOnTime; + body += "s
"; + } else { + body += "
💧 Pump mode is set to Off in ⚙ System settings
"; + } } @@ -467,24 +471,27 @@ void WEBgrowSettings() { body+= "' required>
\n"; - // the input field, which calls javascript convertDateToEpoch() to write data to transmit to id GrowStart - body += "Grow start date:
\n"; - body += "\n"; + // the input field, which calls javascript convertDateToEpoch() to write data to transmit to id GrowStart + body += "Grow start date:

\n"; + + body += "Vegetation duration: days
\n"; + body+= "' required> days
\n"; body += "Bloom duration: days
\n"; + body+= "' required> days

\n"; + + body += "Time LED ON vegetation: hours
\n"; + body+= "' required> hours

\n"; + + body += "Sunrise: Minutes
\n"; + body+= "' required> Minutes

\n"; if(UseLEDrelais == false) { body += "LED brightness: %
\n"; + body += "'/> %

\n"; body += "Pump interval vegetation: every No\n"; body += "
\n"; */ - + + body += "Output configuration
"; // OutputInvert bool body += "Invert Outputs:
\n"; + body += "

When using CanGrow PCB v0.6, set to Yes

\n"; - // PumpMode byte - body += "Pump mode:

1: Water every few days.
\ -2: Water if the soil moisture falls below Soilmoisture low value
\ -3: Water every few days if the soil moisture falls below Soilmoisture low value.

\n"; - // UseLEDrelais bool body += "Use relais for LED (disable PWM):
\n"; - - // TODO ugly. can this done be better? - // PumpOnTime int - body += "Pump ON time: Seconds
\n"; - + body += "

\n"; + + + + + body += "Sensor configuration
"; + // MoistureSensor_Type byte body += "Soilmoisture sensor:
\n"; - // SoilmoistureLow byte - body += "Soilmoisture low: %
\n"; - - // SoilmoistureWet byte - body += "Soilmoisture wet: \n"; - body += "

Analog capacitive: 160
\ -I2C Chirp: 485

"; - // SoilmoistureDry byte body += "Soilmoisture dry: Analog capacitive: 360
\ I2C Chirp: 250

"; + // SoilmoistureWet byte + body += "Soilmoisture wet: \n"; + body += "

Analog capacitive: 160
\ +I2C Chirp: 485

"; // MoistureSensor_Type Javascript body += FPSTR(JSsoilmoistureTypeSelect); @@ -695,7 +688,36 @@ void WEBsystemSettings() { body += "\n"; body += "\n"; body += "\n"; - body += "
\n"; + body += "

\n"; + + + body += "Pump configuration
"; + + // PumpMode byte + body += "Pump mode:

1: Water every few days.
\ +2: Water if the soil moisture falls below Soilmoisture low value
\ +3: Water every few days if the soil moisture falls below Soilmoisture low value.

\n"; + + // TODO ugly. can this done be better? + // PumpOnTime int + body += "Pump ON time: Seconds
\n"; + + // SoilmoistureLow byte + body += "Soilmoisture low: %

\n"; + + + + body += "General configuration
"; // NtpOffset int body += "NTP offset: