Analog Sensor Support

.gitignore

@@ -2,12 +2,15 @@ logs/**
 OpenSprinkler
 wtopts.txt
 *.dat
-*.sh
+*.bak
 testmode.h
 build-1284/*
 .vscode
 .pio
+influx.json
+*~
 *.o
 !build.sh
 !startOpenSprinkler.sh
-!updater.sh
+!updater.sh
+DEADJOE

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "external/TinyWebsockets"]
 	path = external/TinyWebsockets
 	url = https://github.com/gilmaimon/TinyWebsockets.git
+[submodule "external/influxdb-cpp"]
+	path = external/influxdb-cpp
+	url = https://github.com/orca-zhang/influxdb-cpp.git

Dockerfile

@@ -7,7 +7,7 @@ ARG BUILD_VERSION="OSPI"
 FROM base AS os-build
 
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install -y bash g++ make libmosquittopp-dev libssl-dev libi2c-dev libgpiod-dev libgpiod2 gpiod
+RUN apt-get update && apt-get install -y bash g++ make libmosquittopp-dev libssl-dev libi2c-dev
 RUN rm -rf /var/lib/apt/lists/*
 COPY . /OpenSprinkler
 WORKDIR /OpenSprinkler
@@ -19,7 +19,7 @@ RUN make VERSION=${BUILD_VERSION}
 FROM base
 
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install -y libstdc++6 libmosquittopp1 libi2c0 libgpiod2
+RUN apt-get update && apt-get install -y libstdc++6 libmosquittopp1 libi2c0
 RUN rm -rf /var/lib/apt/lists/* 
 RUN mkdir /OpenSprinkler
 RUN mkdir -p /data/logs

EMailSender.cpp

@@ -231,6 +231,7 @@ EMailSender::Response EMailSender::awaitSMTPResponse(EMAIL_NETWORK_CLASS &client
 	EMailSender::Response response;
 	uint32_t ts = millis();
 	while (!client.available()) {
+		wdt_reset();
 		if (millis() > (ts + timeOut)) {
 			response.code = F("1");
 			response.desc = String(respDesc) + "! " + F("SMTP Response TIMEOUT!");
@@ -432,7 +433,7 @@ EMailSender::Response EMailSender::send(const char* to, EMailMessage &email, Att
 	  EMAIL_DEBUG_PRINT(F("ONLY ONE RECIPIENT"));
 
 	const char* arrEmail[] =  {to};
-	return send(arrEmail, 1, email, attachments);
+	return send(arrEmail, 1, 0, 0, email, attachments);
 }
 
 EMailSender::Response EMailSender::send(const char* to[], byte sizeOfTo, EMailMessage &email, Attachments attachments) {
@@ -476,16 +477,17 @@ EMailSender::Response EMailSender::send(const char* to[], byte sizeOfTo,  byte s
 			#ifndef ARDUINO_ESP8266_RELEASE_2_4_2
 			  if (this->isSecure == false){
 				  client.setInsecure();
+				  /*
 				  bool mfln = client.probeMaxFragmentLength(this->smtp_server, this->smtp_port, 512);
 
 				  EMAIL_DEBUG_PRINT("MFLN supported: ");
 				  EMAIL_DEBUG_PRINTLN(mfln?"yes":"no");
 
-				  if (mfln) {
+				  if (mfln) {*/
 					  client.setBufferSizes(512, 512);
-				  } else {
+				  /*} else {
 					  client.setBufferSizes(2048, 2048);
-				  }
+				  }*/
 			  }
 			#endif
 		#elif (EMAIL_NETWORK_TYPE == NETWORK_ESP32)
@@ -629,7 +631,8 @@ EMailSender::Response EMailSender::send(const char* to[], byte sizeOfTo,  byte s
 //		  String auth = "AUTH PLAIN "+String(encode64(logPass));
 		  EMAIL_DEBUG_PRINTLN(auth);
 		  client.println(auth);
-          }
+		  free(logPass);
+      }
 #if defined(ESP32)
 	  else if (this->isCramMD5Login == true) {
 		  EMAIL_DEBUG_PRINTLN(F("AUTH CRAM-MD5"));

EMailSenderKey.h

@@ -79,7 +79,7 @@
 // #define FORCE_DISABLE_SSL
 
 // If you want add a wrapper to emulate SSL over Client like EthernetClient
-// #define SSLCLIENT_WRAPPER
+//#define SSLCLIENT_WRAPPER
 
 // esp8266 microcontrollers configuration
 #ifndef DEFAULT_EMAIL_NETWORK_TYPE_ESP8266
@@ -136,7 +136,7 @@
 	 *  For enc28j60 use EthernetENC available from library manager or
 	 *  https://github.com/jandrassy/EthernetENC
 	 */
-	#define ANALOG_PIN A7
+	#define ANALOG_PIN -1
 	#include <SSLClient.h>
 	#include "trust_anchors.h"
 

Makefile

@@ -1,12 +1,12 @@
 CXX=g++
 # -std=gnu++17
-VERSION?=OSPI
-CXXFLAGS=-std=gnu++14 -D$(VERSION) -DSMTP_OPENSSL -Wall -include string.h -include cstdint -Iexternal/TinyWebsockets/tiny_websockets_lib/include -Iexternal/OpenThings-Framework-Firmware-Library/
+VERSION=OSPI
+CXXFLAGS=-std=gnu++14 -D$(VERSION) -DSMTP_OPENSSL -Wall -include string.h -Iexternal/TinyWebsockets/tiny_websockets_lib/include -Iexternal/OpenThings-Framework-Firmware-Library/ -Iexternal/influxdb-cpp/
 LD=$(CXX)
-LIBS=pthread mosquitto ssl crypto i2c gpiod
+LIBS=pthread mosquitto ssl crypto i2c
 LDFLAGS=$(addprefix -l,$(LIBS))
 BINARY=OpenSprinkler
-SOURCES=main.cpp OpenSprinkler.cpp notifier.cpp program.cpp opensprinkler_server.cpp utils.cpp weather.cpp gpio.cpp mqtt.cpp smtp.c RCSwitch.cpp $(wildcard external/TinyWebsockets/tiny_websockets_lib/src/*.cpp) $(wildcard external/OpenThings-Framework-Firmware-Library/*.cpp)
+SOURCES=main.cpp OpenSprinkler.cpp program.cpp opensprinkler_server.cpp utils.cpp weather.cpp gpio.cpp mqtt.cpp smtp.c RCSwitch.cpp sensors.cpp osinfluxdb.cpp $(wildcard external/TinyWebsockets/tiny_websockets_lib/src/*.cpp) $(wildcard external/OpenThings-Framework-Firmware-Library/*.cpp)
 HEADERS=$(wildcard *.h) $(wildcard *.hpp)
 OBJECTS=$(addsuffix .o,$(basename $(SOURCES)))