Added

add auto-tare functionality and update scale handling based on touch sensor connection

html/waage.html

@@ -55,6 +55,8 @@
                 <h5 class="card-title">Sacle Calibration</h5>
                 <button id="calibrateBtn" class="btn btn-primary">Calibrate Scale</button>
                 <button id="tareBtn" class="btn btn-secondary">Tare Scale</button>
+                &nbsp;&nbsp;&nbsp;Enable Auto-TARE <input type="checkbox" id="autoTareCheckbox" onchange="setAutoTare(this.checked);"
+                    {{autoTare}}>
                 <div id="statusMessage" class="mt-3"></div>
             </div>
         </div>
@@ -139,6 +141,14 @@
                 payload: 'tare'
             }));
         });
+            // Add auto-tare function
+            function setAutoTare(enabled) {
+                ws.send(JSON.stringify({
+                    type: 'scale',
+                    payload: 'setAutoTare',
+                    enabled: enabled
+                }));
+            }
 
         // WebSocket-Verbindung beim Laden der Seite initiieren
         connectWebSocket();

scripts/gzip_files.py

@@ -14,7 +14,7 @@ def copy_file(input_file, output_file):
 
 def should_compress(file):
      # Skip compression for spoolman.html
-    if file == 'spoolman.html':
+    if file == 'spoolman.html' or file == 'waage.html':
         return False
     # Komprimiere nur bestimmte Dateitypen
     return file.endswith(('.js', '.png', '.css', '.html'))

src/main.cpp

@@ -48,15 +48,6 @@ void setup() {
   // NFC Reader
   startNfc();
 
-  // Scale
-  start_scale();
-
-  // WDT initialisieren mit 10 Sekunden Timeout
-  bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus
-  esp_task_wdt_init(10, panic);
-
-  // Aktuellen Task (loopTask) zum Watchdog hinzufügen
-  esp_task_wdt_add(NULL);
   // Touch Sensor
   pinMode(TTP223_PIN, INPUT_PULLUP);
   if (digitalRead(TTP223_PIN) == LOW)
@@ -64,6 +55,16 @@ void setup() {
     Serial.println("Touch Sensor is connected");
     touchSensorConnected = true;
   }
+
+  // Scale
+  start_scale(touchSensorConnected);
+
+  // WDT initialisieren mit 10 Sekunden Timeout
+  bool panic = true; // Wenn true, löst ein WDT-Timeout einen System-Panik aus
+  esp_task_wdt_init(10, panic);
+
+  // Aktuellen Task (loopTask) zum Watchdog hinzufügen
+  esp_task_wdt_add(NULL);
 }
 
 
