Compare commits
	
		
			10 Commits
		
	
	
		
			v1.3.91
			...
			9007a65fc2
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 9007a65fc2 | |||
| 2214f5f5de | |||
| 5c5846c52c | |||
| 517fa37a3d | |||
| aaa7a6ee9c | |||
| a0b8639488 | |||
| a16c05287e | |||
| ecb35a97bd | |||
| ba968611ec | |||
| 6bd11ddce3 | 
							
								
								
									
										13
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,18 @@ | |||||||
| # Changelog | # Changelog | ||||||
|  |  | ||||||
|  | ## [1.3.92] - 2025-02-24 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.92 | ||||||
|  | - remove commented-out code in setBambuSpool function | ||||||
|  | - update installation instructions and formatting in README files | ||||||
|  |  | ||||||
|  | ### Fixed | ||||||
|  | - configure CPU frequency settings in setup function only for testing | ||||||
|  | - update comment to clarify NVS reading process | ||||||
|  | - adjust weight display logic to handle cases for weight less than 2 | ||||||
|  | - update weight display logic to handle negative and specific weight cases | ||||||
|  |  | ||||||
|  |  | ||||||
| ## [1.3.91] - 2025-02-23 | ## [1.3.91] - 2025-02-23 | ||||||
| ### Added | ### Added | ||||||
| - update GitHub Actions workflow for FTP firmware upload with improved credential checks | - update GitHub Actions workflow for FTP firmware upload with improved credential checks | ||||||
|   | |||||||
							
								
								
									
										23
									
								
								README.de.md
									
									
									
									
									
								
							
							
						
						
									
										23
									
								
								README.de.md
									
									
									
									
									
								
							| @@ -71,14 +71,10 @@ Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaO | |||||||
| | OLED SCL          | 22        | | | OLED SCL          | 22        | | ||||||
| | PN532 IRQ         | 32        | | | PN532 IRQ         | 32        | | ||||||
| | PN532 RESET       | 33        | | | PN532 RESET       | 33        | | ||||||
| | PN532 SCK         | 14        | | | PN532 SDA         | 21        | | ||||||
| | PN532 MOSI        | 13        | | | PN532 SCL         | 22        | | ||||||
| | PN532 MISO        | 12        | |  | ||||||
| | PN532 CS/SS       | 15        | |  | ||||||
|  |  | ||||||
| Ich nutze die HSPI default PINs + IRQ und RESET am PN532 | **Achte darauf, dass am PN532 die DIP-Schalter auf I2C gestellt sind** | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
| ## Software-Abhängigkeiten | ## Software-Abhängigkeiten | ||||||
|  |  | ||||||
| @@ -105,21 +101,20 @@ Ich nutze die HSPI default PINs + IRQ und RESET am PN532 | |||||||
|   - PN532 NFC Modul |   - PN532 NFC Modul | ||||||
|   - Verbindungskabel |   - Verbindungskabel | ||||||
|  |  | ||||||
| ### Schritt-für-Schritt Installation | ## Schritt-für-Schritt Installation | ||||||
| ## Einfache Installation | ### Einfache Installation | ||||||
| 1. **Gehe auf https://www.filaman.app/installer.html | 1. **Gehe auf [FilaMan Installer](https://www.filaman.app/installer.html)** | ||||||
|  |  | ||||||
| 2. **Stecke dein ESP an den Rechner und klicke Connect | 2. **Stecke dein ESP an den Rechner und klicke Connect** | ||||||
|  |  | ||||||
| 3. **Wähle dein Device Port und klicke Intall | 3. **Wähle dein Device Port und klicke Intall** | ||||||
|  |  | ||||||
| 4. **Ersteinrichtung:** | 4. **Ersteinrichtung:** | ||||||
|     - Mit dem "FilaMan" WLAN-Zugangspunkt verbinden. |     - Mit dem "FilaMan" WLAN-Zugangspunkt verbinden. | ||||||
|     - WLAN-Einstellungen über das Konfigurationsportal vornehmen. |     - WLAN-Einstellungen über das Konfigurationsportal vornehmen. | ||||||
|     - Weboberfläche unter `http://filaman.local` oder der IP-Adresse aufrufen. |     - Weboberfläche unter `http://filaman.local` oder der IP-Adresse aufrufen. | ||||||
|  |  | ||||||
| ## Compile by yourself | ### Compile by yourself | ||||||
|  |  | ||||||
| 1. **Repository klonen:** | 1. **Repository klonen:** | ||||||
|     ```bash |     ```bash | ||||||
|     git clone https://github.com/ManuelW77/Filaman.git |     git clone https://github.com/ManuelW77/Filaman.git | ||||||
|   | |||||||
							
								
								
									
										26
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										26
									
								
								README.md
									
									
									
									
									
								
							| @@ -75,14 +75,10 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z | |||||||
