kopia lustrzana https://github.com/Aircoookie/WLED
Extend JSON API info object
- add "clock" - CPU clock in MHz - add "flash" - flash size in MB Fix for #3879pull/3887/head
rodzic
a106342439
commit
aa970d6ca5
|
@ -694,8 +694,6 @@ function parseInfo(i) {
|
||||||
function populateInfo(i)
|
function populateInfo(i)
|
||||||
{
|
{
|
||||||
var cn="";
|
var cn="";
|
||||||
var heap = i.freeheap/1024;
|
|
||||||
heap = heap.toFixed(1);
|
|
||||||
var pwr = i.leds.pwr;
|
var pwr = i.leds.pwr;
|
||||||
var pwru = "Not calculated";
|
var pwru = "Not calculated";
|
||||||
if (pwr > 1000) {pwr /= 1000; pwr = pwr.toFixed((pwr > 10) ? 0 : 1); pwru = pwr + " A";}
|
if (pwr > 1000) {pwr /= 1000; pwr = pwr.toFixed((pwr > 10) ? 0 : 1); pwru = pwr + " A";}
|
||||||
|
@ -720,11 +718,13 @@ ${inforow("Build",i.vid)}
|
||||||
${inforow("Signal strength",i.wifi.signal +"% ("+ i.wifi.rssi, " dBm)")}
|
${inforow("Signal strength",i.wifi.signal +"% ("+ i.wifi.rssi, " dBm)")}
|
||||||
${inforow("Uptime",getRuntimeStr(i.uptime))}
|
${inforow("Uptime",getRuntimeStr(i.uptime))}
|
||||||
${inforow("Time",i.time)}
|
${inforow("Time",i.time)}
|
||||||
${inforow("Free heap",heap," kB")}
|
${inforow("Free heap",(i.freeheap/1024).toFixed(1)," kB")}
|
||||||
${i.psram?inforow("Free PSRAM",(i.psram/1024).toFixed(1)," kB"):""}
|
${i.psram?inforow("Free PSRAM",(i.psram/1024).toFixed(1)," kB"):""}
|
||||||
${inforow("Estimated current",pwru)}
|
${inforow("Estimated current",pwru)}
|
||||||
${inforow("Average FPS",i.leds.fps)}
|
${inforow("Average FPS",i.leds.fps)}
|
||||||
${inforow("MAC address",i.mac)}
|
${inforow("MAC address",i.mac)}
|
||||||
|
${inforow("CPU clock",i.clock," MHz")}
|
||||||
|
${inforow("Flash size",i.flash," MB")}
|
||||||
${inforow("Filesystem",i.fs.u + "/" + i.fs.t + " kB (" +Math.round(i.fs.u*100/i.fs.t) + "%)")}
|
${inforow("Filesystem",i.fs.u + "/" + i.fs.t + " kB (" +Math.round(i.fs.u*100/i.fs.t) + "%)")}
|
||||||
${inforow("Environment",i.arch + " " + i.core + " (" + i.lwip + ")")}
|
${inforow("Environment",i.arch + " " + i.core + " (" + i.lwip + ")")}
|
||||||
</table>`;
|
</table>`;
|
||||||
|
|
|
@ -749,6 +749,8 @@ void serializeInfo(JsonObject root)
|
||||||
root[F("arch")] = ESP.getChipModel();
|
root[F("arch")] = ESP.getChipModel();
|
||||||
#endif
|
#endif
|
||||||
root[F("core")] = ESP.getSdkVersion();
|
root[F("core")] = ESP.getSdkVersion();
|
||||||
|
root[F("clock")] = ESP.getCpuFreqMHz();
|
||||||
|
root[F("flash")] = (ESP.getFlashChipSize()/1024)/1024;
|
||||||
#ifdef WLED_DEBUG
|
#ifdef WLED_DEBUG
|
||||||
root[F("maxalloc")] = ESP.getMaxAllocHeap();
|
root[F("maxalloc")] = ESP.getMaxAllocHeap();
|
||||||
root[F("resetReason0")] = (int)rtc_get_reset_reason(0);
|
root[F("resetReason0")] = (int)rtc_get_reset_reason(0);
|
||||||
|
@ -758,6 +760,8 @@ void serializeInfo(JsonObject root)
|
||||||
#else
|
#else
|
||||||
root[F("arch")] = "esp8266";
|
root[F("arch")] = "esp8266";
|
||||||
root[F("core")] = ESP.getCoreVersion();
|
root[F("core")] = ESP.getCoreVersion();
|
||||||
|
root[F("clock")] = ESP.getCpuFreqMHz();
|
||||||
|
root[F("flash")] = (ESP.getFlashChipSize()/1024)/1024;
|
||||||
#ifdef WLED_DEBUG
|
#ifdef WLED_DEBUG
|
||||||
root[F("maxalloc")] = ESP.getMaxFreeBlockSize();
|
root[F("maxalloc")] = ESP.getMaxFreeBlockSize();
|
||||||
root[F("resetReason")] = (int)ESP.getResetInfoPtr()->reason;
|
root[F("resetReason")] = (int)ESP.getResetInfoPtr()->reason;
|
||||||
|
|
|
@ -362,8 +362,9 @@ void WLED::setup()
|
||||||
DEBUG_PRINT(F(", speed ")); DEBUG_PRINT(ESP.getFlashChipSpeed()/1000000);DEBUG_PRINTLN(F("MHz."));
|
DEBUG_PRINT(F(", speed ")); DEBUG_PRINT(ESP.getFlashChipSpeed()/1000000);DEBUG_PRINTLN(F("MHz."));
|
||||||
|
|
||||||
#else
|
#else
|
||||||
DEBUG_PRINT(F("esp8266 "));
|
DEBUG_PRINT(F("esp8266 @ ")); DEBUG_PRINT(ESP.getCpuFreqMHz()); DEBUG_PRINT(F("MHz.\nCore: "));
|
||||||
DEBUG_PRINTLN(ESP.getCoreVersion());
|
DEBUG_PRINTLN(ESP.getCoreVersion());
|
||||||
|
DEBUG_PRINT(F("FLASH: ")); DEBUG_PRINT((ESP.getFlashChipSize()/1024)/1024); DEBUG_PRINTLN(F(" MB"));
|
||||||
#endif
|
#endif
|
||||||
DEBUG_PRINT(F("heap ")); DEBUG_PRINTLN(ESP.getFreeHeap());
|
DEBUG_PRINT(F("heap ")); DEBUG_PRINTLN(ESP.getFreeHeap());
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// version code in format yymmddb (b = daily build)
|
// version code in format yymmddb (b = daily build)
|
||||||
#define VERSION 2403280
|
#define VERSION 2404050
|
||||||
|
|
||||||
//uncomment this if you have a "my_config.h" file you'd like to use
|
//uncomment this if you have a "my_config.h" file you'd like to use
|
||||||
//#define WLED_USE_MY_CONFIG
|
//#define WLED_USE_MY_CONFIG
|
||||||
|
|
Ładowanie…
Reference in New Issue