ua1zbe
/
rdz_ttgo_sonde_dl9rdz
mirror of https://github.com/dl9rdz/rdz_ttgo_sonde
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sync w/ DL2MF: web interface enhancements

This commit is contained in:
Hansi, dl9rdz 2022-09-26 02:02:02 +00:00
parent b9f8849cd8
commit 3443834d3e
4 changed files with 57 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
RX_FSK/RX_FSK.ino
View File

@ -442,6 +442,8 @@ const char *createWIFIForm() {
return message; return message;
} }
#if 0
// moved to map.html (active warning is still TODO
const char *createSondeHubMap() { const char *createSondeHubMap() {
SondeInfo *s = &sonde.sondeList[0]; SondeInfo *s = &sonde.sondeList[0];
char *ptr = message; char *ptr = message;
@ -464,6 +466,7 @@ const char *createSondeHubMap() {
HTMLBODYEND(ptr); HTMLBODYEND(ptr);
return message; return message;
} }
#endif
const char *handleWIFIPost(AsyncWebServerRequest *request) { const char *handleWIFIPost(AsyncWebServerRequest *request) {
char label[10]; char label[10];
@ -508,7 +511,7 @@ void addSondeStatus(char *ptr, int i)
{ {
struct tm ts; struct tm ts;
SondeInfo *s = &sonde.sondeList[i]; SondeInfo *s = &sonde.sondeList[i];
strcat(ptr, "<table>"); strcat(ptr, "<table class=\"stat\">");
sprintf(ptr + strlen(ptr), "<tr><td id=\"sfreq\">%3.3f MHz, Type: %s</td><tr><td>ID: %s", s->freq, sondeTypeLongStr[sonde.realType(s)], sprintf(ptr + strlen(ptr), "<tr><td id=\"sfreq\">%3.3f MHz, Type: %s</td><tr><td>ID: %s", s->freq, sondeTypeLongStr[sonde.realType(s)],
s->d.validID ? s->d.id : "<?""?>"); s->d.validID ? s->d.id : "<?""?>");
if (s->d.validID && (TYPE_IS_DFM(s->type) || TYPE_IS_METEO(s->type) || s->type == STYPE_MP3H) ) { if (s->d.validID && (TYPE_IS_DFM(s->type) || TYPE_IS_METEO(s->type) || s->type == STYPE_MP3H) ) {
@ -529,13 +532,15 @@ void addSondeStatus(char *ptr, int i)
sprintf(ptr + strlen(ptr), "<a target=\"_empty\" href=\"https://www.openstreetmap.org/?mlat=%.6f&mlon=%.6f&zoom=14\">OSM</a> - ", s->d.lat, s->d.lon); sprintf(ptr + strlen(ptr), "<a target=\"_empty\" href=\"https://www.openstreetmap.org/?mlat=%.6f&mlon=%.6f&zoom=14\">OSM</a> - ", s->d.lat, s->d.lon);
sprintf(ptr + strlen(ptr), "<a target=\"_empty\" href=\"https://www.google.com/maps/search/?api=1&query=%.6f,%.6f\">Google</a></td></tr>", s->d.lat, s->d.lon); sprintf(ptr + strlen(ptr), "<a target=\"_empty\" href=\"https://www.google.com/maps/search/?api=1&query=%.6f,%.6f\">Google</a></td></tr>", s->d.lat, s->d.lon);
strcat(ptr, "</table><p/>\n"); strcat(ptr, "</table>\n");
} }
const char *createStatusForm() { const char *createStatusForm() {
char *ptr = message; char *ptr = message;
strcpy(ptr, HTMLHEAD); strcpy(ptr, HTMLHEAD);
strcat(ptr, "<meta http-equiv=\"refresh\" content=\"5\"></head><body>"); strcat(ptr, "<meta http-equiv=\"refresh\" content=\"5\"></head>");
HTMLBODY(ptr, "status.html");
strcat(ptr, "<div class=\"content\">");
for (int i = 0; i < sonde.config.maxsonde; i++) { for (int i = 0; i < sonde.config.maxsonde; i++) {
int snum = (i + sonde.currentSonde) % sonde.config.maxsonde; int snum = (i + sonde.currentSonde) % sonde.config.maxsonde;
@ -543,7 +548,12 @@ const char *createStatusForm() {
addSondeStatus(ptr, snum); addSondeStatus(ptr, snum);
} }
} }
strcat(ptr, "</body></html>"); strcat(ptr, "</div><div class=\"footer\"><span></span>"
"<span class=\"ttgoinfo\">rdzTTGOserver ");
strcat(ptr, version_id);
strcat(ptr, "</span>");
HTMLBODYEND(ptr);
Serial.printf("Status form: size=%d bytes\n", strlen(message)); Serial.printf("Status form: size=%d bytes\n", strlen(message));
return message; return message;
} }
@ -720,7 +730,8 @@ const int N_CONFIG = (sizeof(config_list) / sizeof(struct st_configitems));
const char *createConfigForm() { const char *createConfigForm() {
char *ptr = message; char *ptr = message;
strcpy(ptr, HTMLHEAD); strcat(ptr, "</head>"); strcpy(ptr, HTMLHEAD);
strcat(ptr, "<script src=\"rdz.js\"></script></head>");
HTMLBODY(ptr, "config.html"); HTMLBODY(ptr, "config.html");
strcat(ptr, "<div id=\"cfgtab\"></div>"); strcat(ptr, "<div id=\"cfgtab\"></div>");
strcat(ptr, "<script src=\"cfg.js\"></script>"); strcat(ptr, "<script src=\"cfg.js\"></script>");
@ -764,6 +775,7 @@ const char *createConfigForm() {
strcat(ptr, "\");\n"); strcat(ptr, "\");\n");
} }
strcat(ptr, "configTable();\n </script>"); strcat(ptr, "configTable();\n </script>");
strcat(ptr, "<script>footer()</script>");
HTMLSAVEBUTTON(ptr); HTMLSAVEBUTTON(ptr);
HTMLBODYEND(ptr); HTMLBODYEND(ptr);
Serial.printf("Config form: size=%d bytes\n", strlen(message)); Serial.printf("Config form: size=%d bytes\n", strlen(message));
@ -832,7 +844,7 @@ const char *ctrllabel[] = {"Receiver/next freq. (short keypress)", "Scanner (dou
const char *createControlForm() { const char *createControlForm() {
char *ptr = message; char *ptr = message;
strcpy(ptr, HTMLHEAD); strcpy(ptr, HTMLHEAD);
strcat(ptr, "<script src=\"rdz.js\"></script></head>"); strcat(ptr, "</head>");
HTMLBODY(ptr, "control.html"); HTMLBODY(ptr, "control.html");
for (int i = 0; i < 9; i++) { for (int i = 0; i < 9; i++) {
strcat(ptr, "<input class=\"ctlbtn\" type=\"submit\" name=\""); strcat(ptr, "<input class=\"ctlbtn\" type=\"submit\" name=\"");
@ -844,7 +856,10 @@ const char *createControlForm() {
strcat(ptr, "<p></p>"); strcat(ptr, "<p></p>");
} }
} }
strcat(ptr, "<script> footer() </script>\n"); strcat(ptr, "</div><div class=\"footer\"><span></span>"
"<span class=\"ttgoinfo\">rdzTTGOserver ");
strcat(ptr, version_id);
strcat(ptr, "</span>");
HTMLBODYEND(ptr); HTMLBODYEND(ptr);
Serial.printf("Control form: size=%d bytes\n", strlen(message)); Serial.printf("Control form: size=%d bytes\n", strlen(message));
return message; return message;
@ -1185,13 +1200,14 @@ void SetupAsyncServer() {
request->send(200, "text/html", createWIFIForm()); request->send(200, "text/html", createWIFIForm());
}); });
server.on("/map.html", HTTP_GET, [](AsyncWebServerRequest * request) {
request->send(200, "text/html", createSondeHubMap()); // server.on("/map.html", HTTP_GET, [](AsyncWebServerRequest * request) {
}); // request->send(200, "text/html", createSondeHubMap());
server.on("/map.html", HTTP_POST, [](AsyncWebServerRequest * request) { // });
handleWIFIPost(request); // server.on("/map.html", HTTP_POST, [](AsyncWebServerRequest * request) {
request->send(200, "text/html", createSondeHubMap()); // handleWIFIPost(request);
}); // request->send(200, "text/html", createSondeHubMap());
// });
server.on("/config.html", HTTP_GET, [](AsyncWebServerRequest * request) { server.on("/config.html", HTTP_GET, [](AsyncWebServerRequest * request) {
request->send(200, "text/html", createConfigForm()); request->send(200, "text/html", createConfigForm());

24
RX_FSK/data/map.html Normal file
View File

@ -0,0 +1,24 @@
<html>
<head>
<script>
data = ["T4420541",63.5,-20.0];
document.addEventListener("DOMContentLoaded", function(){
fetch('live.json')
.then((response) => response.json())
.then((data) => {
console.log(data.gps.lat, data.gps.lon, data.sonde.ser);
if( (data.sonde.ser||'')=='' && !(data.gps.lat===undefined) ) {
urlarg = '#!mz=8&mc=' + data.gps.lat + ',' + data.gps.lon
} else {
urlarg = data.sonde.ser || '';
}
id = data.sonde.ser || '';
iftxt='<iframe src="https://sondehub.org/' + urlarg + '" style="border:1px solid #00A3D3;border-radius:20px;height:98vh;width:100%"></iframe>';
document.getElementsByTagName('body')[0].innerHTML = iftxt;
})
})
</script>
</head>
<body>
</body>
</html>

1
RX_FSK/data/rdz.js
View File

@ -12,7 +12,6 @@ function footer() {
document.querySelector(".save").disabled = false; document.querySelector(".save").disabled = false;
}); });
document.querySelector(".save").disabled = true; document.querySelector(".save").disabled = true;
document.querySelector(".ttgoinfo").innerHTML = "rdzTTGOserver %VERSION_ID%";
}); });
} }

3
RX_FSK/data/style.css
View File

@ -13,6 +13,9 @@ body, html {
th.cfg { th.cfg {
padding:5pt padding:5pt
} }
table.stat {
margin:0px 0px 5px 0px;
}
.hamburger { .hamburger {
position: relative; position: relative;