3D-Druck/Filaman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 110 Wiki Activity

refactor: migrate calibration value storage from EEPROM to NVS

Browse Source
This commit is contained in:
Manuel Weiser 2025-02-21 18:04:05 +01:00
parent 1de283b62f
commit 0117302672
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/scale.cpp
View File

@ -3,9 +3,9 @@
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include "config.h" #include "config.h"
#include "HX711.h" #include "HX711.h"
#include <EEPROM.h>
#include "display.h" #include "display.h"
#include "esp_task_wdt.h" #include "esp_task_wdt.h"
#include <Preferences.h>
HX711 scale; HX711 scale;
@ -17,6 +17,10 @@ uint8_t weigthCouterToApi = 0;
uint8_t scale_tare_counter = 0; uint8_t scale_tare_counter = 0;
uint8_t pauseMainTask = 0; uint8_t pauseMainTask = 0;
Preferences preferences;
const char* NVS_NAMESPACE = "scale";
const char* NVS_KEY_CALIBRATION = "cal_value";
// ##### Funktionen für Waage ##### // ##### Funktionen für Waage #####
uint8_t tareScale() { uint8_t tareScale() {
Serial.println("Tare scale"); Serial.println("Tare scale");
@ -48,13 +52,12 @@ void scale_loop(void * parameter) {
void start_scale() { void start_scale() {
Serial.println("Prüfe Calibration Value"); Serial.println("Prüfe Calibration Value");
long calibrationValue; // calibration value (see example file "Calibration.ino") long calibrationValue;
//calibrationValue = 696.0; // uncomment this if you want to set the calibration value in the sketch
EEPROM.begin(512); // NVS
EEPROM.get(calVal_eepromAdress, calibrationValue); // uncomment this if you want to fetch the calibration value from eeprom preferences.begin(NVS_NAMESPACE, true); // true = readonly
calibrationValue = preferences.getLong(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue);
//calibrationValue = EEPROM.read(calVal_eepromAdress); preferences.end();
Serial.print("Read Scale Calibration Value "); Serial.print("Read Scale Calibration Value ");
Serial.println(calibrationValue); Serial.println(calibrationValue);
@ -137,18 +140,19 @@ uint8_t calibrate_scale() {
{ {
Serial.print("New calibration value has been set to: "); Serial.print("New calibration value has been set to: ");
Serial.println(newCalibrationValue); Serial.println(newCalibrationValue);
Serial.print("Save this value to EEPROM adress ");
Serial.println(calVal_eepromAdress);
//EEPROM.put(calVal_eepromAdress, newCalibrationValue); // Speichern mit NVS
EEPROM.put(calVal_eepromAdress, newCalibrationValue); preferences.begin(NVS_NAMESPACE, false); // false = readwrite
EEPROM.commit(); preferences.putLong(NVS_KEY_CALIBRATION, newCalibrationValue);
preferences.end();
EEPROM.get(calVal_eepromAdress, newCalibrationValue); // Verifizieren
//newCalibrationValue = EEPROM.read(calVal_eepromAdress); preferences.begin(NVS_NAMESPACE, true);
long verifyValue = preferences.getLong(NVS_KEY_CALIBRATION, 0);
preferences.end();
Serial.print("Read Value "); Serial.print("Verified stored value: ");
Serial.println(newCalibrationValue); Serial.println(verifyValue);
Serial.println("End calibration, revome weight"); Serial.println("End calibration, revome weight");