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.

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

Migrated to LittleFS - andyb2000 #121

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,21 +88,23 @@ configManager.save();

### Additional files saved

Upload the ```index.html``` file found in the ```data``` directory into the SPIFFS.
Upload the ```index.html``` file found in the ```data``` directory into the LittleFS (note SPIFFS is currently deprecated).
Please see: https://arduino-esp8266.readthedocs.io/en/latest/filesystem.html

Instructions on how to do this vary based on your IDE. Below are links instructions
on the most common IDEs:

#### ESP8266

* [Arduino IDE](http://arduino-esp8266.readthedocs.io/en/latest/filesystem.html#uploading-files-to-file-system)

* [Platform IO](http://docs.platformio.org/en/stable/platforms/espressif.html#uploading-files-to-file-system-spiffs)
* [Platform IO](http://docs.platformio.org/en/stable/platforms/espressif.html#uploading-files-to-file-system)

#### ESP32

* [Arduino IDE](https://github.com/me-no-dev/arduino-esp32fs-plugin)

* [Platform IO](http://docs.platformio.org/en/stable/platforms/espressif32.html#uploading-files-to-file-system-spiffs)
* [Platform IO](http://docs.platformio.org/en/stable/platforms/espressif32.html#uploading-files-to-file-system)

# Documentation

Expand Down Expand Up @@ -146,7 +148,7 @@ void setAPPassword(const char *password)
```
void setAPFilename(const char *filename)
```
> Sets the path in SPIFFS to the webpage to be served by the access point.
> Sets the path in LittleFS to the webpage to be served by the access point.

### setAPTimeout
```
Expand Down
2 changes: 1 addition & 1 deletion library.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ConfigManager",
"version": "2.1.1",
"version": "2.1.2",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be in a separate PR.

"keywords": "wifi, wi-fi, config",
"description": "WiFi connection manager for ESP8266 and ESP32",
"repository":
Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=ConfigManager
version=2.1.1
version=2.1.2
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above.

author=Nick Wiersma <[email protected]>
maintainer=Nick Wiersma <[email protected]>
sentence=WiFi connection manager for ESP8266 and ESP32
Expand Down
6 changes: 3 additions & 3 deletions src/ConfigManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -454,18 +454,18 @@ void ConfigManager::createBaseWebServer() {
}

void ConfigManager::streamFile(const char* file, const char mime[]) {
SPIFFS.begin();
LittleFS.begin();

File f;

if (file[0] == '/') {
f = SPIFFS.open(file, "r");
f = LittleFS.open(file, "r");
} else {
size_t len = strlen(file);
char filepath[len + 1];
strcpy(filepath, "/");
strcat(filepath, file);
f = SPIFFS.open(filepath, "r");
f = LittleFS.open(filepath, "r");
}

if (f) {
Expand Down
2 changes: 1 addition & 1 deletion src/ConfigManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
#include <DNSServer.h>
#include <EEPROM.h>
#include <FS.h>
#include <LittleFS.h>

#if defined(ARDUINO_ARCH_ESP8266) // ESP8266
#include <ESP8266WebServer.h>
#include <ESP8266WiFi.h>
#elif defined(ARDUINO_ARCH_ESP32) // ESP32
#include <SPIFFS.h>
#include <WebServer.h>
#include <WiFi.h>
#endif
Expand Down