From b3b03a81572d352816819cff772231ba037dc338 Mon Sep 17 00:00:00 2001 From: lbernstone Date: Sat, 22 Jun 2019 18:05:55 -0600 Subject: [PATCH 1/3] Remove partitioning comments --- .../examples/eeprom_class/eeprom_class.ino | 28 ++++--------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino b/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino index 03cfa8564c5..c0f37ccafa8 100644 --- a/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino +++ b/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino @@ -2,36 +2,21 @@ ESP32 eeprom_class example with EEPROM library This simple example demonstrates using EEPROM library to store different data in - ESP32 Flash memory in a multiple user-defined EEPROM partition (0x1000 or 4KB max size or less). + ESP32 Flash memory in a multiple user-defined EEPROM class objects. - Install 'ESP32 Partiton Manager' ONCE from https://github.com/francis94c/ESP32Partitions - And generate different partitions with 'partition_name' - Usage: EEPROMClass ANY_OBJECT_NAME("partition_name", size); - - Generated partition that would work perfectly with this example - #Name, Type, SubType, Offset, Size, Flags - nvs, data, nvs, 0x9000, 0x5000, - otadata, data, ota, 0xe000, 0x2000, - app0, app, ota_0, 0x10000, 0x140000, - app1, app, ota_1, 0x150000, 0x140000, - eeprom0, data, 0x99, 0x290000, 0x1000, - eeprom1, data, 0x9a, 0x291000, 0x500, - eeprom2, data, 0x9b, 0x292000, 0x100, - spiffs, data, spiffs, 0x293000, 0x16d000, - Created for arduino-esp32 on 25 Dec, 2017 by Elochukwu Ifediora (fedy0) + converted to nvs by lbernstone - 06/22/2019 */ #include "EEPROM.h" -// Instantiate eeprom objects with parameter/argument names and size same as in the partition table +// Instantiate eeprom objects with parameter/argument names and sizes EEPROMClass NAMES("eeprom0", 0x500); EEPROMClass HEIGHT("eeprom1", 0x200); EEPROMClass AGE("eeprom2", 0x100); void setup() { - // put your setup code here, to run once: Serial.begin(115200); Serial.println("Testing EEPROMClass\n"); if (!NAMES.begin(NAMES.length())) { @@ -57,7 +42,7 @@ void setup() { double height = 5.8; uint32_t age = 47; - // Write: Variables ---> EEPROM partitions + // Write: Variables ---> EEPROM stores NAMES.put(0, name); HEIGHT.put(0, height); AGE.put(0, age); @@ -75,7 +60,7 @@ void setup() { Serial.print("age: "); Serial.println(age); Serial.println("------------------------------------\n"); - // Read: Variables <--- EEPROM partitions + // Read: Variables <--- EEPROM stores NAMES.get(0, name); HEIGHT.get(0, height); AGE.get(0, age); @@ -87,6 +72,5 @@ void setup() { } void loop() { - // put your main code here, to run repeatedly: - + delay(0xFFFFFFFF); } From 9e2e584a2699c4eca5ccd46a995e5a9d0c432083 Mon Sep 17 00:00:00 2001 From: Larry Bernstone Date: Sat, 22 Jun 2019 18:17:40 -0600 Subject: [PATCH 2/3] Revert "Remove partitioning comments" This reverts commit b3b03a81572d352816819cff772231ba037dc338. --- .../examples/eeprom_class/eeprom_class.ino | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino b/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino index c0f37ccafa8..03cfa8564c5 100644 --- a/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino +++ b/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino @@ -2,21 +2,36 @@ ESP32 eeprom_class example with EEPROM library This simple example demonstrates using EEPROM library to store different data in - ESP32 Flash memory in a multiple user-defined EEPROM class objects. + ESP32 Flash memory in a multiple user-defined EEPROM partition (0x1000 or 4KB max size or less). + Install 'ESP32 Partiton Manager' ONCE from https://github.com/francis94c/ESP32Partitions + And generate different partitions with 'partition_name' + Usage: EEPROMClass ANY_OBJECT_NAME("partition_name", size); + + Generated partition that would work perfectly with this example + #Name, Type, SubType, Offset, Size, Flags + nvs, data, nvs, 0x9000, 0x5000, + otadata, data, ota, 0xe000, 0x2000, + app0, app, ota_0, 0x10000, 0x140000, + app1, app, ota_1, 0x150000, 0x140000, + eeprom0, data, 0x99, 0x290000, 0x1000, + eeprom1, data, 0x9a, 0x291000, 0x500, + eeprom2, data, 0x9b, 0x292000, 0x100, + spiffs, data, spiffs, 0x293000, 0x16d000, + Created for arduino-esp32 on 25 Dec, 2017 by Elochukwu Ifediora (fedy0) - converted to nvs by lbernstone - 06/22/2019 */ #include "EEPROM.h" -// Instantiate eeprom objects with parameter/argument names and sizes +// Instantiate eeprom objects with parameter/argument names and size same as in the partition table EEPROMClass NAMES("eeprom0", 0x500); EEPROMClass HEIGHT("eeprom1", 0x200); EEPROMClass AGE("eeprom2", 0x100); void setup() { + // put your setup code here, to run once: Serial.begin(115200); Serial.println("Testing EEPROMClass\n"); if (!NAMES.begin(NAMES.length())) { @@ -42,7 +57,7 @@ void setup() { double height = 5.8; uint32_t age = 47; - // Write: Variables ---> EEPROM stores + // Write: Variables ---> EEPROM partitions NAMES.put(0, name); HEIGHT.put(0, height); AGE.put(0, age); @@ -60,7 +75,7 @@ void setup() { Serial.print("age: "); Serial.println(age); Serial.println("------------------------------------\n"); - // Read: Variables <--- EEPROM stores + // Read: Variables <--- EEPROM partitions NAMES.get(0, name); HEIGHT.get(0, height); AGE.get(0, age); @@ -72,5 +87,6 @@ void setup() { } void loop() { - delay(0xFFFFFFFF); + // put your main code here, to run repeatedly: + } From 970a80f55f0cfcc4aa34d464cf6acc6df3708293 Mon Sep 17 00:00:00 2001 From: Larry Bernstone Date: Sat, 22 Jun 2019 18:19:49 -0600 Subject: [PATCH 3/3] Removed partitioning comments from EEPROM example --- .../examples/eeprom_class/eeprom_class.ino | 29 ++++--------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino b/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino index 03cfa8564c5..1e28dee8616 100644 --- a/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino +++ b/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino @@ -1,37 +1,21 @@ /* ESP32 eeprom_class example with EEPROM library - This simple example demonstrates using EEPROM library to store different data in - ESP32 Flash memory in a multiple user-defined EEPROM partition (0x1000 or 4KB max size or less). - - Install 'ESP32 Partiton Manager' ONCE from https://github.com/francis94c/ESP32Partitions - And generate different partitions with 'partition_name' - Usage: EEPROMClass ANY_OBJECT_NAME("partition_name", size); + ESP32 Flash memory in a multiple user-defined EEPROM class objects. - Generated partition that would work perfectly with this example - #Name, Type, SubType, Offset, Size, Flags - nvs, data, nvs, 0x9000, 0x5000, - otadata, data, ota, 0xe000, 0x2000, - app0, app, ota_0, 0x10000, 0x140000, - app1, app, ota_1, 0x150000, 0x140000, - eeprom0, data, 0x99, 0x290000, 0x1000, - eeprom1, data, 0x9a, 0x291000, 0x500, - eeprom2, data, 0x9b, 0x292000, 0x100, - spiffs, data, spiffs, 0x293000, 0x16d000, - Created for arduino-esp32 on 25 Dec, 2017 by Elochukwu Ifediora (fedy0) + converted to nvs by lbernstone - 06/22/2019 */ #include "EEPROM.h" -// Instantiate eeprom objects with parameter/argument names and size same as in the partition table +// Instantiate eeprom objects with parameter/argument names and sizes EEPROMClass NAMES("eeprom0", 0x500); EEPROMClass HEIGHT("eeprom1", 0x200); EEPROMClass AGE("eeprom2", 0x100); void setup() { - // put your setup code here, to run once: Serial.begin(115200); Serial.println("Testing EEPROMClass\n"); if (!NAMES.begin(NAMES.length())) { @@ -57,7 +41,7 @@ void setup() { double height = 5.8; uint32_t age = 47; - // Write: Variables ---> EEPROM partitions + // Write: Variables ---> EEPROM stores NAMES.put(0, name); HEIGHT.put(0, height); AGE.put(0, age); @@ -75,7 +59,7 @@ void setup() { Serial.print("age: "); Serial.println(age); Serial.println("------------------------------------\n"); - // Read: Variables <--- EEPROM partitions + // Read: Variables <--- EEPROM stores NAMES.get(0, name); HEIGHT.get(0, height); AGE.get(0, age); @@ -87,6 +71,5 @@ void setup() { } void loop() { - // put your main code here, to run repeatedly: - + delay(0xFFFFFFFF); }