@@ -176,6 +177,16 @@ void loop() {
   {
     lastWeightReadTime = currentMillis;
 
+    // Prüfen ob die Waage korrekt genullt ist
+    if (autoTare && (weight > 0 && weight < 5) || weight < 0)
+    {
+      scale_tare_counter++;
+    }
+    else
+    {
+      scale_tare_counter = 0;
+    }
+
     // Prüfen ob das Gewicht gleich bleibt und dann senden
     if (weight == lastWeight && weight > 5)
     {

src/scale.cpp

@@ -14,6 +14,7 @@ TaskHandle_t ScaleTask;
 int16_t weight = 0;
 
 uint8_t weigthCouterToApi = 0;
+uint8_t scale_tare_counter = 0;
 bool scaleTareRequest = false;
 uint8_t pauseMainTask = 0;
 uint8_t scaleCalibrated = 1;
@@ -21,9 +22,26 @@ uint8_t scaleCalibrated = 1;
 Preferences preferences;
 const char* NVS_NAMESPACE = "scale";
 const char* NVS_KEY_CALIBRATION = "cal_value";
+const char *NVS_KEY_AUTOTARE = "auto_tare";
+bool autoTare = true;
 
 // ##### Funktionen für Waage #####
-uint8_t tareScale() {
+uint8_t setAutoTare(bool autoTareValue)
+{
+  Serial.print("Set AutoTare to ");
+  Serial.println(autoTareValue);
+  autoTare = autoTareValue;
+
+  // Speichern mit NVS
+  preferences.begin(NVS_NAMESPACE, false); // false = readwrite
+  preferences.putBool(NVS_KEY_AUTOTARE, autoTare);
+  preferences.end();
+
+  return 1;
+}
+
+uint8_t tareScale()
+{
   Serial.println("Tare scale");
   scale.tare();
   
@@ -38,6 +56,14 @@ void scale_loop(void * parameter) {
   for(;;) {
     if (scale.is_ready()) 
     {
+      // Waage automatisch Taren, wenn zu lange Abweichung
+      if (autoTare && scale_tare_counter >= 5)
+      {
+        Serial.println("Auto Tare scale");
+        scale.tare();
+        scale_tare_counter = 0;
+      }
+
       // Waage manuell Taren
       if (scaleTareRequest == true)
       {
@@ -57,13 +83,21 @@ void scale_loop(void * parameter) {
   }
 }
 
-void start_scale() {
+void start_scale(bool touchSensorConnected)
+{
   Serial.println("Prüfe Calibration Value");
   float calibrationValue;
 
   // NVS lesen
   preferences.begin(NVS_NAMESPACE, true); // true = readonly
   calibrationValue = preferences.getFloat(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue);
+
+  // auto Tare
+  // Wenn Touch Sensor verbunden, dann autoTare auf false setzen
+  // Danach prüfen was in NVS gespeichert ist
+  autoTare = (touchSensorConnected) ? false : true;
+  autoTare = preferences.getBool(NVS_KEY_AUTOTARE, autoTare);
+
   preferences.end();
 
   Serial.print("Read Scale Calibration Value ");

src/scale.h

@@ -4,17 +4,19 @@
 #include <Arduino.h>
 #include "HX711.h"
 
-
-uint8_t start_scale();
+uint8_t setAutoTare(bool autoTareValue);
+uint8_t start_scale(bool touchSensorConnected);
 uint8_t calibrate_scale();
 uint8_t tareScale();
 
 extern HX711 scale;
 extern int16_t weight;
 extern uint8_t weigthCouterToApi;
+extern uint8_t scale_tare_counter;
 extern uint8_t scaleTareRequest;
 extern uint8_t pauseMainTask;
 extern uint8_t scaleCalibrated;
+extern bool autoTare;
 
 extern TaskHandle_t ScaleTask;
 

src/website.cpp

@@ -73,6 +73,11 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
                 success = calibrate_scale();
             }
 
+            if (doc["payload"] == "setAutoTare")
+            {
+                success = setAutoTare(doc["enabled"].as<bool>());
+            }
+
             if (success) {
                 ws.textAll("{\"type\":\"scale\",\"payload\":\"success\"}");
             } else {
@@ -201,13 +206,17 @@ void setupWebserver(AsyncWebServer &server) {
     });
 
     // Route für Waage
-    server.on("/waage", HTTP_GET, [](AsyncWebServerRequest *request){
+    server.on("/waage", HTTP_GET, [](AsyncWebServerRequest *request)
+              {
         Serial.println("Anfrage für /waage erhalten");
-        AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/waage.html.gz", "text/html");
-        response->addHeader("Content-Encoding", "gzip");
-        response->addHeader("Cache-Control", CACHE_CONTROL);
-        request->send(response);
-    });
+      //AsyncWebServerResponse *response = request->beginResponse(LittleFS, "/waage.html.gz", "text/html");
+        //response->addHeader("Content-Encoding", "gzip");
+        //response->addHeader("Cache-Control", CACHE_CONTROL);
+
+        String html = loadHtmlWithHeader("/waage.html");
+        html.replace("{{autoTare}}", (autoTare) ? "checked" : "");
+
+        request->send(200, "text/html", html); });
 
     // Route für RFID
     server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){