Commit 02c3ec0

authored

remove _user_defined_size from EEPROM (#5775)

Summary Related to the issue #5773 and #2280. _user_defined_size is removed from EEPROMClass because it is redundant in the current code EEPROMClass::length() returns _size that is the true available size of EEPROM Impact _user_defined_size is removed from EEPROMClass EEPROMClass::length() returns _size that is the true available size of EEPROM

1 parent cb5a490 commit 02c3ec0Copy full SHA for 02c3ec0

File tree

3 files changed

-13

lines changed

libraries/EEPROM
- examples/eeprom_class
  - eeprom_class.ino
- src
  - EEPROM.cpp
  - EEPROM.h

3 files changed

-13

lines changed

`‎libraries/EEPROM/examples/eeprom_class/eeprom_class.ino`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,27 +11,27 @@`
`11`	`11`	`#include "EEPROM.h"`
`12`	`12`
`13`	`13`	`// Instantiate eeprom objects with parameter/argument names and sizes`
`14`		`-EEPROMClass NAMES("eeprom0", 0x500);`
`15`		`-EEPROMClass HEIGHT("eeprom1", 0x200);`
`16`		`-EEPROMClass AGE("eeprom2", 0x100);`
	`14`	`+EEPROMClass NAMES("eeprom0");`
	`15`	`+EEPROMClass HEIGHT("eeprom1");`
	`16`	`+EEPROMClass AGE("eeprom2");`
`17`	`17`
`18`	`18`	`void setup() {`
`19`	`19`	`Serial.begin(115200);`
`20`	`20`	`delay(1000);`
`21`	`21`	`Serial.println("Testing EEPROMClass\n");`
`22`		`- if (!NAMES.begin(NAMES.length())) {`
	`22`	`+ if (!NAMES.begin(0x500)) {`
`23`	`23`	`Serial.println("Failed to initialise NAMES");`
`24`	`24`	`Serial.println("Restarting...");`
`25`	`25`	`delay(1000);`
`26`	`26`	`ESP.restart();`
`27`	`27`	`}`
`28`		`- if (!HEIGHT.begin(HEIGHT.length())) {`
	`28`	`+ if (!HEIGHT.begin(0x200)) {`
`29`	`29`	`Serial.println("Failed to initialise HEIGHT");`
`30`	`30`	`Serial.println("Restarting...");`
`31`	`31`	`delay(1000);`
`32`	`32`	`ESP.restart();`
`33`	`33`	`}`
`34`		`- if (!AGE.begin(AGE.length())) {`
	`34`	`+ if (!AGE.begin(0x100)) {`
`35`	`35`	`Serial.println("Failed to initialise AGE");`
`36`	`36`	`Serial.println("Restarting...");`
`37`	`37`	`delay(1000);`

`‎libraries/EEPROM/src/EEPROM.cpp`

Lines changed: 2 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ EEPROMClass::EEPROMClass(void)`
`34`	`34`	`, _size(0)`
`35`	`35`	`, _dirty(false)`
`36`	`36`	`, _name("eeprom")`
`37`		`- , _user_defined_size(0)`
`38`	`37`	`{`
`39`	`38`	`}`
`40`	`39`
`@@ -45,17 +44,15 @@ EEPROMClass::EEPROMClass(uint32_t sector)`
`45`	`44`	`, _size(0)`
`46`	`45`	`, _dirty(false)`
`47`	`46`	`, _name("eeprom")`
`48`		`- , _user_defined_size(0)`
`49`	`47`	`{`
`50`	`48`	`}`
`51`	`49`
`52`		`-EEPROMClass::EEPROMClass(const char* name, uint32_t user_defined_size)`
	`50`	`+EEPROMClass::EEPROMClass(const char* name)`
`53`	`51`	`: _handle(0)`
`54`	`52`	`, _data(0)`
`55`	`53`	`, _size(0)`
`56`	`54`	`, _dirty(false)`
`57`	`55`	`, _name(name)`
`58`		`- , _user_defined_size(user_defined_size)`
`59`	`56`	`{`
`60`	`57`	`}`
`61`	`58`
`@@ -215,7 +212,7 @@ uint8_t * EEPROMClass::getDataPtr() {`
`215`	`212`	`*/`
`216`	`213`	`uint16_t EEPROMClass::length ()`
`217`	`214`	`{`
`218`		`- return _user_defined_size;`
	`215`	`+ return _size;`
`219`	`216`	`}`
`220`	`217`
`221`	`218`	`/*`

`‎libraries/EEPROM/src/EEPROM.h`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ typedef uint32_t nvs_handle;`
`35`	`35`	`class EEPROMClass {`
`36`	`36`	`public:`
`37`	`37`	`EEPROMClass(uint32_t sector);`
`38`		`- EEPROMClass(const char* name, uint32_t user_defined_size);`
	`38`	`+ EEPROMClass(const char* name);`
`39`	`39`	`EEPROMClass(void);`
`40`	`40`	`~EEPROMClass(void);`
`41`	`41`
`@@ -112,7 +112,6 @@ class EEPROMClass {`
`112`	`112`	`size_t _size;`
`113`	`113`	`bool _dirty;`
`114`	`114`	`const char* _name;`
`115`		`- uint32_t _user_defined_size;`
`116`	`115`	`};`
`117`	`116`
`118`	`117`	`#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_EEPROM)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 02c3ec0

File tree

3 files changed

3 files changed

`‎libraries/EEPROM/examples/eeprom_class/eeprom_class.ino`

`‎libraries/EEPROM/src/EEPROM.cpp`

`‎libraries/EEPROM/src/EEPROM.h`

0 commit comments