From e2fee1fb3586c8622a31346fb77688886c22cb40 Mon Sep 17 00:00:00 2001
From: Magnus Persson <magnus@noreply.github.com>
Date: Tue, 5 Jul 2022 17:55:05 +0200
Subject: [PATCH] Updated esp32 fwk

---
 platformio.ini               | 40 +++++++-----------------------------
 src/helper.cpp               |  6 ------
 src/main.hpp                 |  1 -
 src_docs/source/releases.rst |  7 +++++++
 4 files changed, 14 insertions(+), 40 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 3c89a53..8c09c30 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -34,15 +34,15 @@ build_flags =
 	-D USER_SSID=\""\""           # =\""myssid\""
 	-D USER_SSID_PWD=\""\""       # =\""mypwd\""	
 	-D CFG_APPVER="\"1.1.0\""
-	-D CFG_GITREV=\""alfa-1\""
+	-D CFG_GITREV=\""beta-1\""
 	#!python script/git_rev.py
 lib_deps = # Switched to forks for better version control.
 	# Using local copy of these libraries
   #https://github.com/mp-se/i2cdevlib.git#<document> 		
-	#https://github.com/mp-se/OneWire
+	#https://github.com/mp-se/OneWire																		  # Using this version; https://github.com/arendst/Tasmota/tree/development/lib/lib_basic/OneWire-Stickbreaker
 	#https://github.com/mp-se/Arduino-Temperature-Control-Library
-	https://github.com/mp-se/ESP_WiFiManager#v1.9.0												# https://github.com/khoih-prog/ESP_WiFiManager
-	https://github.com/mp-se/ESP_DoubleResetDetector#v1.2.1						  	# https://github.com/khoih-prog/ESP_DoubleResetDetector
+	#https://github.com/khoih-prog/ESP_WiFiManager
+	#https://github.com/khoih-prog/ESP_DoubleResetDetector
 	https://github.com/mp-se/tinyexpr																		  #	https://github.com/codeplea/tinyexpr
 	https://github.com/mp-se/incbin																			  #	https://github.com/graphitemaster/incbin
 	https://github.com/mp-se/Arduino-Log#1.1.1    												# https://github.com/thijse/Arduino-Log
@@ -128,7 +128,7 @@ board_build.filesystem = littlefs
 
 [env:gravity32-release]
 framework = arduino
-platform = espressif32 @ 3.5.0
+platform = espressif32 @ 5.0.0
 upload_speed = ${common_env_data.upload_speed}
 monitor_speed = ${common_env_data.monitor_speed}
 extra_scripts =  
@@ -153,8 +153,8 @@ build_flags =
 	-D MAIN_DISABLE_LOGGING
 lib_deps = 
 	${common_env_data.lib_deps}
-	https://github.com/lorol/LITTLEFS#1.0.6
 	https://github.com/mp-se/NimBLE-Arduino#1.3.8	 # https://github.com/h2zero/NimBLE-Arduino
+lib_ignore = 
 board = featheresp32
 build_type = release
 board_build.partitions = part32.csv
@@ -163,7 +163,7 @@ monitor_filters = esp32_exception_decoder
 
 [env:gravity32-perf]
 framework = arduino
-platform = espressif32 @ 3.5.0
+platform = espressif32 @ 5.0.0
 upload_speed = ${common_env_data.upload_speed}
 monitor_speed = ${common_env_data.monitor_speed}
 extra_scripts =  
@@ -179,35 +179,9 @@ build_flags =
 	-D LOG_LEVEL=5
 lib_deps = 
 	${common_env_data.lib_deps}
-	https://github.com/lorol/LITTLEFS#1.0.6
 	https://github.com/mp-se/NimBLE-Arduino#1.3.8	 # https://github.com/h2zero/NimBLE-Arduino
 board = featheresp32
 build_type = release
 board_build.partitions = part32.csv
 board_build.filesystem = littlefs 
 monitor_filters = esp32_exception_decoder
-
-#[env:gravity32-release2]
-#framework = arduino
-#platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.3/platform-espressif32-2.0.2.3.zip # build fails
-#platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2.2/platform-tasmota-espressif32-2.0.2.zip
-#platform = espressif32 @ 4.1.0
-#upload_speed = ${common_env_data.upload_speed}
-#monitor_speed = ${common_env_data.monitor_speed}
-#extra_scripts =  
-#	script/copy_html.py
-#	script/copy_firmware.py
-#	script/create_versionjson.py
-#build_unflags = 
-#	${common_env_data.build_unflags}
-#build_flags = 
-#	${common_env_data.build_flags}
-#	-D ESPRESSIF32_20 # v2.0 framework
-#	-D LOG_LEVEL=5 
-#lib_deps = 
-#	${common_env_data.lib_deps}
-#	https://github.com/mp-se/NimBLE-Arduino#1.3.8 # https://github.com/h2zero/NimBLE-Arduino
-#board = featheresp32
-#build_type = release
-#board_build.partitions = part32.csv 
-#board_build.filesystem = littlefs 
diff --git a/src/helper.cpp b/src/helper.cpp
index fdcff16..8fc82e0 100644
--- a/src/helper.cpp
+++ b/src/helper.cpp
@@ -194,14 +194,8 @@ void printBuildOptions() {
 #ifdef SKIP_SLEEPMODE
                "SKIP_SLEEP "
 #endif
-#ifdef EMBED_HTML
-               "EMBED_HTML "
-#endif
 #ifdef COLLECT_PERFDATA
                "PERFDATA "
-#endif
-#ifdef ACTIVATE_OTA
-               "OTA "
 #endif
                CR),
              CFG_APPVER, CFG_GITREV, LOG_LEVEL);
diff --git a/src/main.hpp b/src/main.hpp
index 5ea9a62..d97a4a2 100644
--- a/src/main.hpp
+++ b/src/main.hpp
@@ -45,7 +45,6 @@ extern RunMode runMode;
 #include <LittleFS.h>
 #else
 #include <LITTLEFS.h>
-#define LittleFS LITTLEFS
 #endif
 #include <FS.h>
 #define ESPhttpUpdate httpUpdate
diff --git a/src_docs/source/releases.rst b/src_docs/source/releases.rst
index a95e747..0722ef7 100644
--- a/src_docs/source/releases.rst
+++ b/src_docs/source/releases.rst
@@ -24,6 +24,13 @@ Features
 ++++++++
 * Added storage mode which is activated under hardware setting. When place on the cap (<5 degres tilt) the device will go into 
 storage mode and sleep for the max allowed time. 
+ 
+Other
++++++
+* Upgraded framework for ESP8266 to v5.0.0
+* Upgraded framework for ESP32 to v2.0.2
+* Updated OneWire library to be complaint with new ESP32 SDK
+* Fixed issue in i2cdev connected to wrong usage of TwoWire on ESP32 (Gyro initialization hang). 
 
 Issues adressed
 ++++++++++++++++