Skip to content
This repository was archived by the owner on Feb 4, 2023. It is now read-only.

Commit 268351a

Browse files
authored
v1.2.1 to fix compile error
### Releases v1.2.1 1. Fix compile error for ESP32 core v1.0.5-
1 parent 6d6dc8e commit 268351a

File tree

6 files changed

+34
-21
lines changed

6 files changed

+34
-21
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ This [**ESP_DoubleResetDetector** library](https://github.com/khoih-prog/ESP_Dou
102102
2. [`ESP32 Core 2.0.1+`](https://github.com/espressif/arduino-esp32) for ESP32-based boards. [![Latest release](https://img.shields.io/github/release/espressif/arduino-esp32.svg)](https://github.com/espressif/arduino-esp32/releases/latest/)
103103
3. [`ESP8266 Core 3.0.2+`](https://github.com/esp8266/Arduino) for ESP8266-based boards. [![Latest release](https://img.shields.io/github/release/esp8266/Arduino.svg)](https://github.com/esp8266/Arduino/releases/latest/). SPIFFS is deprecated from ESP8266 core 2.7.1+, to use LittleFS.
104104

105-
4. [`LittleFS_esp32 v1.0.6+`](https://github.com/lorol/LITTLEFS) for ESP32-based boards using LittleFS with ESP32 core v1.0.4-. To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/LittleFS_esp32.svg?)](https://www.ardu-badge.com/LittleFS_esp32). **Notice**: This [`LittleFS_esp32 library`](https://github.com/lorol/LITTLEFS) has been integrated to Arduino [ESP32 core v1.0.6+](https://github.com/espressif/arduino-esp32/tree/master/libraries/LITTLEFS) and you don't need to install it if using ESP32 core v1.0.6+
105+
4. [`LittleFS_esp32 v1.0.6+`](https://github.com/lorol/LITTLEFS) for ESP32-based boards using LittleFS with ESP32 core v1.0.5-. To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/LittleFS_esp32.svg?)](https://www.ardu-badge.com/LittleFS_esp32). **Notice**: This [`LittleFS_esp32 library`](https://github.com/lorol/LITTLEFS) has been integrated to Arduino [ESP32 core v1.0.6+](https://github.com/espressif/arduino-esp32/tree/master/libraries/LITTLEFS) and you don't need to install it if using ESP32 core v1.0.6+
106106

107107
---
108108

@@ -272,8 +272,8 @@ This is terminal debug output when running [ESP32_FSWebServer_DRD](https://githu
272272

273273
```cpp
274274
Starting ESP32_FSWebServer_DRD with DoubleResetDetect using SPIFFS on ESP32_DEV
275-
ESP_WiFiManager Version v1.7.5
276-
ESP_DoubleResetDetector Version v1.2.0
275+
ESP_WiFiManager Version v1.7.7
276+
ESP_DoubleResetDetector Version v1.2.1
277277
FS File: /ConfigSW.json, size: 150B
278278
FS File: /CanadaFlag_1.png, size: 40.25KB
279279
FS File: /CanadaFlag_2.png, size: 8.12KB
@@ -338,8 +338,8 @@ This is terminal debug output when running [ConfigOnDoubleReset](https://github.
338338

339339
```
340340
Starting ConfigOnDoubleReset with DoubleResetDetect using LittleFS on ESP32_DEV
341-
ESP_WiFiManager Version v1.7.5
342-
ESP_DoubleResetDetector Version v1.2.0
341+
ESP_WiFiManager Version v1.7.7
342+
ESP_DoubleResetDetector Version v1.2.1
343343
[WM] RFC925 Hostname = ConfigOnDoubleReset
344344
[WM] Set CORS Header to : Your Access-Control-Allow-Origin
345345
Stored: SSID = HueNet1, Pass = 12345678
@@ -382,8 +382,8 @@ load:0x40080400,len:6352
382382
entry 0x400806b8
383383

384384
Starting ConfigOnDoubleReset with DoubleResetDetect using LittleFS on ESP32_DEV
385-
ESP_WiFiManager Version v1.7.5
386-
ESP_DoubleResetDetector Version v1.2.0
385+
ESP_WiFiManager Version v1.7.7
386+
ESP_DoubleResetDetector Version v1.2.1
387387
[WM] RFC925 Hostname = ConfigOnDoubleReset
388388
[WM] Set CORS Header to : Your Access-Control-Allow-Origin
389389
Stored: SSID = HueNet1, Pass = jenniqqs

changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
## Table of Contents
1313

1414
* [Changelog](#changelog)
15+
* [Releases v1.2.1](#releases-v121)
1516
* [Releases v1.2.0](#releases-v120)
1617
* [Releases v1.1.2](#releases-v112)
1718
* [Releases v1.1.1](#releases-v111)
@@ -25,6 +26,10 @@
2526

2627
## Changelog
2728

29+
### Releases v1.2.1
30+
31+
1. Fix compile error for ESP32 core v1.0.5-
32+
2833
### Releases v1.2.0
2934

3035
1. Auto detect ESP32 core and use either built-in LittleFS or [LITTLEFS](https://github.com/lorol/LITTLEFS) library

examples/ConfigOnDoubleReset/ConfigOnDoubleReset.ino

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,9 @@
6565
// Use LittleFS
6666
#include "FS.h"
6767

68-
// Check cores/esp32/esp_arduino_version.h
69-
#if ( ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0) ) //(ESP_ARDUINO_VERSION_MAJOR >= 2)
68+
// Check cores/esp32/esp_arduino_version.h and cores/esp32/core_version.h
69+
//#if ( ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0) ) //(ESP_ARDUINO_VERSION_MAJOR >= 2)
70+
#if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) )
7071
#warning Using ESP32 Core 1.0.6 or 2.0.0+
7172
// The library has been merged into esp32 core from release 1.0.6
7273
#include <LittleFS.h>
@@ -75,7 +76,7 @@
7576
#define FileFS LittleFS
7677
#define FS_Name "LittleFS"
7778
#else
78-
#warning Using ESP32 Core 1.0.4-. You must install LITTLEFS library
79+
#warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library
7980
// The library has been merged into esp32 core from release 1.0.6
8081
#include <LITTLEFS.h> // https://github.com/lorol/LITTLEFS
8182

library.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ESP_DoubleResetDetector",
3-
"version": "1.2.0",
3+
"version": "1.2.1",
44
"keywords": "rtc,eeprom,littlefs,spiffs,reset,data,esp32,esp8266,double-reset,detector",
55
"description": "Library to detect a double reset within a predetermined time, using RTC Memory, EEPROM, LittleFS or SPIFFS for ESP8266 and ESP32",
66
"authors":
@@ -27,7 +27,7 @@
2727
{
2828
"owner": "lorol",
2929
"name": "LittleFS_esp32",
30-
"version": "^1.0.5",
30+
"version": "^1.0.6",
3131
"platforms": ["espressif32"]
3232
}
3333
],

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=ESP_DoubleResetDetector
2-
version=1.2.0
2+
version=1.2.1
33
author=Khoi Hoang
44
maintainer=Khoi Hoang <[email protected]>
55
license=MIT

src/ESP_DoubleResetDetector.h

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
1010
Built by Khoi Hoang https://github.com/khoih-prog/ESP_DoubleResetDetector
1111
Licensed under MIT license
12-
Version: 1.2.0
12+
Version: 1.2.1
1313
1414
Version Modified By Date Comments
1515
------- ----------- ---------- -----------
@@ -21,6 +21,7 @@
2121
1.1.1 K Hoang 28/12/2020 Suppress all possible compiler warnings
2222
1.1.2 K Hoang 10/10/2021 Update `platform.ini` and `library.json`
2323
1.2.0 K Hoang 26/11/2021 Auto detect ESP32 core and use either built-in LittleFS or LITTLEFS library
24+
1.2.1 K Hoang 26/11/2021 Fix compile error for ESP32 core v1.0.5-
2425
*****************************************************************************************************************************/
2526

2627
#pragma once
@@ -34,7 +35,7 @@
3435
#include <WProgram.h>
3536
#endif
3637

37-
#define ESP_DOUBLE_RESET_DETECTOR_VERSION "ESP_DoubleResetDetector v1.2.0"
38+
#define ESP_DOUBLE_RESET_DETECTOR_VERSION "ESP_DoubleResetDetector v1.2.1"
3839
#define ESP_DOUBLERESETDETECTOR_VERSION ESP_DOUBLE_RESET_DETECTOR_VERSION
3940

4041
//#define ESP_DRD_USE_EEPROM false
@@ -83,16 +84,22 @@
8384
#ifdef ESP32
8485

8586
#if ESP_DRD_USE_LITTLEFS
86-
// Check cores/esp32/esp_arduino_version.h
87-
#if ( ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0) ) //(ESP_ARDUINO_VERSION_MAJOR >= 2)
87+
// Check cores/esp32/esp_arduino_version.h and cores/esp32/core_version.h
88+
//#if ( ESP_ARDUINO_VERSION >= ESP_ARDUINO_VERSION_VAL(2, 0, 0) ) //(ESP_ARDUINO_VERSION_MAJOR >= 2)
89+
#if ( defined(ESP_ARDUINO_VERSION_MAJOR) && (ESP_ARDUINO_VERSION_MAJOR >= 2) )
8890
#warning Using ESP32 Core 1.0.6 or 2.0.0+
89-
#include <LittleFS.h> // https://github.com/lorol/LITTLEFS
90-
#define FileFS LittleFS
91+
// The library has been merged into esp32 core from release 1.0.6
92+
#include <LittleFS.h>
93+
94+
#define FileFS LittleFS
95+
#define FS_Name "LittleFS"
9196
#else
92-
#warning Using ESP32 Core 1.0.4-. You must install LITTLEFS library
97+
#warning Using ESP32 Core 1.0.5-. You must install LITTLEFS library
9398
// The library has been merged into esp32 core from release 1.0.6
9499
#include <LITTLEFS.h> // https://github.com/lorol/LITTLEFS
95-
#define FileFS LITTLEFS
100+
101+
#define FileFS LITTLEFS
102+
#define FS_Name "LittleFS"
96103
#endif
97104
#else
98105
#include "SPIFFS.h"

0 commit comments

Comments
 (0)