mirror
/
rdz_ttgo_sonde
kopia lustrzana https://github.com/dl9rdz/rdz_ttgo_sonde
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

fix #164

pull/168/head
Hansi, dl9rdz 2021-09-16 17:48:11 +02:00
rodzic 29bdcc8f5b
commit 374f84115b
3 zmienionych plików z 15 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
RX_FSK/RX_FSK.ino
Wyświetl plik

@ -149,6 +149,11 @@ String processor(const String& var) {
if (var == "VERSION_ID") {
return String(version_id);
}
if (var == "FULLNAMEID") {
char tmp[128];
snprintf(tmp, 128, "%s-%c%d", version_id, SPIFFS_MAJOR+'A'-1, SPIFFS_MINOR);
return String(tmp);
}
if (var == "AUTODETECT_INFO") {
char tmpstr[128];
const char *fpstr;
@ -560,6 +565,8 @@ void setupConfigData() {
String line = readLine(file); //file.readStringUntil('\n');
sonde.setConfig(line.c_str());
}
int shII = atoi(sonde.config.sondehub.fimport);
if(shImportInterval > shII) shImportInterval = shII;
}
@ -1303,6 +1310,10 @@ void SetupAsyncServer() {
request->send(200, "application/vnd.google-earth.kml+xml", createKMLDynamic());
});
server.on("/upd.html", HTTP_GET, [](AsyncWebServerRequest * request) {
request->send(SPIFFS, "/upd.html", String(), false, processor);
});
server.onNotFound([](AsyncWebServerRequest * request) {
if (request->method() == HTTP_OPTIONS) {
request->send(200);
@ -1311,6 +1322,7 @@ void SetupAsyncServer() {
if (url.endsWith(".gpx"))
request->send(200, "application/gpx+xml", sendGPX(request));
else {
// TODO: set correct type for .js
request->send(SPIFFS, url, "text/html");
Serial.printf("URL is %s\n", url.c_str());
//request->send(404);
@ -3509,7 +3521,7 @@ void sondehub_send_header(WiFiClient * client, SondeInfo * s, struct st_sondehub
Serial.print("PUT /sondes/telemetry HTTP/1.1\r\n"
"Host: ");
Serial.println(conf->host);
Serial.println("accept: text/plain\r\n"
Serial.print("accept: text/plain\r\n"
"Content-Type: application/json\r\n"
"Transfer-Encoding: chunked\r\n");

2
RX_FSK/data/upd.html
Wyświetl plik

@ -4,7 +4,7 @@
<body>
<form action="update.html" method="post"><p>Currently installed: devel20210908-B14</p>
<form action="update.html" method="post"><p>Currently installed: %FULLNAMEID%</p>
<p>
Available master: <span id="masterDiv">(...checking...)</span>

2
RX_FSK/version.h
Wyświetl plik

@ -1,4 +1,4 @@
const char *version_name = "rdzTTGOsonde";
const char *version_id = "devel20210915";
const int SPIFFS_MAJOR=2;
const int SPIFFS_MINOR=15;
const int SPIFFS_MINOR=16;