CHANGELOG.md

@@ -1,13 +1,5 @@
 # Changelog
 
-## [1.4.9] - 2025-03-29
-### Changed
-- update platformio.ini for version v1.4.9
-
-### Fixed
-- enhance HTTP method handling in sendToApi function
-
-
 ## [1.4.8] - 2025-03-29
 ### Changed
 - update platformio.ini for version v1.4.8

platformio.ini

@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [common]
-version = "1.4.9"
+version = "1.4.8"
 to_old_version = "1.4.0"
 
 ##

src/api.cpp

@@ -100,10 +100,9 @@ void sendToApi(void *parameter) {
     http.addHeader("Content-Type", "application/json");
     if (octoEnabled && octoToken != "") http.addHeader("X-Api-Key", octoToken);
 
-    int httpCode;
+    int httpCode = http.PUT(updatePayload);
     if (httpType == "PATCH") httpCode = http.PATCH(updatePayload);
-    else if (httpType == "POST") httpCode = http.POST(updatePayload);
+    if (httpType == "POST") httpCode = http.POST(updatePayload);
-    else httpCode = http.PUT(updatePayload);
 
     if (httpCode == HTTP_CODE_OK) {
         Serial.println("Spoolman erfolgreich aktualisiert");

src/config.cpp

@@ -19,12 +19,6 @@ const uint16_t SCALE_LEVEL_WEIGHT = 500;
 uint16_t defaultScaleCalibrationValue = 430;
 // ***** HX711
 
-// ***** TTP223 (Touch Sensor)
-// TTP223 circuit wiring
-const uint8_t TTP223_PIN = 15;
-// ***** TTP223
-
-
 // ***** Display
 // Declaration for an SSD1306 display connected to I2C (SDA, SCL pins)
 // On an ESP32:   21(SDA),  22(SCL)

src/config.h

@@ -11,8 +11,6 @@ extern const uint8_t LOADCELL_SCK_PIN;
 extern const uint8_t calVal_eepromAdress;
 extern const uint16_t SCALE_LEVEL_WEIGHT;
 
-extern const uint8_t TTP223_PIN;
-
 extern const int8_t OLED_RESET;
 extern const uint8_t SCREEN_ADDRESS;
 extern const uint8_t SCREEN_WIDTH;

src/main.cpp

@@ -39,6 +39,7 @@ void setup() {
   setupWebserver(server);
 
   // Spoolman API
+  // api.cpp
   initSpoolman();
 
   // Bambu MQTT
@@ -47,7 +48,6 @@ void setup() {
   // NFC Reader
   startNfc();
 
-  // Scale
   start_scale();
 
   // WDT initialisieren mit 10 Sekunden Timeout
@@ -56,9 +56,6 @@ void setup() {
 
   // Aktuellen Task (loopTask) zum Watchdog hinzufügen
   esp_task_wdt_add(NULL);
-
-  // Touch Sensor
-  pinMode(TTP223_PIN, INPUT_PULLUP);
 }
 
 
@@ -87,25 +84,13 @@ uint8_t autoAmsCounter = 0;
 uint8_t weightSend = 0;
 int16_t lastWeight = 0;
 
-// WIFI check variables
 unsigned long lastWifiCheckTime = 0;
 const unsigned long wifiCheckInterval = 60000; // Überprüfe alle 60 Sekunden (60000 ms)
 
-// Button debounce variables
-unsigned long lastButtonPress = 0;
-const unsigned long debounceDelay = 500; // 500 ms debounce delay
-
 // ##### PROGRAM START #####
 void loop() {
   unsigned long currentMillis = millis();
 
-  // Überprüfe den Status des Touch Sensors
-  if (digitalRead(TTP223_PIN) == LOW && currentMillis - lastButtonPress > debounceDelay) 
-  {
-    lastButtonPress = currentMillis;
-    scaleTareRequest = true;
-  }
-
   // Überprüfe regelmäßig die WLAN-Verbindung
   if (intervalElapsed(currentMillis, lastWifiCheckTime, wifiCheckInterval)) 
   {
@@ -173,6 +158,25 @@ void loop() {
   {
     lastWeightReadTime = currentMillis;
 
+    // Prüfen ob die Waage korrekt genullt ist
+    if ((weight > 0 && weight < 5) || weight < -1)
+    {
+      if(scaleTareCounter < 5)
+      {
+        scaleTareCounter++;
+      }
+      else
+      {
+        scaleTareRequest = true;
+        scaleTareCounter = 0;
+      }
+      
+    }
+    else
+    {
+      scaleTareCounter = 0;
+    }
+
     // Prüfen ob das Gewicht gleich bleibt und dann senden
     if (weight == lastWeight && weight > 5)
     {