Skip to content

fix SPIFFS when not enabled in build options #5249

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

Merged
merged 12 commits into from
Dec 6, 2018
Merged

fix SPIFFS when not enabled in build options #5249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d62d143
fix #5246 - also add optional SPIFFS.begin(false): will not try to fo…
d-a-v Oct 14, 2018
a3fa654
remove autoformat
d-a-v Oct 14, 2018
c76c336
fix host tests
d-a-v Oct 15, 2018
404090c
Merge branch 'master' into spiffsfix
d-a-v Oct 18, 2018
fa587bb
Merge branch 'master' into spiffsfix
devyte Oct 21, 2018
826e913
Merge branch 'master' into spiffsfix
d-a-v Oct 31, 2018
0addc08
Merge branch 'master' into spiffsfix
devyte Nov 7, 2018
2b4951f
Merge branch 'master' into spiffsfix
devyte Nov 8, 2018
d365824
Merge branch 'master' into spiffsfix
devyte Nov 8, 2018
fcd2913
Merge branch 'master' into spiffsfix
d-a-v Nov 30, 2018
b67f6c8
Merge branch 'master' into spiffsfix
d-a-v Dec 6, 2018
cdd492c
fix CI
d-a-v Dec 6, 2018
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
10 changes: 0 additions & 10 deletions cores/esp8266/spiffs_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,6 @@ bool isSpiffsFilenameValid(const char* name)
// these symbols should be defined in the linker script for each flash layout
#ifndef CORE_MOCK
#ifdef ARDUINO
extern "C" uint32_t _SPIFFS_start;
extern "C" uint32_t _SPIFFS_end;
extern "C" uint32_t _SPIFFS_page;
extern "C" uint32_t _SPIFFS_block;

#define SPIFFS_PHYS_ADDR ((uint32_t) (&_SPIFFS_start) - 0x40200000)
#define SPIFFS_PHYS_SIZE ((uint32_t) (&_SPIFFS_end) - (uint32_t) (&_SPIFFS_start))
#define SPIFFS_PHYS_PAGE ((uint32_t) &_SPIFFS_page)
#define SPIFFS_PHYS_BLOCK ((uint32_t) &_SPIFFS_block)

#ifndef SPIFFS_MAX_OPEN_FILES
#define SPIFFS_MAX_OPEN_FILES 5
#endif
Expand Down
16 changes: 16 additions & 0 deletions cores/esp8266/spiffs_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,18 @@

using namespace fs;

#ifdef ARDUINO
extern "C" uint32_t _SPIFFS_start;
extern "C" uint32_t _SPIFFS_end;
extern "C" uint32_t _SPIFFS_page;
extern "C" uint32_t _SPIFFS_block;

#define SPIFFS_PHYS_ADDR ((uint32_t) (&_SPIFFS_start) - 0x40200000)
#define SPIFFS_PHYS_SIZE ((uint32_t) (&_SPIFFS_end) - (uint32_t) (&_SPIFFS_start))
#define SPIFFS_PHYS_PAGE ((uint32_t) &_SPIFFS_page)
#define SPIFFS_PHYS_BLOCK ((uint32_t) &_SPIFFS_block)
#endif

extern int32_t spiffs_hal_write(uint32_t addr, uint32_t size, uint8_t *src);
extern int32_t spiffs_hal_erase(uint32_t addr, uint32_t size);
extern int32_t spiffs_hal_read(uint32_t addr, uint32_t size, uint8_t *dst);
Expand Down Expand Up @@ -114,6 +126,10 @@ class SPIFFSImpl : public FSImpl

bool begin() override
{
#if defined(ARDUINO) && !defined(CORE_MOCK)
if (&_SPIFFS_end <= &_SPIFFS_start)
return false;
#endif
if (SPIFFS_mounted(&_fs) != 0) {
return true;
}
Expand Down