Ollo/HomieRoomSensor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In standalone mode, do not allocate the memory, necessary to read the sensors

Browse Source
This commit is contained in:
Ollo 2021-12-18 21:44:49 +01:00
parent a3be4f19a1
commit 2c884710c1
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
data/index.htm → data/standalone.htm
View File

26
src/main.cpp
View File

@ -94,7 +94,7 @@
* TYPE DEFS * TYPE DEFS
******************************************************************************/ ******************************************************************************/
typedef struct { typedef struct s_point {
long timestamp; long timestamp;
float temp; float temp;
#ifdef BME680 #ifdef BME680
@ -171,7 +171,7 @@ unsigned int mButtonPressed = 0;
bool mSomethingReceived = false; bool mSomethingReceived = false;
bool mConnectedNonMQTT = false; bool mConnectedNonMQTT = false;
sensor_point mMeasureSeries[MEASURE_POINT_MAX]; sensor_point* mMeasureSeries;
uint32_t mMeasureIndex = 0; uint32_t mMeasureIndex = 0;
/****************************************************************************** /******************************************************************************
@ -392,6 +392,11 @@ String diagramJson(void) {
String bufferDataPressure = "\"\""; String bufferDataPressure = "\"\"";
String bufferDatasets; String bufferDatasets;
String bufferData; String bufferData;
if (mMeasureSeries == NULL) {
buffer = "{ \"error\": \"Malloc failed\" }";
return buffer;
}
long now = millis(); long now = millis();
if (mMeasureIndex > 0) { if (mMeasureIndex > 0) {
bufferLabels = "[ \"" + String((now - mMeasureSeries[0].timestamp) / 1000) + "s"; bufferLabels = "[ \"" + String((now - mMeasureSeries[0].timestamp) / 1000) + "s";
@ -465,11 +470,13 @@ void loopHandler()
} }
// FIXME: add the measured data into the big list // FIXME: add the measured data into the big list
mMeasureSeries[mMeasureIndex].timestamp = millis(); if (mMeasureSeries != NULL) {
mMeasureSeries[mMeasureIndex].pm25 = millis() / 100; /* Dummy */ mMeasureSeries[mMeasureIndex].timestamp = millis();
mMeasureSeries[mMeasureIndex].temp = random(10,30) * 1.0f; /* Dummy */ mMeasureSeries[mMeasureIndex].pm25 = millis() / 100; /* Dummy */
mMeasureSeries[mMeasureIndex].pressure = random(900,1050) * 1.0f; /* Dummy */ mMeasureSeries[mMeasureIndex].temp = random(10,30) * 1.0f; /* Dummy */
mMeasureIndex++; mMeasureSeries[mMeasureIndex].pressure = random(900,1050) * 1.0f; /* Dummy */
mMeasureIndex++;
}
/* Clean cycles buttons */ /* Clean cycles buttons */
if ((!mConnectedNonMQTT) && (mButtonPressed <= BUTTON_MIN_ACTION_CYCLE)) { if ((!mConnectedNonMQTT) && (mButtonPressed <= BUTTON_MIN_ACTION_CYCLE)) {
@ -545,7 +552,6 @@ void setup()
return (candidate > 1) && (candidate <= 200); return (candidate > 1) && (candidate <= 200);
}); });
memset(serialRxBuf, 0, SERIAL_RCEVBUF_MAX); memset(serialRxBuf, 0, SERIAL_RCEVBUF_MAX);
memset(mMeasureSeries, 0, sizeof(sensor_point) * MEASURE_POINT_MAX);
pmSerial.begin(PM1006_BIT_RATE); pmSerial.begin(PM1006_BIT_RATE);
Homie.setup(); Homie.setup();
@ -580,6 +586,8 @@ void setup()
digitalWrite(WITTY_RGB_G, HIGH); digitalWrite(WITTY_RGB_G, HIGH);
if (mConfigured) if (mConfigured)
{ {
mMeasureSeries = (sensor_point *) malloc(sizeof(sensor_point) * MEASURE_POINT_MAX);
memset(mMeasureSeries, 0, sizeof(sensor_point) * MEASURE_POINT_MAX);
if (i2cEnable.get()) { if (i2cEnable.get()) {
#ifdef BME680 #ifdef BME680
printf("Wait 1 second...\r\n"); printf("Wait 1 second...\r\n");
@ -634,7 +642,7 @@ void setup()
mHttp->on("/diagram", HTTP_GET, [](AsyncWebServerRequest *request){ mHttp->on("/diagram", HTTP_GET, [](AsyncWebServerRequest *request){
request->send(200, "application/json", diagramJson()); request->send(200, "application/json", diagramJson());
}); });
mHttp->serveStatic("/", SPIFFS, "/").setDefaultFile("index.htm"); mHttp->serveStatic("/", SPIFFS, "/").setDefaultFile("standalone.htm");
mHttp->begin(); mHttp->begin();
Homie.getLogger() << "Webserver started" << endl; Homie.getLogger() << "Webserver started" << endl;
} else { } else {