INSA/clover
1
0
Fork 0
mirror of https://github.com/Lemonochrme/clover.git synced 2025-06-08 08:40:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deleted unused light. Setting the lights to off when booting.

Browse source
This commit is contained in:
Yohan Boujon 2023-12-15 22:19:26 +01:00
parent c4398dbab2
commit 820494206d
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
embedded/lib/Display/Screen.cpp
View file

@ -128,14 +128,13 @@ void Screen::boot()
_screen->sendBuffer(); _screen->sendBuffer();
} }
void Screen::loop(const float plantHumidity, const float airTemperature, const float airHumidity, const float light) void Screen::loop(const float plantHumidity, const float airTemperature, const float airHumidity)
{ {
_screen->clearBuffer(); _screen->clearBuffer();
// Updating with values // Updating with values
loopWindow.Update(0,String("Hum: ")+String(plantHumidity,1)+String("%")); loopWindow.Update(0,String("Hum: ")+String(plantHumidity,1)+String("%"));
loopWindow.Update(1,String("Tem: ")+String(airTemperature,1)+String("°C")); loopWindow.Update(1,String("Tem: ")+String(airTemperature,1)+String("°C"));
loopWindow.Update(2,String("Hum: ")+String(airHumidity,1)+String("%")); loopWindow.Update(2,String("Hum: ")+String(airHumidity,1)+String("%"));
//loopWindow.Update(3,String("Light: ")+String(light,1)+String("%"));
// Component // Component
loopWindow.Display(); loopWindow.Display();
iconWindow.Display(); iconWindow.Display();

2
embedded/lib/Display/Screen.hpp
View file

@ -54,7 +54,7 @@ namespace Display
void notConnected(); void notConnected();
void connected(const char *ipaddress, uint8_t timing); void connected(const char *ipaddress, uint8_t timing);
void boot(); void boot();
void loop(const float plantHumidity, const float airTemperature, const float airHumidity, const float light); void loop(const float plantHumidity, const float airTemperature, const float airHumidity);
// Getters // Getters
uint16_t getHeight(); uint16_t getHeight();
uint16_t getWidth(); uint16_t getWidth();

9
embedded/src/main.cpp
View file

@ -29,6 +29,10 @@ void setup()
Serial.println(WiFi.localIP()); Serial.println(WiFi.localIP());
led.setup(); led.setup();
airSensor.setup(); airSensor.setup();
// Lights are off when powered
led.setColor(0,{0,0,0});
led.setColor(1,{0,0,0});
} }
void loop() void loop()
@ -68,16 +72,14 @@ void loop()
auto soilHumidityData = static_cast<float>(std::any_cast<int>(humidity.getValue())); auto soilHumidityData = static_cast<float>(std::any_cast<int>(humidity.getValue()));
auto airTemperatureData = airSensor.getTemperature(); auto airTemperatureData = airSensor.getTemperature();
auto airHumidityData = airSensor.getHumidity(); auto airHumidityData = airSensor.getHumidity();
auto lightData = random(0, 1000) / 10.0;
// Updating the data handler // Updating the data handler
dataHandler.updateSoilMoistureData(soilHumidityData); dataHandler.updateSoilMoistureData(soilHumidityData);
dataHandler.updateAirTemperatureData(airTemperatureData); dataHandler.updateAirTemperatureData(airTemperatureData);
dataHandler.updateAirHumidityData(airHumidityData); dataHandler.updateAirHumidityData(airHumidityData);
dataHandler.updateLightData(lightData);
// Screen showing // Screen showing
screen.loop(soilHumidityData,airTemperatureData,airHumidityData,lightData); screen.loop((soilHumidityData/950.0f)*100.0f,airTemperatureData,airHumidityData);
// TODO: Add LedComponent management // TODO: Add LedComponent management
if (soilHumidityData < 550) { if (soilHumidityData < 550) {
@ -86,6 +88,7 @@ void loop()
Serial.println("Idle..."); Serial.println("Idle...");
} else { } else {
Serial.println("Soil too wet."); Serial.println("Soil too wet.");
Serial.println("Soil too wet.");
} }
serverHandler.loop(); serverHandler.loop();