feedc0de/WifiLamp
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Updated sketch to use new central server

Browse Source
This commit is contained in:
0xFEEDC0DE
2018-04-20 22:10:32 +02:00
parent a25e54ac48
commit a33fdaa645
3 changed files with 124 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
relaiswebserver.cpp
View File

@@ -47,8 +47,7 @@ void RelaisWebserver::handleRequest(HttpClientConnection *connection, const Http
for(auto _client : m_relaisServer->clients())
{
if(!_client->name().isEmpty() &&
_client->name() == parts.at(2))
if(clientId(_client) == parts.at(2))
{
client = _client;
break;
@@ -79,6 +78,12 @@ void RelaisWebserver::handleRequest(HttpClientConnection *connection, const Http
redirectRoot(connection, request);
return;
}
else if(parts.at(3) == "delete")
{
client->deleteLater();
redirectRoot(connection, request);
return;
}
else
{
handle404(connection, request);
@@ -102,24 +107,25 @@ void RelaisWebserver::handleRoot(HttpClientConnection *connection, const HttpReq
output.append("<th>Name</th>");
output.append("<th>Status</th>");
output.append("<th>Actions</th>");
output.append("<th>Administration</th>");
output.append("</tr>");
output.append("</thead>");
output.append("<tbody>");
for(auto client : m_relaisServer->clients())
{
output.append("<tr>");
output.append("<td>" % client->peerAddress().toString() % ':' % QString::number(client->peerPort()) % "</td>");
output.append("<td>" % client->name() % "</td>");
output.append("<td>" % client->status() % "</td>");
if(!client->name().isEmpty())
{
output.append("<td><a href=\"/devices/" % client->name().toHtmlEscaped() % "/toggle\">" % tr("toggle") % "</a> ");
if(client->status() != QStringLiteral("on"))
output.append("<a href=\"/devices/" % client->name().toHtmlEscaped() % "/on\">" % tr("on") % "</a> ");
if(client->status() != QStringLiteral("off"))
output.append("<a href=\"/devices/" % client->name().toHtmlEscaped() % "/off\">" % tr("off") % "</a> ");
output.append("</td>");
}
output.append("<td>" % clientId(client).toHtmlEscaped() % "</td>");
output.append("<td>" % client->name().toHtmlEscaped() % "</td>");
output.append("<td>" % client->status().toHtmlEscaped() % "</td>");
output.append("<td><a href=\"/devices/" % clientId(client).toHtmlEscaped() % "/toggle\">" % tr("toggle") % "</a> ");
if(client->status() != QStringLiteral("on"))
output.append("<a href=\"/devices/" % clientId(client).toHtmlEscaped() % "/on\">" % tr("on") % "</a> ");
if(client->status() != QStringLiteral("off"))
output.append("<a href=\"/devices/" % clientId(client).toHtmlEscaped() % "/off\">" % tr("off") % "</a> ");
output.append("</td>");
output.append("<td><a href=\"/devices/" % clientId(client).toHtmlEscaped() % "/delete\">" % tr("Delete") % "</a></td>");
output.append("</tr>");
}
output.append("</tbody>");
@@ -159,3 +165,8 @@ void RelaisWebserver::handle404(HttpClientConnection *connection, const HttpRequ
connection->sendResponse(response);
}
QString RelaisWebserver::clientId(RelaisClient *client)
{
return client->peerAddress().toString() % ':' % QString::number(client->peerPort());
}

4
relaiswebserver.h
View File

@@ -4,9 +4,10 @@
#include "httpserver.h"
class RelaisServer;
class HttpClientConnection;
class HttpRequest;
class RelaisClient;
class RelaisServer;
class RelaisWebserver : public HttpServer
{
@@ -22,6 +23,7 @@ private:
void handleRoot(HttpClientConnection *connection, const HttpRequest &request);
void redirectRoot(HttpClientConnection *connection, const HttpRequest &request);
void handle404(HttpClientConnection *connection, const HttpRequest &request);
static QString clientId(RelaisClient *client);
RelaisServer *m_relaisServer;
};

115
WifiLamp.ino → single_lamp/single_lamp.ino
View File

@@ -4,8 +4,7 @@
const char* ssid = "McDonalds Free WiFi 2.4GHz";
const char* password = "Passwort_123";
const int relaisPin = D1;
const char* host = "192.168.0.243";
const char* success = "success";
@@ -72,16 +71,96 @@ const char* updateContent = "<!doctype html>"
"</body>"
"</html>";
class ControlClient {
public:
explicit ControlClient(const char *name, const int pin) :
m_name(name),
m_pin(pin)
{
}
void begin() {
Serial.println(m_pin);
Serial.println("begin()");
pinMode(m_pin, OUTPUT);
digitalWrite(m_pin, HIGH);
}
void handleClient() {
if(!m_client.connected()) {
Serial.println("Connecting to server...");
if (m_client.connect(host, 1234)) {
Serial.println("Connected to server!");
m_client.println(m_name);
sendStatus();
} else {
Serial.println("Could not connect to server!");
}
}
if(m_client.connected()) {
while(m_client.available()) {
char c(m_client.read());
Serial.println(c);
switch(c) {
case '1': on(); break;
case '0': off(); break;
case 't': toggle(); break;
case 's': sendStatus(); break;
default: Serial.print("Unknown command: "); Serial.println(c);
}
}
}
}
void on() {
Serial.println("on()");
digitalWrite(m_pin, HIGH);
sendStatus();
}
void off() {
Serial.println("off()");
digitalWrite(m_pin, LOW);
sendStatus();
}
void toggle() {
Serial.println("toggle()");
if(status()) {
off();
} else {
on();
}
}
bool status() {
return digitalRead(m_pin) == HIGH;
}
void sendStatus() {
Serial.println("sendStatus()");
m_client.println(status() ? "on" : "off");
}
private:
WiFiClient m_client;
const char *m_name;
const int m_pin;
};
ESP8266WebServer server(80);
ControlClient relaisClient("daniel_decke", D1);
void setup() {
Serial.begin(115200);
Serial.println();
pinMode(relaisPin, OUTPUT);
digitalWrite(relaisPin, HIGH);
WiFi.begin(ssid, password);
relaisClient.begin();
server.on("/", HTTP_GET, []() {
server.sendHeader("Connection", "close");
@@ -94,21 +173,21 @@ void setup() {
});
server.on("/on", HTTP_GET, []() {
digitalWrite(relaisPin, HIGH);
relaisClient.on();
server.sendHeader("Connection", "close");
server.send(200, "text/plain", success);
});
server.on("/off", HTTP_GET, []() {
digitalWrite(relaisPin, LOW);
relaisClient.off();
server.sendHeader("Connection", "close");
server.send(200, "text/plain", success);
});
server.on("/toggle", HTTP_GET, []() {
digitalWrite(relaisPin, digitalRead(relaisPin) ? LOW : HIGH);
relaisClient.toggle();
server.sendHeader("Connection", "close");
server.send(200, "text/plain", success);
@@ -116,7 +195,7 @@ void setup() {
server.on("/status", HTTP_GET, []() {
server.sendHeader("Connection", "close");
server.send(200, "text/plain", digitalRead(relaisPin) ? "on" : "off");
server.send(200, "text/plain", relaisClient.status() ? "on" : "off");
});
server.on("/update", HTTP_POST, []() {
@@ -150,18 +229,16 @@ void setup() {
});
server.begin();
if (WiFi.waitForConnectResult() != WL_CONNECTED) {
for(int i = 0; i < 2; i++) {
digitalWrite(relaisPin, LOW);
delay(500);
digitalWrite(relaisPin, HIGH);
delay(500);
}
}
}
void loop() {
server.handleClient();
if(WiFi.status() == WL_CONNECTED) {
relaisClient.handleClient();
server.handleClient();
} else {
Serial.println("No wifi");
delay(500);
}
delay(1);
}