added testmode, fixed formating
This commit is contained in:
Your Name
parent
2c70ff1ed3
commit
98799bd2d5
@ -75,6 +75,8 @@ void Plant::postMQTTconnection(void)
|
||||
|
||||
void Plant::deactivatePump(void)
|
||||
{
|
||||
int plantId = this->mPlantId;
|
||||
Serial << "deactivating pump " << plantId << endl;
|
||||
digitalWrite(this->mPinPump, LOW);
|
||||
if (this->mConnected)
|
||||
{
|
||||
@ -85,6 +87,8 @@ void Plant::deactivatePump(void)
|
||||
|
||||
void Plant::activatePump(void)
|
||||
{
|
||||
int plantId = this->mPlantId;
|
||||
Serial << "activating pump " << plantId << endl;
|
||||
digitalWrite(this->mPinPump, HIGH);
|
||||
if (this->mConnected)
|
||||
{
|
||||
|
||||
@ -36,7 +36,8 @@
|
||||
#define MAX_TANK_DEPTH 1000
|
||||
#define TEST_TOPIC "roundtrip\0"
|
||||
|
||||
#define getTopic char* topic = new char[strlen(Homie.getConfiguration().mqtt.baseTopic) + strlen(Homie.getConfiguration().deviceId) + 1 + strlen(TEST_TOPIC) + 1]; \
|
||||
#define getTopic \
|
||||
char *topic = new char[strlen(Homie.getConfiguration().mqtt.baseTopic) + strlen(Homie.getConfiguration().deviceId) + 1 + strlen(TEST_TOPIC) + 1]; \
|
||||
strcpy(topic, Homie.getConfiguration().mqtt.baseTopic); \
|
||||
strcat(topic, Homie.getConfiguration().deviceId); \
|
||||
strcat(topic, "/"); \
|
||||
@ -74,7 +75,6 @@ RunningMedian waterRawSensor = RunningMedian(5);
|
||||
float mSolarVoltage = 0.0f; /**< Voltage from solar panels */
|
||||
unsigned long setupFinishedTimestamp;
|
||||
|
||||
|
||||
/*************************** Hardware abstraction *****************************/
|
||||
|
||||
OneWire oneWire(SENSOR_ONEWIRE);
|
||||
@ -116,7 +116,8 @@ void espDeepSleepFor(long seconds, bool activatePump, bool withHomieShutdown)
|
||||
Serial << "abort deepsleep, DownloadMode active" << endl;
|
||||
return;
|
||||
}
|
||||
if(withHomieShutdown){
|
||||
if (withHomieShutdown)
|
||||
{
|
||||
for (int i = 0; i < 10; i++)
|
||||
{
|
||||
long cTime = getCurrentTime();
|
||||
@ -166,19 +167,21 @@ void espDeepSleepFor(long seconds, bool activatePump, bool withHomieShutdown)
|
||||
Serial.println(" seconds");
|
||||
esp_sleep_enable_timer_wakeup((seconds * 1000U * 1000U));
|
||||
Serial.flush();
|
||||
if(withHomieShutdown){
|
||||
if (withHomieShutdown)
|
||||
{
|
||||
Homie.prepareToSleep();
|
||||
}else {
|
||||
}
|
||||
else
|
||||
{
|
||||
Serial << "Bye offline mode" << endl;
|
||||
Serial.flush();
|
||||
esp_deep_sleep_start();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
//requires homie being started
|
||||
void readOneWireSensors(bool withMQTT){
|
||||
void readOneWireSensors(bool withMQTT)
|
||||
{
|
||||
int sensorCount = sensors.getDS18Count();
|
||||
Serial << "Read OneWire" << endl;
|
||||
Serial.flush();
|
||||
@ -200,19 +203,25 @@ void readOneWireSensors(bool withMQTT){
|
||||
ds18b20Address[6],
|
||||
ds18b20Address[7]);
|
||||
|
||||
if (String(lipoSensorAddr.get()).compareTo(String(buf))) {
|
||||
if(withMQTT){
|
||||
if (String(lipoSensorAddr.get()).compareTo(String(buf)))
|
||||
{
|
||||
if (withMQTT)
|
||||
{
|
||||
sensorTemp.setProperty(TEMPERATUR_SENSOR_LIPO).send(String(temp));
|
||||
}
|
||||
Serial << "Lipo Temperatur " << temp << " °C " << endl;
|
||||
} else if (String(waterSensorAddr.get()).compareTo(String(buf))) {
|
||||
if(withMQTT){
|
||||
}
|
||||
else if (String(waterSensorAddr.get()).compareTo(String(buf)))
|
||||
{
|
||||
if (withMQTT)
|
||||
{
|
||||
sensorTemp.setProperty(TEMPERATUR_SENSOR_WATER).send(String(temp));
|
||||
}
|
||||
Serial << "Water Temperatur " << temp << " °C " << endl;
|
||||
}
|
||||
/* Always send the sensor address with the temperatur value */
|
||||
if(withMQTT){
|
||||
if (withMQTT)
|
||||
{
|
||||
sensorTemp.setProperty(String(buf)).send(String(temp));
|
||||
}
|
||||
Serial << "Temperatur " << String(buf) << " : " << temp << " °C " << endl;
|
||||
@ -272,10 +281,10 @@ void readPowerSwitchedSensors()
|
||||
digitalWrite(OUTPUT_ENABLE_SENSOR, LOW);
|
||||
}
|
||||
|
||||
|
||||
void onMessage(char* incoming, char* payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total){
|
||||
getTopic
|
||||
if(strcmp(incoming,topic) == 0){
|
||||
void onMessage(char *incoming, char *payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total)
|
||||
{
|
||||
getTopic if (strcmp(incoming, topic) == 0)
|
||||
{
|
||||
mAliveWasRead = true;
|
||||
}
|
||||
};
|
||||
@ -292,7 +301,8 @@ void onHomieEvent(const HomieEvent &event)
|
||||
case HomieEventType::SENDING_STATISTICS:
|
||||
break;
|
||||
case HomieEventType::MQTT_READY:
|
||||
if (mSensorsRead) {
|
||||
if (mSensorsRead)
|
||||
{
|
||||
Serial.printf("Timeout occured... too late!\r\n");
|
||||
return;
|
||||
}
|
||||
@ -308,7 +318,8 @@ void onHomieEvent(const HomieEvent &event)
|
||||
}
|
||||
{
|
||||
getTopic
|
||||
Homie.getMqttClient().subscribe(topic,2);
|
||||
Homie.getMqttClient()
|
||||
.subscribe(topic, 2);
|
||||
Homie.getMqttClient().publish(topic, 2, false, "ping");
|
||||
Homie.getMqttClient().onMessage(onMessage);
|
||||
}
|
||||
@ -350,8 +361,8 @@ int determineNextPump()
|
||||
Serial.printf("%d Skip deactivated pump\r\n", i);
|
||||
continue;
|
||||
}
|
||||
if ((rtcLastWateringPlant[i] > 0)
|
||||
&& ((rtcLastWateringPlant[i] + plant.getCooldownInSeconds()) < getCurrentTime())) {
|
||||
if ((rtcLastWateringPlant[i] > 0) && ((rtcLastWateringPlant[i] + plant.getCooldownInSeconds()) < getCurrentTime()))
|
||||
{
|
||||
Serial.printf("%d Skipping due to cooldown %ld / %ld \r\n", i, rtcLastWateringPlant[i], plant.getCooldownInSeconds());
|
||||
continue;
|
||||
}
|
||||
@ -369,18 +380,18 @@ int determineNextPump()
|
||||
{
|
||||
/* Handle e.g. start = 21, end = 8 */
|
||||
if (((plant.getHoursStart() > plant.getHoursEnd()) &&
|
||||
(getCurrentHour() >= plant.getHoursStart() || getCurrentHour() <= plant.getHoursEnd()))
|
||||
||
|
||||
(getCurrentHour() >= plant.getHoursStart() || getCurrentHour() <= plant.getHoursEnd())) ||
|
||||
/* Handle e.g. start = 8, end = 21 */
|
||||
((plant.getHoursStart() < plant.getHoursEnd()) &&
|
||||
(getCurrentHour() >= plant.getHoursStart() && getCurrentHour() <= plant.getHoursEnd()))
|
||||
||
|
||||
(getCurrentHour() >= plant.getHoursStart() && getCurrentHour() <= plant.getHoursEnd())) ||
|
||||
/* no time from NTP received */
|
||||
(getCurrentTime() < 10000))
|
||||
{
|
||||
Serial.printf("%d Requested pumping\r\n", i);
|
||||
pumpToUse = i;
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
Serial.printf("%d ignored due to time boundary: %d to %d (current %d)\r\n", i, plant.getHoursStart(), plant.getHoursEnd(), getCurrentHour());
|
||||
}
|
||||
continue;
|
||||
@ -413,7 +424,8 @@ bool aliveHandler(const HomieRange &range, const String &value)
|
||||
}
|
||||
else
|
||||
{
|
||||
if(mDownloadMode){
|
||||
if (mDownloadMode)
|
||||
{
|
||||
esp_restart();
|
||||
}
|
||||
mDownloadMode = false;
|
||||
@ -425,7 +437,8 @@ bool aliveHandler(const HomieRange &range, const String &value)
|
||||
bool notStarted = true;
|
||||
void homieLoop()
|
||||
{
|
||||
if(mMQTTReady && mAliveWasRead && notStarted){
|
||||
if (mMQTTReady && mAliveWasRead && notStarted)
|
||||
{
|
||||
Serial.println("received alive & mqtt is ready");
|
||||
notStarted = false;
|
||||
plantcontrol(true);
|
||||
@ -462,7 +475,6 @@ void setup()
|
||||
|
||||
digitalWrite(OUTPUT_ENABLE_PUMP, LOW);
|
||||
|
||||
|
||||
pinMode(OUTPUT_ENABLE_SENSOR, OUTPUT);
|
||||
|
||||
if (HomieInternals::MAX_CONFIG_SETTING_SIZE < MAX_CONFIG_SETTING_ITEMS)
|
||||
@ -472,7 +484,6 @@ void setup()
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
/************************* Start One-Wire bus ***************/
|
||||
int tempInitStartTime = millis();
|
||||
uint8_t sensorCount = 0U;
|
||||
@ -530,9 +541,6 @@ void setup()
|
||||
Serial << "Wifi mode set to " << WIFI_STA << endl;
|
||||
WiFi.mode(WIFI_STA);
|
||||
|
||||
|
||||
|
||||
|
||||
for (int i = 0; i < MAX_PLANTS; i++)
|
||||
{
|
||||
mPlants[i].advertise();
|
||||
@ -568,7 +576,12 @@ void setup()
|
||||
.setDatatype(NUMBER_TYPE)
|
||||
.setUnit("V");
|
||||
sensorWater.advertise("remaining").setDatatype(NUMBER_TYPE).setUnit("%");
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
readOneWireSensors(false);
|
||||
digitalWrite(OUTPUT_ENABLE_PUMP, HIGH);
|
||||
delay(100);
|
||||
Serial << "Wifi mode set to " << WIFI_AP_STA << endl;
|
||||
WiFi.mode(WIFI_AP_STA);
|
||||
Serial.println("Initial Setup. Start Accesspoint...");
|
||||
@ -590,13 +603,34 @@ void loop()
|
||||
{
|
||||
if (nextBlink < millis())
|
||||
{
|
||||
nextBlink = millis() + 500;
|
||||
digitalWrite(OUTPUT_ENABLE_SENSOR, !digitalRead(OUTPUT_ENABLE_SENSOR));
|
||||
if (mConfigured)
|
||||
{
|
||||
nextBlink = millis() + 500;
|
||||
}
|
||||
else
|
||||
{
|
||||
nextBlink = millis() + 5000;
|
||||
if (lastPumpRunning >= 0 && lastPumpRunning < MAX_PLANTS)
|
||||
{
|
||||
mPlants[lastPumpRunning].deactivatePump();
|
||||
}
|
||||
if (lastPumpRunning > MAX_PLANTS)
|
||||
{
|
||||
digitalWrite(OUTPUT_ENABLE_PUMP, LOW);
|
||||
}
|
||||
if (lastPumpRunning < MAX_PLANTS){
|
||||
lastPumpRunning++;
|
||||
mPlants[lastPumpRunning].activatePump();
|
||||
}
|
||||
}
|
||||
else {
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
unsigned long timeSinceSetup = millis() - setupFinishedTimestamp;
|
||||
if ((timeSinceSetup > MQTT_TIMEOUT) && (!mSensorsRead)) {
|
||||
if ((timeSinceSetup > MQTT_TIMEOUT) && (!mSensorsRead))
|
||||
{
|
||||
mSensorsRead = true;
|
||||
/* Disable Wifi and put modem into sleep mode */
|
||||
WiFi.mode(WIFI_OFF);
|
||||
@ -615,7 +649,6 @@ void loop()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/***
|
||||
* @fn plantcontrol
|
||||
* Main function, doing the logic
|
||||
@ -660,7 +693,8 @@ void plantcontrol(bool withHomie)
|
||||
float chipTemp = battery.getTemperature();
|
||||
Serial << "Chip Temperatur " << chipTemp << " °C " << endl;
|
||||
|
||||
if(withHomie){
|
||||
if (withHomie)
|
||||
{
|
||||
sensorWater.setProperty("remaining").send(String(waterLevelMax.get() - waterRawSensor.getAverage()));
|
||||
sensorLipo.setProperty("percent").send(String(100 * batteryVoltage / VOLT_MAX_BATT));
|
||||
sensorLipo.setProperty("volt").send(String(batteryVoltage));
|
||||
@ -671,13 +705,13 @@ void plantcontrol(bool withHomie)
|
||||
sensorLipo.setProperty("CCA").send(String(battery.getCCA()));
|
||||
sensorSolar.setProperty("volt").send(String(mSolarVoltage));
|
||||
sensorTemp.setProperty(TEMPERATUR_SENSOR_CHIP).send(String(chipTemp));
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
Serial.println("Skipping MQTT, offline mode");
|
||||
Serial.flush();
|
||||
}
|
||||
|
||||
|
||||
|
||||
bool hasWater = true; //FIXMEmWaterGone > waterLevelMin.get();
|
||||
//FIXME no water warning message
|
||||
lastPumpRunning = determineNextPump();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user