Analog sensor vegetronix

.gitignore

@@ -7,3 +7,4 @@ testmode.h
 build-1284/*
 .vscode
 .pio
+*.bak

Sensor API.txt

@@ -0,0 +1,137 @@
+Sensor API
+This api documentation is part of the opensprinkler 
+
+<ip> the ip-address, for example 192.168.0.55
+<pw> the MD5 encrypted password, opendoor=a6d82bced638de3def1e9bbb4983225c
+
+
+Create Sensors (sc):
+creates, modifies or deletes a sensor.
+"nr" for a unique number >= 1
+"type" for the sensor-type, see sf. type=0 deletes the sensor
+"group" for group assignment, a nr of another sensor with type=SENSOR_GROUP_YXZ
+"name" a name
+"ip" for the ip-address, only for network connected sensors. All others use ip=0
+"port" for the ip-port-address, only for network connected sensors. All others use port=0
+"id" sub-id, e.a. modbus address or subid, for ADC Sensors 0..7
+"ri" read interval in seconds
+"enable" 0=sensor disabled, 1=sensor enabled
+"log" 0=logging disabled, 1=logging enabled
+
+examples:
+http://<ip>/sc?pw=<pw>&nr=1&type=1&group=0&name=SMT100-Mois&ip=4261456064&port=8899&id=253&ri=60&enable=1&log=1
+http://<ip>/sc?pw=<pw>&nr=2&type=2&group=0&name=SMT100-Temp&ip=4261456064&port=8899&id=253&ri=60&enable=1&log=1
+http://<ip>/sc?pw=<pw>&nr=3&type=11&group=0&name=SMT50-Mois&ip=0&id=0&ri=60&enable=1&log=1
+http://<ip>/sc?pw=<pw>&nr=4&type=12&group=0&name=SMT50-Temp&ip=0&id=1&ri=60&enable=1&log=1
+
+ip: dec=4261456064 = hex=FE00A8C0 = 
+FE = 254
+00 = 000
+A8 = 168
+C0 = 192
+   = 192.168.000.254
+
+For the Truebner SMT100 RS485 Modbus you need a RS485 Modbus RTU over TCP converter.
+Set ip/port for the converter, e.a PUSR USR-W610 in transparent modus.
+
+For the analog ports of the extension board (including SMT50) use id 0..7
+
+type:
+SENSOR_NONE                       0   None or deleted sensor
+SENSOR_SMT100_MODBUS_RTU_MOIS     1   Truebner SMT100 RS485 Modbus RTU over TCP, moisture mode
+SENSOR_SMT100_MODBUS_RTU_TEMP     2   Truebner SMT100 RS485 Modbus RTU over TCP, temperature mode
+SENSOR_ANALOG_EXTENSION_BOARD     10  New OpenSprinkler analog extension board x8 - voltage mode 0..4V
+SENSOR_ANALOG_EXTENSION_BOARD_P   11  New OpenSprinkler analog extension board x8 - percent 0..3.3V to 0..100%
+SENSOR_SMT50_MOIS                 15  New OpenSprinkler analog extension board x8 - SMT50 VWC [%] = (U * 50) : 3
+SENSOR_SMT50_TEMP                 16  New OpenSprinkler analog extension board x8 - SMT50 T [°C] = (U – 0,5) * 100
+SENSOR_OSPI_ANALOG_INPUTS         20  Old OSPi analog input
+SENSOR_REMOTE                     100 Remote sensor of an remote opensprinkler
+SENSOR_GROUP_MIN                 1000 Sensor group with min value
+SENSOR_GROUP_MAX                 1001 Sensor group with max value
+SENSOR_GROUP_AVG                 1002 Sensor group with avg value
+SENSOR_GROUP_SUM                 1003 Sensor group with sum value
+
+List Sensors (sl):
+lists the current sensors
+examples:
+http://<ip>/sl?pw=<pw>
+
+Get last Sensor values (sg):
+returns last read sensor values
+examples:
+http://<ip>/sg?pw=<pw>
+http://<ip>/sg?pw=<pw>&nr=1
+
+Read sensor now (sr):
+executes sensor read and returns the values
+examples:
+http://<ip>/sr?pw=<pw>
+http://<ip>/sr?pw=<pw>&nr=1
+
+Set sensor address for SMT100 (sa): 
+Only for SMT100: Set modbus address
+Disconnect all other modbus sensors, so that only one sensor is connected. Sets the modbus address for sensor nr to id
+examples:
+http://<ip>/sa?pw=<pw>&nr=1&id=1
+
+Dump Sensor Log (so):
+dumps the sensor log
+examples:
+http://<ip>/so?pw=<pw>
+http://<ip>/so?pw=<pw>&start=0&max=100&nr=1&type=1&before=1666915277&after=1666915277
+
+Clear Sensor Log (sn):
+clears the sensor log
+examples:
+http://<ip>/sn?pw=<pw>
+
+Program adjustments (sb):
+defines program adjustments
+"nr" adjustment-nr
+"type" adjustment-type (0=delete, 1=linear, 2=digital min, 3=digital max)
+"sensor" sensor-nr
+"prog" program-nr
+"factor1", "factor2", "min", "max" formula-values
+examples:
+http://<ip>/sb?pw=<pw>&nr=1&type=1&sensor=4&prog=1&factor1=0&factor2=2&min=0&max=50
+
+type:
+PROG_NONE        0 //No adjustment (delete)
+PROG_LINEAR      1 //formula
+PROG_DIGITAL_MIN 2 //1=under or equal min, 0=above
+PROG_DIGITAL_MAX 3 //1=over or equal max, 0=below
+
+formula:
+   min max  factor1 factor2
+   10..90 -> 5..1 factor1 > factor2
+    a   b    c  d
+   (b-sensorData) / (b-a) * (c-d) + d
+
+   10..90 -> 1..5 factor1 < factor2
+    a   b    c  d
+   (sensorData-a) / (b-a) * (d-c) + c
+
+min/max is the used range of the sensor (for example min=10 max=80)
+factor1/factor2 is the calculated adjustment (for example factor1=2 factor2=0)
+So a sensordata of 10 will be a adjustment of factor 2 (200%) or
+a sensordata of 80 will be a adjustment of factor 0 (0%)
+everything between will be linear scaled in the range of 0..2
+
+List Program adjustments (se):
+lists the current program adjustments
+examples:
+http://<ip>/se?pw=<pw>
+&nr=1&prog=1
+
+List supported sensor types (sf):
+lists supported sensor types
+examples:
+http://<ip>/sf?pw=<pw>
+
+List supported program adjustments (sh):
+http://<ip>/sh?pw=<pw>
+
+System used and free space (du):
+http://<ip>/du?pw=<pw>
+
+

build.sh

@@ -14,12 +14,12 @@ if [ "$1" == "demo" ]; then
 	echo "Installing required libraries..."
 	apt-get install -y libmosquitto-dev
 	echo "Compiling firmware..."
-	g++ -o OpenSprinkler -DDEMO -std=c++14 -m32 main.cpp OpenSprinkler.cpp program.cpp opensprinkler_server.cpp utils.cpp weather.cpp gpio.cpp etherport.cpp mqtt.cpp -lpthread -lmosquitto
+	g++ -o OpenSprinkler -DDEMO -std=c++14 -m32 main.cpp OpenSprinkler.cpp program.cpp opensprinkler_server.cpp utils.cpp weather.cpp gpio.cpp etherport.cpp mqtt.cpp sensors.cpp -lpthread -lmosquitto
 elif [ "$1" == "osbo" ]; then
 	echo "Installing required libraries..."
 	apt-get install -y libmosquitto-dev
 	echo "Compiling firmware..."
-	g++ -o OpenSprinkler -DOSBO main.cpp OpenSprinkler.cpp program.cpp opensprinkler_server.cpp utils.cpp weather.cpp gpio.cpp etherport.cpp mqtt.cpp -lpthread -lmosquitto
+	g++ -o OpenSprinkler -DOSBO main.cpp OpenSprinkler.cpp program.cpp opensprinkler_server.cpp utils.cpp weather.cpp gpio.cpp etherport.cpp mqtt.cpp sensors.cpp -lpthread -lmosquitto
 else
 	echo "Installing required libraries..."
 	apt-get update
@@ -31,7 +31,7 @@ else
 		exit 0
 	fi
 	echo "Compiling firmware..."
-	g++ -o OpenSprinkler -DOSPI main.cpp OpenSprinkler.cpp program.cpp opensprinkler_server.cpp utils.cpp weather.cpp gpio.cpp etherport.cpp mqtt.cpp -lpthread -lmosquitto
+	g++ -o OpenSprinkler -DOSPI main.cpp OpenSprinkler.cpp program.cpp opensprinkler_server.cpp utils.cpp weather.cpp gpio.cpp etherport.cpp mqtt.cpp sensors.cpp -lpthread -lmosquitto
 fi
 
 if [ ! "$SILENT" = true ] && [ -f OpenSprinkler.launch ] && [ ! -f /etc/init.d/OpenSprinkler.sh ]; then

defines.h

@@ -24,19 +24,19 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-//#define ENABLE_DEBUG  // enable serial debug
+#define ENABLE_DEBUG  // enable serial debug
 
 typedef unsigned char byte;
 typedef unsigned long ulong;
 
 #define TMP_BUFFER_SIZE      255   // scratch buffer size
 
 /** Firmware version, hardware version, and maximal values */
-#define OS_FW_VERSION  220  // Firmware version: 220 means 2.2.0
+#define OS_FW_VERSION  230  // Firmware version: 220 means 2.2.0
 														// if this number is different from the one stored in non-volatile memory
 														// a device reset will be automatically triggered
 
-#define OS_FW_MINOR      1  // Firmware minor version
+#define OS_FW_MINOR      127 // Firmware minor version
 
 /** Hardware version base numbers */
 #define OS_HW_VERSION_BASE   0x00 // OpenSprinkler