chore: remove deprecated release script

.github/workflows/release.yml

@@ -0,0 +1,33 @@
+name: Create Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    
+    - name: Get version from tag
+      id: get_version
+      run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
+      
+    - name: Read CHANGELOG.md
+      id: changelog
+      run: |
+        CHANGELOG=$(awk "/## \[${{ steps.get_version.outputs.VERSION }}\]/{p=1;print;next} /## \[/{p=0} p" CHANGELOG.md)
+        echo "::set-output name=CHANGES::$CHANGELOG"
+      
+    - name: Create Release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.ref }}
+        release_name: Release ${{ steps.get_version.outputs.VERSION }}
+        body: ${{ steps.changelog.outputs.CHANGES }}
+        draft: false
+        prerelease: false

CHANGELOG.md

@@ -0,0 +1,14 @@
+# Changelog
+
+## [1.0.2] - 2025-02-16
+### Added
+- Feature 1
+- Feature 2
+
+### Changed
+- Change 1
+- Change 2
+
+### Fixed
+- Fix 1
+- Fix 2

create_combined_binary.py

@@ -1,68 +0,0 @@
-Import("env")
-from os.path import join, exists
-import shutil
-import os
-
-def combine_binaries(source, target, env):
-    # Define paths for binary files
-    build_dir = env.subst("$BUILD_DIR")
-    project_dir = env.subst("$PROJECT_DIR")
-    combined_bin = join(build_dir, "combined.bin")
-    firmware_bin = join(build_dir, "firmware.bin")
-    spiffs_bin = join(build_dir, "spiffs.bin")
-    
-    # Define target firmware path
-    firmware_dir = join(project_dir, "firmware")
-    target_firmware = join(firmware_dir, "filaman.bin")
-
-    # Build firmware if it doesn't exist
-    if not exists(firmware_bin):
-        print("Building firmware...")
-        env.Execute("pio run -t buildprog")
-
-    # Build SPIFFS if it doesn't exist
-    if not exists(spiffs_bin):
-        print("Building SPIFFS image...")
-        env.Execute("pio run -t buildfs")
-
-    # Check if files exist after build attempts
-    if not exists(firmware_bin):
-        raise Exception("Firmware binary not found at: " + firmware_bin)
-    
-    if not exists(spiffs_bin):
-        raise Exception("SPIFFS binary not found at: " + spiffs_bin)
-
-    print("Found firmware at:", firmware_bin)
-    print("Found SPIFFS at:", spiffs_bin)
-
-    # Command to merge firmware and SPIFFS
-    merge_command = (
-        "esptool.py --chip esp32 merge_bin -o {combined_bin} "
-        "--flash_mode dio --flash_freq 40m --flash_size 4MB "
-        "0x10000 {firmware_bin} 0x310000 {spiffs_bin}"
-    ).format(
-        combined_bin=combined_bin,
-        firmware_bin=firmware_bin,
-        spiffs_bin=spiffs_bin
-    )
-    
-    print("Executing merge command:", merge_command)
-    env.Execute(merge_command)
-
-    # Create firmware directory if it doesn't exist
-    if not exists(firmware_dir):
-        os.makedirs(firmware_dir)
-
-    # Move combined binary to target location
-    print(f"Moving combined binary to {target_firmware}")
-    shutil.copy2(combined_bin, target_firmware)
-    print(f"Binary successfully moved to {target_firmware}")
-
-# Register the custom target with explicit dependencies
-env.AddCustomTarget(
-    name="combine_binaries",
-    dependencies=["buildfs", "buildprog"],
-    actions=[combine_binaries],
-    title="Combine Firmware & SPIFFS",
-    description="Combines firmware.bin and spiffs.bin into a single binary"
-)

html/header.html

@@ -12,7 +12,7 @@
         <div style="display: flex; align-items: center; gap: 2rem;">
             <img src="/logo.png" alt="FilaMan Logo" class="logo">
             <div class="logo-text">
-                <h1>FilaMan</h1>
+                <h1>FilaMan<span class="version">v1.0.2</span></h1>
                 <h4>Filament Management Tool</h4>
             </div>
         </div>
@@ -32,3 +32,4 @@
             <div class="ram-status" id="ramStatus"></div>
         </div>
     </div>
+

html/index.html

@@ -1,4 +1,39 @@
-{{header}}
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>FilaMan - Filament Management Tool</title>
+    <link rel="icon" type="image/png" href="/favicon.ico">
+    <link rel="stylesheet" href="style.css">
+</head>
+<body>
+    <div class="navbar">
+        <div style="display: flex; align-items: center; gap: 2rem;">
+            <img src="/logo.png" alt="FilaMan Logo" class="logo">
+            <div class="logo-text">
+                <h1>FilaMan<span class="version">v1.0.2</span></h1>
+                <h4>Filament Management Tool</h4>
+            </div>
+        </div>
+        <nav style="display: flex; gap: 1rem;">
+            <a href="/">Start</a>
+            <a href="/waage">Scale</a>
+            <a href="/spoolman">Spoolman/Bambu</a>
+            <a href="/about">About</a>
+        </nav>
+        <div class="status-container">
+            <div class="status-item">
+                <span class="status-dot" id="bambuDot"></span>B
+            </div>
+            <div class="status-item">
+                <span class="status-dot" id="spoolmanDot"></span>S
+            </div>
+            <div class="ram-status" id="ramStatus"></div>
+        </div>
+    </div>
+
+
 
     <div class="container">
         <h1>FilaMan</h1>

