kopia lustrzana https://github.com/dl9rdz/rdz_ttgo_sonde
Merge branch 'dl9rdz:devel' into patch-4
commit
8d52aa08d5
|
@ -61,6 +61,8 @@ commit_website_files() {
|
||||||
git add ${BRANCH}/update.ino.bin
|
git add ${BRANCH}/update.ino.bin
|
||||||
echo "${TRAVIS_COMMIT_MESSAGE}" >> ${BRANCH}/${VERSION}-changelog.txt
|
echo "${TRAVIS_COMMIT_MESSAGE}" >> ${BRANCH}/${VERSION}-changelog.txt
|
||||||
git add ${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"
|
git commit --message "Travis build: $TRAVIS_BUILD_NUMBER"
|
||||||
}
|
}
|
||||||
upload_files() {
|
upload_files() {
|
||||||
|
|
|
@ -1008,7 +1008,11 @@ const char *createUpdateForm(boolean run) {
|
||||||
if (run) {
|
if (run) {
|
||||||
strcat(ptr, "<p>Doing update, wait until reboot</p>");
|
strcat(ptr, "<p>Doing update, wait until reboot</p>");
|
||||||
} else {
|
} 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, "<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>");
|
strcat(ptr, "</form></body></html>");
|
||||||
Serial.printf("Update form: size=%d bytes\n", strlen(message));
|
Serial.printf("Update form: size=%d bytes\n", strlen(message));
|
||||||
|
@ -2231,7 +2235,9 @@ void loopDecoder() {
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
} else {
|
} else {
|
||||||
|
#if FEATURE_SONDEHUB
|
||||||
sondehub_finish_data(&shclient, s, &sonde.config.sondehub);
|
sondehub_finish_data(&shclient, s, &sonde.config.sondehub);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
// always send data, even if not valid....
|
// always send data, even if not valid....
|
||||||
if (rdzclient.connected()) {
|
if (rdzclient.connected()) {
|
||||||
|
|
|
@ -51,6 +51,9 @@
|
||||||
%VERSION_NAME%<br>
|
%VERSION_NAME%<br>
|
||||||
Copyright © 2019-2021 by Hansi Reiser, DL9RDZ<br>
|
Copyright © 2019-2021 by Hansi Reiser, DL9RDZ<br>
|
||||||
(version %VERSION_ID%)<br><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),
|
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://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>,
|
<a href="https://www.dl2mf.de/" target="_blank">Meinhard Guenther, DL2MF</a>,
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
const char *version_name = "rdzTTGOsonde";
|
const char *version_name = "rdzTTGOsonde";
|
||||||
const char *version_id = "devel20210806";
|
const char *version_id = "devel20210807";
|
||||||
const int SPIFFS_MAJOR=2;
|
const int SPIFFS_MAJOR=2;
|
||||||
const int SPIFFS_MINOR=12;
|
const int SPIFFS_MINOR=13;
|
||||||
|
|
Ładowanie…
Reference in New Issue