diff --git a/.gitignore b/.gitignore index efe145f..df33f47 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,9 @@ # Commit firmware.bin for upload -.pio/* -!.pio/build -.pio/build/* -!.pio/build/esp12e -.pio/build/esp12e/* -!.pio/build/esp12e/firmware.bin +.pio +build/* +!build/esp12e +build/esp12e/* +!build/esp12e/firmware.bin # Don't save network credentials include/networkCredentials.h diff --git a/.pio/build/esp12e/firmware.bin b/.pio/build/esp12e/firmware.bin deleted file mode 100644 index 1e00f3d..0000000 Binary files a/.pio/build/esp12e/firmware.bin and /dev/null differ diff --git a/build/esp12e/firmware.bin b/build/esp12e/firmware.bin new file mode 100644 index 0000000..4ea7bf3 Binary files /dev/null and b/build/esp12e/firmware.bin differ diff --git a/include/version.h b/include/version.h index daf682f..c40e6a8 100644 --- a/include/version.h +++ b/include/version.h @@ -1,9 +1,9 @@ #ifndef BUILD_NUMBER - #define BUILD_NUMBER 9 + #define BUILD_NUMBER 28 #endif #ifndef VERSION - #define VERSION "v0.1.9 - 2023-11-28 12:03:55.553853" + #define VERSION "v0.1.28 - 2023-11-28 13:25:47.461259" #endif #ifndef VERSION_SHORT - #define VERSION_SHORT "v0.1.9" + #define VERSION_SHORT "v0.1.28" #endif diff --git a/platformio.ini b/platformio.ini index f00a9dd..77531f3 100644 --- a/platformio.ini +++ b/platformio.ini @@ -8,6 +8,9 @@ ; Please visit documentation for the other options and examples ; https://docs.platformio.org/page/projectconf.html +[platformio] +build_dir = build + [env:esp12e] platform = espressif8266 board = esp12e diff --git a/src/myOTA.cpp b/src/myOTA.cpp index babefdb..71db391 100644 --- a/src/myOTA.cpp +++ b/src/myOTA.cpp @@ -45,19 +45,29 @@ void handleOTALocal() { } void handleOTARemote() { - BearSSL::WiFiClientSecure client; + WiFiClient client; const uint8_t fingerprint[20] = { 0xe9, 0x4e, 0x54, 0xa9, 0x30, 0x86, 0x3d, 0x53, 0x5b, 0xa0, 0xd2, 0xd3, 0xa5, 0xdd, 0x0d, 0xe3, 0xbd, 0xa8, 0xc9, 0xc2, }; - client.setFingerprint(fingerprint); - t_httpUpdate_return ret = ESPhttpUpdate.update(client, "https://github.com/bendtherules/Patient-counter-esp8266/raw/main/.pio/build/esp12e/firmware.bin", VERSION_SHORT); + // client.setFingerprint(fingerprint); + // client.setInsecure(); + const char* host = "www.github.com"; + const int httpsPort = 80; + Serial.println(host); + if (!client.connect(host, httpsPort)) { + Serial.println("connection failed"); + return; + } else { + Serial.println("connection worked"); + } + t_httpUpdate_return ret = ESPhttpUpdate.update(client, "http://github.com/bendtherules/Patient-counter-esp8266/raw/main ", VERSION_SHORT); switch(ret) { case HTTP_UPDATE_FAILED: - Serial.println("[update] Update failed."); + Serial.print("[update] Update failed. Reason - "); + Serial.println(ESPhttpUpdate.getLastErrorString()); break; case HTTP_UPDATE_NO_UPDATES: - Serial.print("[update] Update no Update. Reason -"); - Serial.println(ESPhttpUpdate.getLastErrorString()); + Serial.println("[update] Update no Update."); break; case HTTP_UPDATE_OK: Serial.println("[update] Update ok."); // may not be called since we reboot the ESP diff --git a/versioning b/versioning index f11c82a..368f89c 100644 --- a/versioning +++ b/versioning @@ -1 +1 @@ -9 \ No newline at end of file +28 \ No newline at end of file