aaribaud/ESPSomfy-RTS
0
0
Fork 0
mirror of https://github.com/rstrouse/ESPSomfy-RTS.git synced 2025-12-13 02:52:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow install of firmware from the main repository #171

Browse source
This commit is contained in:
Robert Strouse 2023-10-19 15:05:37 -07:00
parent a9325eeca5
commit 51f7a0700b
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
GitOTA.cpp
View file

@ -255,8 +255,9 @@ void GitUpdater::emitDownloadProgress(uint8_t num, size_t total, size_t loaded,
bool GitUpdater::beginUpdate(const char *version) { bool GitUpdater::beginUpdate(const char *version) {
Serial.println("Begin update called..."); Serial.println("Begin update called...");
if(strcmp(version, "main") == 0) strcpy(this->baseUrl, "https://github.com/rstrouse/ESPSomfy-RTS/blob/main/"); if(strcmp(version, "Main") == 0) strcpy(this->baseUrl, "https://raw.githubusercontent.com/rstrouse/ESPSomfy-RTS/master/");
else sprintf(this->baseUrl, "https://github.com/rstrouse/ESPSomfy-RTS/releases/download/%s/", version); else sprintf(this->baseUrl, "https://github.com/rstrouse/ESPSomfy-RTS/releases/download/%s/", version);
strcpy(this->targetRelease, version); strcpy(this->targetRelease, version);
this->emitUpdateCheck(); this->emitUpdateCheck();
strcpy(this->currentFile, "SomfyController.ino.esp32.bin"); strcpy(this->currentFile, "SomfyController.ino.esp32.bin");
@ -289,6 +290,7 @@ int8_t GitUpdater::downloadFile() {
uint8_t ndx = 0; uint8_t ndx = 0;
char url[128]; char url[128];
sprintf(url, "%s%s", this->baseUrl, this->currentFile); sprintf(url, "%s%s", this->baseUrl, this->currentFile);
Serial.println(url);
if(https.begin(*client, url)) { if(https.begin(*client, url)) {
https.setFollowRedirects(HTTPC_FORCE_FOLLOW_REDIRECTS); https.setFollowRedirects(HTTPC_FORCE_FOLLOW_REDIRECTS);
Serial.print("[HTTPS] GET...\n"); Serial.print("[HTTPS] GET...\n");
@ -347,6 +349,7 @@ int8_t GitUpdater::downloadFile() {
} }
} }
} }
Serial.printf("Update %s complete\n", this->currentFile); Serial.printf("Update %s complete\n", this->currentFile);
free(buff); free(buff);
@ -355,6 +358,9 @@ int8_t GitUpdater::downloadFile() {
// TODO: memory allocation error. // TODO: memory allocation error.
} }
} }
else {
return httpCode;
}
} }
https.end(); https.end();
Serial.printf("End update %s\n", this->currentFile); Serial.printf("End update %s\n", this->currentFile);

BIN
SomfyController.ino.esp32.bin
View file

Binary file not shown.