Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Get real Flash Chip Size via API call #7159

Merged
merged 4 commits into from
Sep 7, 2022
Merged

Get real Flash Chip Size via API call #7159

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
169d4b5
Get real Flash Chip Size
Jason2866 Aug 21, 2022
d7f892d
Merge branch 'master' into patch-3
Jason2866 Aug 24, 2022
60d9b37
Merge branch 'master' into patch-3
P-R-O-C-H-Y Sep 6, 2022
80483da
Merge branch 'master' into patch-3
Jason2866 Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions cores/esp32/Esp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,13 +305,17 @@ const char * EspClass::getSdkVersion(void)
return esp_get_idf_version();
}

uint32_t ESP_getFlashChipId(void)
{
uint32_t id = g_rom_flashchip.device_id;
id = ((id & 0xff) << 16) | ((id >> 16) & 0xff) | (id & 0xff00);
return id;
}

uint32_t EspClass::getFlashChipSize(void)
{
esp_image_header_t fhdr;
if(flashRead(ESP_FLASH_IMAGE_BASE, (uint32_t*)&fhdr, sizeof(esp_image_header_t)) && fhdr.magic != ESP_IMAGE_HEADER_MAGIC) {
return 0;
}
return magicFlashChipSize(fhdr.spi_size);
uint32_t id = (ESP_getFlashChipId() >> 16) & 0xFF;
return 2 << (id - 1);
Jason2866 marked this conversation as resolved.
Show resolved Hide resolved
}

uint32_t EspClass::getFlashChipSpeed(void)
Expand Down