Compare commits
	
		
			9 Commits
		
	
	
		
			v2.0.2-bet
			...
			v2.0.4-bet
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| f9aa7f2e6b | |||
| f810bc5352 | |||
| 043c2d4fa8 | |||
| f5a1debd7d | |||
| 37309da185 | |||
| bcb7c039e2 | |||
| 98ec5b9846 | |||
| f0d1692ae1 | |||
| 10587276c2 | 
							
								
								
									
										40
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										40
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,45 @@ | ||||
| # Changelog | ||||
|  | ||||
| ## [2.0.4-beta1] - 2025-09-03 | ||||
| ### Changed | ||||
| - improve auto tare logic and reset conditions in scale handling | ||||
|  | ||||
|  | ||||
| ## [2.0.4] - 2025-09-02 | ||||
| ### Changed | ||||
| - filter out automatic release documentation commits in changelog categorization | ||||
| - disable auto tare and weight filter reset in scale loop | ||||
|  | ||||
|  | ||||
| ## [2.0.3] - 2025-09-02 | ||||
| ### Added | ||||
| - add updateOctoSpoolId for OctoPrint integration and change autoSetToBambuSpoolId type to uint16_t | ||||
|  | ||||
| ### Changed | ||||
| - update platformio.ini for version v2.0.3 | ||||
| - update changelog and header for version v2.0.2-beta6 | ||||
| - update platformio.ini for beta version v2.0.2-beta6 | ||||
| - update changelog and header for version v2.0.2-beta5 | ||||
| - update platformio.ini for beta version v2.0.2-beta5 | ||||
| - update changelog and header for version v2.0.2-beta4 | ||||
| - update platformio.ini for beta version v2.0.2-beta4 | ||||
| - update changelog and header for version v2.0.2-beta3 | ||||
| - update platformio.ini for beta version v2.0.2-beta3 | ||||
| - update changelog and header for version v2.0.2-beta2 | ||||
| - update platformio.ini for beta version v2.0.2-beta2 | ||||
| - update changelog and header for version v2.0.2-beta1 | ||||
| - update platformio.ini for beta version v2.0.2-beta1 | ||||
|  | ||||
| ### Fixed | ||||
| - set scale tare request to true in setup function | ||||
| - correct assignment operator in scale tare request handling | ||||
| - correct tare scale request handling in tareScale function | ||||
| - reset weight filter after tare scale operation | ||||
| - correct tare scale function to set scaleTareRequest flag | ||||
| - reset weight counter logic and update spool ID in loop function | ||||
| - reduce delay in start_scale function and reset weight after tare | ||||
|  | ||||
|  | ||||
| ## [2.0.2-beta6] - 2025-09-02 | ||||
| ### Added | ||||
| - add updateOctoSpoolId for OctoPrint integration and change autoSetToBambuSpoolId type to uint16_t | ||||
|   | ||||
| @@ -9,7 +9,7 @@ | ||||
| ; https://docs.platformio.org/page/projectconf.html | ||||
|  | ||||
| [common] | ||||
| version = "2.0.2-beta6" | ||||
| version = "2.0.4-beta1" | ||||
| to_old_version = "1.5.10" | ||||
|  | ||||
| ## | ||||
|   | ||||
| @@ -42,6 +42,12 @@ def categorize_commit(commit_msg): | ||||
|     """Categorize commit messages based on conventional commits""" | ||||
|     lower_msg = commit_msg.lower() | ||||
|      | ||||
|     # Filter out automatic release documentation commits | ||||
|     if ('docs:' in lower_msg and  | ||||
|         ('update changelog and header for version' in lower_msg or  | ||||
|          'update platformio.ini for' in lower_msg)): | ||||
|         return None  # Skip these commits | ||||
|      | ||||
|     # Check for breaking changes first | ||||
|     if ('!' in commit_msg and any(x in lower_msg for x in ['feat!', 'fix!', 'chore!', 'refactor!'])) or \ | ||||
|        'breaking change' in lower_msg or 'breaking:' in lower_msg: | ||||
| @@ -77,11 +83,12 @@ def get_changes_from_git(): | ||||
|         for commit in commits: | ||||
|             if commit: | ||||
|                 category = categorize_commit(commit) | ||||
|                 # Clean up commit message | ||||
|                 clean_msg = re.sub(r'^(feat|fix|chore|docs|style|refactor|perf|test)(\(.*\))?!?:', '', commit).strip() | ||||
|                 # Remove BREAKING CHANGE prefix if present | ||||
|                 clean_msg = re.sub(r'^breaking change:\s*', '', clean_msg, flags=re.IGNORECASE).strip() | ||||
|                 changes[category].append(clean_msg) | ||||
|                 if category is not None:  # Skip commits that return None (filtered out) | ||||
|                     # Clean up commit message | ||||
|                     clean_msg = re.sub(r'^(feat|fix|chore|docs|style|refactor|perf|test)(\(.*\))?!?:', '', commit).strip() | ||||
|                     # Remove BREAKING CHANGE prefix if present | ||||
|                     clean_msg = re.sub(r'^breaking change:\s*', '', clean_msg, flags=re.IGNORECASE).strip() | ||||
|                     changes[category].append(clean_msg) | ||||
|                  | ||||
|     except subprocess.CalledProcessError: | ||||
|         print("Error: Failed to get git commits") | ||||
|   | ||||
							
								
								
									
										11
									
								
								src/main.cpp
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								src/main.cpp
									
									
									
									
									
								
							| @@ -197,17 +197,6 @@ void loop() { | ||||
|     { | ||||
|       lastWeightReadTime = currentMillis; | ||||
|  | ||||
|       // Prüfen ob die Waage korrekt genullt ist | ||||
|       // Abweichung von 2g ignorieren | ||||
|       if (autoTare && (weight > 2 && weight < 7) || weight < -2) | ||||
|       { | ||||
|         scale_tare_counter++; | ||||
|       } | ||||
|       else | ||||
|       { | ||||
|         scale_tare_counter = 0; | ||||
|       } | ||||
|  | ||||
|       // Prüfen ob das Gewicht gleich bleibt und dann senden | ||||
|       if (abs(weight - lastWeight) <= 2 && weight > 5) | ||||
|       { | ||||
|   | ||||
| @@ -161,19 +161,21 @@ void scale_loop(void * parameter) { | ||||
|      | ||||
|     // Only measure at defined intervals to reduce noise | ||||
|     if (currentTime - lastMeasurementTime >= MEASUREMENT_INTERVAL_MS) { | ||||
|       // Prüfen ob die Waage korrekt genullt ist | ||||
|       // Abweichung von 2g ignorieren | ||||
|       if (autoTare && (weight > 2 && weight < 7) || weight < -2) | ||||
|       { | ||||
|         scale_tare_counter++; | ||||
|       } | ||||
|       else | ||||
|       { | ||||
|         scale_tare_counter = 0; | ||||
|       } | ||||
|  | ||||
|       if (scale.is_ready())  | ||||
|       { | ||||
|         // Waage automatisch Taren, wenn zu lange Abweichung | ||||
|         if (autoTare && scale_tare_counter >= 5)  | ||||
|         { | ||||
|           Serial.println("Auto Tare scale"); | ||||
|           scale.tare(); | ||||
|           resetWeightFilter(); // Reset filter after auto tare | ||||
|           scale_tare_counter = 0; | ||||
|         } | ||||
|  | ||||
|         // Waage manuell Taren | ||||
|         if (scaleTareRequest == true)  | ||||
|         if (scaleTareRequest == true || (autoTare && scale_tare_counter >= 5))  | ||||
|         { | ||||
|           Serial.println("Re-Tare scale"); | ||||
|           oledShowMessage("TARE Scale"); | ||||
| @@ -183,6 +185,8 @@ void scale_loop(void * parameter) { | ||||
|           vTaskDelay(pdMS_TO_TICKS(1000)); | ||||
|           oledShowWeight(0); | ||||
|           scaleTareRequest = false; | ||||
|           scale_tare_counter = 0; | ||||
|           weight = 0; // Reset global weight variable after tare | ||||
|         } | ||||
|  | ||||
|         // Get raw weight reading | ||||
|   | ||||
		Reference in New Issue
	
	Block a user