Compare commits
	
		
			2 Commits
		
	
	
		
			v1.4.9
			...
			83d14b32d1
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 83d14b32d1 | |||
| 2bf7c9fb7d | 
| @@ -19,6 +19,12 @@ 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) | ||||
|   | ||||
| @@ -11,6 +11,8 @@ 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; | ||||
|   | ||||
							
								
								
									
										36
									
								
								src/main.cpp
									
									
									
									
									
								
							
							
						
						
									
										36
									
								
								src/main.cpp
									
									
									
									
									
								
							| @@ -39,7 +39,6 @@ void setup() { | ||||
|   setupWebserver(server); | ||||
|  | ||||
|   // Spoolman API | ||||
|   // api.cpp | ||||
|   initSpoolman(); | ||||
|  | ||||
|   // Bambu MQTT | ||||
| @@ -48,6 +47,7 @@ void setup() { | ||||
|   // NFC Reader | ||||
|   startNfc(); | ||||
|  | ||||
|   // Scale | ||||
|   start_scale(); | ||||
|  | ||||
|   // WDT initialisieren mit 10 Sekunden Timeout | ||||
| @@ -56,6 +56,9 @@ void setup() { | ||||
|  | ||||
|   // Aktuellen Task (loopTask) zum Watchdog hinzufügen | ||||
|   esp_task_wdt_add(NULL); | ||||
|  | ||||
|   // Touch Sensor | ||||
|   pinMode(TTP223_PIN, INPUT_PULLUP); | ||||
| } | ||||
|  | ||||
|  | ||||
| @@ -84,13 +87,25 @@ 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))  | ||||
|   { | ||||
| @@ -158,25 +173,6 @@ 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) | ||||
|     { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user