ElixirForge/WiFiManager
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/WiFiManager.git synced 2026-10-13 23:01:20 +10:00
Code Releases Activity

fixes #1532

Browse Source
This commit is contained in:
tablatronix
2022-12-15 14:41:21 -06:00
parent bacaf521e4
commit 32b6bda04c
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WiFiManager.cpp
+5 -2
View File
@@ -2007,6 +2007,7 @@ void WiFiManager::handleInfo() {
F("memsmeter"),
F("lastreset"),
F("temp"),
// F("hall"),
F("wifihead"),
F("conx"),
F("stassid"),
@@ -2249,8 +2250,10 @@ String WiFiManager::getInfoData(String id){
p = FPSTR(HTTP_INFO_temp);
p.replace(FPSTR(T_1),(String)temperatureRead());
p.replace(FPSTR(T_2),(String)((temperatureRead()+32)*1.8));
// p.replace(FPSTR(T_3),(String)hallRead());
// p.replace(FPSTR(T_3),"NA"); // removed hall sensor as reads can cause issues with adcs
}
else if(id==F("hall")){
p = FPSTR(HTTP_INFO_hall);
p.replace(FPSTR(T_1),(String)hallRead()); // hall sensor reads can cause issues with adcs
}
#endif
else if(id==F("aboutver")){
WiFiManager.h
+8 -1
View File
@@ -163,19 +163,26 @@
// #pragma message "ESP_ARDUINO_VERSION_MAJOR = " WM_STRING(ESP_ARDUINO_VERSION_MAJOR)
// #pragma message "ESP_ARDUINO_VERSION_MINOR = " WM_STRING(ESP_ARDUINO_VERSION_MINOR)
// #pragma message "ESP_ARDUINO_VERSION_PATCH = " WM_STRING(ESP_ARDUINO_VERSION_PATCH)
#ifdef ESP_ARDUINO_VERSION_MAJOR
#define VER_ARDUINO_STR WM_STRING(ESP_ARDUINO_VERSION_MAJOR) "." WM_STRING(ESP_ARDUINO_VERSION_MINOR) "." WM_STRING(ESP_ARDUINO_VERSION_PATCH)
#else
#define VER_ARDUINO_STR "Unknown"
#endif
#else
#include <core_version.h>
// #pragma message "ESP_ARDUINO_VERSION_GIT = " WM_STRING(ARDUINO_ESP32_GIT_VER)// 0x46d5afb1
// #pragma message "ESP_ARDUINO_VERSION_DESC = " WM_STRING(ARDUINO_ESP32_GIT_DESC) // 1.0.6
// #pragma message "ESP_ARDUINO_VERSION_REL = " WM_STRING(ARDUINO_ESP32_RELEASE) //"1_0_6"
#ifdef ESP_ARDUINO_VERSION_MAJOR
#define VER_ARDUINO_STR WM_STRING(ESP_ARDUINO_VERSION_MAJOR) "." WM_STRING(ESP_ARDUINO_VERSION_MINOR) "." WM_STRING(ESP_ARDUINO_VERSION_PATCH)
#else
#define VER_ARDUINO_STR "Unknown"
#endif
#endif
#else
#define VER_ARDUINO_STR "Unknown"
#endif
// #pragma message "VER_IDF_STR = " WM_STRING(VER_IDF_STR)
// #pragma message "VER_ARDUINO_STR = " WM_STRING(VER_ARDUINO_STR)
wm_strings_en.h
+2 -1
View File
@@ -181,7 +181,8 @@ const char HTTP_JS[] PROGMEM =
const char HTTP_INFO_lastreset[] PROGMEM = "<dt>Last reset reason</dt><dd>CPU0: {1}<br/>CPU1: {2}</dd>";
const char HTTP_INFO_aphost[] PROGMEM = "<dt>Access point hostname</dt><dd>{1}</dd>";
const char HTTP_INFO_psrsize[] PROGMEM = "<dt>PSRAM Size</dt><dd>{1} bytes</dd>";
const char HTTP_INFO_temp[] PROGMEM = "<dt>Temperature</dt><dd>{1} C&deg; / {2} F&deg;</dd><dt>Hall</dt><dd>{3}</dd>";
const char HTTP_INFO_temp[] PROGMEM = "<dt>Temperature</dt><dd>{1} C&deg; / {2} F&deg;</dd>";
const char HTTP_INFO_hall[] PROGMEM = "<dt>Hall</dt><dd>{1}</dd>";
#else
const char HTTP_INFO_esphead[] PROGMEM = "<h3>esp8266</h3><hr><dl>";
const char HTTP_INFO_fchipid[] PROGMEM = "<dt>Flash chip ID</dt><dd>{1}</dd>";