From f21d1a845856ba580e447a5d508186fb5ec2b38b Mon Sep 17 00:00:00 2001 From: Hideaki Tai Date: Mon, 18 Oct 2021 10:58:14 +0900 Subject: [PATCH 1/2] Add EEPROM::capacity() --- libraries/EEPROM/examples/eeprom_class/eeprom_class.ino | 6 +++--- libraries/EEPROM/src/EEPROM.cpp | 8 ++++++++ libraries/EEPROM/src/EEPROM.h | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino b/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino index 18a191c57d9..aa5de3a87db 100644 --- a/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino +++ b/libraries/EEPROM/examples/eeprom_class/eeprom_class.ino @@ -19,19 +19,19 @@ void setup() { Serial.begin(115200); delay(1000); Serial.println("Testing EEPROMClass\n"); - if (!NAMES.begin(NAMES.length())) { + if (!NAMES.begin(NAMES.capacity())) { Serial.println("Failed to initialise NAMES"); Serial.println("Restarting..."); delay(1000); ESP.restart(); } - if (!HEIGHT.begin(HEIGHT.length())) { + if (!HEIGHT.begin(HEIGHT.capacity())) { Serial.println("Failed to initialise HEIGHT"); Serial.println("Restarting..."); delay(1000); ESP.restart(); } - if (!AGE.begin(AGE.length())) { + if (!AGE.begin(AGE.capacity())) { Serial.println("Failed to initialise AGE"); Serial.println("Restarting..."); delay(1000); diff --git a/libraries/EEPROM/src/EEPROM.cpp b/libraries/EEPROM/src/EEPROM.cpp index a9d39abf611..12abe0b61a3 100644 --- a/libraries/EEPROM/src/EEPROM.cpp +++ b/libraries/EEPROM/src/EEPROM.cpp @@ -210,6 +210,14 @@ uint8_t * EEPROMClass::getDataPtr() { return &_data[0]; } +/* + Get EEPROM total size in byte defined by the user +*/ +uint16_t EEPROMClass::capacity () +{ + return _user_defined_size; +} + /* Get EEPROM total size in byte defined by the user */ diff --git a/libraries/EEPROM/src/EEPROM.h b/libraries/EEPROM/src/EEPROM.h index 032e1f65f86..0552ae88e1d 100644 --- a/libraries/EEPROM/src/EEPROM.h +++ b/libraries/EEPROM/src/EEPROM.h @@ -42,6 +42,7 @@ class EEPROMClass { bool begin(size_t size); uint8_t read(int address); void write(int address, uint8_t val); + uint16_t capacity(); uint16_t length(); bool commit(); void end(); From 387a20e7bd88821da20183fd4536434995b0d8e0 Mon Sep 17 00:00:00 2001 From: Hideaki Tai Date: Mon, 18 Oct 2021 10:59:29 +0900 Subject: [PATCH 2/2] change EEPROM::length() to return _size --- libraries/EEPROM/src/EEPROM.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/EEPROM/src/EEPROM.cpp b/libraries/EEPROM/src/EEPROM.cpp index 12abe0b61a3..0190579daf2 100644 --- a/libraries/EEPROM/src/EEPROM.cpp +++ b/libraries/EEPROM/src/EEPROM.cpp @@ -223,7 +223,7 @@ uint16_t EEPROMClass::capacity () */ uint16_t EEPROMClass::length () { - return _user_defined_size; + return _size; } /*