Added support for s2 mini

This commit is contained in:
Magnus Persson 2022-10-19 11:48:50 +02:00
parent 47bae4d28e
commit bbdbf88a76
7 changed files with 47 additions and 45 deletions

View File

@ -166,6 +166,38 @@ board_build.embed_txtfiles =
html/index.min.htm html/index.min.htm
html/test.min.htm html/test.min.htm
[env:gravity32s2-release]
framework = ${common_env_data.framework}
platform = ${common_env_data.platform32}
upload_speed = ${common_env_data.upload_speed}
monitor_speed = ${common_env_data.monitor_speed}
extra_scripts = ${common_env_data.extra_scripts}
build_unflags =
${common_env_data.build_unflags}
build_flags =
-Wl,-Map,output.map
${common_env_data.build_flags}
-DLOG_LEVEL=0
-DCORE_DEBUG_LEVEL=0
-DESP32S2
-DARDUINO_ESP32S2_DEV
-DUSE_SERIAL0
lib_deps =
${common_env_data.lib_deps}
lib_ignore =
board = lolin_s2_mini
build_type = release
board_build.partitions = part32.csv
board_build.filesystem = littlefs
board_build.embed_txtfiles =
html/calibration.min.htm
html/config.min.htm
html/firmware.min.htm
html/format.min.htm
html/about.min.htm
html/index.min.htm
html/test.min.htm
[env:gravity32c3-debug] [env:gravity32c3-debug]
framework = ${common_env_data.framework} framework = ${common_env_data.framework}
platform = ${common_env_data.platform32} platform = ${common_env_data.platform32}
@ -214,34 +246,3 @@ board_build.embed_txtfiles =
html/index.min.htm html/index.min.htm
html/test.min.htm html/test.min.htm
; [env:gravity32s2-release]
; framework = ${common_env_data.framework}
; platform = ${common_env_data.platform32}
; upload_speed = ${common_env_data.upload_speed}
; monitor_speed = ${common_env_data.monitor_speed}
; extra_scripts = ${common_env_data.extra_scripts}
; build_unflags =
; ${common_env_data.build_unflags}
; build_flags =
; -Wl,-Map,output.map
; ${common_env_data.build_flags}
; -DLOG_LEVEL=5
; -DCORE_DEBUG_LEVEL=0
; -DESP32S2
; -DARDUINO_ESP32S2_DEV
; lib_deps =
; ${common_env_data.lib_deps}
; ${common_env_data.lib_deps32}
; lib_ignore =
; board = lolin_s2_mini
; build_type = debug
; board_build.partitions = part32.csv
; board_build.filesystem = littlefs
; board_build.embed_txtfiles =
; html/calibration.min.htm
; html/config.min.htm
; html/firmware.min.htm
; html/format.min.htm
; html/about.min.htm
; html/index.min.htm
; html/test.min.htm

View File

@ -148,7 +148,7 @@ class Config {
#elif defined(ESP32C3) #elif defined(ESP32C3)
float _voltageFactor = 1.3; float _voltageFactor = 1.3;
#elif defined(ESP32S2) #elif defined(ESP32S2)
float _voltageFactor = 1.3; float _voltageFactor = 0.59;
#else // ESP32 #else // ESP32
float _voltageFactor = 1.3; float _voltageFactor = 1.3;
#endif #endif

View File

@ -120,8 +120,7 @@ void checkResetReason() {
} }
Log.notice(F("HELP: Last reset cause '%s' (%d)" CR), rStr.c_str(), r); Log.notice(F("HELP: Last reset cause '%s' (%d)" CR), rStr.c_str(), r);
// Havent found a good way to get exception cause from an ESP32
#warning "TODO: Implement logging of crashes for esp32"
#endif #endif
} }

View File

