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

Merge branch 'dl9rdz:devel' into patch-4

pull/123/head
Luke Prior 2021-08-08 17:31:20 +10:00 zatwierdzone przez GitHub
rodzic 78187e6d76 74eafe1fd6
commit 8d52aa08d5
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
4 zmienionych plików z 13 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
.travis/push.sh
Wyświetl plik

@ -61,6 +61,8 @@ commit_website_files() {
git add ${BRANCH}/update.ino.bin
echo "${TRAVIS_COMMIT_MESSAGE}" >> ${BRANCH}/${VERSION}-changelog.txt
git add ${BRANCH}/${VERSION}-changelog.txt
echo "<html><body><p>${VERSION}</p></body></html>" > ${BRANCH}/update-info.html
git add ${BRANCH}/update-info.html
git commit --message "Travis build: $TRAVIS_BUILD_NUMBER"
}
upload_files() {

6
RX_FSK/RX_FSK.ino
Wyświetl plik

@ -1008,7 +1008,11 @@ const char *createUpdateForm(boolean run) {
if (run) {
strcat(ptr, "<p>Doing update, wait until reboot</p>");
} else {
sprintf(ptr+strlen(ptr), "<p>Currently installed: %s-%c%d</p>\n", version_id, SPIFFS_MAJOR+'A'-1, SPIFFS_MINOR);
strcat(ptr, "<p>Available master:: <iframe src=\"http://rdzsonde.mooo.com/master/update-info.html\" style=\"height:40px;width:400px\"></iframe><br>"
"Available devel: <iframe src=\"http://rdzsonde.mooo.com/devel/update-info.html\" style=\"height:40px;width:400px\"></iframe></p>");
strcat(ptr, "<input type=\"submit\" name=\"master\" value=\"Master-Update\"></input><br><input type=\"submit\" name=\"devel\" value=\"Devel-Update\">");
strcat(ptr, "<br><p>Note: If suffix is the same, update should work fully. If the number is different, update contains changes in the file system. A full re-flash is required to get all new features, but the update should not break anything. If the letter is different, a full re-flash is mandatory, update will not work</p>");
}
strcat(ptr, "</form></body></html>");
Serial.printf("Update form: size=%d bytes\n", strlen(message));
@ -2231,7 +2235,9 @@ void loopDecoder() {
}
#endif
} else {
#if FEATURE_SONDEHUB
sondehub_finish_data(&shclient, s, &sonde.config.sondehub);
#endif
}
// always send data, even if not valid....
if (rdzclient.connected()) {

3
RX_FSK/data/index.html
Wyświetl plik

@ -51,6 +51,9 @@
%VERSION_NAME%<br>
Copyright &copy; 2019-2021 by Hansi Reiser, DL9RDZ<br>
(version %VERSION_ID%)<br><br>
<a href="/update.html">Check for update (requires TTGO internet connection via WiFi)</a><br><br>
with contributions by Vigor and Xavier (M20 support),
<a href="https://github.com/LukePrior">Luke Prior</a> and <a href="https://github.com/oh3bsg">OH3BSG</a> (SondeHub support),
<a href="https://www.dl2mf.de/" target="_blank">Meinhard Guenther, DL2MF</a>,

4
RX_FSK/version.h
Wyświetl plik

@ -1,4 +1,4 @@
const char *version_name = "rdzTTGOsonde";
const char *version_id = "devel20210806";
const char *version_id = "devel20210807";
const int SPIFFS_MAJOR=2;
const int SPIFFS_MINOR=12;
const int SPIFFS_MINOR=13;