html/rfid.html

@@ -1,4 +1,39 @@
-{{header}}
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>FilaMan - Filament Management Tool</title>
+    <link rel="icon" type="image/png" href="/favicon.ico">
+    <link rel="stylesheet" href="style.css">
+</head>
+<body>
+    <div class="navbar">
+        <div style="display: flex; align-items: center; gap: 2rem;">
+            <img src="/logo.png" alt="FilaMan Logo" class="logo">
+            <div class="logo-text">
+                <h1>FilaMan<span class="version">v1.0.2</span></h1>
+                <h4>Filament Management Tool</h4>
+            </div>
+        </div>
+        <nav style="display: flex; gap: 1rem;">
+            <a href="/">Start</a>
+            <a href="/waage">Scale</a>
+            <a href="/spoolman">Spoolman/Bambu</a>
+            <a href="/about">About</a>
+        </nav>
+        <div class="status-container">
+            <div class="status-item">
+                <span class="status-dot" id="bambuDot"></span>B
+            </div>
+            <div class="status-item">
+                <span class="status-dot" id="spoolmanDot"></span>S
+            </div>
+            <div class="ram-status" id="ramStatus"></div>
+        </div>
+    </div>
+
+
 <div class="connection-status hidden">
     <div class="spinner"></div>
     <span>Connection lost. Trying to reconnect...</span>

html/rfid.js