@ -48,7 +48,6 @@ extern RunMode runMode;
#elif defined(ESP32C3) #elif defined(ESP32C3)
#include <FS.h> #include <FS.h>
#include <LittleFS.h> #include <LittleFS.h>
#include "esp32c3/rom/rtc.h" #include "esp32c3/rom/rtc.h"
#define ESPhttpUpdate httpUpdate #define ESPhttpUpdate httpUpdate
#define ESP_RESET ESP.restart #define ESP_RESET ESP.restart
@ -60,31 +59,27 @@ extern RunMode runMode;
#else #else
#define PIN_SDA 7 #define PIN_SDA 7
#define PIN_SCL 6 #define PIN_SCL 6
#endif #endif // JTAG_DEBUG
#define PIN_DS A3 #define PIN_DS A3
#define PIN_A0 A0 #define PIN_A0 A0
// This should be the LED_BUILTIN, but that is also connected SDA (Gyro) so we // This should be the LED_BUILTIN, but that is also connected SDA (Gyro) so we
// cannot use both. So we point LED to pin 8 which is not used. // cannot use both. So we point LED to pin 8 which is not used.
#define PIN_LED 8 #define PIN_LED 8
/*
#elif defined(ESP32S2) #elif defined(ESP32S2)
#include <FS.h> #include <FS.h>
#include <LittleFS.h> #include <LittleFS.h>
#include "esp32s2/rom/rtc.h" #include "esp32s2/rom/rtc.h"
#define ESPhttpUpdate httpUpdate #define ESPhttpUpdate httpUpdate
#define ESP_RESET ESP.restart #define ESP_RESET ESP.restart
#define ESP8266WebServer WebServer #define ESP8266WebServer WebServer
#define PIN_SDA SDA #define PIN_SDA A17
#define PIN_SCL SCL #define PIN_SCL A15
#define PIN_DS A8 #define PIN_DS A8
#define PIN_A0 A2 #define PIN_A0 A2
#define PIN_LED LED_BUILTIN #define PIN_LED LED_BUILTIN
*/
#else // defined (ESP32) #else // defined (ESP32)
#include <FS.h> #include <FS.h>
#include <LittleFS.h> #include <LittleFS.h>
#include "esp32/rom/rtc.h" #include "esp32/rom/rtc.h"
#define ESPhttpUpdate httpUpdate #define ESPhttpUpdate httpUpdate
#define ESP_RESET ESP.restart #define ESP_RESET ESP.restart

View File

@ -90,7 +90,7 @@ void WebServerHandler::webHandleConfig() {
#elif defined(ESP32C3) #elif defined(ESP32C3)
doc[PARAM_PLATFORM] = "esp32c3"; doc[PARAM_PLATFORM] = "esp32c3";
#elif defined(ESP32S2) #elif defined(ESP32S2)
doc[PARAM_PLATFORM] = "esp32s3"; doc[PARAM_PLATFORM] = "esp32s2";
#else // esp32 mini #else // esp32 mini
doc[PARAM_PLATFORM] = "esp32"; doc[PARAM_PLATFORM] = "esp32";
#endif #endif
@ -273,7 +273,7 @@ void WebServerHandler::webHandleStatus() {
#elif defined(ESP32C3) #elif defined(ESP32C3)
doc[PARAM_PLATFORM] = "esp32c3"; doc[PARAM_PLATFORM] = "esp32c3";
#elif defined(ESP32S2) #elif defined(ESP32S2)
doc[PARAM_PLATFORM] = "esp32s3"; doc[PARAM_PLATFORM] = "esp32s2";
#else // esp32 mini #else // esp32 mini
doc[PARAM_PLATFORM] = "esp32"; doc[PARAM_PLATFORM] = "esp32";
#endif #endif

View File

@ -61,7 +61,7 @@ Here is an image of where I added the resistor for the voltage divider.
ESP32s2 mini ESP32s2 mini
++++++++++++ ++++++++++++
Work in progress... This is model is now fully supported by gravitymon. Same setup as for ESP32C3 mini.
ESP32 d1 mini ESP32 d1 mini
+++++++++++++ +++++++++++++

View File

@ -3,6 +3,13 @@
Releases Releases
######## ########
v1.2.0 - beta2
==============
Features
++++++++
* Added support for the ESP32 S2 mini board
v1.2.0 - beta1 v1.2.0 - beta1
============== ==============