| | OLED SCL          | 22        | | | OLED SCL          | 22        | | ||||||
| | PN532 IRQ         | 32        | | | PN532 IRQ         | 32        | | ||||||
| | PN532 RESET       | 33        | | | PN532 RESET       | 33        | | ||||||
| | PN532 SCK  	    | 14        | | | PN532 SDA         | 21        | | ||||||
| | PN532 MOSI    	| 13        | | | PN532 SCL         | 22        | | ||||||
| | PN532 MISO       	| 12        | |  | ||||||
| | PN532 CS/SS       | 15        | |  | ||||||
|  |  | ||||||
| I use the HSPI default PINs + IRQ and RESET at the PN532 | **Make sure that the DIP switches on the PN532 are set to I2C** | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
| ## Software Dependencies | ## Software Dependencies | ||||||
|  |  | ||||||
| @@ -95,9 +91,9 @@ I use the HSPI default PINs + IRQ and RESET at the PN532 | |||||||
| - `Adafruit_SSD1306`: OLED display control | - `Adafruit_SSD1306`: OLED display control | ||||||
| - `HX711`: Load cell communication | - `HX711`: Load cell communication | ||||||
|  |  | ||||||
| ## Installation | ### Installation | ||||||
|  |  | ||||||
| ### Prerequisites | ## Prerequisites | ||||||
| - **Software:** | - **Software:** | ||||||
|   - [PlatformIO](https://platformio.org/) in VS Code |   - [PlatformIO](https://platformio.org/) in VS Code | ||||||
|   - [Spoolman](https://github.com/Donkie/Spoolman) instance |   - [Spoolman](https://github.com/Donkie/Spoolman) instance | ||||||
| @@ -109,20 +105,20 @@ I use the HSPI default PINs + IRQ and RESET at the PN532 | |||||||
|   - PN532 NFC Module |   - PN532 NFC Module | ||||||
|   - Connecting wires |   - Connecting wires | ||||||
|  |  | ||||||
| ### Step-by-Step Installation | ## Step-by-Step Installation | ||||||
| ## Easy Installation | ### Easy Installation | ||||||
| 1. **Go to https://www.filaman.app/installer.html | 1. **Go to [FilaMan Installer](https://www.filaman.app/installer.html)** | ||||||
|  |  | ||||||
| 2. **Plug you device in and push Connect button | 2. **Plug you device in and push Connect button** | ||||||
|  |  | ||||||
| 3. **Select your Device Port and push Intall | 3. **Select your Device Port and push Intall** | ||||||
|  |  | ||||||
| 4. **Initial Setup:** | 4. **Initial Setup:** | ||||||
|     - Connect to the "FilaMan" WiFi access point. |     - Connect to the "FilaMan" WiFi access point. | ||||||
|     - Configure WiFi settings through the captive portal. |     - Configure WiFi settings through the captive portal. | ||||||
|     - Access the web interface at `http://filaman.local` or the IP address. |     - Access the web interface at `http://filaman.local` or the IP address. | ||||||
|  |  | ||||||
| ## Compile by yourself | ### Compile by yourself | ||||||
| 1. **Clone the Repository:** | 1. **Clone the Repository:** | ||||||
|     ```bash |     ```bash | ||||||
|     git clone https://github.com/ManuelW77/Filaman.git |     git clone https://github.com/ManuelW77/Filaman.git | ||||||
|   | |||||||
| @@ -9,7 +9,7 @@ | |||||||
| ; https://docs.platformio.org/page/projectconf.html | ; https://docs.platformio.org/page/projectconf.html | ||||||
|  |  | ||||||
| [common] | [common] | ||||||
| version = "1.3.91" | version = "1.3.92" | ||||||
| ## | ## | ||||||
| [env:esp32dev] | [env:esp32dev] | ||||||
| platform = espressif32 | platform = espressif32 | ||||||
|   | |||||||
| @@ -218,37 +218,6 @@ bool setBambuSpool(String payload) { | |||||||
|         doc.clear(); |         doc.clear(); | ||||||
|         yield(); |         yield(); | ||||||
|     } |     } | ||||||
| /* |  | ||||||
|     if (setting_id != "") { |  | ||||||
|         yield(); |  | ||||||
|         doc["print"]["sequence_id"] = 0; |  | ||||||
|         doc["print"]["command"] = "ams_filament_setting"; |  | ||||||
|         doc["print"]["nozzle_temp_min"] = minTemp; |  | ||||||
|         doc["print"]["nozzle_temp_max"] = maxTemp; |  | ||||||
|         doc["print"]["setting_id"] = setting_id; |  | ||||||
|         doc["print"]["tray_color"] = color.length() == 8 ? color : color+"FF"; |  | ||||||
|         doc["print"]["ams_id"] = amsId < 200 ? amsId : 255; |  | ||||||
|         doc["print"]["tray_id"] = trayId < 200 ? trayId : 254; |  | ||||||
|         doc["print"]["tray_info_idx"] = tray_info_idx; |  | ||||||
|         doc["print"]["tray_type"] = type; |  | ||||||
|  |  | ||||||
|         // Serialize the JSON |  | ||||||
|         String output; |  | ||||||
|         serializeJson(doc, output); |  | ||||||
|  |  | ||||||
|         if (sendMqttMessage(output)) { |  | ||||||
|             Serial.println("Filament Setting successfully set"); |  | ||||||
|         } |  | ||||||
|         else |  | ||||||
|         { |  | ||||||
|             Serial.println("Failed to set Filament setting"); |  | ||||||
|             return false; |  | ||||||
|         } |  | ||||||
|  |  | ||||||
|         doc.clear(); |  | ||||||
|         yield(); |  | ||||||
|     } |  | ||||||
| */ |  | ||||||
|  |  | ||||||
|     return true; |     return true; | ||||||
| } | } | ||||||
|   | |||||||
| @@ -122,7 +122,7 @@ void loop() { | |||||||
|   // Ausgabe der Waage auf Display |   // Ausgabe der Waage auf Display | ||||||
|   if (pauseMainTask == 0 && weight != lastWeight && hasReadRfidTag == 0) |   if (pauseMainTask == 0 && weight != lastWeight && hasReadRfidTag == 0) | ||||||
|   { |   { | ||||||
|     (weight < 0) ? oledShowMessage("!! -1") : oledShowWeight(weight); |     (weight < 2) ? oledShowMessage("0") : oledShowWeight(weight); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|  |  | ||||||
|   | |||||||
| @@ -55,7 +55,7 @@ uint8_t start_scale() { | |||||||
|   Serial.println("Prüfe Calibration Value"); |   Serial.println("Prüfe Calibration Value"); | ||||||
|   long calibrationValue; |   long calibrationValue; | ||||||
|  |  | ||||||
|   // NVS |   // NVS lesen | ||||||
|   preferences.begin(NVS_NAMESPACE, true); // true = readonly |   preferences.begin(NVS_NAMESPACE, true); // true = readonly | ||||||
|   calibrationValue = preferences.getLong(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue); |   calibrationValue = preferences.getLong(NVS_KEY_CALIBRATION, defaultScaleCalibrationValue); | ||||||
|   preferences.end(); |   preferences.end(); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user