sundp
/
EasyLoRaWAN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GUI Changes to EasyLoRaWAN gateway

This commit is contained in:
IoTThinks.com 2020-05-09 08:37:18 +07:00 committed by GitHub
parent 4e840688b3
commit 46b5bd44ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1848 additions and 1816 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
EasyLoRaWANGateway/_wwwServer.ino
View File

@ -424,27 +424,40 @@ static void openWebPage()
if (gwayConfig.refresh) { if (gwayConfig.refresh) {
response += String() + "<!DOCTYPE HTML><HTML><HEAD><meta http-equiv='refresh' content='"+_WWW_INTERVAL+";http://"; response += String() + "<!DOCTYPE HTML><HTML><HEAD><meta http-equiv='refresh' content='"+_WWW_INTERVAL+";http://";
response += tt; response += tt;
response += "'><TITLE>1ch Gateway " + String(tt) + "</TITLE>"; // Easy LoRa
// response += "'><TITLE>1ch Gateway " + String(tt) + "</TITLE>";
response += "'><TITLE>Easy LoRaWAN Gateway " + String(tt) + "</TITLE>";
} }
else { else {
response += String("<!DOCTYPE HTML><HTML><HEAD><TITLE>1ch Gateway " + String(tt) + "</TITLE>"); // Easy LoRa
// response += String("<!DOCTYPE HTML><HTML><HEAD><TITLE>1ch Gateway " + String(tt) + "</TITLE>");
response += String("<!DOCTYPE HTML><HTML><HEAD><TITLE>Easy LoRaWAN Gateway " + String(tt) + "</TITLE>");
} }
#else #else
response += String("<!DOCTYPE HTML><HTML><HEAD><TITLE>1ch Gateway " + String(tt) + "</TITLE>"); // Easy LoRa
// response += String("<!DOCTYPE HTML><HTML><HEAD><TITLE>1ch Gateway " + String(tt) + "</TITLE>");
response += String("<!DOCTYPE HTML><HTML><HEAD><TITLE>Easy LoRaWAN Gateway " + String(tt) + "</TITLE>");
#endif #endif
response += "<META HTTP-EQUIV='CONTENT-TYPE' CONTENT='text/html; charset=UTF-8'>"; response += "<META HTTP-EQUIV='CONTENT-TYPE' CONTENT='text/html; charset=UTF-8'>";
response += "<META NAME='AUTHOR' CONTENT='M. Westenberg (mw1554@hotmail.com)'>"; response += "<META NAME='AUTHOR' CONTENT='M. Westenberg (mw1554@hotmail.com)'>";
response += "<style>.thead {background-color:green; color:white;} "; // Easy LoRa
// response += "<style>.thead {background-color:green; color:white;} ";
response += "<style>.thead {background-color:#109bc5; color:white;} ";
response += ".cell {border: 1px solid black;}"; response += ".cell {border: 1px solid black;}";
response += ".config_table {max_width:100%; min-width:400px; width:98%; border:1px solid black; border-collapse:collapse;}"; response += ".config_table {max_width:100%; min-width:400px; width:98%; border:1px solid black; border-collapse:collapse;}";
response += "</style></HEAD><BODY>"; response += "</style></HEAD><BODY>";
response +="<h1>ESP Gateway Config</h1>"; // Easy LoRa
// response +="<h1>ESP Gateway Config</h1>";
response +="<h1>Easy LoRaWAN Gateway</h1>";
response +="<p style='font-size:10px;'>"; response +="<p style='font-size:10px;'>";
response +="Version: "; response+=VERSION; response +="Version: "; response+=VERSION;
response +="<br>ESP alive since "; // STARTED ON
// Easy LoRa
// response +="<br>ESP alive since "; // STARTED ON
response +="<br>Gateway is alive since "; // STARTED ON
stringTime(startTime, response); stringTime(startTime, response);
response +=", Uptime: "; // UPTIME response +=", Uptime: "; // UPTIME
@ -485,8 +498,12 @@ static void gatewaySettings()
response +="<table class=\"config_table\">"; response +="<table class=\"config_table\">";
response +="<tr>"; response +="<tr>";
response +="<th class=\"thead\">Setting</th>"; response +="<th class=\"thead\">Setting</th>";
response +="<th colspan=\"2\" style=\"background-color: green; color: white; width:120px;\">Value</th>";
response +="<th colspan=\"4\" style=\"background-color: green; color: white; width:100px;\">Set</th>"; // Easy LoRa
// response +="<th colspan=\"2\" style=\"background-color: green; color: white; width:120px;\">Value</th>";
// response +="<th colspan=\"4\" style=\"background-color: green; color: white; width:100px;\">Set</th>";
response +="<th colspan=\"2\" style=\"background-color: #109bc5; color: white; width:120px;\">Value</th>";
response +="<th colspan=\"4\" style=\"background-color: #109bc5; color: white; width:100px;\">Set</th>";
response +="</tr>"; response +="</tr>";
bg = " background-color: "; bg = " background-color: ";
@ -699,7 +716,7 @@ static void gatewaySettings()
// -------------------------------------------------------------------------------- // --------------------------------------------------------------------------------
// H2 Package Statistics // H2 Package Statistics
// //
// This section display a matrix on the screen where everay channel and spreading // This section display a matrix on the screen where every channel and spreading
// factor is displayed. // factor is displayed.
// -------------------------------------------------------------------------------- // --------------------------------------------------------------------------------
static void statisticsData() static void statisticsData()
@ -708,7 +725,10 @@ static void statisticsData()
// //
// Header Row // Header Row
// //
response +="<h2>Package Statistics</h2>"; // Easy LoRa
// response +="<h2>Package Statistics</h2>";
response +="<h2>Traffic Statistics</h2>";
response +="<table class=\"config_table\">"; response +="<table class=\"config_table\">";
response +="<tr><th class=\"thead\">Counter</th>"; response +="<tr><th class=\"thead\">Counter</th>";
# if _STATISTICS == 3 # if _STATISTICS == 3
@ -716,14 +736,20 @@ static void statisticsData()
response +="<th class=\"thead\">C 1</th>"; response +="<th class=\"thead\">C 1</th>";
response +="<th class=\"thead\">C 2</th>"; response +="<th class=\"thead\">C 2</th>";
# endif //_STATISTICS==3 # endif //_STATISTICS==3
response +="<th class=\"thead\">Pkgs</th>"; // Easy LoRa
response +="<th class=\"thead\">Pkgs/hr</th>"; // response +="<th class=\"thead\">Pkgs</th>";
// response +="<th class=\"thead\">Pkgs/hr</th>";
response +="<th class=\"thead\">Pkts</th>";
response +="<th class=\"thead\">Pkts/hr</th>";
response +="</tr>"; response +="</tr>";
// //
// Table rows // Table rows
// //
response +="<tr><td class=\"cell\">Packages Downlink</td>"; // Easy LoRa
// response +="<tr><td class=\"cell\">Packages Downlink</td>";
response +="<tr><td class=\"cell\">Packet Downlink</td>";
# if _STATISTICS == 3 # if _STATISTICS == 3
response +="<td class=\"cell\">" + String(statc.msg_down_0) + "</td>"; response +="<td class=\"cell\">" + String(statc.msg_down_0) + "</td>";
response +="<td class=\"cell\">" + String(statc.msg_down_1) + "</td>"; response +="<td class=\"cell\">" + String(statc.msg_down_1) + "</td>";
@ -732,7 +758,9 @@ static void statisticsData()
response += "<td class=\"cell\">" + String(statc.msg_down) + "</td>"; response += "<td class=\"cell\">" + String(statc.msg_down) + "</td>";
response +="<td class=\"cell\"></td></tr>"; response +="<td class=\"cell\"></td></tr>";
response +="<tr><td class=\"cell\">Packages Uplink Total</td>"; // Easy LoRa
// response +="<tr><td class=\"cell\">Packages Uplink Total</td>";
response +="<tr><td class=\"cell\">Packet Uplink Total</td>";
# if _STATISTICS == 3 # if _STATISTICS == 3
response +="<td class=\"cell\">" + String(statc.msg_ttl_0) + "</td>"; response +="<td class=\"cell\">" + String(statc.msg_ttl_0) + "</td>";
response +="<td class=\"cell\">" + String(statc.msg_ttl_1) + "</td>"; response +="<td class=\"cell\">" + String(statc.msg_ttl_1) + "</td>";
@ -742,7 +770,9 @@ static void statisticsData()
response +="<td class=\"cell\">" + String((statc.msg_ttl*3600)/(now() - startTime)) + "</td></tr>"; response +="<td class=\"cell\">" + String((statc.msg_ttl*3600)/(now() - startTime)) + "</td></tr>";
# if _GATEWAYNODE==1 # if _GATEWAYNODE==1
response +="<tr><td class=\"cell\">Packages Internal Sensor</td>"; // Easy LoRa
// response +="<tr><td class=\"cell\">Packages Internal Sensor</td>";
response +="<tr><td class=\"cell\">Packet Internal Sensor</td>";
# if _STATISTICS == 3 # if _STATISTICS == 3
response +="<td class=\"cell\">" + String(statc.msg_sens_0) + "</td>"; response +="<td class=\"cell\">" + String(statc.msg_sens_0) + "</td>";
response +="<td class=\"cell\">" + String(statc.msg_sens_1) + "</td>"; response +="<td class=\"cell\">" + String(statc.msg_sens_1) + "</td>";
@ -751,8 +781,9 @@ static void statisticsData()
response +="<td class=\"cell\">" + String(statc.msg_sens) + "</td>"; response +="<td class=\"cell\">" + String(statc.msg_sens) + "</td>";
response +="<td class=\"cell\">" + String((statc.msg_sens*3600)/(now() - startTime)) + "</td></tr>"; response +="<td class=\"cell\">" + String((statc.msg_sens*3600)/(now() - startTime)) + "</td></tr>";
# endif //_GATEWAYNODE # endif //_GATEWAYNODE
// Easy LoRa
response +="<tr><td class=\"cell\">Packages Uplink OK </td>"; // response +="<tr><td class=\"cell\">Packages Uplink OK </td>";
response +="<tr><td class=\"cell\">Packet Uplink OK </td>";
#if _STATISTICS == 3 #if _STATISTICS == 3
response +="<td class=\"cell\">" + String(statc.msg_ok_0) + "</td>"; response +="<td class=\"cell\">" + String(statc.msg_ok_0) + "</td>";
response +="<td class=\"cell\">" + String(statc.msg_ok_1) + "</td>"; response +="<td class=\"cell\">" + String(statc.msg_ok_1) + "</td>";
@ -1812,4 +1843,3 @@ static void websiteFooter()
#endif // _SERVER==1 #endif // _SERVER==1

4
EasyLoRaWANGateway/configGway.h
View File

@ -1,7 +1,9 @@
// 1-channel LoRa Gateway for ESP32 and ESP8266 // 1-channel LoRa Gateway for ESP32 and ESP8266
// Copyright (c) Maarten Westenberg 2016-2020 // Copyright (c) Maarten Westenberg 2016-2020
#define VERSION "V.6.2.4.EU433; PlatformIO 200428n" // Easy LoRa // Easy LoRa
// #define VERSION "V.6.2.4.EU868; PlatformIO 200428n"
#define VERSION "V.6.2.4.EU433"
// //
// Based on work done by Thomas Telkamp for Raspberry PI 1ch gateway and many others. // Based on work done by Thomas Telkamp for Raspberry PI 1ch gateway and many others.
// //