Webserver is running

This commit is contained in:
Ollo 2021-11-27 16:19:35 +01:00
parent 49312a203d
commit 29beff5e82
2 changed files with 46 additions and 8 deletions

10
data/index.htm Normal file
View File

@ -0,0 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8">
<title>IKEA Home Sensor</title>
</head>
<body id="body">
<h1>Room Sensor</h1>
</body>
</html>

View File

@ -78,6 +78,8 @@
#define NODE_GAS "gas" #define NODE_GAS "gas"
#define NODE_HUMIDITY "humidity" #define NODE_HUMIDITY "humidity"
#define NODE_AMBIENT "ambient" #define NODE_AMBIENT "ambient"
#define MQTT_DUMMYHOST "localhost"
/****************************************************************************** /******************************************************************************
* TYPE DEFS * TYPE DEFS
******************************************************************************/ ******************************************************************************/
@ -95,6 +97,7 @@ void log(int level, String message, int code);
bool mConfigured = false; bool mConfigured = false;
bool mConnected = false; bool mConnected = false;
bool mFailedI2Cinitialization = false; bool mFailedI2Cinitialization = false;
AsyncWebServer* mHttp;
/******************************* Sensor data **************************/ /******************************* Sensor data **************************/
HomieNode particle(NODE_PARTICLE, "particle", "number"); /**< Measuret in micro gram per quibik meter air volume */ HomieNode particle(NODE_PARTICLE, "particle", "number"); /**< Measuret in micro gram per quibik meter air volume */
@ -142,6 +145,7 @@ int spm25 = 0;
int last = 0; int last = 0;
unsigned int mButtonPressed = 0; unsigned int mButtonPressed = 0;
bool mSomethingReceived = false; bool mSomethingReceived = false;
bool mConnectedNonMQTT = false;
/****************************************************************************** /******************************************************************************
* LOCAL FUNCTIONS * LOCAL FUNCTIONS
@ -197,8 +201,7 @@ void onHomieEvent(const HomieEvent &event)
{ {
switch (event.type) switch (event.type)
{ {
case HomieEventType::MQTT_READY: case HomieEventType::WIFI_CONNECTED:
mConnected=true;
digitalWrite(WITTY_RGB_R, LOW); digitalWrite(WITTY_RGB_R, LOW);
if (!i2cEnable.get()) { /** keep green LED activated to power I2C sensor */ if (!i2cEnable.get()) { /** keep green LED activated to power I2C sensor */
digitalWrite(WITTY_RGB_G, LOW); digitalWrite(WITTY_RGB_G, LOW);
@ -206,6 +209,13 @@ void onHomieEvent(const HomieEvent &event)
digitalWrite(WITTY_RGB_B, LOW); digitalWrite(WITTY_RGB_B, LOW);
strip.fill(strip.Color(0,0,128)); strip.fill(strip.Color(0,0,128));
strip.show(); strip.show();
if (String(Homie.getConfiguration().mqtt.server.host).equals(MQTT_DUMMYHOST)) {
strip.fill(strip.Color(0,64,0));
mConnectedNonMQTT = true;
}
break;
case HomieEventType::MQTT_READY:
mConnected=true;
if (mFailedI2Cinitialization) { if (mFailedI2Cinitialization) {
log(MQTT_LEVEL_DEBUG, F("Could not find a valid BME680 sensor, check wiring or " log(MQTT_LEVEL_DEBUG, F("Could not find a valid BME680 sensor, check wiring or "
"try a different address!"), MQTT_LOG_I2CINIT); "try a different address!"), MQTT_LOG_I2CINIT);
@ -327,8 +337,6 @@ bool ledHandler(const HomieRange& range, const String& value) {
return false; return false;
} }
/****************************************************************************** /******************************************************************************
* GLOBAL FUNCTIONS * GLOBAL FUNCTIONS
*****************************************************************************/ *****************************************************************************/
@ -348,7 +356,7 @@ void setup()
Homie_setFirmware(HOMIE_FIRMWARE_NAME, HOMIE_FIRMWARE_VERSION); Homie_setFirmware(HOMIE_FIRMWARE_NAME, HOMIE_FIRMWARE_VERSION);
Homie.setLoopFunction(loopHandler); Homie.setLoopFunction(loopHandler);
Homie.onEvent(onHomieEvent); Homie.onEvent(onHomieEvent);
i2cEnable.setDefaultValue(false); i2cEnable.setDefaultValue(true);
rgbTemp.setDefaultValue(false); rgbTemp.setDefaultValue(false);
memset(serialRxBuf, 0, 80); memset(serialRxBuf, 0, 80);
@ -412,10 +420,25 @@ void setup()
} }
} }
strip.fill(strip.Color(0,0,0)); strip.fill(strip.Color(0,0,0));
for (int i=0;i < (PIXEL_COUNT / 2); i++) { String mqttHost = String(Homie.getConfiguration().mqtt.server.host);
strip.setPixelColor(0, strip.Color(0,0,128)); if (mqttHost.equals(MQTT_DUMMYHOST)) {
Homie.getLogger() << "Server without MQTT" << endl;
for (int i=0;i < (PIXEL_COUNT / 2); i++) {
strip.setPixelColor(0, strip.Color(0,128,0));
}
} else {
for (int i=0;i < (PIXEL_COUNT / 2); i++) {
strip.setPixelColor(0, strip.Color(0,0,128));
}
} }
strip.show(); strip.show();
mHttp = new AsyncWebServer(80);
mHttp->on("/heap", HTTP_GET, [](AsyncWebServerRequest *request){
request->send(200, "text/plain", String(ESP.getFreeHeap()));
});
mHttp->serveStatic("/", SPIFFS, "/").setDefaultFile("index.htm");
mHttp->begin();
Homie.getLogger() << "Webserver started" << endl;
digitalWrite(WITTY_RGB_B, HIGH); digitalWrite(WITTY_RGB_B, HIGH);
} else { } else {
strip.fill(strip.Color(128,0,0)); strip.fill(strip.Color(128,0,0));
@ -428,7 +451,11 @@ void setup()
void loop() void loop()
{ {
Homie.loop(); if (!mConnectedNonMQTT) {
Homie.loop();
} else {
/*FIXME handle here a webserver */
}
/* use the pin, receiving the soft serial additionally as button */ /* use the pin, receiving the soft serial additionally as button */
if (digitalRead(GPIO_BUTTON) == LOW) { if (digitalRead(GPIO_BUTTON) == LOW) {
mButtonPressed++; mButtonPressed++;
@ -464,4 +491,5 @@ void log(int level, String message, int statusCode)
Homie.getMqttClient().publish(logTopic, 2, false, buffer.c_str()); Homie.getMqttClient().publish(logTopic, 2, false, buffer.c_str());
delete logTopic; delete logTopic;
} }
Homie.getLogger() << (level) << "@" << (statusCode) << " " << (message) << endl;
} }