From 2d64148d127e7d201da92e43683624f498d28459 Mon Sep 17 00:00:00 2001 From: Robert van den Breemen Date: Tue, 14 Mar 2023 22:26:17 +0100 Subject: [PATCH] fix the 0bytes on update Pic firmware, by downgrading the core to 2.7.4 --- Makefile | 6 ++++-- version.h | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index ab23311..a74a670 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,9 @@ CFLAGS = $(CFLAGS_DEFAULT) CLI := arduino-cli PLATFORM := esp8266:esp8266 CFGFILE := arduino-cli.yaml -ESP8266URL := https://github.com/esp8266/Arduino/releases/download/3.0.2/package_esp8266com_index.json +# bug in http stream, fallback to 2.7.4 +# ESP8266URL := https://github.com/esp8266/Arduino/releases/download/3.0.2/package_esp8266com_index.json +ESP8266URL := https://github.com/esp8266/Arduino/releases/download/2.7.4/package_esp8266com_index.json LIBRARIES := libraries/WiFiManager libraries/ArduinoJson libraries/PubSubClient libraries/TelnetStream libraries/AceTime libraries/OneWire libraries/DallasTemperature BOARDS := arduino/package_esp8266com_index.json # PORT can be overridden by the environment or on the command line. E.g.: @@ -78,7 +80,7 @@ libraries/PubSubClient: $(CLI) lib install pubsubclient@2.8.0 libraries/TelnetStream: - $(CLI) lib install TelnetStream@1.2.2 + $(CLI) lib install TelnetStream@1.2.4 libraries/AceTime: $(CLI) lib install Acetime@2.0.1 diff --git a/version.h b/version.h index 809c1bf..55f6b94 100644 --- a/version.h +++ b/version.h @@ -1,16 +1,16 @@ //The version number conforms to semver.org format #define _VERSION_MAJOR 0 #define _VERSION_MINOR 10 -#define _VERSION_PATCH 1 -#define _VERSION_BUILD 2072 -#define _VERSION_GITHASH "141d6bf" -//#define _VERSION_PRERELEASE beta //uncomment to define prerelease labels: alpha - beta - rc -#define _VERSION_DATE "26-02-2023" -#define _VERSION_TIME "21:02:42" -#define _SEMVER_CORE "0.10.1" -#define _SEMVER_BUILD "0.10.1+2072" -#define _SEMVER_GITHASH "0.10.1+141d6bf" -#define _SEMVER_FULL "0.10.1+141d6bf" -#define _SEMVER_NOBUILD "0.10.1 (26-02-2023)" -#define _VERSION "0.10.1+141d6bf (26-02-2023)" +#define _VERSION_PATCH 2 +#define _VERSION_BUILD 2087 +#define _VERSION_GITHASH "fa737be" +#define _VERSION_PRERELEASE beta +#define _VERSION_DATE "14-03-2023" +#define _VERSION_TIME "22:07:39" +#define _SEMVER_CORE "0.10.2" +#define _SEMVER_BUILD "0.10.2+2087" +#define _SEMVER_GITHASH "0.10.2+fa737be" +#define _SEMVER_FULL "0.10.2-beta+fa737be" +#define _SEMVER_NOBUILD "0.10.2-beta (14-03-2023)" +#define _VERSION "0.10.2-beta+fa737be (14-03-2023)" //The version information is created automatically, more information here: https://github.com/rvdbreemen/autoinc-semver