mathieu/Domotique
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
8a92263ae0
Domotique/WifiControlSensor/WebServer.ino

258 lines
10 KiB
Arduino
Raw Normal View History

Move configuration into a dedicated file
2016-03-30 00:44:37 +02:00
#define STRINGIFY(x) #x
#define TOSTRING(x) STRINGIFY(x)
Change function naming to be coherent across files
2016-03-24 14:54:55 +01:00
void WebHandleRoot() {
Auto refresh home page
2016-03-17 01:05:19 +01:00
server.send(200, "text/html",
Move configuration into a dedicated file
2016-03-30 00:44:37 +02:00
"<head><meta http-equiv=\"refresh\" content=\"" + String(CONFIG_SAMPLING_PERIODE_MS / 1000) + "\" ></head>"
Improve HTML presentation
2016-03-26 01:26:36 +01:00
"<h1>You are connected to " + String(hostName) + "</h1>"
"<fieldset>"
"<legend>Sensors</legend>"
Web Interface print DHT info
2016-04-07 15:45:55 +02:00
#ifdef CONFIG_ENABLE_BMP180
Improve HTML presentation
2016-03-26 01:26:36 +01:00
"Temperature " + String(temp, 2) + "C<br/>"
"Pressure " + String(pressure, 2) + "mB<br/>"
Disable more code when bmp is not enabled
2016-04-06 15:51:27 +02:00
#endif
Web Interface print DHT info
2016-04-07 15:45:55 +02:00
#ifdef CONFIG_ENABLE_DHT
"Temperature DHT " + String(dhtTemp, 0) + "C<br/>"
"Humidity DHT " + String(dhtHumidity, 0) + "%<br/>"
Return dryness to http and mqtt
2016-06-04 18:45:11 +02:00
#endif
#ifdef CONFIG_ENABLE_DRY_SENSOR
"Dryness " + String((dryness*100)/1024) + "%<br/>"
Web Interface print DHT info
2016-04-07 15:45:55 +02:00
#endif
"</fieldset>"
Move configuration into a dedicated file
2016-03-30 00:44:37 +02:00
#ifdef CONFIG_WEB_CONTROLLED_GPIO
Disable more code when bmp is not enabled
2016-04-06 15:51:27 +02:00
"<fieldset>"
Move configuration into a dedicated file
2016-03-30 00:44:37 +02:00
"<legend>Relay</legend>"
"<a href=\"/gpio?gpio=" TOSTRING(CONFIG_WEB_CONTROLLED_GPIO) "&amp;value=1\">Relay ON</a><br/>"
"<a href=\"/gpio?gpio=" TOSTRING(CONFIG_WEB_CONTROLLED_GPIO) "&value=0\">Relay OFF</a><br/>"
Improve HTML presentation
2016-03-26 01:26:36 +01:00
"</fieldset>"
Move configuration into a dedicated file
2016-03-30 00:44:37 +02:00
#endif
Improve HTML presentation
2016-03-26 01:26:36 +01:00
"<fieldset>"
"<legend>Settings</legend>"
"<a href=\"/setup\">Enter Setup</a><br/>"
"<a href=\"/otamode\">Put device in OTA mode</a><br/>"
Change function naming to be coherent across files
2016-03-24 14:54:55 +01:00
"MQTT Status: " + (MqttIsConnected() ? "Connected" : "Disconnected") + "<br/>"
Disable more code when bmp is not enabled
2016-04-06 15:51:27 +02:00
#ifdef CONFIG_ENABLE_BMP180
Change function naming to be coherent across files
2016-03-24 14:54:55 +01:00
"BMP 180 (Temp+Pression) Status: " + (BMP180IsConnected() ? "Connected" : "Disconnected") + "<br/>"
Disable more code when bmp is not enabled
2016-04-06 15:51:27 +02:00
#endif
Improve HTML presentation
2016-03-26 01:26:36 +01:00
"Free space: " + ESP.getFreeSketchSpace() + "<br/>"
"Free heap: " + ESP.getFreeHeap() + "<br/>"
Include build date into web interface
2016-04-10 00:37:41 +02:00
"Build the " + __DATE__ + " at " + __TIME__ + "<br/>"
Improve HTML presentation
2016-03-26 01:26:36 +01:00
"</fieldset>"
Take measure of Temperature from BMP180
2016-03-11 00:43:24 +01:00
);
}
Fix Warnings
2016-04-07 16:14:19 +02:00
void WebSendError(const char *error) {
Save Static ip config as uint32_t
2016-04-07 02:02:51 +02:00
server.send(500, "text/plain", error);
}
Suggest SSID name when configuring Wifi Details
2016-07-08 16:04:20 +02:00
void WebBuildSSIDList(String &datalist){
int n = WiFi.scanNetworks();
datalist = "<datalist id=\"scan_ssid\">";
// sort by RSSI
int indices[n];
for (int i = 0; i < n; i++) {
indices[i] = i;
}
for (int i = 0; i < n; i++) {
for (int j = i + 1; j < n; j++) {
if (WiFi.RSSI(indices[j]) > WiFi.RSSI(indices[i])) {
std::swap(indices[i], indices[j]);
}
}
}
for (int i = 0; i < n; ++i){
datalist += "<option value=\""+WiFi.SSID(indices[i])+"\">";
}
datalist += "</datalist>";
}
Change function naming to be coherent across files
2016-03-24 14:54:55 +01:00
void WebHandleSetup() {
Improve form for Setup
2016-03-14 17:36:56 +01:00
uint8_t mode;
char *confSsid = "";
char *confPassword = "";
char *confHost = "";
char *mqttServer = "";
char *mqttUser = "";
char *mqttPasswd = "";
int mqttPort = 1883;
Save ip config into eeprom
2016-04-06 19:34:29 +02:00
int ip_config = 0;
Even initialize int
2016-04-14 01:17:37 +02:00
uint32_t ip = 0;
uint32_t gw = 0;
uint32_t mask = 0;
uint32_t dns = 0;
uint32_t dns2 = 0;
Improve form for Setup
2016-03-14 17:36:56 +01:00
Suggest SSID name when configuring Wifi Details
2016-07-08 16:04:20 +02:00
String ssidlist;
WebBuildSSIDList(ssidlist);
Save Static ip config as uint32_t
2016-04-07 02:02:51 +02:00
EepromReadConfig(mode, &confSsid, &confPassword, &confHost, &mqttServer, &mqttUser, &mqttPasswd, mqttPort, ip_config, ip, gw, mask, dns, dns2);
Improve form for Setup
2016-03-14 17:36:56 +01:00
Take measure of Temperature from BMP180
2016-03-11 00:43:24 +01:00
server.send(200, "text/html", "<form action=\"/save\" method=\"get\">"
Improve form for Setup
2016-03-14 17:36:56 +01:00
"<fieldset>"
"<legend>Wifi configuration:</legend>"
Suggest SSID name when configuring Wifi Details
2016-07-08 16:04:20 +02:00
"<div><label for=\"ssid\">Wifi SSID :</label> <br/><input list=\"scan_ssid\" type=\"text\" name=\"ssid\" value=\"" + String(confSsid) + "\" /></div>"
"" + ssidlist + ""
"<div><label for=\"password\">Wifi Password :</label><br/><input type=\"password\" name=\"password\" style=\"border-color:red\" /> </div>"
Improve HTML presentation
2016-03-26 01:26:36 +01:00
"<div><label for=\"host\">Hostname :</label><br/><input type=\"text\" name=\"host\" value=\"" + String(confHost) + "\" /> </div>"
Improve form for Setup
2016-03-14 17:36:56 +01:00
"</fieldset>"
"<fieldset>"
Save ip config into eeprom
2016-04-06 19:34:29 +02:00
"<legend>IP Configuration</legend>"
"<div><input type=\"radio\" name=\"ip_config\" value=\"0\" checked>DHCP <input type=\"radio\" name=\"ip_config\" value=\"1\">Static</div>"
Display configured IP value in setup page
2016-04-07 12:05:37 +02:00
"<div><label for=\"ip\">Ip :</label><br/><input type=\"text\" name=\"ip\" value=\"" + (ip == 0 ? "192.168.0.123": IPAddress(ip).toString()) + "\" /> </div>"
"<div><label for=\"gw\">Gateway :</label><br/><input type=\"text\" name=\"gw\" value=\"" + (gw == 0 ? "192.168.0.250": IPAddress(gw).toString()) + "\" /> </div>"
"<div><label for=\"mask\">Netmask :</label><br/><input type=\"text\" name=\"mask\" value=\"" + (mask == 0 ? "255.255.255.0": IPAddress(mask).toString()) + "\" /> </div>"
"<div><label for=\"mask\">DNS :</label><br/><input type=\"text\" name=\"dns\" value=\"" + (dns == 0 ? "192.168.0.250": IPAddress(dns).toString()) + "\" /> </div>"
"<div><label for=\"mask\">DNS2 :</label><br/><input type=\"text\" name=\"dns2\" value=\"" + (dns2 == 0 ? "": IPAddress(dns2).toString()) + "\" /> </div>"
Save ip config into eeprom
2016-04-06 19:34:29 +02:00
"</fieldset>"
"<fieldset>"
Improve form for Setup
2016-03-14 17:36:56 +01:00
"<legend>MQTT:</legend>"
Improve HTML presentation
2016-03-26 01:26:36 +01:00
"<div><label for=\"mqttServer\">Server :</label><br/><input type=\"text\" name=\"mqttServer\" value=\"" + String(mqttServer) + "\" /> </div>"
"<div><label for=\"mqttUser\">Username :</label><br/><input type=\"text\" name=\"mqttUser\" value=\"" + String(mqttUser) + "\" /> </div>"
Suggest SSID name when configuring Wifi Details
2016-07-08 16:04:20 +02:00
"<div><label for=\"mqttPasswd\">Password :</label><br/><input type=\"password\" name=\"mqttPasswd\" style=\"border-color:red\" /> </div>"
Improve HTML presentation
2016-03-26 01:26:36 +01:00
"<div><label for=\"mqttPort\">Port :</label><br/><input type=\"text\" name=\"mqttPort\" value=\"" + String(mqttPort) + "\" /> </div>"
Improve form for Setup
2016-03-14 17:36:56 +01:00
"</fieldset>"
Take measure of Temperature from BMP180
2016-03-11 00:43:24 +01:00
"<div class=\"button\"> <button type=\"submit\">Save</button></div>"
"</form>");
}
Change function naming to be coherent across files
2016-03-24 14:54:55 +01:00
void WebHandleGpio() {
Take measure of Temperature from BMP180
2016-03-11 00:43:24 +01:00
if (!server.hasArg("gpio") || !server.hasArg("value")) {
server.send(500, "text/plain", "Bad arguments\r\n");
return;
}
Change function naming to be coherent across files
2016-03-24 14:54:55 +01:00
MqttChangeGpioValue(server.arg("gpio").toInt(), server.arg("value").toInt());
Take measure of Temperature from BMP180
2016-03-11 00:43:24 +01:00
server.send(200, "text/html", "<h1>GPIO" + server.arg("gpio") + " changed to " + server.arg("value") + "</h1>");
}
Fix Warnings
2016-04-07 16:14:19 +02:00
boolean WebSetIp(IPAddress &addr, const char *id, const char *error) {
Save Static ip config as uint32_t
2016-04-07 02:02:51 +02:00
if (server.arg(id) != "" && !addr.fromString(server.arg(id).c_str())) {
WebSendError(error);
return false;
}
return true;
}
Change function naming to be coherent across files
2016-03-24 14:54:55 +01:00
void WebHandleSave() {
Save Static ip config as uint32_t
2016-04-07 02:02:51 +02:00
IPAddress ip;
IPAddress gw;
IPAddress mask;
IPAddress dns;
IPAddress dns2;
Take measure of Temperature from BMP180
2016-03-11 00:43:24 +01:00
Save ip config into eeprom
2016-04-06 19:34:29 +02:00
if (!server.hasArg("ssid") || !server.hasArg("password") || !server.hasArg("host")
|| !server.hasArg("mqttServer") || !server.hasArg("mqttUser") || !server.hasArg("mqttPasswd")
|| !server.hasArg("mqttPort") || !server.hasArg("ip_config") || !server.hasArg("ip")
|| !server.hasArg("gw") || !server.hasArg("mask") || !server.hasArg("dns")
|| !server.hasArg("dns2")) {
Take measure of Temperature from BMP180
2016-03-11 00:43:24 +01:00
server.send(500, "text/plain", "Bad arguments\r\n");
return;
}
Save Static ip config as uint32_t
2016-04-07 02:02:51 +02:00
//Check Ip configuration
if (server.arg("ip_config").toInt() == 1) {
if (!WebSetIp(ip, "ip", "Incorrect IP") || !WebSetIp(gw, "gw", "Incorrect Gateway") || !WebSetIp(mask, "mask", "Incorrect NetMask") ||
!WebSetIp(dns, "dns", "Incorrect DNS") || !WebSetIp(dns2, "dns2", "Incorrect DNS2")) {
return;
}
}
Save ip config into eeprom
2016-04-06 19:34:29 +02:00
if (EepromSaveConfig(BOOTMODE_NORMAL, server.arg("ssid"), server.arg("password"),
server.arg("host"), server.arg("mqttServer"), server.arg("mqttUser"),
server.arg("mqttPasswd"), server.arg("mqttPort").toInt(),
Save Static ip config as uint32_t
2016-04-07 02:02:51 +02:00
server.arg("ip_config").toInt(), static_cast<uint32_t>(ip), static_cast<uint32_t>(gw),
static_cast<uint32_t>(mask), static_cast<uint32_t>(dns), static_cast<uint32_t>(dns2)) < 0) {
WebSendError("Cannot Save Credentials (Too long ?Contains \";\"?)\r\n");
Take measure of Temperature from BMP180
2016-03-11 00:43:24 +01:00
return;
}
Add a way to test Wifi Config in AP mode
2016-07-08 01:03:32 +02:00
if(WiFi.softAPIP() != IPAddress((uint32_t)0)){
//In STA mode, we can test the AP connection
WiFi.begin(server.arg("ssid").c_str(), server.arg("password").c_str());
server.send(200, "text/html", "<h1>Configuration Saved</h1><br/>"
"<a href=\"/wifiStatus\">Check Wifi Configuration</a><br/>");
}else{
server.send(200, "text/html", "<h1>Configuration Saved</h1><br/>"
"<a href=\"/reboot\">Reboot</a><br/>");
}
Take measure of Temperature from BMP180
2016-03-11 00:43:24 +01:00
}
Change function naming to be coherent across files
2016-03-24 14:54:55 +01:00
void WebHandleOTA() {
Make Serial output optionnal Save 2k of ROM
2016-03-26 15:07:15 +01:00
SKETCH_DEBUG_PRINTLN("Boot mode Set to OTA");
Change function naming to be coherent across files
2016-03-24 14:54:55 +01:00
EepromSaveBootMode(BOOTMODE_OTA);
Do not need to be setup to play with gpio or OTA And reindent
2016-03-11 01:41:21 +01:00
server.send(200, "text/html", "<h1>OTA Mode set</h1><br/>"
Return dryness to http and mqtt
2016-06-04 18:45:11 +02:00
"You can reboot now<br/>"
Improve HTML presentation
2016-03-26 01:26:36 +01:00
"<a href=\"/reboot\">Reboot</a><br/>");
Take measure of Temperature from BMP180
2016-03-11 00:43:24 +01:00
}
Change function naming to be coherent across files
2016-03-24 14:54:55 +01:00
void WebHandleNotFound() {
Take measure of Temperature from BMP180
2016-03-11 00:43:24 +01:00
String message = "File Not Found\n\n";
message += "URI: ";
message += server.uri();
message += "\nMethod: ";
message += (server.method() == HTTP_GET) ? "GET" : "POST";
message += "\nArguments: ";
message += server.args();
message += "\n";
for (uint8_t i = 0; i < server.args(); i++) {
message += " " + server.argName(i) + ": " + server.arg(i) + "\n";
}
server.send(404, "text/plain", message);
}
Change function naming to be coherent across files
2016-03-24 14:54:55 +01:00
void WebHandleReboot() {
Make Serial output optionnal Save 2k of ROM
2016-03-26 15:07:15 +01:00
SKETCH_DEBUG_PRINTLN("HTTP request to reboot");
Add http request to reboot ESP GPIO0 should be at 3.3v to boot correctly
2016-03-16 01:09:25 +01:00
server.send(200, "text/html", "<h1>Device Reboot</h1><br/>");
ESP.restart();
}
Add a way to test Wifi Config in AP mode
2016-07-08 01:03:32 +02:00
String statusToString(wl_status_t status) {
switch(status){
case WL_IDLE_STATUS: return String("Idle");
case WL_NO_SSID_AVAIL: return String("Wifi not found");
case WL_CONNECTED: return String("Connected");
case WL_CONNECT_FAILED: return String("Connection failed (Wrong password ?)");
case WL_CONNECTION_LOST: return String("Connection Lost");
case WL_DISCONNECTED: return String("Connecting");
default: return String(status);
}
}
void WebHandleWifiStatus() {
String message;
if(WiFi.status() == WL_DISCONNECTED)
message += "<head><meta http-equiv=\"refresh\" content=\"1\" ></head>";
message += "<h1>Wifi Connection Status</h1><br/>";
message += "Connection to ";
message += WiFi.SSID();
message += ":<br/>";
message += statusToString(WiFi.status());
message += "<br/>";
if(mode == BOOTMODE_SETUP && WiFi.status() == WL_CONNECTED){
message += "Wifi correctly setup!, you can reboot now<br/>";
message += "<a href=\"/reboot\">Reboot</a><br/>";
}
if(WiFi.status() == WL_CONNECT_FAILED || WiFi.status() == WL_NO_SSID_AVAIL){
message += "Try to reconfigure you WiFi details<br/>";
message += "<a href=\"/setup\">Enter Setup</a><br/>";
}
server.send(200, "text/html", message);
}
Fix Warnings
2016-04-07 16:14:19 +02:00
void WebSetupServer(int ) {
Change function naming to be coherent across files
2016-03-24 14:54:55 +01:00
server.on("/", WebHandleRoot);
server.on("/setup", WebHandleSetup);
server.on("/save", WebHandleSave);
server.on("/gpio", WebHandleGpio);
server.on("/otamode", WebHandleOTA);
server.on("/reboot", WebHandleReboot);
Add a way to test Wifi Config in AP mode
2016-07-08 01:03:32 +02:00
server.on("/wifiStatus", WebHandleWifiStatus);
Do not need to be setup to play with gpio or OTA And reindent
2016-03-11 01:41:21 +01:00
Change function naming to be coherent across files
2016-03-24 14:54:55 +01:00
server.onNotFound(WebHandleNotFound);
Take measure of Temperature from BMP180
2016-03-11 00:43:24 +01:00
server.begin();
Make Serial output optionnal Save 2k of ROM
2016-03-26 15:07:15 +01:00
SKETCH_DEBUG_PRINTLN("HTTP server started");
Take measure of Temperature from BMP180
2016-03-11 00:43:24 +01:00
}
Reference in New Issue Copy Permalink