bug fixes

Author: Yurik72

HomeController/BME280Controller.cpp

@@ -8,13 +8,19 @@
 #include <Adafruit_Sensor.h>
 #include <Adafruit_BME280.h>
 
+
 //REGISTER_CONTROLLER(BME280Controller)
 #ifndef ESP8266 
 REGISTER_CONTROLLER_FACTORY(BME280Controller)
 #endif
 
 //BME280ControllerFactory* ff = new BME280ControllerFactory();
 
+String GetStateStringForHistory(BMEState state) {
+
+	return "";
+}
+
 const size_t bufferSize = JSON_OBJECT_SIZE(20);
 
 BME280Controller::BME280Controller() {
@@ -34,6 +40,8 @@ BME280Controller::BME280Controller() {
 	this->hap_hum=NULL;
 	this->hap_press=NULL;
 #endif
+	this->usehistory = false;
+	this->pHistory = NULL;
 }
 String  BME280Controller::serializestate() {
 
@@ -75,6 +83,8 @@ void BME280Controller::loadconfig(JsonObject& json) {
 	uselegacy = json["uselegacy"];
 	loadif(temp_corr, json, "temp_corr");
 	loadif(hum_corr, json, "hum_corr");
+	loadif(usehistory, json, "usehistory");
+	
 }
 void BME280Controller::getdefaultconfig(JsonObject& json) {
 	json[FPSTR(szi2caddr)]= i2caddr;
@@ -91,6 +101,11 @@ void BME280Controller::getdefaultconfig(JsonObject& json) {
 #define BME_CS 14
 void  BME280Controller::setup() {
 	DBG_OUTPUT_PORT.println("BME280Controller setup");
+	if (usehistory) {
+		pHistory = new BME280History();
+		pHistory->SetSize(MAX_HISTORY_RECORDS);
+		pHistory->SetGetStringFn(GetStateStringForHistory);
+	}
 	if (this->uselegacy) {
 		DBG_OUTPUT_PORT.println("Init Adafruit_BME280");
 		this->pbme = new Adafruit_BME280();

HomeController/BME280Controller.h

@@ -3,6 +3,11 @@
 #include <Arduino.h>
 #include <ArduinoJson.h>
 #include "BaseController.h"
+#include "BMEHistory.h"
+
+#define PERIOD_HISTORY_MS 36000
+#define MAX_HISTORY_RECORDS 20
+
 #ifdef	ENABLE_NATIVE_HAP
 extern "C"{
 #include "homeintegration.h"
@@ -16,6 +21,7 @@ struct BMEState
 	double temp=0.0;
 	double hum = 0.0;
 	double pres = 0.0;
+	long gtime = 0;
 };
 enum BMECMD {
 	BMEOn = 1,
@@ -25,6 +31,7 @@ enum BMECMD {
 	BMERestore = 2048
 };
 class BME280Controller;
+typedef CBMEHistory<BMEState> BME280History;
 typedef CController<BME280Controller, BMEState, BMECMD> BME;
 class BME280Controller : public BME
 {
@@ -52,6 +59,7 @@ class BME280Controller : public BME
 	void write8(byte reg, byte value);
 	uint8_t i2caddr;
 	bool uselegacy;
+	bool usehistory;
 	bool isinit;
 	double temp_corr;
 	double hum_corr;
@@ -66,6 +74,8 @@ class BME280Controller : public BME
 	homekit_service_t* hapservice_press;
 	homekit_characteristic_t * hap_press;
 #endif
+	BME280History* pHistory;
+
 };
 DEFINE_CONTROLLER_FACTORY(BME280Controller)
 

HomeController/BME680Controller.cpp

@@ -29,6 +29,8 @@ BME680Controller::BME680Controller() {
 	this->hum_corr = 0.0;
 	this->gas_lower_limit = 10000;  // Bad air quality limit
 	this->gas_upper_limit = 300000; // Good air quality limit
+	this->coreMode = Core;
+	this->core = 0;
 #ifdef	ENABLE_NATIVE_HAP
 	this->ishap=true;
 	this->hapservice_temp=NULL;
@@ -171,7 +173,10 @@ void BME680Controller::run() {
 		command newcmd;
 		newcmd.mode = BME680Measure;
 		this->meassure(newcmd.state);
+
 #ifdef  BME680CONTROLLER_DEBUG
+		//DBG_OUTPUT_PORT.println("Start delay test");
+		//delay(30000);
 		DBG_OUTPUT_PORT.print("BME680Controller->");
 		DBG_OUTPUT_PORT.print("Temperature in Celsius : ");
 		DBG_OUTPUT_PORT.print(newcmd.state.temp);
@@ -226,6 +231,12 @@ void BME680Controller::meassure(BME680State& state) {
 		state.gas_resistance = ReadGasReference();
 		state.gas = getpsevdoIaqGasScore(state.gas_resistance);
 		state.last_measure_ms = millis();
+#ifdef  BME680CONTROLLER_DEBUG
+		DBG_OUTPUT_PORT.print("gas_resistance");
+		DBG_OUTPUT_PORT.println(state.gas_resistance);
+		DBG_OUTPUT_PORT.print("gas");
+		DBG_OUTPUT_PORT.println(state.gas);
+#endif 
 //		DBG_OUTPUT_PORT.println(state.gas_resistance);
 //		DBG_OUTPUT_PORT.println(state.gas);
 
@@ -305,9 +316,9 @@ int BME680Controller::getpsevdoIaqGasScore(int  val) {
 	//Calculate gas contribution to IAQ index
 	const int maxiaq = 500;
 	if (val > gas_upper_limit)
-		return maxiaq;
-	if (val < gas_lower_limit)
 		return 0;
+	if (val < gas_lower_limit)
+		return maxiaq;
 	int gas_score = maxiaq -( (val - gas_lower_limit) * maxiaq )/ (gas_upper_limit - gas_lower_limit);
 
 	return gas_score;

HomeController/BMEHistory.cpp

@@ -0,0 +1,4 @@
+#include "BMEHistory.h"
+
+
+

HomeController/BMEHistory.h

@@ -0,0 +1,48 @@
+#pragma once
+#include "Arduino.h"
+
+#include "Array.h"
+#include <FS.h>
+
+#if !defined(ESP8266)
+#include <SPIFFS.h>
+#endif
+
+template<class T>
+class CBMEHistory :public CSimpleArray <T>{
+public:
+	typedef void(*WriteElementFN)(Stream* ps,T elem);
+	typedef String(*GetStringElement)( T elem);
+	void WriteToStream(Stream* ps) {
+		for (int i = 0; i < this->GetSize(); i++) {
+			pfn_write_element(ps,this->GetAt(i));
+		}
+	}
+	bool WriteToFile(String fileName) {
+		File file = SPIFFS.open(fileName, "w");
+		if (!file)
+			return false;
+		file.print("[");
+		for (int i = 0; i < this->GetSize(); i++) {
+			String s = pfn_get_string_element(this->GetAt(i));
+			file.print(s);
+			if (i == (this->GetSize() - 1)) {
+				file.print("\r\n");
+			}
+			else {
+				file.print(",\r\n");
+			}
+
+		}
+		file.print("]");
+		file.close();
+		return true;
+	}
+	void SetWriteFn(WriteElementFN fn) { pfn_write_element = fn; };
+	void SetGetStringFn(GetStringElement fn) { pfn_get_string_element = fn; };
+private:
+	WriteElementFN pfn_write_element;
+	GetStringElement pfn_get_string_element;
+};
+
+

HomeController/BaseController.cpp

@@ -376,8 +376,11 @@ void runcoreloop(void*param)
 
 		if (self != NULL ) // &&  self->shouldRun())
 			self->runcore();
-		if (self->get_coremode() == Core && self->shouldRun()) {
+		if (self != NULL && self->get_coremode() == Core && self->shouldRun()) {
 			self->run();
+			Controllers* pc = Controllers::getInstance();
+			pc->run_trigger_for(self);
+
 			//DBG_OUTPUT_PORT.println("CBaseController::run from core");
 		}
 	    // https://github.com/espressif/arduino-esp32/issues/595

HomeController/BaseController.h

@@ -46,6 +46,7 @@ void runcoreloop(void*param);
 #endif
 #define CONTROLLER_MAX_COMMANDS 99
 class CBaseController;
+
 enum ControllerEvent {
 	SleepStart = 0,
 	SleepUp = 1

HomeController/CWeatherDisplay.cpp

@@ -174,7 +174,7 @@ void WeatherDisplayController::run() {
 				break;
 			case WDSetCurrentData:
 				newState.data = cmd.state.data;
-
+				
 				bweather = dispMode == MainWether;
 				bInfo=bAllClear= dispMode == Info;
 
@@ -707,7 +707,7 @@ if(disptype==ST7735){
 		pDisplay->println(format_doublestr("Press %.f",wdata.pressure));
 	 }else{
 	   pDisplay->setTextSize(2);
-	   if (wdata.gas > 0) {
+	   if (wdata.gas_resistance > 0) {
 		   pDisplay->setCursor(180, main_offset_y_wetaher);
 		   pDisplay->setTextColor(COLOR_LIGHTBLUE);
 		   pDisplay->print(format_doublestr("%.f %%", wdata.humidity));

HomeController/CWeatherDisplay.h

@@ -74,7 +74,8 @@ struct WeatherData{
   double temp=0;
   double pressure=0;
   double humidity=0;
-  double gas = 0;
+  double gas = 0; 
+  uint32_t gas_resistance = 0;
 
 
 };

HomeController/Controllers.cpp

@@ -526,6 +526,16 @@ void Controllers::handleloops() {
 	}
 
 }
+void Controllers::run_trigger_for(CBaseController* ctl) {
+	for (int j = 0; j < this->triggers.GetSize(); j++) {
+		Trigger* tr = this->triggers.GetAt(j);
+
+		if (strcmp(ctl->get_name(), tr->get_src()) == 0) {
+
+			tr->handleloop(ctl, this);
+		}
+	}
+}
 void Controllers::set_monitor_state(uint channel, bool isOn, long mask, uint masklen, uint duration) {
 
 	if (pMonitor) {