mirror of
https://github.com/esp8266/Arduino.git
synced 2025-04-19 23:22:16 +03:00
* Add LittleFS as internal flash filesystem Adds a LittleFS object which uses the ARMmbed littlefs embedded filesystem, https://github.com/ARMmbed/littlefs, to enable a new filesystem for onboard flash utilizing the exact same API as the existing SPIFFS filesystem. LittleFS is built for low memory systems that are subject to random power losses, is actively supported by the ARMmbed community, supports directories, and seems to be much faster in the large-ish read-mostly applications I use. LittleFS, however, has a larger minimum file allocation unit and does not do static wear levelling. This means that for systems that need many little files (<4K), have small SPIFFS areas (64K), or which have a large static set of files covering the majority of flash coupled with a frequently updated set of other files, it may not perform as well. Simply replace SPIFFS.begin() with LittleFS.begin() in your sketch, use LittleFS.open in place of SPIFFS.open to open files, and everything else just works thanks to the magic of @igrr's File base class. **LITTLEFS FLASH LAYOUT IS INCOMPATIBLE WITH SPIFFS** Since it is a completely different filesystem, you will need to reformat your flash (and lose any data therein) to use it. Tools to build the flash filesystem and upload are at https://github.com/earlephilhower/arduino-esp8266littlefs-plugin and https://github.com/earlephilhower/mklittlefs/ . The mklittlefs tool is installed as part of the Arduino platform installation, automatically. The included example shows a contrived read-mostly example and demonstrates how the same calls work on either SPIFFS.* or LittleFS.* Host tests are also included as part of CI. Directories are fully supported in LittleFS. This means that LittleFS will have a slight difference vs. SPIFFS when you use LittleFS.openDir()/Dir.next(). On SPIFFS dir.next() will return all filesystem entries, including ones in "subdirs" (because in SPIFFS there are no subdirs and "/" is the same as any other character in a filename). On LittleFS, dir.next() will only return entries in the directory specified, not subdirs. So to list files in "/subdir/..." you need to actually openDir("/subdir") and use Dir.next() to parse through just those elements. The returned filenames also only have the filename returned, not full paths. So on a FS with "/a/1", "/a/2" when you do openDir("/a"); dir.next().getName(); you get "1" and "2" and not "/a/1" and "/a/2" like in SPIFFS. This is consistent with POSIX ideas about reading directories and more natural for a FS. Most code will not be affected by this, but if you depend on openDir/Dir.next() you need to be aware of it. Corresponding ::mkdir, ::rmdir, ::isDirectory, ::isFile, ::openNextFile, and ::rewind methods added to Filesystem objects. Documentation has been updated with this and other LittleFS information. Subdirectories are made silently when they do not exist when you try and create a file in a subdir. They are silently removed when the last file in them is deleted. This is consistent with what SPIFFS does but is obviously not normal POSIX behavior. Since there has never been a "FS.mkdir()" method this is the only way to be compatible with legacy SPIFFS code. SPIFFS code has been refactored to pull out common flash_hal_* ops and placed in its own namespace, like LittleFS. * Fix up merge blank line issue * Merge in the FSConfig changs from SDFS PR Enable setConfig for LittleFS as well plys merge the SPIFFS changes done in the SDFS PR. * Fix merge errors * Update to use v2-alpha branch The V2-alpha branch supports small file optimizations which can help increase the utilization of flash when small files are prevalent. It also adds support for metadata, which means we can start adding things like file creation times, if desired (not yet). * V2 of littlefs is now in upstream/master * Update test to support non-creation-ordered files In a directory, the order in which "readNextFile()" will return a name is undefined. SPIFFS may return it in order, but LittleFS does not as of V2. Update the test to look for files by name when doing readNextFile() testing. * Fix LittleFS.truncate implementation * Fix SDFS tests SDFS, SPIFFS, and LittleFS now all share the same common set of tests, greatly increasing the SDFS test coverage. * Update to point to mklittlefs v2 Upgrade mklittlefs to V2 format support * Remove extra FS::write(const char *s) method This was removed in #5861 and erroneously re-introduced here. * Minimize spurious differences from master * Dramatically reduce memory usage Reduce the program and read chunk sizes which impacts performance minimally but reduces per-file RAM usage of 16KB to <1KB. * Add @d-a-v's host emulation for LittleFS * Fix SW Serial library version * Fix free space reporting Thanks to @TD-er for discovering the issue * Update littlefs to latest upstream * Remove sdfat version included by accident * Update SDFAT to include MOCK changes required * Update to include SD.h test of file append
273 lines
6.5 KiB
C++
273 lines
6.5 KiB
C++
/*
|
|
Arduino emulator main loop
|
|
Copyright (c) 2018 david gauchard. All rights reserved.
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a
|
|
copy of this software and associated documentation files (the "Software"),
|
|
to deal with the Software without restriction, including without limitation
|
|
the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
and/or sell copies of the Software, and to permit persons to whom the
|
|
Software is furnished to do so, subject to the following conditions:
|
|
|
|
- Redistributions of source code must retain the above copyright notice,
|
|
this list of conditions and the following disclaimers.
|
|
|
|
- Redistributions in binary form must reproduce the above copyright notice,
|
|
this list of conditions and the following disclaimers in the
|
|
documentation and/or other materials provided with the distribution.
|
|
|
|
- The names of its contributors may not be used to endorse or promote
|
|
products derived from this Software without specific prior written
|
|
permission.
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
DEALINGS WITH THE SOFTWARE.
|
|
*/
|
|
|
|
#include <Arduino.h>
|
|
#include <user_interface.h> // wifi_get_ip_info()
|
|
|
|
#include <signal.h>
|
|
#include <unistd.h>
|
|
#include <getopt.h>
|
|
#include <termios.h>
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
|
|
#define MOCK_PORT_SHIFTER 9000
|
|
|
|
bool user_exit = false;
|
|
const char* host_interface = nullptr;
|
|
size_t spiffs_kb = 1024;
|
|
size_t littlefs_kb = 1024;
|
|
bool ignore_sigint = false;
|
|
bool restore_tty = false;
|
|
bool mockdebug = false;
|
|
int mock_port_shifter = MOCK_PORT_SHIFTER;
|
|
|
|
#define STDIN STDIN_FILENO
|
|
|
|
static struct termios initial_settings;
|
|
|
|
int mockverbose (const char* fmt, ...)
|
|
{
|
|
va_list ap;
|
|
va_start(ap, fmt);
|
|
if (mockdebug)
|
|
return fprintf(stderr, MOCK) + vfprintf(stderr, fmt, ap);
|
|
return 0;
|
|
}
|
|
|
|
static int mock_start_uart(void)
|
|
{
|
|
struct termios settings;
|
|
|
|
if (!isatty(STDIN))
|
|
{
|
|
perror("setting tty in raw mode: isatty(STDIN)");
|
|
return -1;
|
|
}
|
|
if (tcgetattr(STDIN, &initial_settings) < 0)
|
|
{
|
|
perror("setting tty in raw mode: tcgetattr(STDIN)");
|
|
return -1;
|
|
}
|
|
settings = initial_settings;
|
|
settings.c_lflag &= ~(ignore_sigint ? ISIG : 0);
|
|
settings.c_lflag &= ~(ECHO | ICANON);
|
|
settings.c_iflag &= ~(ICRNL | INLCR | ISTRIP | IXON);
|
|
settings.c_oflag |= (ONLCR);
|
|
settings.c_cc[VMIN] = 0;
|
|
settings.c_cc[VTIME] = 0;
|
|
if (tcsetattr(STDIN, TCSANOW, &settings) < 0)
|
|
{
|
|
perror("setting tty in raw mode: tcsetattr(STDIN)");
|
|
return -1;
|
|
}
|
|
restore_tty = true;
|
|
return 0;
|
|
}
|
|
|
|
static int mock_stop_uart(void)
|
|
{
|
|
if (!restore_tty) return 0;
|
|
if (!isatty(STDIN)) {
|
|
perror("restoring tty: isatty(STDIN)");
|
|
return -1;
|
|
}
|
|
if (tcsetattr(STDIN, TCSANOW, &initial_settings) < 0)
|
|
{
|
|
perror("restoring tty: tcsetattr(STDIN)");
|
|
return -1;
|
|
}
|
|
printf("\e[?25h"); // show cursor
|
|
return (0);
|
|
}
|
|
|
|
static uint8_t mock_read_uart(void)
|
|
{
|
|
uint8_t ch = 0;
|
|
return (read(STDIN, &ch, 1) == 1) ? ch : 0;
|
|
}
|
|
|
|
void help (const char* argv0, int exitcode)
|
|
{
|
|
printf(
|
|
"%s - compiled with esp8266/arduino emulator\n"
|
|
"options:\n"
|
|
" -h\n"
|
|
" -i <interface> - use this interface for IP address\n"
|
|
" -l - bind tcp/udp servers to interface only (not 0.0.0.0)\n"
|
|
" -s - port shifter (default: %d, when root: 0)\n"
|
|
" -c - ignore CTRL-C (send it via Serial)\n"
|
|
" -f - no throttle (possibly 100%%CPU)\n"
|
|
" -b - blocking tty/mocked-uart (default: not blocking tty)\n"
|
|
" -S - spiffs size in KBytes (default: %zd)\n"
|
|
" -L - littlefs size in KBytes (default: %zd)\n"
|
|
" -v - mock verbose\n"
|
|
" (negative value will force mismatched size)\n"
|
|
, argv0, MOCK_PORT_SHIFTER, spiffs_kb, littlefs_kb);
|
|
exit(exitcode);
|
|
}
|
|
|
|
static struct option options[] =
|
|
{
|
|
{ "help", no_argument, NULL, 'h' },
|
|
{ "fast", no_argument, NULL, 'f' },
|
|
{ "local", no_argument, NULL, 'l' },
|
|
{ "sigint", no_argument, NULL, 'c' },
|
|
{ "blockinguart", no_argument, NULL, 'b' },
|
|
{ "verbose", no_argument, NULL, 'v' },
|
|
{ "interface", required_argument, NULL, 'i' },
|
|
{ "spiffskb", required_argument, NULL, 'S' },
|
|
{ "littlefskb", required_argument, NULL, 'L' },
|
|
{ "portshifter", required_argument, NULL, 's' },
|
|
};
|
|
|
|
void cleanup ()
|
|
{
|
|
mock_stop_spiffs();
|
|
mock_stop_littlefs();
|
|
mock_stop_uart();
|
|
}
|
|
|
|
void control_c (int sig)
|
|
{
|
|
(void)sig;
|
|
|
|
if (user_exit)
|
|
{
|
|
fprintf(stderr, MOCK "stuck, killing\n");
|
|
cleanup();
|
|
exit(1);
|
|
}
|
|
user_exit = true;
|
|
}
|
|
|
|
int main (int argc, char* const argv [])
|
|
{
|
|
bool fast = false;
|
|
bool blocking_uart = false;
|
|
|
|
signal(SIGINT, control_c);
|
|
if (geteuid() == 0)
|
|
mock_port_shifter = 0;
|
|
else
|
|
mock_port_shifter = MOCK_PORT_SHIFTER;
|
|
|
|
for (;;)
|
|
{
|
|
int n = getopt_long(argc, argv, "hlcfbvi:S:s:", options, NULL);
|
|
if (n < 0)
|
|
break;
|
|
switch (n)
|
|
{
|
|
case 'h':
|
|
help(argv[0], EXIT_SUCCESS);
|
|
break;
|
|
case 'i':
|
|
host_interface = optarg;
|
|
break;
|
|
case 'l':
|
|
global_ipv4_netfmt = NO_GLOBAL_BINDING;
|
|
break;
|
|
case 's':
|
|
mock_port_shifter = atoi(optarg);
|
|
break;
|
|
case 'c':
|
|
ignore_sigint = true;
|
|
break;
|
|
case 'f':
|
|
fast = true;
|
|
break;
|
|
case 'S':
|
|
spiffs_kb = atoi(optarg);
|
|
break;
|
|
case 'L':
|
|
littlefs_kb = atoi(optarg);
|
|
break;
|
|
case 'b':
|
|
blocking_uart = true;
|
|
break;
|
|
case 'v':
|
|
mockdebug = true;
|
|
break;
|
|
default:
|
|
help(argv[0], EXIT_FAILURE);
|
|
}
|
|
}
|
|
|
|
mockverbose("server port shifter: %d\n", mock_port_shifter);
|
|
|
|
if (spiffs_kb)
|
|
{
|
|
String name = argv[0];
|
|
name += "-spiffs";
|
|
name += String(spiffs_kb > 0? spiffs_kb: -spiffs_kb, DEC);
|
|
name += "KB";
|
|
mock_start_spiffs(name, spiffs_kb);
|
|
}
|
|
|
|
if (littlefs_kb)
|
|
{
|
|
String name = argv[0];
|
|
name += "-littlefs";
|
|
name += String(littlefs_kb > 0? littlefs_kb: -littlefs_kb, DEC);
|
|
name += "KB";
|
|
mock_start_littlefs(name, littlefs_kb);
|
|
}
|
|
|
|
// setup global global_ipv4_netfmt
|
|
wifi_get_ip_info(0, nullptr);
|
|
|
|
if (!blocking_uart)
|
|
{
|
|
// set stdin to non blocking mode
|
|
mock_start_uart();
|
|
}
|
|
|
|
// install exit handler in case Esp.restart() is called
|
|
atexit(cleanup);
|
|
|
|
setup();
|
|
while (!user_exit)
|
|
{
|
|
uint8_t data = mock_read_uart();
|
|
|
|
if (data)
|
|
uart_new_data(UART0, data);
|
|
if (!fast)
|
|
usleep(1000); // not 100% cpu, ~1000 loops per second
|
|
loop();
|
|
check_incoming_udp();
|
|
}
|
|
cleanup();
|
|
|
|
return 0;
|
|
}
|