arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-01 03:26:58 +03:00
Code Activity

Fix indentation to spaces

Browse Source 
Run test/restyle.sh
Remove commented code
Use #ifdef blocks for debugging.  `DEBUG_ESP_CORE` and `DEBUG_ESP_PORT`
use `static constexpr  layout` which saves ROM ~500B for unused vars
This commit is contained in:
sticilface
2020-11-15 11:01:42 +00:00
parent f4a42a0c1b
commit 9feb47ab06
2 changed files with 243 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
libraries/FSTools/FSTools.h
View File

@ -1,88 +1,91 @@
#pragma once
#include <FS.h>
#include <FS.h>
#include <memory>
#include <functional>
/*
A temporary FS is made between the END of the sketch... and the start of the partition you try to mount, to maximise the available space for copying the FS.
The WORST case this is at 0x40300000 which is for a 3m FS on 4m flash.. leaving 460Kb for copying.
A temporary FS is made between the END of the sketch... and the start of the partition you try to mount, to maximise the available space for copying the FS.
The WORST case this is at 0x40300000 which is for a 3m FS on 4m flash.. leaving 460Kb for copying.
*/
I have not worked out a way to prevent linking of ALL the layouts except to use #ifdef guards. Ideas welcome as it uses 400B ROM.
*/
namespace FST {
namespace FST
{
struct layout {
layout(uint32_t s, uint32_t e, uint32_t p, uint32_t b) : startAddr(s), endAddr(e), page(p), block(b) {};
uint32_t startAddr{0};
uint32_t endAddr{0};
uint32_t page{0};
uint32_t block{0};
};
struct layout
{
constexpr layout(uint32_t s, uint32_t e, uint32_t p, uint32_t b) : startAddr(s), endAddr(e), page(p), block(b) {};
const uint32_t startAddr{0};
const uint32_t endAddr{0};
const uint32_t page{0};
const uint32_t block{0};
};
enum FS_t : uint8_t {
SPIFFS,
LITTLEFS
};
enum FS_t : uint8_t
{
SPIFFS,
LITTLEFS
};
extern const layout layout_512k32;
extern const layout layout_512k64;
extern const layout layout_512k128;
static constexpr layout layout_512k32 = { 0x40273000, 0x4027B000, 0x100, 0x1000 };
static constexpr layout layout_512k64 = { 0x4026B000, 0x4027B000, 0x100, 0x1000 };
static constexpr layout layout_512k128 = { 0x4025B000, 0x4027B000, 0x100, 0x1000 };
extern const layout layout_1m64;
extern const layout layout_1m128;
extern const layout layout_1m144;
extern const layout layout_1m160;
extern const layout layout_1m192;
extern const layout layout_1m256;
extern const layout layout_1m512;
static constexpr layout layout_1m64 = { 0x402EB000, 0x402FB000, 0x100, 0x1000 };
static constexpr layout layout_1m128 = { 0x402DB000, 0x402FB000, 0x100, 0x1000 };
static constexpr layout layout_1m144 = { 0x402D7000, 0x402FB000, 0x100, 0x1000 };
static constexpr layout layout_1m160 = { 0x402D3000, 0x402FB000, 0x100, 0x1000 };
static constexpr layout layout_1m192 = { 0x402CB000, 0x402FB000, 0x100, 0x1000 };
static constexpr layout layout_1m256 = { 0x402BB000, 0x402FB000, 0x100, 0x1000 };
static constexpr layout layout_1m512 = { 0x4027B000, 0x402FB000, 0x100, 0x2000 };
extern const layout layout_2m64;
extern const layout layout_2m128;
extern const layout layout_2m256;
extern const layout layout_2m512;
extern const layout layout_2m1m;
static constexpr layout layout_2m64 = { 0x403F0000, 0x403FB000, 0x100, 0x1000 };
static constexpr layout layout_2m128 = { 0x403E0000, 0x403FB000, 0x100, 0x1000 };
static constexpr layout layout_2m256 = { 0x403C0000, 0x403FB000, 0x100, 0x1000 };
static constexpr layout layout_2m512 = { 0x40380000, 0x403FA000, 0x100, 0x2000 };
static constexpr layout layout_2m1m = { 0x40300000, 0x403FA000, 0x100, 0x2000 };
extern const layout layout_4m1m;
extern const layout layout_4m2m;
extern const layout layout_4m3m;
static constexpr layout layout_4m1m = { 0x40500000, 0x405FA000, 0x100, 0x2000 };
static constexpr layout layout_4m2m = { 0x40400000, 0x405FA000, 0x100, 0x2000 };
static constexpr layout layout_4m3m = { 0x40300000, 0x405FA000, 0x100, 0x2000 };
extern const layout layout_8m6m;
extern const layout layout_8m7m;
static constexpr layout layout_8m6m = { 0x40400000, 0x409FA000, 0x100, 0x2000 };
static constexpr layout layout_8m7m = { 0x40300000, 0x409FA000, 0x100, 0x2000 };
extern const layout layout_16m14m;
extern const layout layout_16m15m;
typedef std::function<void(File & f)> FileCb;
static constexpr layout layout_16m14m = { 0x40400000, 0x411FA000, 0x100, 0x2000 };
static constexpr layout layout_16m15m = { 0x40300000, 0x411FA000, 0x100, 0x2000 };
typedef std::function<void(File & f)> FileCb;
};
class FSTools {
class FSTools
{
public:
FSTools();
~FSTools();
bool attemptToMountFS(fs::FS & fs);
bool mountAlternativeFS( FST::FS_t type, const FST::layout & layout, bool keepMounted = false );
bool mounted();
bool moveFS(fs::FS & destinationFS);
void reset();
void fileListIterator(FS & fs, const char * dirName, FST::FileCb Cb );
FSTools();
~FSTools();
bool attemptToMountFS(fs::FS & fs);
bool mountAlternativeFS(FST::FS_t type, const FST::layout & layout, bool keepMounted = false);
bool mounted();
bool moveFS(fs::FS & destinationFS);
void reset();
void fileListIterator(FS & fs, const char * dirName, FST::FileCb Cb);
private:
uint32_t _getStartAddr(const FST::layout & layout);
uint32_t _getSize(const FST::layout & layout);
// void _dumpFileInfo(File & f);
bool _copyFS(FS & sourceFS, FS & destFS);
std::unique_ptr<fs::FS> _pFS;
bool _mounted{false};
const FST::layout * _layout{nullptr};
uint32_t _getStartAddr(const FST::layout & layout);
uint32_t _getSize(const FST::layout & layout);
#ifdef DEBUG_ESP_CORE
void _dumpFileInfo(File & f);
#endif
bool _copyFS(FS & sourceFS, FS & destFS);
std::unique_ptr<fs::FS> _pFS;
bool _mounted{false};
const FST::layout * _layout{nullptr};
};