Fix esp-idf compatibility, add support for basic auth, add support fo…

README.md

@@ -1,4 +1,49 @@
-# OpenAirProject AirQuality / Dust Meter
+# OpenAirProject AirQuality / Dust / CO2 / Distance - Meter + GPIO and OLED Display
+
+The current implementation of this code contains support for additional
+hardware like:
+
+- CO2 sensor: MH-Z19 (can be calibrated via 
+
+		http://<sensor>/trigger?func=calibrate
+
+- OLED display: SSD 1306
+
+- Ultrasonic distance sensor: HC SR04
+
+- GPIO: 4 ports in with counter via
+
+		http://<sensor>/status
+
+- GPIO 4 ports out with trigger via 
+
+		http://<sensor>/trigger?delay=<0|ms>&gpio=<0-3>&value=<0|1>
+
+Further these changes and additions have been made:
+
+- FIX WIFI instability
+
+- Add Device ID to DHCP-Client-Hostname
+
+- Show collected values in realtime on web frontend
+
+- Add disable / enable single hardware components via web frontend
+
+- Add configurable offsets for humidity, temperature and altitude via web frontend
+
+- Add HTTP-GET publisher with basic auth
+
+- Some Pinouts have been changed:
+
+- - Button is now on Pin 0 (button on ESP32 board), low active (configurable)
+
+- - RGB LED has been reduced to channel blue on Pin 2 (LED on ESP32 board, configurable)
+
+- - Pins for heater and fan have been set to unused (-1) by default
+
+- - No need for RTS/CTS pin assignment on RS232 ports
+
+## The following description is outdated ##
 
 ## Features
 

components/oap-aws/awsiot.c

@@ -36,6 +36,7 @@
 #include "oap_common.h"
 #include "oap_debug.h"
 #include "oap_publisher.h"
+#include "oap_storage.h"
 #include "bootwifi.h"
 
 static const char *TAG = "awsiot";
@@ -102,9 +103,9 @@ static esp_err_t awsiot_rest_post(oap_measurement_t* meas, oap_sensor_config_t *
 	if (meas->env) {
 		cJSON* weather = cJSON_CreateObject();
 		cJSON_AddItemToObject(results, "weather", weather);
-		cJSON_AddNumberToObject(weather, "temp", meas->env->temp);
-		cJSON_AddNumberToObject(weather, "pressure", meas->env->pressure);
-		cJSON_AddNumberToObject(weather, "humidity", meas->env->humidity);
+		cJSON_AddNumberToObject(weather, "temp", meas->env->bmx280.temp);
+		cJSON_AddNumberToObject(weather, "pressure", meas->env->bmx280.pressure);
+		cJSON_AddNumberToObject(weather, "humidity", meas->env->bmx280.humidity);
 		cJSON_AddNumberToObject(weather, "sensor", meas->env->sensor_idx);
 	} else {
 		cJSON_AddNullToObject(results, "weather");
@@ -113,9 +114,9 @@ static esp_err_t awsiot_rest_post(oap_measurement_t* meas, oap_sensor_config_t *
 	if (meas->env_int) {
 		cJSON* internal = cJSON_CreateObject();
 		cJSON_AddItemToObject(results, "internal", internal);
-		cJSON_AddNumberToObject(internal, "temp", meas->env_int->temp);
-		cJSON_AddNumberToObject(internal, "pressure", meas->env_int->pressure);
-		cJSON_AddNumberToObject(internal, "humidity", meas->env_int->humidity);
+		cJSON_AddNumberToObject(internal, "temp", meas->env_int->bmx280.temp);
+		cJSON_AddNumberToObject(internal, "pressure", meas->env_int->bmx280.pressure);
+		cJSON_AddNumberToObject(internal, "humidity", meas->env_int->bmx280.humidity);
 		cJSON_AddNumberToObject(internal, "sensor", meas->env_int->sensor_idx);
 	} else {
 		cJSON_AddNullToObject(results, "internal");
@@ -132,13 +133,6 @@ static esp_err_t awsiot_rest_post(oap_measurement_t* meas, oap_sensor_config_t *
 	return res;
 }
 
-static void set_config_str_field(char** field, char* value) {
-	if (*field) {
-		free(*field);
-	}
-	*field = str_dup(value);
-}
-
 static esp_err_t awsiot_configure(cJSON* awsiot) {
 	awsiot_config.configured = 0;
 

components/oap-common/default_config.json

@@ -4,7 +4,8 @@
 		"password": "",
 		"ip": "",
 		"gw": "",
-		"netmask": ""
+		"netmask": "",
+		"sensorId": ""
 	},
 	"thingspeak": {
 		"enabled": 0,
@@ -20,15 +21,28 @@
 	},
 	"sensor" : {
 		"config" : {
-			"indoor" 	: 	0,
+			"pms_enabled"   :       0,
+			"bmx280_enabled":       0,
+			"mhz19_enabled" :       0,
+			"hcsr04_enabled":       0,
+			"ssd1306_enabled":      0,
+			"gpio_enabled"  :       1,
+			"indoor" 	: 	1,
 			"led"		:	1,
-			"fan"		:	1,
-			"heater"	:	1,
+			"fan"		:	0,
+			"heater"	:	0,
 			"measTime"	: 	60,
 			"warmUpTime":	30,
 			"measInterval": 300,
 			"test"		:	0,
-			"measStrategy":	0
+			"measStrategy"	:	0,
+			"altitude"	:	573,
+			"tempOffset"	:	0,
+			"humidityOffset"	:	0
 		}
+	},
+	"http_get_publisher": {
+		"enabled": 0,
+		"url": "https://<myurl>/pushvals.cgi"
 	}
-}
+}

components/oap-common/include/oap_common.h

@@ -34,6 +34,8 @@
 #include "esp_log.h"
 #include "freertos/FreeRTOS.h"
 
+#include "esp_request.h"
+
 //to silence eclipse errors
 typedef unsigned short uint16_t;
 
@@ -47,6 +49,14 @@ void oap_reboot(char* cause);
 long oap_epoch_sec();
 long oap_epoch_sec_valid();
 
+typedef struct {
+	double *data;
+	size_t size;
+	unsigned int lastpos;
+	double sum;
+} sma_data_t;
+
+
 //from esp-arduino
 
 /**
@@ -67,5 +77,9 @@ uint32_t micros();
 uint32_t millis();
 void delay(uint32_t);
 void delayMicroseconds(uint32_t us);
-
+void set_gpio(uint8_t gpio, uint8_t enabled);
+void configure_gpio(uint8_t gpio);
+void req_set_user_agent(request_t* req);
+double sma_generator (sma_data_t *sma, double value);
+int64_t get_time_millis();
 #endif /* MAIN_COMMON_COMMON_H_ */

components/oap-common/include/oap_data.h

@@ -26,11 +26,19 @@
 #include "oap_data_pm.h"
 #include "oap_data_env.h"
 
+// FIXME this stuff has to be generalized
 typedef struct {
 	pm_data_t* pm;
 	pm_data_t* pm_aux;
 	env_data_t* env;
 	env_data_t* env_int;
+	env_data_t* co2;
+	env_data_t* distance1;
+	env_data_t* distance2;
+	env_data_t* gpio1;
+	env_data_t* gpio2;
+	env_data_t* gpio3;
+	env_data_t* gpio4;
 	long int local_time;
 } oap_measurement_t;
 
@@ -45,7 +53,23 @@ typedef struct {
 	int meas_interval;
 	int meas_strategy;	//interval, continuos, etc
 	int test;
+	int altitude;
+	int tempOffset;
+	int humidityOffset;
+	int pms_enabled;
+	int hcsr04_enabled;
+	int bmx280_enabled;
+	int gpio_enabled;
+	int ssd1306_enabled;
+	int mhz19_enabled;
+	int gpio_udp_enabled;
 } oap_sensor_config_t;
 
+typedef struct {
+	env_data_t env_data;
+	long timestamp;
+} env_data_record_t;
+
+extern env_data_record_t last_env_data[];
 
 #endif /* COMPONENTS_OAP_COMMON_INCLUDE_OAP_DATA_H_ */

components/oap-common/include/oap_data_env.h

@@ -23,11 +23,43 @@
 #ifndef COMPONENTS_OAP_COMMON_INCLUDE_OAP_DATA_ENV_H_
 #define COMPONENTS_OAP_COMMON_INCLUDE_OAP_DATA_ENV_H_
 
+typedef enum {
+	sensor_bmx280 = 0,
+	sensor_mhz19,
+	sensor_hcsr04,
+	sensor_gpio
+} sensor_type_t;
+
 typedef struct {
-	double temp;
-	double pressure;
-	double humidity;
 	uint8_t sensor_idx;
+	sensor_type_t sensor_type;
+
+	union {
+		struct {
+			double temp;
+			double pressure;
+			double sealevel;
+			double humidity;
+			uint32_t altitude;
+		} bmx280;
+		struct {
+			double temp;
+			uint32_t co2;
+		} mhz19;
+		struct {
+			uint32_t distance;
+		} hcsr04;
+		struct {
+			int val;
+			int64_t GPIlastLow;
+			int64_t GPIlastHigh;
+			int64_t GPICounter;
+			int64_t GPICountDelta;
+			int64_t GPOlastOut;
+			int64_t GPOtriggerLength;
+			int8_t GPOlastVal;
+		} gpio;
+	};
 } env_data_t;
 
 #endif /* COMPONENTS_OAP_COMMON_INCLUDE_OAP_DATA_ENV_H_ */

components/oap-common/include/oap_debug.h

@@ -35,3 +35,4 @@ size_t avg_free_heap_size();
 void log_task_stack(const char* task);
 void log_heap_size(const char* msg);
 void reduce_heap_size_to(size_t size);
+void hexdump(const unsigned char *data, int len);

components/oap-common/include/oap_storage.h

@@ -26,6 +26,20 @@
 #include <stdlib.h>
 #include "cJSON.h"
 
+/**
+ * @brief    get a mac based system name
+ */
+void get_generic_name(char *name);
+
+/**
+ * @brief    get allocated string from string
+ */
+void set_config_str_field(char** field, char* value);
+
+/**
+ * @brief    initialise config
+ */
+void storage_clean();
 
 /**
  * @brief    initialise storage and config

components/oap-common/include/oap_version.h

@@ -37,8 +37,8 @@
 #include "esp_err.h"
 
 #define OAP_VER_MAJOR 1
-#define OAP_VER_MINOR 2
-#define OAP_VER_PATCH 0
+#define OAP_VER_MINOR 4
+#define OAP_VER_PATCH 29
 
 typedef struct {
 	uint8_t major;

components/oap-common/oap_common.c

@@ -30,15 +30,17 @@
 #include "esp_log.h"
 #include "esp_system.h"
 #include "freertos/task.h"
+#include "driver/gpio.h"
 
 static const long FEB22_2017 = 1487795557;
+static const char *TAG="oap";
 
 static int _reboot_in_progress = 0;
 int is_reboot_in_progress() {
 	return _reboot_in_progress;
 }
 void oap_reboot(char* cause) {
-	ESP_LOGW("oap", "REBOOT ON DEMAND (%s)", cause);
+	ESP_LOGW(TAG, "REBOOT ON DEMAND (%s)", cause);
 	_reboot_in_progress = 1;
 	esp_restart();
 }
@@ -105,4 +107,43 @@ void IRAM_ATTR delayMicroseconds(uint32_t us)
     }
 }
 
+void set_gpio(uint8_t gpio, uint8_t enabled) {
+	if (gpio > 0) {
+		ESP_LOGD(TAG, "set pin %d => %d", gpio, enabled);
+		gpio_set_level(gpio, enabled);
+	}
+}
+
+void configure_gpio(uint8_t gpio) {
+	if (gpio > 0) {
+		ESP_LOGD(TAG, "configure pin %d as output", gpio);
+		gpio_pad_select_gpio(gpio);
+		ESP_ERROR_CHECK(gpio_set_direction(gpio, GPIO_MODE_OUTPUT));
+		ESP_ERROR_CHECK(gpio_set_pull_mode(gpio, GPIO_PULLDOWN_ONLY));
+	}
+}
+
+void req_set_user_agent(request_t* req) {
+    char agent[80];
+    sprintf(agent, "User-Agent: OAP-ESP32/%s", oap_version_str());
+    req_setopt(req, REQ_SET_HEADER, agent);
+}
+
+double sma_generator (sma_data_t *sma, double value) {
+	sma->sum += value;
+	sma->data[sma->lastpos%sma->size] = value;
+	sma->lastpos++;
+	unsigned int size=sma->size;
+	if(sma->lastpos >= sma->size) {
+		sma->sum -= sma->data[sma->lastpos%sma->size];
+	} else {
+		size=sma->lastpos;
+	}
+	return sma->sum/size;
+}
 
+int64_t get_time_millis() {
+   struct timeval tv;
+   gettimeofday(&tv, NULL);
+   return (tv.tv_sec * 1000LL + (tv.tv_usec / 1000LL));
+}

components/oap-common/oap_debug.c

@@ -154,3 +154,12 @@ void heap_log_free(heap_log* log) {
 		ESP_LOGD("debug", "----------> leaked : %d",  xPortGetFreeHeapSize() - initial_heap);
 	}
 }
+
+void hexdump(const unsigned char *data, int len) {
+	char str[80];
+	str[0]=0;
+	for(int i=0;i<len;i++){
+		sprintf(str, "%s %02x", str, data[i]);
+	}
+	ESP_LOGD("debug", "%s",str);
+}