Updated esp32 fwk

This commit is contained in:
Magnus Persson 2022-07-05 17:55:05 +02:00
parent ae595ff50c
commit e2fee1fb35
4 changed files with 14 additions and 40 deletions

View File

@ -34,15 +34,15 @@ build_flags =
-D USER_SSID=\""\"" # =\""myssid\"" -D USER_SSID=\""\"" # =\""myssid\""
-D USER_SSID_PWD=\""\"" # =\""mypwd\"" -D USER_SSID_PWD=\""\"" # =\""mypwd\""
-D CFG_APPVER="\"1.1.0\"" -D CFG_APPVER="\"1.1.0\""
-D CFG_GITREV=\""alfa-1\"" -D CFG_GITREV=\""beta-1\""
#!python script/git_rev.py #!python script/git_rev.py
lib_deps = # Switched to forks for better version control. lib_deps = # Switched to forks for better version control.
# Using local copy of these libraries # Using local copy of these libraries
#https://github.com/mp-se/i2cdevlib.git#<document> #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/Arduino-Temperature-Control-Library
https://github.com/mp-se/ESP_WiFiManager#v1.9.0 # https://github.com/khoih-prog/ESP_WiFiManager #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_DoubleResetDetector
https://github.com/mp-se/tinyexpr # https://github.com/codeplea/tinyexpr 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/incbin # https://github.com/graphitemaster/incbin
https://github.com/mp-se/Arduino-Log#1.1.1 # https://github.com/thijse/Arduino-Log 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] [env:gravity32-release]
framework = arduino framework = arduino
platform = espressif32 @ 3.5.0 platform = espressif32 @ 5.0.0
upload_speed = ${common_env_data.upload_speed} upload_speed = ${common_env_data.upload_speed}
monitor_speed = ${common_env_data.monitor_speed} monitor_speed = ${common_env_data.monitor_speed}
extra_scripts = extra_scripts =
@ -153,8 +153,8 @@ build_flags =
-D MAIN_DISABLE_LOGGING -D MAIN_DISABLE_LOGGING
lib_deps = lib_deps =
${common_env_data.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 https://github.com/mp-se/NimBLE-Arduino#1.3.8 # https://github.com/h2zero/NimBLE-Arduino
lib_ignore =
board = featheresp32 board = featheresp32
build_type = release build_type = release
board_build.partitions = part32.csv board_build.partitions = part32.csv
@ -163,7 +163,7 @@ monitor_filters = esp32_exception_decoder
[env:gravity32-perf] [env:gravity32-perf]
framework = arduino framework = arduino
platform = espressif32 @ 3.5.0 platform = espressif32 @ 5.0.0
upload_speed = ${common_env_data.upload_speed} upload_speed = ${common_env_data.upload_speed}
monitor_speed = ${common_env_data.monitor_speed} monitor_speed = ${common_env_data.monitor_speed}
extra_scripts = extra_scripts =
@ -179,35 +179,9 @@ build_flags =
-D LOG_LEVEL=5 -D LOG_LEVEL=5
lib_deps = lib_deps =
${common_env_data.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 https://github.com/mp-se/NimBLE-Arduino#1.3.8 # https://github.com/h2zero/NimBLE-Arduino
board = featheresp32 board = featheresp32
build_type = release build_type = release
board_build.partitions = part32.csv board_build.partitions = part32.csv
board_build.filesystem = littlefs board_build.filesystem = littlefs
monitor_filters = esp32_exception_decoder 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

View File

@ -194,14 +194,8 @@ void printBuildOptions() {
#ifdef SKIP_SLEEPMODE #ifdef SKIP_SLEEPMODE
"SKIP_SLEEP " "SKIP_SLEEP "
#endif #endif
#ifdef EMBED_HTML
"EMBED_HTML "
#endif
#ifdef COLLECT_PERFDATA #ifdef COLLECT_PERFDATA
"PERFDATA " "PERFDATA "
#endif
#ifdef ACTIVATE_OTA
"OTA "
#endif #endif
CR), CR),
CFG_APPVER, CFG_GITREV, LOG_LEVEL); CFG_APPVER, CFG_GITREV, LOG_LEVEL);

View File

@ -45,7 +45,6 @@ extern RunMode runMode;
#include <LittleFS.h> #include <LittleFS.h>
#else #else
#include <LITTLEFS.h> #include <LITTLEFS.h>
#define LittleFS LITTLEFS
#endif #endif
#include <FS.h> #include <FS.h>
#define ESPhttpUpdate httpUpdate #define ESPhttpUpdate httpUpdate

View File

@ -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 * 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. 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 Issues adressed
++++++++++++++++ ++++++++++++++++