Updating a File (KeyValueEEPROM) to ArduinoJson 6 - arduino

Question

I am an engineer not a programmer, but due to circumstance I am fix the programming for a project I am working on.
This is where I am currently stuck. The KeyValueEEPROM.h is used to store the collected data by the main program, and then read from to upload to a SQL database.
Somewhere in this process I am losing the data collected by the sensor. I believe I isolated the problem to the referenced file.
the first version was made using ArduinoJson 5 (I am not the original creator). This is incompatible with the current program, as ArduinoJson 5 has been upgraded to the 6th version.
The other one is edited by me to use ArduinoJson 6.
I had to change the file to get the codes to compile (which it now does), but I am not sure if I was able to preserve the functions.
I would like someone to point out any mistakes I made during the 'update'.
ArduinoJson5 Version:
#ifndef KeyValueEEPROM_h
#define KeyValueEEPROM_h
#include <Arduino.h>
#include <ArduinoJson.h>
#include <EEPROM.h>
#ifndef KeyValueEEPROM_SIZE
#if defined(ESP8266) || defined(ESP32) || defined(__AVR_ATmega1280__) ||
defined(__AVR_ATmega2560__)
#define KeyValueEEPROM_SIZE 4096
#endif
#if defined(__AVR_ATmega328P__) || defined(__AVR_ATmega32U4__)
#define KeyValueEEPROM_SIZE 1024
#endif
#if defined(__AVR_ATmega168__)
#define KeyValueEEPROM_SIZE 512
#endif
#endif
class KeyValueEEPROMClass {
public:
// Public methods
void begin() {
// If this method was already called, return.
if (LibraryStartet) return;
// Read JSON data from the EEPROM.
String json = readEEPROM();
// Parse JSON data.
root = &jsonBuffer.parseObject(json);
// If JSON couldn't be parsed,
if (!root->success()) {
// then create an new key-value store.
clear();
}
};
void clear() {
// Clear buffer.
jsonBuffer.clear();
// Create JSON root object.
root = &jsonBuffer.createObject();
};
void remove(String key) {
// Remove key.
root->remove(key);
};
void apply() {
// Clear the EEPROM.
clearEEPROM();
// Extract JSON data from the root object.
String json;
root->printTo(json);
// Write JSON data to the EEPROM.
writeEEPROM(json);
};
bool exists(String key) {
return root->containsKey(key);
};
template <typename T>
T get(String key) {
T value = (*root)[key].as<T>();
return value;
};
template <typename T>
void set(String key, T value) {
(*root)[key] = value;
};
private:
// Private methods
void clearEEPROM() {
#if defined(ESP8266) || defined(ESP32)
// Begin EEPROM library.
EEPROM.begin(KeyValueEEPROM_SIZE);
#endif
// Write all bytes to zero.
for (int i = 0; i < KeyValueEEPROM_SIZE; i++) EEPROM.write(i, '\0');
// End EEPROM library.
EEPROM.end();
};
String readEEPROM() {
#if defined(ESP8266) || defined(ESP32)
// Begin EEPROM library.
EEPROM.begin(KeyValueEEPROM_SIZE);
#endif
// Read JSON data until null-termination.
String string = ""; unsigned int i; unsigned char byte;
for (i = 0; i < KeyValueEEPROM_SIZE; i++) {
byte = EEPROM.read(i);
if (byte == '\0') {
break;
} else {
string += char(byte);
}
}
// End EEPROM library.
EEPROM.end();
// Return JSON data.
return string;
};
void writeEEPROM(String json) {
#if defined(ESP8266) || defined(ESP32)
// Begin EEPROM library.
EEPROM.begin(KeyValueEEPROM_SIZE);
#endif
// Write JSON data.
unsigned int i;
for (i = 0; i < json.length(); i++) {
EEPROM.write(i, json.charAt(i));
}
// If the length of the JSON data is smaller than the EEPROM size,
if (json.length() < KeyValueEEPROM_SIZE)
// than write at the last position a null-termination.
EEPROM.write(json.length(), '\0');
// End EEPROM library.
EEPROM.end();
}
// Properties
StaticJsonBuffer<KeyValueEEPROM_SIZE> jsonBuffer;
JsonObject *root;
bool LibraryStartet = false;
};
static KeyValueEEPROMClass KeyValueEEPROM;
extern KeyValueEEPROMClass KeyValueEEPROM;
#endif
ArduinoJson6 Version
#ifndef KeyValueEEPROM_h
#define KeyValueEEPROM_h
#include <Arduino.h>
#include <ArduinoJson.h>
#include <EEPROM.h>
#ifndef KeyValueEEPROM_SIZE
#if defined(ESP8266) || defined(ESP32) || defined(__AVR_ATmega1280__) ||
defined(__AVR_ATmega2560__)
#define KeyValueEEPROM_SIZE 4096
#endif
#if defined(__AVR_ATmega328P__) || defined(__AVR_ATmega32U4__)
#define KeyValueEEPROM_SIZE 1024
#endif
#if defined(__AVR_ATmega168__)
#define KeyValueEEPROM_SIZE 512
#endif
#endif
class KeyValueEEPROMClass {
public:
// Public methods
void begin() {
// If this method was already called, return.
if (LibraryStartet) return;
// Read JSON data from the EEPROM.
String json = readEEPROM();
// Parse JSON data.
DeserializationError error = deserializeJson(doc,json);
// If JSON couldn't be parsed,
if (error) {
// then create an new key-value store.
clear();
}
};
void clear() {
// Clear buffer.
doc.clear();
// Create JSON root object.
// doc = &doc.createObject();
};
void remove(String key) {
// Remove key.
doc.remove(key);
};
void apply() {
// Clear the EEPROM.
clearEEPROM();
// Extract JSON data from the root object.
String json;
//doc.
serializeJson(doc, json);
// Write JSON data to the EEPROM.
writeEEPROM(json);
};
bool exists(String key) {
return doc.containsKey(key);
};
template <typename T>
T get(String key) {
T value = doc[key].as<T>();
return value;
};
template <typename T>
void set(String key, T value) {
doc[key] = value;
};
private:
// Private methods
void clearEEPROM() {
#if defined(ESP8266) || defined(ESP32)
// Begin EEPROM library.
EEPROM.begin(KeyValueEEPROM_SIZE);
#endif
// Write all bytes to zero.
for (int i = 0; i < KeyValueEEPROM_SIZE; i++) EEPROM.write(i, '\0');
// End EEPROM library.
EEPROM.end();
};
String readEEPROM() {
#if defined(ESP8266) || defined(ESP32)
// Begin EEPROM library.
EEPROM.begin(KeyValueEEPROM_SIZE);
#endif
// Read JSON data until null-termination.
String string = ""; unsigned int i; unsigned char byte;
for (i = 0; i < KeyValueEEPROM_SIZE; i++) {
byte = EEPROM.read(i);
if (byte == '\0') {
break;
} else {
string += char(byte);
}
}
// End EEPROM library.
EEPROM.end();
// Return JSON data.
return string;
};
void writeEEPROM(String json) {
#if defined(ESP8266) || defined(ESP32)
// Begin EEPROM library.
EEPROM.begin(KeyValueEEPROM_SIZE);
#endif
// Write JSON data.
unsigned int i;
for (i = 0; i < json.length(); i++) {
EEPROM.write(i, json.charAt(i));
}
// If the length of the JSON data is smaller than the EEPROM size,
if (json.length() < KeyValueEEPROM_SIZE)
// than write at the last position a null-termination.
EEPROM.write(json.length(), '\0');
// End EEPROM library.
EEPROM.end();
}
// Properties
StaticJsonDocument<KeyValueEEPROM_SIZE> doc;
//JsonObject *doc;
JsonObject object = doc.to<JsonObject>();
bool LibraryStartet = false;
};
static KeyValueEEPROMClass KeyValueEEPROM;
extern KeyValueEEPROMClass KeyValueEEPROM;
#endif
This is also my first post here, so if I have formatting issues or lack clarity I apologize.
Thanks,