From fb68dee8294cccfcfa12f8a049dda3cf37afdb2b Mon Sep 17 00:00:00 2001 From: Marcus Date: Wed, 22 May 2024 01:04:42 +0200 Subject: [PATCH] firmware wip - add return RAW soilmoisture analog value --- Arduino/CanGrow/CanGrow_Sensors.h | 6 +++++- Arduino/CanGrow/CanGrow_WebFunctions.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Arduino/CanGrow/CanGrow_Sensors.h b/Arduino/CanGrow/CanGrow_Sensors.h index 8cd8242..8c54700 100644 --- a/Arduino/CanGrow/CanGrow_Sensors.h +++ b/Arduino/CanGrow/CanGrow_Sensors.h @@ -162,7 +162,11 @@ int getSoilmoisture(byte moistureSensor, bool returnRAW = false) { soilmoisture = -1; } - return map(soilmoisture, wet, dry, 100, 0); + if(returnRAW == true) { + return soilmoisture; + } else { + return map(soilmoisture, wet, dry, 100, 0); + } } int getLightchirp() { diff --git a/Arduino/CanGrow/CanGrow_WebFunctions.h b/Arduino/CanGrow/CanGrow_WebFunctions.h index 3db581a..657edea 100644 --- a/Arduino/CanGrow/CanGrow_WebFunctions.h +++ b/Arduino/CanGrow/CanGrow_WebFunctions.h @@ -1015,6 +1015,7 @@ void APIgetDebug() { // Chirp objSensors["chirp"]["temperature"] = getTemperature(2); objSensors["chirp"]["soilmoisture"] = getSoilmoisture(2); + objSensors["chirp"]["soilmoistureRAW"] = getSoilmoisture(2, true); objSensors["chirp"]["light"] = getLightchirp(); // DHT11/22 @@ -1023,6 +1024,7 @@ void APIgetDebug() { // Analog objSensors["analog"]["soilmoisture"] = getSoilmoisture(1); + objSensors["analog"]["soilmoistureRAW"] = getSoilmoisture(1, true); objSensors["analog"]["waterlevel"] = getWaterlevel(); String body;