jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 18:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change flashmode from digit to text

Browse Source
This commit is contained in:
Theo Arends 2022-08-21 14:21:17 +02:00
parent 4468adf4ac
commit e55e9d8485
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasmota/tasmota_support/support_command.ino
View File

@ -770,14 +770,14 @@ void CmndStatus(void)
#endif // ESP32 #endif // ESP32
D_JSON_PROGRAMFLASHSIZE "\":%d,\"" D_JSON_FLASHSIZE "\":%d" D_JSON_PROGRAMFLASHSIZE "\":%d,\"" D_JSON_FLASHSIZE "\":%d"
",\"" D_JSON_FLASHCHIPID "\":\"%06X\"" ",\"" D_JSON_FLASHCHIPID "\":\"%06X\""
",\"FlashFrequency\":%d,\"" D_JSON_FLASHMODE "\":%d"), ",\"FlashFrequency\":%d,\"" D_JSON_FLASHMODE "\":\"%s\""),
ESP_getSketchSize()/1024, ESP_getFreeSketchSpace()/1024, ESP_getFreeHeap1024(), ESP_getSketchSize()/1024, ESP_getFreeSketchSpace()/1024, ESP_getFreeHeap1024(),
#ifdef ESP32 #ifdef ESP32
uxTaskGetStackHighWaterMark(nullptr) / 1024, ESP.getPsramSize()/1024, ESP.getFreePsram()/1024, uxTaskGetStackHighWaterMark(nullptr) / 1024, ESP.getPsramSize()/1024, ESP.getFreePsram()/1024,
#endif // ESP32 #endif // ESP32
ESP.getFlashChipSize()/1024, ESP_getFlashChipRealSize()/1024 ESP.getFlashChipSize()/1024, ESP_getFlashChipRealSize()/1024
, ESP_getFlashChipId() , ESP_getFlashChipId()
, ESP.getFlashChipSpeed()/1000000, ESP.getFlashChipMode()); , ESP.getFlashChipSpeed()/1000000, ESP_getFlashChipMode().c_str());
ResponseAppendFeatures(); ResponseAppendFeatures();
XsnsDriverState(); XsnsDriverState();
ResponseAppend_P(PSTR(",\"Sensors\":")); ResponseAppend_P(PSTR(",\"Sensors\":"));

9
tasmota/tasmota_support/support_esp.ino
View File

@ -558,6 +558,7 @@ int32_t ESP_getHeapFragmentation(void) {
uint32_t ESP_getFlashChipId(void) uint32_t ESP_getFlashChipId(void)
{ {
// uint32_t id = bootloader_read_flash_id();
uint32_t id = g_rom_flashchip.device_id; uint32_t id = g_rom_flashchip.device_id;
id = ((id & 0xff) << 16) | ((id >> 16) & 0xff) | (id & 0xff00); id = ((id & 0xff) << 16) | ((id >> 16) & 0xff) | (id & 0xff00);
return id; return id;
@ -967,6 +968,14 @@ float ESP_getFreeHeap1024(void) {
} }
*/ */
const char kFlashModes[] PROGMEM = "QIO|QOUT|DIO|DOUT";
String ESP_getFlashChipMode(void) {
uint32_t flash_mode = ESP.getFlashChipMode() &3;
char stemp[6];
return GetTextIndexed(stemp, sizeof(stemp), flash_mode, kFlashModes);
}
/*********************************************************************************************\ /*********************************************************************************************\
* High entropy hardware random generator * High entropy hardware random generator
* Thanks to DigitalAlchemist * Thanks to DigitalAlchemist