@@ -112,9 +112,39 @@ function initWebSocket() {
                 
                 if (bambuDot) {
                     bambuDot.className = 'status-dot ' + (data.bambu_connected ? 'online' : 'offline');
+                    // Add click handler only when offline
+                    if (!data.bambu_connected) {
+                        bambuDot.style.cursor = 'pointer';
+                        bambuDot.onclick = function() {
+                            if (socket && socket.readyState === WebSocket.OPEN) {
+                                socket.send(JSON.stringify({
+                                    type: 'reconnect',
+                                    payload: 'bambu'
+                                }));
+                            }
+                        };
+                    } else {
+                        bambuDot.style.cursor = 'default';
+                        bambuDot.onclick = null;
+                    }
                 }
                 if (spoolmanDot) {
                     spoolmanDot.className = 'status-dot ' + (data.spoolman_connected ? 'online' : 'offline');
+                    // Add click handler only when offline
+                    if (!data.spoolman_connected) {
+                        spoolmanDot.style.cursor = 'pointer';
+                        spoolmanDot.onclick = function() {
+                            if (socket && socket.readyState === WebSocket.OPEN) {
+                                socket.send(JSON.stringify({
+                                    type: 'reconnect',
+                                    payload: 'spoolman'
+                                }));
+                            }
+                        };
+                    } else {
+                        spoolmanDot.style.cursor = 'default';
+                        spoolmanDot.onclick = null;
+                    }
                 }
                 if (ramStatus) {
                     ramStatus.textContent = `${data.freeHeap}k`;
@@ -209,16 +239,6 @@ function updateNfcInfo() {
         `${spool.id} | ${spool.filament.name} (${spool.filament.material})` === selectedText
     );
 
-    if (selectedSpool && selectedSpool.extra.nfc_id) {
-        nfcInfo.textContent = "NFC Tag assigned";
-        nfcInfo.classList.add("nfc-success");
-        nfcInfo.classList.remove("nfc-error");
-    } else {
-        nfcInfo.textContent = "No NFC-Tag assigned";
-        nfcInfo.classList.add("nfc-error");
-        nfcInfo.classList.remove("nfc-success");
-    }
-
     if (selectedSpool) {
         writeButton.classList.remove("hidden");
     } else {
@@ -236,7 +256,7 @@ function displayAmsData(amsData) {
         
         const trayHTML = ams.tray.map(tray => {
             // Prüfe ob überhaupt Daten vorhanden sind
-            const relevantFields = ['tray_type', 'tray_sub_brands', 'tray_info_idx', 'setting_id'];
+            const relevantFields = ['tray_type', 'tray_sub_brands', 'tray_info_idx', 'setting_id', 'cali_idx'];
             const hasAnyContent = relevantFields.some(field => 
                 tray[field] !== null && 
                 tray[field] !== undefined && 
@@ -293,7 +313,8 @@ function displayAmsData(amsData) {
             const trayProperties = [
                 { key: 'tray_sub_brands', label: 'Sub Brands' },
                 { key: 'tray_info_idx', label: 'Filament IDX' },
-                { key: 'setting_id', label: 'Setting ID' }
+                { key: 'setting_id', label: 'Setting ID' },
+                { key: 'cali_idx', label: 'Calibration IDX' }
             ];
 
             // Nur gültige Felder anzeigen
@@ -304,7 +325,13 @@ function displayAmsData(amsData) {
                     tray[prop.key] !== '' &&
                     tray[prop.key] !== 'null'
                 )
-                .map(prop => `<p>${prop.label}: ${tray[prop.key]}</p>`)
+                .map(prop => {
+                    // Spezielle Behandlung für setting_id
+                    if (prop.key === 'cali_idx' && tray[prop.key] === '-1') {
+                        return `<p>${prop.label}: not calibrated</p>`;
+                    }
+                    return `<p>${prop.label}: ${tray[prop.key]}</p>`;
+                })
                 .join('');
 
             // Temperaturen nur anzeigen, wenn beide nicht 0 sind
@@ -417,12 +444,22 @@ function handleSpoolIn(amsId, trayId) {
             nozzle_temp_max: parseInt(maxTemp),
             type: selectedSpool.filament.material,
             brand: selectedSpool.filament.vendor.name,
-            tray_info_idx: selectedSpool.filament.extra.bambu_idx.replace(/['"]+/g, '').trim()
+            tray_info_idx: selectedSpool.filament.extra.bambu_idx.replace(/['"]+/g, '').trim(),
+            cali_idx: "-1"  // Default-Wert setzen
         }
     };
 
-    // Debug logging
+    // Prüfe, ob der Key cali_idx vorhanden ist und setze ihn
-    console.log("Sende WebSocket Nachricht:", payload);
+    if (selectedSpool.filament.extra.bambu_cali_id) {
+        payload.payload.cali_idx = selectedSpool.filament.extra.bambu_cali_id.replace(/['"]+/g, '').trim();
+    }
+
+    // Prüfe, ob der Key bambu_setting_id vorhanden ist
+    if (selectedSpool.filament.extra.bambu_setting_id) {
+        payload.payload.bambu_setting_id = selectedSpool.filament.extra.bambu_setting_id.replace(/['"]+/g, '').trim();
+    }
+
+    console.log("Spool-In Payload:", payload);
 
     try {
         socket.send(JSON.stringify(payload));
@@ -479,7 +516,7 @@ function updateNfcData(data) {
             }
 
         } else {
-            nfcDataDiv.innerHTML = '<div style="margin-top: 10px;"></div>';
+            nfcDataDiv.innerHTML = '<div class="info-message-inner" style="margin-top: 10px;"></div>';
         }
         nfcStatusContainer.appendChild(nfcDataDiv);
         return;

html/spoolman.html

@@ -1,4 +1,39 @@
-{{header}}
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>FilaMan - Filament Management Tool</title>
+    <link rel="icon" type="image/png" href="/favicon.ico">
+    <link rel="stylesheet" href="style.css">
+</head>
+<body>
+    <div class="navbar">
+        <div style="display: flex; align-items: center; gap: 2rem;">
+            <img src="/logo.png" alt="FilaMan Logo" class="logo">
+            <div class="logo-text">
+                <h1>FilaMan<span class="version">v1.0.2</span></h1>
+                <h4>Filament Management Tool</h4>
+            </div>
+        </div>
+        <nav style="display: flex; gap: 1rem;">
+            <a href="/">Start</a>
+            <a href="/waage">Scale</a>
+            <a href="/spoolman">Spoolman/Bambu</a>
+            <a href="/about">About</a>
+        </nav>
+        <div class="status-container">
+            <div class="status-item">
+                <span class="status-dot" id="bambuDot"></span>B
+            </div>
+            <div class="status-item">
+                <span class="status-dot" id="spoolmanDot"></span>S
+            </div>
+            <div class="ram-status" id="ramStatus"></div>
+        </div>
+    </div>
+
+
     <script>
         window.onload = function() {
             if (spoolmanUrl && spoolmanUrl.trim() !== "") {

html/spoolman.js

@@ -86,6 +86,7 @@ function populateVendorDropdown(data, selectedSmId = null) {
     });
 
     // Nach der Schleife: Formatierung der Gesamtlänge
+    console.log("Total Lenght: ", totalLength);
     const formattedLength = totalLength > 1000 
         ? (totalLength / 1000).toFixed(2) + " km" 
         : totalLength.toFixed(2) + " m";

html/style.css

@@ -133,6 +133,15 @@ body {
     background-color: #dc2626;
 }
 
+.status-dot.offline {
+    cursor: pointer;
+}
+
+.status-dot.offline:hover {
+    opacity: 0.8;
+    transform: scale(1.1);
+}
+
 .ram-status { 
     color: var(--inner-text-color);
     font-size: 0.9em;
@@ -471,11 +480,15 @@ a:hover {
 
 .info-message {
     padding: 10px;
-    background-color: #fff3f3;
+    background-color: var(--header-bg);
     border-radius: 4px;
     border-left: 4px solid #39d82e;
 }
 
+.info-message-inner {
+    background-color: var(--header-bg) !important;
+}
+
 .nfc-header {
     display: grid;
     grid-template-columns: 40px 1fr 40px;
@@ -994,3 +1007,10 @@ input[type="submit"]:disabled,
 .spool-button:hover {
     opacity: 0.8;
 }
+
+.version {
+    font-size: 0.4em;
+    color: #000;
+    vertical-align: middle;
+    margin-left: 0.5rem;
+}

html/waage.html

@@ -1,4 +1,39 @@
-{{header}}
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>FilaMan - Filament Management Tool</title>
+    <link rel="icon" type="image/png" href="/favicon.ico">
+    <link rel="stylesheet" href="style.css">
+</head>
+<body>
+    <div class="navbar">
+        <div style="display: flex; align-items: center; gap: 2rem;">
+            <img src="/logo.png" alt="FilaMan Logo" class="logo">
+            <div class="logo-text">
+                <h1>FilaMan<span class="version">v1.0.2</span></h1>
+                <h4>Filament Management Tool</h4>
+            </div>
+        </div>
+        <nav style="display: flex; gap: 1rem;">
+            <a href="/">Start</a>
+            <a href="/waage">Scale</a>
+            <a href="/spoolman">Spoolman/Bambu</a>
+            <a href="/about">About</a>
+        </nav>
+        <div class="status-container">
+            <div class="status-item">
+                <span class="status-dot" id="bambuDot"></span>B
+            </div>
+            <div class="status-item">
+                <span class="status-dot" id="spoolmanDot"></span>S
+            </div>
+            <div class="ram-status" id="ramStatus"></div>
+        </div>
+    </div>
+
+
     <div class="content">
         <h1>Scale Configuration Page</h1>
         

html/wifi.html

@@ -1,4 +1,39 @@
-{{header}}
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>FilaMan - Filament Management Tool</title>
+    <link rel="icon" type="image/png" href="/favicon.ico">
+    <link rel="stylesheet" href="style.css">
+</head>
+<body>
+    <div class="navbar">
+        <div style="display: flex; align-items: center; gap: 2rem;">
+            <img src="/logo.png" alt="FilaMan Logo" class="logo">
+            <div class="logo-text">
+                <h1>FilaMan<span class="version">v1.0.2</span></h1>
+                <h4>Filament Management Tool</h4>
+            </div>
+        </div>
+        <nav style="display: flex; gap: 1rem;">
+            <a href="/">Start</a>
+            <a href="/waage">Scale</a>
+            <a href="/spoolman">Spoolman/Bambu</a>
+            <a href="/about">About</a>
+        </nav>
+        <div class="status-container">
+            <div class="status-item">
+                <span class="status-dot" id="bambuDot"></span>B
+            </div>
+            <div class="status-item">
+                <span class="status-dot" id="spoolmanDot"></span>S
+            </div>
+            <div class="ram-status" id="ramStatus"></div>
+        </div>
+    </div>
+
+
     <div class="content">
         <h1>WiFi Configuration Page</h1>
         <form action="/setToken" method="post">

partitions.csv

@@ -1,6 +0,0 @@
-# Name,   Type, SubType, Offset,  Size, Flags
-nvs,      data, nvs,     0x9000,  0x4000,
-otadata,  data, ota,     0xd000,  0x2000,
-app0,     app,  ota_0,   0x10000, 0x180000,
-app1,     app,  ota_1,   0x190000,0x180000,
-spiffs,   data, spiffs,  0x310000,0x0F0000,

platformio.ini

@@ -8,6 +8,9 @@
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html
 
+[common]
+version = "1.0.2"
+
 [env:esp32dev]
 platform = espressif32
 board = esp32dev
@@ -27,10 +30,7 @@ lib_deps =
     digitaldragon/SSLClient @ ^1.3.2
     
 ; Enable SPIFFS upload
-board_build.partitions = partitions.csv
 board_build.filesystem = spiffs
-board_upload.flash_size = 4MB
-board_build.spiffs_create = yes
 board_build.spiffs.partition = 2M
 board_build.spiffs.upload_size = 2M
 
@@ -40,18 +40,12 @@ build_flags =
     -fdata-sections
     -DNDEBUG
     -mtext-section-literals
+    '-D VERSION="${common.version}"'
 
 extra_scripts = 
-    pre:gzip_files.py
+    pre:scripts/combine_html.py
-    pre:extra_script.py
+    pre:scripts/pre_build.py
-    post:$PROJECT_DIR/create_combined_binary.py
+    pre:scripts/pre_spiffs.py
-
+    pre:scripts/gzip_files.py
-# Add custom target for combining binaries
+    pre:scripts/extra_script.py
-custom_targets = 
+    pre:scripts/update_changelog.py
-    combine_binaries
-
-# Define the build sequence
-targets = 
-    buildfs     # Build SPIFFS image
-    buildprog   # Build firmware
-    #combine_binaries  # Combine both binaries

scripts/combine_html.py

@@ -0,0 +1,31 @@
+Import("env")
+import os
+
+def combine_html_files(source, target, env):
+    html_dir = "./html"
+    header_file = os.path.join(html_dir, "header.html")
+    
+    # Read header content
+    with open(header_file, 'r') as f:
+        header_content = f.read()
+    
+    # Process all HTML files except header.html
+    for filename in os.listdir(html_dir):
+        if filename.endswith('.html') and filename != 'header.html':
+            file_path = os.path.join(html_dir, filename)
+            
+            # Read content
+            with open(file_path, 'r') as f:
+                content = f.read()
+            
+            # Replace placeholder with header content
+            if '{{header}}' in content:
+                new_content = content.replace('{{header}}', header_content)
+                
+                # Write back combined content
+                with open(file_path, 'w') as f:
+                    f.write(new_content)
+                print(f"Combined header with {filename}")
+
+# Register the script to run before building SPIFFS
+env.AddPreAction("buildfs", combine_html_files)

scripts/gzip_files.py

@@ -14,7 +14,7 @@ def copy_file(input_file, output_file):
 
 def should_compress(file):
     # Komprimiere nur bestimmte Dateitypen
-    return file.endswith(('.js', '.png', '.css'))
+    return file.endswith(('.js', '.png', '.css', '.html'))
 
 def main(source_dir, target_dir):
     for root, dirs, files in os.walk(source_dir):

scripts/pre_build.py

@@ -0,0 +1,25 @@
+Import("env")
+import os
+
+def replace_version(source, target, env):
+    # Get version from common section
+    version = env.GetProjectConfig().get("common", "version").strip('"')
+    header_file = "./html/header.html"
+    
+    with open(header_file, 'r') as file:
+        content = file.read()
+    
+    # Replace version in header.html using string manipulation instead of regex
+    search = '<h1>FilaMan<span class="version">v'
+    end = '</span>'
+    start_pos = content.find(search)
+    if start_pos != -1:
+        start_pos += len(search)
+        end_pos = content.find(end, start_pos)
+        if end_pos != -1:
+            content = content[:start_pos] + version + content[end_pos:]
+    
+    with open(header_file, 'w') as file:
+        file.write(content)
+
+env.AddPreAction("buildfs", replace_version)

scripts/pre_spiffs.py

@@ -0,0 +1,7 @@
+Import("env")
+
+# Wiederverwendung der replace_version Funktion
+exec(open("./scripts/pre_build.py").read())
+
+# Bind to SPIFFS build
+env.AddPreAction("buildfs", replace_version)

scripts/update_changelog.py

@@ -0,0 +1,36 @@
+import os
+import re
+from datetime import datetime
+
+def get_version():
+    with open('../platformio.ini', 'r') as f:
+        content = f.read()
+        version_match = re.search(r'version\s*=\s*"([^"]+)"', content)
+        return version_match.group(1) if version_match else None
+
+def update_changelog():
+    version = get_version()
+    today = datetime.now().strftime('%Y-%m-%d')
+    
+    changelog_template = f"""## [{version}] - {today}
+### Added
+- 
+
+### Changed
+-
+
+### Fixed
+-
+"""
+    
+    with open('../CHANGELOG.md', 'r') as f:
+        content = f.read()
+    
+    # Insert new version template after the header
+    updated_content = content.replace("# Changelog\n", f"# Changelog\n\n{changelog_template}")
+    
+    with open('../CHANGELOG.md', 'w') as f:
+        f.write(updated_content)
+
+if __name__ == "__main__":
+    update_changelog()

src/api.cpp

@@ -279,6 +279,7 @@ bool checkSpoolmanExtraFields() {
         "price_meter",
         "price_gramm",
         "bambu_setting_id",
+        "bambu_cali_id",
         "bambu_idx",
         "bambu_k",
         "bambu_flow_ratio",
@@ -312,7 +313,11 @@ bool checkSpoolmanExtraFields() {
         "\"field_type\": \"text\","
         "\"key\": \"bambu_setting_id\"}",
 
-        "{\"name\": \"Bambu IDX\","
+        "{\"name\": \"Bambu Cali ID\","
+        "\"field_type\": \"text\","
+        "\"key\": \"bambu_cali_id\"}",
+
+        "{\"name\": \"Bambu Filament IDX\","
         "\"field_type\": \"text\","
         "\"key\": \"bambu_idx\"}",
 

src/bambu.cpp

@@ -137,43 +137,7 @@ bool sendMqttMessage(String payload) {
 }
 
 bool setBambuSpool(String payload) {
-    /* payload
+    Serial.println("Spool settings in");
-    //// set Spool
-    {
-        "print": {
-            "sequence_id": 0,
-            "command": "ams_filament_setting",
-            "ams_id": 0, // AMS ID 0-3 oder externe Spule 255
-            "tray_id": 0, // Tray ID 0-3 oder externe Spule 254
-            "tray_color": "000000FF",
-            "nozzle_temp_min": 170,
-            "nozzle_temp_max": 200,
-            "tray_type": "PETG",
-            "setting_id": "",
-            "tray_info_idx": "GFG99"
-        }
-    }
-
-
-
-    //// Remove Spool
-    {
-        "print":{
-            "ams_id":255,
-            "command":"ams_filament_setting",
-            "nozzle_temp_max": 0,
-            "nozzle_temp_min": 0,
-            "sequence_id": 0,
-            "setting_id": "",
-            "tray_color": "FFFFFFFF",
-            "tray_id": 254,
-            "tray_info_idx": "",
-            "tray_type": "",
-        }
-    }
-    */
-
-    Serial.println("Setting spool");
     Serial.println(payload);
 
     // Parse the JSON
@@ -193,8 +157,10 @@ bool setBambuSpool(String payload) {
     int maxTemp = doc["nozzle_temp_max"];
     String type = doc["type"].as<String>();
     String brand = doc["brand"].as<String>();
-    String tray_info_idx = doc["tray_info_idx"].as<String>();
+    String tray_info_idx = (doc["tray_info_idx"].as<String>() != "-1") ? doc["tray_info_idx"].as<String>() : "";
     if (tray_info_idx == "") tray_info_idx = (brand != "" && type != "") ? findFilamentIdx(brand, type) : "";
+    String setting_id = doc["bambu_setting_id"].as<String>();
+    String cali_idx = doc["cali_idx"].as<String>();
 
     doc.clear();
 
@@ -206,8 +172,9 @@ bool setBambuSpool(String payload) {
     doc["print"]["nozzle_temp_min"] = minTemp;
     doc["print"]["nozzle_temp_max"] = maxTemp;
     doc["print"]["tray_type"] = type;
-    doc["print"]["setting_id"] = "";
+    doc["print"]["cali_idx"] = (cali_idx != "") ? cali_idx : "";
     doc["print"]["tray_info_idx"] = tray_info_idx;
+    doc["print"]["setting_id"] = setting_id;
 
     // Serialize the JSON
     String output;
@@ -222,6 +189,67 @@ bool setBambuSpool(String payload) {
         return false;
     }
     
+    doc.clear();
+    yield();
+
+    if (cali_idx != "") {
+        yield();
+        doc["print"]["sequence_id"] = 0;
+        doc["print"]["command"] = "extrusion_cali_sel";
+        doc["print"]["filament_id"] = tray_info_idx;
+        doc["print"]["nozzle_diameter"] = "0.4";
+        doc["print"]["cali_idx"] = cali_idx.toInt();
+        doc["print"]["tray_id"] = trayId < 200 ? trayId : 254;
+        doc["print"]["ams_id"] = amsId < 200 ? amsId : 255;
+
+        // Serialize the JSON
+        String output;
+        serializeJson(doc, output);
+
+        if (sendMqttMessage(output)) {
+            Serial.println("Extrusion calibration successfully set");
+        }
+        else
+        {
+            Serial.println("Failed to set extrusion calibration");
+            return false;
+        }
+
+        doc.clear();
+        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;
 }
 
@@ -278,7 +306,8 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
                 JsonObject trayObj = trayArray[j];
                 if (trayObj["tray_info_idx"].as<String>() != ams_data[storedIndex].trays[j].tray_info_idx ||
                     trayObj["tray_type"].as<String>() != ams_data[storedIndex].trays[j].tray_type ||
-                    trayObj["tray_color"].as<String>() != ams_data[storedIndex].trays[j].tray_color) {
+                    trayObj["tray_color"].as<String>() != ams_data[storedIndex].trays[j].tray_color ||
+                    trayObj["cali_idx"].as<String>() != ams_data[storedIndex].trays[j].cali_idx) {
                     hasChanges = true;
                     break;
                 }
@@ -295,7 +324,8 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
                     foundExternal = true;
                     if (vtTray["tray_info_idx"].as<String>() != ams_data[i].trays[0].tray_info_idx ||
                         vtTray["tray_type"].as<String>() != ams_data[i].trays[0].tray_type ||
-                        vtTray["tray_color"].as<String>() != ams_data[i].trays[0].tray_color) {
+                        vtTray["tray_color"].as<String>() != ams_data[i].trays[0].tray_color ||
+                        vtTray["cali_idx"].as<String>() != ams_data[i].trays[0].cali_idx) {
                         hasChanges = true;
                     }
                     break;
@@ -304,17 +334,11 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
             if (!foundExternal) hasChanges = true;
         }
 
-        // Wenn Bambu connection changed
-        if (bambu_connected != doc["print"]["bambu_connected"].as<bool>()) {
-            hasChanges = true;
-        }
-
         if (!hasChanges) return;
 
         // Fortfahren mit der bestehenden Verarbeitung, da Änderungen gefunden wurden
         ams_count = amsArray.size();
         
-        // Restlicher bestehender Code...
         for (int i = 0; i < ams_count && i < 16; i++) {
             JsonObject amsObj = amsArray[i];
             JsonArray trayArray = amsObj["tray"].as<JsonArray>();
@@ -331,25 +355,7 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
                 ams_data[i].trays[j].nozzle_temp_min = trayObj["nozzle_temp_min"].as<int>();
                 ams_data[i].trays[j].nozzle_temp_max = trayObj["nozzle_temp_max"].as<int>();
                 ams_data[i].trays[j].setting_id = trayObj["setting_id"].as<String>();
-            }
+                ams_data[i].trays[j].cali_idx = trayObj["cali_idx"].as<String>();
-        }
-        //Serial.println("----------------");
-        //Serial.println();
-
-        // Sende die aktualisierten AMS-Daten an alle WebSocket-Clients
-        //sendAmsData(nullptr);
-
-        // Verarbeite erst die normalen AMS-Daten
-        for (int i = 0; i < amsArray.size() && i < 16; i++) {
-            JsonObject amsObj = amsArray[i];
-            JsonArray trayArray = amsObj["tray"].as<JsonArray>();
-
-            ams_data[i].ams_id = amsObj["id"].as<uint8_t>();
-            for (int j = 0; j < trayArray.size() && j < 4; j++) {
-                JsonObject trayObj = trayArray[j];
-                ams_data[i].trays[j].id = trayObj["id"].as<uint8_t>();
-                ams_data[i].trays[j].tray_info_idx = trayObj["tray_info_idx"].as<String>();
-                // ... weitere Tray-Daten ...
             }
         }
         
@@ -369,6 +375,7 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
             ams_data[extIdx].trays[0].nozzle_temp_min = vtTray["nozzle_temp_min"].as<int>();
             ams_data[extIdx].trays[0].nozzle_temp_max = vtTray["nozzle_temp_max"].as<int>();
             ams_data[extIdx].trays[0].setting_id = vtTray["setting_id"].as<String>();
+            ams_data[extIdx].trays[0].cali_idx = vtTray["cali_idx"].as<String>();
             ams_count++;  // Erhöhe ams_count für die externe Spule
         }
 
@@ -396,12 +403,60 @@ void mqtt_callback(char* topic, byte* payload, unsigned int length) {
                 trayObj["nozzle_temp_min"] = ams_data[i].trays[j].nozzle_temp_min;
                 trayObj["nozzle_temp_max"] = ams_data[i].trays[j].nozzle_temp_max;
                 trayObj["setting_id"] = ams_data[i].trays[j].setting_id;
+                trayObj["cali_idx"] = ams_data[i].trays[j].cali_idx;
             }
         }
 
         serializeJson(wsArray, amsJsonData);
         sendAmsData(nullptr);
     }
+    // Neue Bedingung für ams_filament_setting
+    else if (doc["print"]["command"] == "ams_filament_setting") {
+        int amsId = doc["print"]["ams_id"].as<int>();
+        int trayId = doc["print"]["tray_id"].as<int>();
+        String settingId = doc["print"]["setting_id"].as<String>();
+        
+        // Finde das entsprechende AMS und Tray
+        for (int i = 0; i < ams_count; i++) {
+            if (ams_data[i].ams_id == amsId) {
+                // Update setting_id im entsprechenden Tray
+                ams_data[i].trays[trayId].setting_id = settingId;
+                
+                // Erstelle neues JSON für WebSocket-Clients
+                JsonDocument wsDoc;
+                JsonArray wsArray = wsDoc.to<JsonArray>();
+
+                for (int j = 0; j < ams_count; j++) {
+                    JsonObject amsObj = wsArray.createNestedObject();
+                    amsObj["ams_id"] = ams_data[j].ams_id;
+
+                    JsonArray trays = amsObj.createNestedArray("tray");
+                    int maxTrays = (ams_data[j].ams_id == 255) ? 1 : 4;
+                    
+                    for (int k = 0; k < maxTrays; k++) {
+                        JsonObject trayObj = trays.createNestedObject();
+                        trayObj["id"] = ams_data[j].trays[k].id;
+                        trayObj["tray_info_idx"] = ams_data[j].trays[k].tray_info_idx;
+                        trayObj["tray_type"] = ams_data[j].trays[k].tray_type;
+                        trayObj["tray_sub_brands"] = ams_data[j].trays[k].tray_sub_brands;
+                        trayObj["tray_color"] = ams_data[j].trays[k].tray_color;
+                        trayObj["nozzle_temp_min"] = ams_data[j].trays[k].nozzle_temp_min;
+                        trayObj["nozzle_temp_max"] = ams_data[j].trays[k].nozzle_temp_max;
+                        trayObj["setting_id"] = ams_data[j].trays[k].setting_id;
+                        trayObj["cali_idx"] = ams_data[j].trays[k].cali_idx;
+                    }
+                }
+
+                // Aktualisiere das globale amsJsonData
+                amsJsonData = "";
+                serializeJson(wsArray, amsJsonData);
+                
+                // Sende an WebSocket Clients
+                sendAmsData(nullptr);
+                break;
+            }
+        }
+    }
 }
 
 void reconnect() {
@@ -512,3 +567,10 @@ bool setupMqtt() {
     }
     return true;
 }
+
+void bambu_restart() {
+    if (BambuMqttTask) {
+        vTaskDelete(BambuMqttTask);
+    }
+    setupMqtt();
+}

src/bambu.h

@@ -13,6 +13,7 @@ struct TrayData {
     int nozzle_temp_min;
     int nozzle_temp_max;
     String setting_id;
+    String cali_idx;
 };
 
 #define MAX_AMS 17  // 16 normale AMS + 1 externe Spule
@@ -33,5 +34,6 @@ bool saveBambuCredentials(const String& bambu_ip, const String& bambu_serialnr,
 bool setupMqtt();
 void mqtt_loop(void * parameter);
 bool setBambuSpool(String payload);
+void bambu_restart();
 
 #endif

src/website.cpp

@@ -69,6 +69,16 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
             }
         }
 
+        else if (doc["type"] == "reconnect") {
+            if (doc["payload"] == "bambu") {
+                bambu_restart();
+            }
+
+            if (doc["payload"] == "spoolman") {
+                initSpoolman();
+            }
+        }
+
         else if (doc["type"] == "setBambuSpool") {
             Serial.println(doc["payload"].as<String>());
             setBambuSpool(doc["payload"]);
@@ -82,24 +92,16 @@ void onWsEvent(AsyncWebSocket *server, AsyncWebSocketClient *client, AwsEventTyp
 
 // Funktion zum Laden und Ersetzen des Headers in einer HTML-Datei
 String loadHtmlWithHeader(const char* filename) {
-    if (!SPIFFS.exists(filename) || !SPIFFS.exists("/header.html")) {
+    Serial.println("Lade HTML-Datei: " + String(filename));
+    if (!SPIFFS.exists(filename)) {
         Serial.println("Fehler: Datei nicht gefunden!");
         return "Fehler: Datei nicht gefunden!";
     }
 
-    // Lade den Header
-    File headerFile = SPIFFS.open("/header.html", "r");
-    String header = headerFile.readString();
-    headerFile.close();
-
-    // Lade die Hauptdatei
     File file = SPIFFS.open(filename, "r");
     String html = file.readString();
     file.close();
 
-    // Ersetze den Platzhalter mit dem Header
-    html.replace("{{header}}", header);
-
     return html;
 }
 
@@ -159,25 +161,31 @@ void setupWebserver(AsyncWebServer &server) {
     Serial.print("Geladene Spoolman-URL: ");
     Serial.println(spoolmanUrl);
 
-    // Route für die Startseite
+    // Route für about
     server.on("/about", HTTP_GET, [](AsyncWebServerRequest *request){
-        Serial.println("Anfrage für / erhalten");
+        Serial.println("Anfrage für /about erhalten");
-        String html = loadHtmlWithHeader("/index.html");
+        AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/about.html.gz", "text/html");
-        request->send(200, "text/html", html);
+        response->addHeader("Content-Encoding", "gzip");
+        response->addHeader("Cache-Control", CACHE_CONTROL);
+        request->send(response);
     });
 
     // Route für Waage
     server.on("/waage", HTTP_GET, [](AsyncWebServerRequest *request){
         Serial.println("Anfrage für /waage erhalten");
-        String html = loadHtmlWithHeader("/waage.html");
+        AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/waage.html.gz", "text/html");
-        request->send(200, "text/html", html);
+        response->addHeader("Content-Encoding", "gzip");
+        response->addHeader("Cache-Control", CACHE_CONTROL);
+        request->send(response);
     });
 
     // Route für RFID
     server.on("/", HTTP_GET, [](AsyncWebServerRequest *request){
         Serial.println("Anfrage für /rfid erhalten");
-        String html = loadHtmlWithHeader("/rfid.html");
+        AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/rfid.html.gz", "text/html");
-        request->send(200, "text/html", html);
+        response->addHeader("Content-Encoding", "gzip");
+        response->addHeader("Cache-Control", CACHE_CONTROL);
+        request->send(response);
         Serial.println("RFID-Seite gesendet");
     });
 
@@ -201,8 +209,10 @@ void setupWebserver(AsyncWebServer &server) {
     // Route für WiFi
     server.on("/wifi", HTTP_GET, [](AsyncWebServerRequest *request){
         Serial.println("Anfrage für /wifi erhalten");
-        String html = loadHtmlWithHeader("/wifi.html");
+        AsyncWebServerResponse *response = request->beginResponse(SPIFFS, "/wifi.html.gz", "text/html");
-        request->send(200, "text/html", html);
+        response->addHeader("Content-Encoding", "gzip");
+        response->addHeader("Cache-Control", CACHE_CONTROL);
+        request->send(response);
     });
 
     // Route für Spoolman Setting