Refactor GlobalHeatingFaultToastManager to improve code readability by consolidating Icon component formatting, enhancing maintainability and consistency in the UI component structure.

* updated docs

* updated docs

* Clarify Basic Auth instructions and curl examples

Updated instructions for Basic Auth to clarify the use of the credentials.sh script and added authentication details to example curl requests.

* Update curl example to include -k option

Added note about ignoring self-signed certificate error in curl.

* Update Caddy root certificate instructions for NixOS

Clarified instructions for locating and trusting the Caddy root certificate on NixOS.

* updated api docs

* updated docs

.gitattributes

@@ -1,3 +0,0 @@
-.png filter=lfs diff=lfs merge=lfs -text
-.jpg filter=lfs diff=lfs merge=lfs -text
-.jpeg filter=lfs diff=lfs merge=lfs -text

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,40 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: 'BUG: '
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Navigate to '...'
+2. Select/Press '....'
+3. Execute operation '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots/Photos**
+If applicable, add screenshots from the HMI display or photos of the machine screen to help explain your problem.
+
+**Machine Information (please complete the following):**
+ - Machine Type: [Winder2, Laser, Aquapath...]
+ - Control Software Version: [e.g. 2.4.1]
+ - Settings: [e.g. Different Gear Ratios, PID Settings, …]
+
+**Device Information (if issue occurs on external device):**
+ - Device Type: [e.g. Tablet, PLC, Remote Control Panel]
+ - OS: [e.g. Windows 10, Linux, etc.]
+ - Connection Type: [e.g. Ethernet, USB]
+
+**Error Messages/Codes**
+If applicable, provide exact error codes or messages displayed or found in the troubleshooting terminal.
+
+**Additional context**
+Add any other context about the problem here (e.g., recent software updates, environmental factors).

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,33 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: 'Feat: '
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. During operation, I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions, workarounds, or features you've considered.
+
+**Use Case/Application:**
+ - Machine Type(s): [e.g. All machines, Winder, Aquapath, ...]
+ - Frequency of Use: [e.g. Daily, During setup, Occasionally]
+
+**Expected Benefits:**
+ - Efficiency Improvement: [e.g. Reduces setup time by X minutes, Eliminates manual steps]
+ - Safety Enhancement: [e.g. Prevents operator error, Adds safety checks]
+ - Production Impact: [e.g. Increases throughput, Reduces downtime, Improves quality]
+ - User Experience: [e.g. Simplifies workflow, Reduces training time]
+
+**Mockups/Sketches**
+If applicable, add sketches, mockups, or photos showing how the feature would appear on the HMI display or integrate with the machine.
+
+**Additional context**
+Add any other context, industry standards, or examples from other control systems about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,14 @@
+## What does this PR do / add / change?
+
+<!-- Describe the purpose of this PR. What problem does it solve or what feature does it add? -->
+
+## Screenshots
+
+<!-- Include screenshots for any UI changes. Remove this section if not applicable. -->
+
+## Checklist before opening the pr
+
+- [ ] Tested locally
+- [ ] Tested on the machine (if hardware interaction is involved)
+- [ ] No format errors (`cargo fmt` / `npm run format`)
+- [ ] No build errors (`cargo build` / `npm run build`)

.github/workflows/electron.yml

@@ -8,6 +8,9 @@ on:
     branches:
       - master
 
+permissions:
+  contents: read
+
 defaults:
   run:
     working-directory: electron

.github/workflows/issue-status-check.yml

@@ -0,0 +1,213 @@
+name: Stale Assigned Issue Check
+
+on:
+  schedule:
+    # Run every Sunday at 9:00 AM UTC
+    - cron: '0 9 * * 0'
+  workflow_dispatch: # Allow manual triggering for testing
+
+jobs:
+  check-stale-issues:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      issues: write
+      pull-requests: read
+    
+    steps:
+      - name: Check assigned issues for status updates
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const ONE_WEEK_MS = 7 * 24 * 60 * 60 * 1000;
+            const now = new Date();
+            
+            // Helper function to check rate limits
+            async function checkRateLimit() {
+              try {
+                const { data: rateLimit } = await github.rest.rateLimit.get();
+                const remaining = rateLimit.resources.core.remaining;
+                const reset = new Date(rateLimit.resources.core.reset * 1000);
+                console.log(`Rate limit: ${remaining} requests remaining (resets at ${reset.toISOString()})`);
+                return remaining > 10; // Stop if fewer than 10 requests remaining
+              } catch (error) {
+                console.log(`Could not check rate limit: ${error.message}`);
+                return true; // Continue on error
+              }
+            }
+            
+            // Get all open issues
+            const issues = await github.paginate(github.rest.issues.listForRepo, {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              state: 'open',
+              per_page: 100
+            });
+            
+            console.log(`Found ${issues.length} open issues`);
+            
+            // Helper function to check if issue has linked PRs using GraphQL
+            async function hasLinkedPRs(issueNumber) {
+              try {
+                const query = `
+                  query($owner: String!, $repo: String!, $issueNumber: Int!) {
+                    repository(owner: $owner, name: $repo) {
+                      issue(number: $issueNumber) {
+                        timelineItems(first: 100, itemTypes: CONNECTED_EVENT) {
+                          nodes {
+                            ... on ConnectedEvent {
+                              subject {
+                                ... on PullRequest {
+                                  number
+                                  state
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                `;
+                
+                const result = await github.graphql(query, {
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  issueNumber: issueNumber
+                });
+                
+                const linkedPRs = result.repository.issue.timelineItems.nodes
+                  .filter(node => node.subject && node.subject.state === 'OPEN')
+                  .map(node => node.subject.number);
+                
+                return linkedPRs.length > 0;
+              } catch (error) {
+                console.log(`Could not check linked PRs for issue #${issueNumber}: ${error.message}`);
+                return false; // Assume no linked PRs on error to avoid false positives
+              }
+            }
+            
+            let processedCount = 0;
+            let commentedCount = 0;
+            let errorCount = 0;
+            
+            for (const issue of issues) {
+              try {
+                // Check rate limit periodically
+                if (processedCount % 10 === 0 && !(await checkRateLimit())) {
+                  console.log('Rate limit nearly exhausted, stopping to avoid hitting limit');
+                  break;
+                }
+                
+                // Skip pull requests (they appear in issues list too)
+                if (issue.pull_request) {
+                  continue;
+                }
+                
+                // Skip if not assigned
+                if (!issue.assignees || issue.assignees.length === 0) {
+                  console.log(`Issue #${issue.number}: Not assigned, skipping`);
+                  continue;
+                }
+                
+                console.log(`Checking issue #${issue.number}: ${issue.title}`);
+                processedCount++;
+                
+                // Check if issue has linked PRs
+                const hasOpenLinkedPR = await hasLinkedPRs(issue.number);
+                
+                if (hasOpenLinkedPR) {
+                  console.log(`Issue #${issue.number}: Has linked open PR, skipping`);
+                  continue;
+                }
+                
+                // Get all comments on the issue
+                let comments = [];
+                try {
+                  comments = await github.paginate(github.rest.issues.listComments, {
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    issue_number: issue.number,
+                    per_page: 100
+                  });
+                } catch (commentError) {
+                  console.error(`Issue #${issue.number}: Could not fetch comments - ${commentError.message}`);
+                  errorCount++;
+                  continue;
+                }
+                
+                // Find the most recent comment or update
+                let lastActivity = new Date(issue.created_at);
+                
+                if (issue.updated_at) {
+                  lastActivity = new Date(issue.updated_at);
+                }
+                
+                if (comments.length > 0) {
+                  const lastComment = comments[comments.length - 1];
+                  const lastCommentDate = new Date(lastComment.created_at);
+                  if (lastCommentDate > lastActivity) {
+                    lastActivity = lastCommentDate;
+                  }
+                }
+                
+                // Check if last activity was more than a week ago
+                const daysSinceActivity = Math.floor((now - lastActivity) / (1000 * 60 * 60 * 24));
+                
+                if (daysSinceActivity >= 7) {
+                  console.log(`Issue #${issue.number}: No activity for ${daysSinceActivity} days`);
+                  
+                  // Check if we already posted a status request in the last 7 days
+                  const recentComments = comments.filter(comment => {
+                    const commentDate = new Date(comment.created_at);
+                    return (now - commentDate) < ONE_WEEK_MS;
+                  });
+                  
+                  const alreadyAsked = recentComments.some(comment => 
+                    comment.user.type === 'Bot' && 
+                    comment.body.includes('status update')
+                  );
+                  
+                  if (alreadyAsked) {
+                    console.log(`Issue #${issue.number}: Already requested status this week, skipping`);
+                    continue;
+                  }
+                  
+                  // Post a status request comment
+                  try {
+                    const assigneeNames = issue.assignees.map(a => `@${a.login}`).join(', ');
+                    await github.rest.issues.createComment({
+                      owner: context.repo.owner,
+                      repo: context.repo.repo,
+                      issue_number: issue.number,
+                      body: `Hi ${assigneeNames}! 👋\n\n` +
+                            `This issue has been assigned to you for ${daysSinceActivity} days with no recent activity or linked pull requests.\n\n` +
+                            `Could you please provide a status update? If you're:\n` +
+                            `- ✅ Working on it: Let us know your progress\n` +
+                            `- 🔄 Need help: Tag someone or describe what's blocking you\n` +
+                            `- 🚫 No longer working on it: Let us know so we can reassign\n\n` +
+                            `Thank you!`
+                    });
+                    
+                    console.log(`Issue #${issue.number}: Posted status request comment`);
+                    commentedCount++;
+                  } catch (commentError) {
+                    console.error(`Issue #${issue.number}: Could not post comment - ${commentError.message}`);
+                    errorCount++;
+                    // Continue to next issue
+                  }
+                } else {
+                  console.log(`Issue #${issue.number}: Activity ${daysSinceActivity} days ago, still fresh`);
+                }
+              } catch (error) {
+                console.error(`Issue #${issue.number}: Error processing - ${error.message}`);
+                errorCount++;
+                // Continue to next issue instead of failing the entire workflow
+                continue;
+              }
+            }
+            
+            console.log(`\nStale issue check complete!`);
+            console.log(`Processed: ${processedCount} issues`);
+            console.log(`Commented on: ${commentedCount} issues`);
+            console.log(`Errors: ${errorCount}`);

.github/workflows/nix.yml

@@ -8,6 +8,9 @@ on:
     branches:
       - master
 
+permissions:
+  contents: read
+
 env:
   NIX_PATH: nixpkgs=channel:nixos-25.05
 

.github/workflows/rust.yml

@@ -12,6 +12,9 @@ env:
   CARGO_TERM_COLOR: always
   RUST_VERSION: "1.86"
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest

.github/workflows/update-npm-hash.yml

@@ -0,0 +1,80 @@
+name: Update npm deps hash
+
+on:
+  pull_request:
+    paths:
+      - 'electron/package-lock.json'
+      - 'electron/package.json'
+  workflow_dispatch:
+
+env:
+  NIX_PATH: nixpkgs=channel:nixos-25.05
+
+permissions:
+  contents: write
+  pull-requests: write
+  actions: write
+
+jobs:
+  update-hash:
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.head.repo.full_name == github.repository
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install Nix
+        uses: nixbuild/nix-quick-install-action@v34
+        with:
+          nix_conf: |
+            keep-env-derivations = true
+            keep-outputs = true
+
+      - name: Calculate new npm deps hash
+        id: calc-hash
+        run: |
+          # Calculate the hash using nix run with nixpkgs
+          NEW_HASH=$(nix run 'nixpkgs#prefetch-npm-deps' electron/package-lock.json)
+          echo "hash=$NEW_HASH" >> $GITHUB_OUTPUT
+          echo "Calculated hash: $NEW_HASH"
+
+      - name: Update npmDepsHash in electron.nix
+        run: |
+          NEW_HASH="${{ steps.calc-hash.outputs.hash }}"
+          sed -i "s|npmDepsHash = \".*\";|npmDepsHash = \"$NEW_HASH\";|" nixos/packages/electron.nix
+          
+      - name: Check if hash changed
+        id: check-changes
+        run: |
+          if git diff --quiet nixos/packages/electron.nix; then
+            echo "changed=false" >> $GITHUB_OUTPUT
+            echo "No changes needed - hash is already correct"
+          else
+            echo "changed=true" >> $GITHUB_OUTPUT
+            echo "Hash updated in electron.nix"
+          fi
+
+      - name: Commit and push if changed
+        if: steps.check-changes.outputs.changed == 'true'
+        run: |
+          git config --local user.email "github-actions[bot]@users.noreply.github.com"
+          git config --local user.name "github-actions[bot]"
+          git add nixos/packages/electron.nix
+          git commit -m "chore: update npmDepsHash to ${{ steps.calc-hash.outputs.hash }}"
+          git push
+
+      - name: Comment on PR
+        if: steps.check-changes.outputs.changed == 'true'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: 'Automatically updated `npmDepsHash` to `${{ steps.calc-hash.outputs.hash }}`\n\n**Next step:** Trigger the checks by pushing an empty commit:\n```bash\ngit commit --allow-empty -m "trigger ci" && git push\n```'
+            })

.gitignore

@@ -1,10 +1,11 @@
 target/
 dist/
 .DS_Store
-Cargo.lock
 dhat-heap.json
 build.sh
 shell.nix
 node_modules/
 runtime_metrics.csv
-compile_metrics.csv
+compile_metrics.csv
+.idea/
+electron/dist-electron/

CHANGELOG.md

@@ -1,3 +1,15 @@
+# `2.14.1`
+_26.01.2026_
+
+## Laser
+-[#1079](https://github.com/qitechgmbh/control/pull/1079) Fixed Overflowing of buffer for Graphs causing crashes
+
+# `2.14.0`
+_22.01.2026_
+
+## General 
+- [#1040](https://github.com/qitechgmbh/control/pull/1040) Added API for reading Machine Data
+
 # `2.13.0`
 _07.01.2026_
 
@@ -5,7 +17,6 @@ _07.01.2026_
 - [#925](https://github.com/qitechgmbh/control/pull/925) Switch to Setup when selected machine is disconnected
 - [#937](https://github.com/qitechgmbh/control/pull/937) Added minimal Support for WAGO 
 - [#945](https://github.com/qitechgmbh/control/pull/945) Improvements for On-Screen Keyboard usage in Ethercat Setup Page
-- []
 
 ## Extruder V3
 - [#930](https://github.com/qitechgmbh/control/pull/930) Added Extruder V3

Cargo.lock

@@ -204,7 +204,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -221,7 +221,7 @@ checksum = "99e1aca718ea7b89985790c94aad72d77533063fe00bc497bb79a7c2dae6a661"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -232,9 +232,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "axum"
-version = "0.8.7"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b098575ebe77cb6d14fc7f32749631a6e44edbef6b796f89b020e99ba20d425"
+checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8"
 dependencies = [
  "axum-core",
  "axum-macros",
@@ -291,7 +291,7 @@ checksum = "604fde5e028fea851ce1d8570bbdc034bec850d157f7569d10f347d06808c05c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -390,9 +390,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
+checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
 dependencies = [
  "serde",
 ]
@@ -539,7 +539,7 @@ version = "0.1.0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -682,7 +682,7 @@ dependencies = [
  "deluxe-macros",
  "once_cell",
  "proc-macro2",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -695,7 +695,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -710,7 +710,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -721,7 +721,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -962,14 +962,13 @@ dependencies = [
  "deluxe",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "ethercrab"
 version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbb13becfa15713adb09b27fdb74468b827cdc78aa99aea638a89c1b0db3ce94"
+source = "git+https://github.com/v-morlock/ethercrab?branch=main#d297d13389d85a4edb4e69cc98f9dd7f12626cac"
 dependencies = [
  "async-io",
  "atomic-waker",
@@ -998,8 +997,7 @@ dependencies = [
 [[package]]
 name = "ethercrab-wire"
 version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d15828cb020fb44c92ca67e1ee3c122c9621c2e00d383d066e488f0619023ba2"
+source = "git+https://github.com/v-morlock/ethercrab?branch=main#d297d13389d85a4edb4e69cc98f9dd7f12626cac"
 dependencies = [
  "ethercrab-wire-derive",
  "heapless",
@@ -1008,20 +1006,19 @@ dependencies = [
 [[package]]
 name = "ethercrab-wire-derive"
 version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e790b8011211ed70babfcacbd4277b91ee21402ad5ba6a2c293db02e2f12919"
+source = "git+https://github.com/v-morlock/ethercrab?branch=main#d297d13389d85a4edb4e69cc98f9dd7f12626cac"
 dependencies = [
  "criterion",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "euclid"
-version = "0.22.11"
+version = "0.22.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48"
+checksum = "df61bf483e837f88d5c2291dcf55c67be7e676b3a51acc48db3a7b163b91ed63"
 dependencies = [
  "num-traits",
 ]
@@ -1878,7 +1875,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -1908,7 +1905,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2221,7 +2218,7 @@ checksum = "22f968c5ea23d555e670b449c1c5e7b2fc399fdaec1d304a17cd48e288abc107"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2251,20 +2248,20 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.145"
+version = "1.0.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
 dependencies = [
  "itoa",
  "memchr",
- "ryu",
  "serde",
  "serde_core",
+ "zmij",
 ]
 
 [[package]]
@@ -2332,6 +2329,7 @@ dependencies = [
  "smol",
  "socketioxide",
  "spin_sleep",
+ "ta",
  "textplots",
  "tokio",
  "tower-http",
@@ -2573,9 +2571,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.111"
+version = "2.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
+checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2588,6 +2586,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
 
+[[package]]
+name = "ta"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "609409d472a0a7d8d4dd9e19891bbdef546b9dce670c3057d0e02192dc541226"
+
 [[package]]
 name = "tap"
 version = "1.0.1"
@@ -2621,7 +2625,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2681,7 +2685,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2843,7 +2847,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -2880,9 +2884,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.20"
+version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
+checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
 dependencies = [
  "chrono",
  "matchers",
@@ -3074,7 +3078,7 @@ dependencies = [
  "bumpalo",
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
  "wasm-bindgen-shared",
 ]
 
@@ -3139,7 +3143,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -3150,7 +3154,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -3426,5 +3430,11 @@ checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.111",
+ "syn 2.0.114",
 ]
+
+[[package]]
+name = "zmij"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ff05f8caa9038894637571ae6b9e29466c1f4f829d26c9b28f869a29cbe3445"

README.md

@@ -2,167 +2,76 @@
 
 # QiTech Control
 
-QiTech Control is an open-source framework designed to bring modern software paradigms to certified industrial hardware.
+QiTech Control is an open-source framework designed to bring modern software development practices to certified industrial hardware.
 
 It frees developers from proprietary, license-heavy PLC ecosystems and rigid "point-and-click" workflows that are no longer adequate for today's complex automation challenges.
 
 QiTech Control combines the modularity and reliability of standard EtherCAT terminals (e.g., WAGO, Beckhoff) with the power of a modern Rust & React stack.
 
+## Documentation
 
-[![](https://img.youtube.com/vi/KI3YeBwfV-s/maxresdefault.jpg)](https://www.youtube.com/watch?v=KI3YeBwfV-s)
-*Click here to watch a video demo of our software.*
+**[View Full Documentation Wiki](https://github.com/qitechgmbh/control/wiki)**
 
-[![](https://img.youtube.com/vi/55egCAkQgyM/maxresdefault.jpg)](https://youtu.be/55egCAkQgyM) 
-*Click here to watch a full explainer Video of our Software.*
+- [Getting Started](https://github.com/qitechgmbh/control/wiki/Getting-Started)
+- [Architecture Overview](https://github.com/qitechgmbh/control/wiki/Architecture-Overview)
+- [EtherCAT Basics](https://github.com/qitechgmbh/control/wiki/Ethercat-Basics)
+- [Device Examples](https://github.com/qitechgmbh/control/wiki/Hardware-Examples)
+- [REST API Reference](https://github.com/qitechgmbh/control/wiki/Rest-Api)
 
-# Repo Structure
+## Videos
 
-Frontend
+| Software Demo | Full Explainer |
+|---------------|----------------|
+| [![](https://img.youtube.com/vi/KI3YeBwfV-s/maxresdefault.jpg)](https://www.youtube.com/watch?v=KI3YeBwfV-s)<br/>*Watch a demo of the control software in action* | [![](https://img.youtube.com/vi/55egCAkQgyM/maxresdefault.jpg)](https://youtu.be/55egCAkQgyM)<br/>*Watch a complete overview of QiTech Control* |
 
-- `/electron`: Frontend code for the control software built with React and Electron.
+## Repository Structure
 
-Backend
+- **`/electron`** - React + Electron frontend
+- **`/server`** - Rust backend implementing machine logic
+- **`/ethercat-hal`** - Hardware abstraction layer for EtherCAT devices
+- **`/control-core`** - Core control logic
+- **`/nixos`** - Custom Linux OS with realtime kernel
 
-- `/server`: Glue between Beckhoff and Electron. Implements machine logic.
-- `/ethercat-hal`: Hardware abstraction layer for Beckhoff (and possibly other EtherCat) devices and protocols.
-- `/ethercat-hal-derive`: Macros for `ethercat-hal`
-- `/control-core`: Core control logic for the server.
+## Technology Stack
 
-Operating System
+**Backend:** Rust with [Ethercrab](https://github.com/ethercrab-rs/ethercrab) for EtherCAT, [SocketIO](https://socket.io/) for real-time communication, [axum](https://docs.rs/axum/latest/axum/) for REST API
 
-- `/nixos`: Custom Linux with realtime kernel & preconfigured for touchscreens.
-
-Other
-
-- `/docs`: Documentation for the project.
-
-# Technology Choices
-
-## Backend
-
-To interface with Beckhoff and other EtherCAT devices we need an EtherCAT master software. Possibilities are [PySOEM](https://github.com/bnjmnp/pysoem) (Python), [SOEM](https://github.com/OpenEtherCATsociety/SOEM) (C) and [Ethercrab](https://github.com/ethercrab-rs/ethercrab) (Rust). For realtime operation only C and Rust are suitable. We chose Rust because of safety and confidence in the written code.
-
-[SocketIO](https://socket.io/) was chosen for performant event driven communication from the backend to the server. But we still use REST with [axum](https://docs.rs/axum/latest/axum/) for the communication thet benefits from the request/response model.
-
-We use [Smol](https://github.com/smol-rs/smol) for EtherCAT IO in the control loop for it's performance and [Tokio](https://tokio.rs/) for server IO because of it's ecosystem and maturity.
-
-## Frontend
-
-We could combine the code of the frontend and backend using [Doxius](https://dioxuslabs.com/) but it lacks good Linux support. We chose [Electron](https://www.electronjs.org/) with [React](https://react.dev/) for it's maturity and ecosystem. For the UI we use [Shadcn](https://ui.shadcn.com/) components and [Tailwind](https://tailwindcss.com/) for styling. For routing we use [TanStack Router](https://tanstack.com/router/v1).
-
-# Dev Setup
-
-[Developer Documentation](./docs/developer-docs/)
-
-## Backend
-
-- Rust stable 1.86^ toolchain (install via [rustup](https://rustup.rs/))
-- `rust-analyzer` extension for VSCode
-- Set your interface in `server/src/ethercat/init.rs` like `en10`
-- Connect a Beckhoff EK1100 to your interface
-- run `cd server && cargo run` to start the server (localhost:3001)
-
-## Frontend
-
-- nodejs and npm installed
-- run `cd electron && npm i && npm run start` to start the frontend
-
-# Machines
-
-| Machine Type | Version | Release Date | Description                 | Change to Previous Version                             | Vendor ID                  | Machine ID | Implemented | Docs                            |
-| ------------ | ------- | ------------ | --------------------------- | ------------------------------------------------------ | -------------------------- | ---------- | ----------- | ------------------------------- |
-| Winder       | V1      | ???          | Winding Filaments & Similar | -                                                      | 1 (Qitech Industries GmbH) | 1          | Reserved    | -                               |
-| Winder       | V2      | 2025         | Winding Filaments & Similar | Reengineered Traverse                                  | 1 (Qitech Industries GmbH) | 2          | Yes         | [](./docs/machines/winder-1.md) |
-| Extruder     | V1      | ???          | Single Screw Extruder       | -                                                      | 1 (Qitech Industries GmbH) | 3          | Reserved    | -                               |
-| Extruder     | V2      | 2025         | Single Screw Extruder       | PT100 Thermometers, Optional Additional Heating Zone 4 | 1 (Qitech Industries GmbH) | 4          | Yes         |                                 |
-| Waterway     | V1      | 2025         | Filament Water Cooling      | -                                                      | 1 (Qitech Industries GmbH) | 5          | In Progress     |                                 |
-| Laser        | V1      | ???          | Diameter Measuring Laser    | -                                                      | 1 (Qitech Industries GmbH) | 6          | Yes         |                                 |
-| Mock         | -       | ???          | Mock Machine for Testing    | -                                                      | 1 (Qitech Industries GmbH) | 7          | Yes         | -                               |
-
-# Minimal Hardware Examples
-
-For complete step-by-step tutorials on setting up your first hardware, including wiring diagrams and software configuration, see the [Getting Started Guide](./docs/developer-docs/getting-started.md#minimal-hardware-examples).
-
-Available examples:
-- **LED Control with EL2004** - Digital output control (simplest setup)
-- **Analog Input with EL3021** - Reading analog current measurements
+**Frontend:** [Electron](https://www.electronjs.org/) + [React](https://react.dev/) with [Shadcn](https://ui.shadcn.com/) components and [Tailwind](https://tailwindcss.com/) styling
 
 
-# More Docs
+## Hardware Examples
 
-- [x] [Architecture & Data Flow](./docs/architecture-overview.md)
+QiTech Control supports a wide range of EtherCAT hardware from WAGO and Beckhoff. We provide complete step-by-step tutorials with wiring diagrams and software configuration for many common modules.
 
-  - [x] Example Winder V2
+**[View all hardware examples and tutorials on the wiki](https://github.com/qitechgmbh/control/wiki/Hardware-Examples)**
 
-- [ ] Electron
+Quick links to popular examples:
+- [EL2004 - LED Control](https://github.com/qitechgmbh/control/wiki/Minimal-Example-El2004) (simplest setup for beginners)
+- [EL3021 - Analog Input](https://github.com/qitechgmbh/control/wiki/Minimal-Example-El3021)
+- [EL7031 - Stepper Motor Control](https://github.com/qitechgmbh/control/wiki/Minimal-Example-El7031-Motor)
+- [WAGO 750-402 - Digital Input](https://github.com/qitechgmbh/control/wiki/Minimal-Example-Wago750-402)
+- [WAGO 750-455 - Analog Input](https://github.com/qitechgmbh/control/wiki/Minimal-Example-Wago-750-455)
 
-  - Folder Structure
-  - Routing with TanStack Router
-  - Design with Tailwind & Shadcn
-  - ...
+## QiTech Machines
 
-- [ ] Interfacing with Electron/Server
+QiTech Control powers 10+ production machines for filament extrusion, winding, measurement, and material processing.
 
-  - [ ] SocketIO
-    - Machine Namespace
-    - Main Namespace
-  - [ ] REST
-    - Machine Mutations
-    - Write Device Identification
+**[View complete machine catalog on the wiki](https://github.com/qitechgmbh/control/wiki/QiTech-Machines)**
 
-- Server
 
-  - [x] [Threading](./docs/control-loop.md)
-  - [x] [Logging](./docs/logging.md)
-  - [ ] Control Loop Setup
-    - Control Loop Thread
-      - [ ] realtime
-    - Maindevice
-    - Group
-    - Extracting Device Identifications
-    - Identifying Groups
-    - Validating Machines
-    - Run Control Loop
-  - [x] [Control Loop](./docs/control-loop.md)
-  - [x] [Machine/Device Identification](./docs/identification.md)
-  - [ ] Machines
-    - When to create a new Machine?
-      - Versioning
-      - Code sharing
-    - Creating/Validating a Machine
-      - Validation
-      - Configuration
-  - [ ] Machine Implementation Guide
-    - Link: How to create a Device
-    - Link: How to create an Actor
-    - Link: How to create a Machine
-      - API (SocketIO + REST)
-      - Creation/Validation Logic
-        - Optional/Mandatory Devices
-        - Validate Devices
-      - Business Logic
-    - Link: How to create Machine Abstraction (Like Traverse/Puller/...)
-    - Forward `act` in winder.
+## Contributing
 
-- [ ] Control Core
+This is an open-source project. Contributions are welcome! Please see the [wiki](https://github.com/qitechgmbh/control/wiki) for development guidelines.
 
-  - [x] [Actors](./docs/actors.md)
-  - [ ] SocketIO
-    - Namespaces & Caching
-    - Joining leaving namespaces
-    - NamespaceId
-    - Caching
-      - Serverside Caching
-      - Clientside Caching
-  - [ ] REST
 
-- [x] Ethercat HAL
 
-  - [x] [Devices](./docs/devices.md)
-  - [x] [Configuration (CoE)](./docs/coe.md)
-  - [x] [IO](./docs/io.md)
-  - [x] [PDO](./docs/pdo.md)
+## Additional Videos
 
-- [x] [Ethercat Basics](./docs/ethercat-basics.md)
+| Episode Highlights |  |
+|--------------------|--------------------|
+| [![](https://img.youtube.com/vi/U2wNN6sF4to/maxresdefault.jpg)](https://www.youtube.com/watch?v=U2wNN6sF4to&t=163s)<br/>**Day in the Software Team**<br/>*Behind the scenes with Robin and how the team ships control software.* | [![](https://img.youtube.com/vi/R5WGAY3WRWA/maxresdefault.jpg)](https://www.youtube.com/watch?v=R5WGAY3WRWA&t=1s)<br/>**Software Stack Day**<br/>*A fast tour through the tools, stack, and daily workflow.* |
+| [![](https://img.youtube.com/vi/xyaHwxXguw4/maxresdefault.jpg)](https://www.youtube.com/watch?v=xyaHwxXguw4&t=32s)<br/>**First Client**<br/>*A milestone week building the first real client project.* | [![](https://img.youtube.com/vi/moI7z2PVdF4/maxresdefault.jpg)](https://www.youtube.com/watch?v=moI7z2PVdF4)<br/>**Steelworks Week**<br/>*A deep-dive week on a demanding steelworks order.* |
 
-- [x] [NixOS Operating System](./docs/nixos/README.md)
+## License
+
+See [LICENSE](LICENSE) file for details.

control-core/Cargo.toml

@@ -9,11 +9,11 @@ workspace = true
 [dependencies]
 anyhow = "1.0.100"
 
-axum = "0.8.6"
+axum = "0.8.8"
 
 ethercat_hal = { path = "../ethercat-hal" }
 units = { path = "../units" }
-ethercrab = "0.6"
+ethercrab = { git = "https://github.com/v-morlock/ethercrab", branch = "main" }
 interfaces = "0.0.9"
 serde = "1.0.219"
 serialport = "4.7.3"

credentials.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+# Generate 18 random alphanumeric characters base64 encode It
+password=$(head -c 18 /dev/urandom | base64)
+
+echo "Basic Authentication; user=machine password=$password"
+echo $password > /tmp/machine_password
+
+caddy_hash=$(caddy hash-password --plaintext $password)
+
+echo "(machine_basic_auth) {
+    basic_auth {
+        machine $caddy_hash
+    }
+}" | sudo tee /var/lib/caddy/auth_snippet.conf
+
+# Transfer ownership to caddy user
+sudo chown caddy:caddy /var/lib/caddy/auth_snippet.conf
+
+# Tigther permissions (Only readable by root or caddy user)
+sudo chmod 600 /var/lib/caddy/auth_snippet.conf
+
+sudo systemctl restart caddy.service
+

docs/developer-docs/Wago-Stepper-Documentation.md

@@ -0,0 +1,931 @@
+# Wago Stepper Controller - Developer Documentation
+
+**Models:** 750-671 & 750-672  
+**Last Updated:** February 2026  
+
+## Table of Contents
+
+1. [Overview](#overview)
+2. [Hardware Quick Reference](#hardware-quick-reference)
+3. [Architecture & Code Organization](#architecture--code-organization)
+4. [Control & Status Bytes](#control--status-bytes)
+5. [Implementation Details](#implementation-details)
+6. [Prescalers & Calculations](#prescalers--calculations)
+7. [Common Pitfalls & Debug Tips](#common-pitfalls--debug-tips)
+
+---
+
+## Overview
+
+The Wago Stepper Controllers (750-671 and 750-672) drive stepper motors via EtherCAT. This documentation focuses on **velocity/speed control mode** implementation.
+
+### Key Differences Between Models
+
+| Feature         | 750-671                                    | 750-672                              |
+| --------------- | ------------------------------------------ | ------------------------------------ |
+| Max Voltage     | 50 VDC                                     | 70 VDC                               |
+| Max Current     | 5 A                                        | 7.5 A                                |
+| Speed Control   | Via Application Selector in config         | Via Control Byte C1 command          |
+| Control Byte C1 | Different bit layout (M_Speed_Control bit) | Command field (0x18 = Speed Control) |
+
+**For 750-671:** Must set `Application_Selector = 2` and `PWM_Period = 0` in WAGO I/O CHECK before using speed control.
+
+**For 750-672:** Speed control is selected directly via command in Control Byte C1 (no config needed).
+
+### Process Image
+
+Both models use **12 bytes bidirectional** (96 bits each way):
+
+```
+Input (TxPDO - Controller → PLC):
+ [0] S0 (status)
+ [1] Reserved
+ [2-3] Actual Velocity (i16)
+ [4-5] Reserved
+ [6-8] Actual Position (24-bit: L, M, H)
+ [9] S3 (digital inputs, warnings)
+ [10] S2 (busy, error, on_speed, etc.)
+ [11] S1 (acknowledgments)
+
+Output (RxPDO - PLC → Controller):
+ [0] C0 (control)
+ [1] Reserved
+ [2-3] Target Velocity (i16, clamped to ±25000)
+ [4-5] Acceleration (u16)
+ [6-8] Position (24-bit: L, M, H)
+ [9] C3 (position/reset control)
+ [10] C2 (prescalers, error quit)
+ [11] C1 (main control: enable, start, mode)
+```
+
+---
+
+## Hardware Quick Reference
+
+### Connections
+
+| Pin | Name | Purpose |
+|-----|------|---------|
+| DI1+ | Digital Input 1 | Enable input (connect to 24V or control via software) |
+| DI2+ | Digital Input 2 | Referencing input |
+| DI- | Ground | Reference potential for DI1/DI2 |
+| A1, A2 | Motor Winding A | Connect to motor phase A |
+| B1, B2 | Motor Winding B | Connect to motor phase B |
+
+### Status LEDs
+
+- **LED H:** Shows error codes via blink patterns (see Wago manual section 3.3 for error codes)
+- Other LEDs show Ready, Enable, Busy states (see manual section 2.1.2.3)
+
+---
+
+## Architecture & Code Organization
+
+### File Structure
+
+```
+devices/
+  wago_modules/
+    wago_750_672.rs          # Device struct, EtherCAT interface
+    
+io/
+  stepper_velocity_wago_750_672.rs  # High-level wrapper & byte helpers
+```
+
+### Key Components
+
+#### 1. `Wago750_672` Struct (EtherCAT Device)
+
+Located in `devices/wago_modules/wago_750_672.rs`
+
+```rust
+pub struct Wago750_672 {
+    is_used: bool,
+    tx_bit_offset: usize,  // Input data offset
+    rx_bit_offset: usize,  // Output data offset
+    pub rxpdo: Wago750_672RxPdo,  // Data we send
+    pub txpdo: Wago750_672TxPdo,  // Data we receive
+    module: Option<Module>,
+    pub state: InitState,
+    pub initialized: bool,
+}
+```
+
+**Responsibilities:**
+- Implements EtherCAT device traits
+- Handles bit-level I/O with process image
+- Runs state machine in `input()` method
+- Thread-safe (used via `Arc<RwLock<>>`)
+
+#### 2. `StepperVelocityWago750672` Wrapper
+
+Located in `io/stepper_velocity_wago_750_672.rs`
+
+```rust
+pub struct StepperVelocityWago750672 {
+    pub device: Arc<RwLock<Wago750_672>>,
+    pub state: InitState,
+    pub target_velocity: i16,
+    pub target_acceleration: u16,
+    pub enabled: bool,
+    pub freq_range_sel: u8,
+    pub acc_range_sel: u8,
+}
+```
+
+**Responsibilities:**
+- Provides high-level API (`set_velocity()`, `set_enabled()`)
+- Manages prescaler settings
+- Abstracts away state machine complexity
+
+### Why Two Layers?
+
+1. **`Wago750_672`:** Low-level EtherCAT device that handles cycle-by-cycle I/O
+2. **`StepperVelocityWago750672`:** High-level wrapper for application logic
+
+This separation allows:
+- EtherCAT device to run in tight real-time loop
+- Application code to use simple API without worrying about cycles/acknowledgments
+- Easy testing of each layer independently
+
+---
+
+## Control & Status Bytes
+
+### Design Pattern: Type-Safe Byte Construction
+
+Instead of hardcoding hex values like `0x1B`, we use builder pattern with enums:
+
+```rust
+// ❌ BAD - magic numbers, error-prone
+dev.rxpdo.c1 = 0x1B;
+
+// ✅ GOOD - explicit, self-documenting
+let c1 = ControlByteC1::new()
+    .with_flag(C1Flag::Enable)
+    .with_flag(C1Flag::Stop2N)
+    .with_command(C1Command::SpeedControl)
+    .bits();
+dev.rxpdo.c1 = c1;
+```
+
+### Wago 750-672 Control Bytes
+
+#### Control Byte C1 (Offset 11) - Main Control
+
+```rust
+pub struct ControlByteC1(u8);
+
+pub enum C1Flag {
+    Enable = 0b0000_0001,  // Bit 0: Must be 1 to enable
+    Stop2N = 0b0000_0010,  // Bit 1: Must be 1 for normal operation
+    Start  = 0b0000_0100,  // Bit 2: Rising edge triggers action
+}
+
+pub enum C1Command {
+    Idle          = 0b0000_0000,  // Bits 3-7: Operating mode
+    SinglePosition = 0b0000_1000,
+    RunProgram    = 0b0001_0000,
+    SpeedControl  = 0b0001_1000,  // ← We use this
+    Reference     = 0b0010_0000,
+    JogMode       = 0b0010_1000,
+    Mailbox       = 0b0011_0000,
+}
+```
+
+**Implementation:**
+
+```rust
+impl ControlByteC1 {
+    pub const fn new() -> Self {
+        Self(0)
+    }
+
+    pub const fn with_flag(mut self, flag: C1Flag) -> Self {
+        self.0 |= flag as u8;  // OR in the bit
+        self
+    }
+
+    pub const fn with_command(mut self, cmd: C1Command) -> Self {
+        self.0 = (self.0 & 0b0000_0111) | (cmd as u8);  // Mask lower 3 bits, set upper 5
+        self
+    }
+
+    pub const fn bits(self) -> u8 {
+        self.0
+    }
+}
+```
+
+**Key Points:**
+- `const fn` allows compile-time evaluation
+- Chainable builder pattern
+- Command overwrites bits 3-7 while preserving 0-2
+- Flags are additive (multiple can be set)
+
+#### Control Byte C2 (Offset 10) - Prescalers & Error Handling
+
+```rust
+pub struct ControlByteC2(u8);
+
+pub enum C2Flag {
+    FreqRangeSelL = 0b0000_0001,  // Bit 0: Freq prescaler LSB
+    FreqRangeSelH = 0b0000_0010,  // Bit 1: Freq prescaler MSB
+    AccRangeSelL  = 0b0000_0100,  // Bit 2: Acc prescaler LSB
+    AccRangeSelH  = 0b0000_1000,  // Bit 3: Acc prescaler MSB
+    PreCalc       = 0b0100_0000,  // Bit 6: Pre-calculation
+    ErrorQuit     = 0b1000_0000,  // Bit 7: Acknowledge error
+}
+
+impl ControlByteC2 {
+    pub const fn with_freq_range(mut self, sel: u8) -> Self {
+        self.0 = (self.0 & 0b1111_1100) | (sel & 0b0000_0011);
+        self
+    }
+
+    pub const fn with_acc_range(mut self, sel: u8) -> Self {
+        self.0 = (self.0 & 0b1111_0011) | ((sel & 0b0000_0011) << 2);
+        self
+    }
+}
+```
+
+**Critical:** Prescalers can only be changed when controller is **disabled** (before Enable state).
+
+#### Control Byte C3 (Offset 9) - Position & Reset
+
+```rust
+pub struct ControlByteC3(u8);
+
+pub enum C3Flag {
+    SetActualPos = 0b0000_0001,  // Bit 0: Set current position
+    DirectionPos = 0b0000_0010,  // Bit 2: Force positive direction
+    DirectionNeg = 0b0000_0100,  // Bit 3: Force negative direction
+    ResetQuit    = 0b1000_0000,  // Bit 7: Acknowledge reset
+}
+```
+
+### Status Bytes (Read-Only)
+
+#### Status Byte S1 (Offset 11) - Acknowledgments
+
+```rust
+pub struct StatusByteS1(u8);
+
+pub enum S1Flag {
+    Ready      = 0b0000_0001,  // Bit 0: Acknowledges Enable
+    Stop2NAck  = 0b0000_0010,  // Bit 1: Acknowledges Stop2_N
+    StartAck   = 0b0000_0100,  // Bit 2: Acknowledges Start
+}
+// Bits 3-7: Mirrors C1 command when acknowledged
+
+impl StatusByteS1 {
+    pub const fn has_flag(self, flag: S1Flag) -> bool {
+        (self.0 & flag as u8) != 0
+    }
+}
+```
+
+**Usage Pattern:**
+```rust
+// Wait for acknowledgment
+if self.txpdo.s1 == c1 {
+    // All bits acknowledged, proceed
+}
+```
+
+#### Status Byte S2 (Offset 10) - Operation Status
+
+```rust
+pub struct StatusByteS2(u8);
+
+pub enum S2Flag {
+    OnTarget    = 0b0000_0001,  // Bit 0: Position reached (positioning mode)
+    Busy        = 0b0000_0010,  // Bit 1: Executing command
+    StandStill  = 0b0000_0100,  // Bit 2: Motor not moving
+    OnSpeed     = 0b0000_1000,  // Bit 3: Target velocity reached
+    Direction   = 0b0001_0000,  // Bit 4: Rotation direction (0=neg, 1=pos)
+    ReferenceOk = 0b0010_0000,  // Bit 5: Referencing complete
+    PreCalcAck  = 0b0100_0000,  // Bit 6: Pre-calc acknowledged
+    Error       = 0b1000_0000,  // Bit 7: Error occurred (check LED H)
+}
+```
+
+**Critical for velocity control:** Monitor `OnSpeed` bit to know when target velocity is reached.
+
+#### Status Byte S3 (Offset 9) - Digital Inputs & Warnings
+
+```rust
+pub struct StatusByteS3(u8);
+
+pub enum S3Flag {
+    Input1  = 0b0000_0001,  // Bits 0-5: Digital input states
+    Input2  = 0b0000_0010,
+    Input3  = 0b0000_0100,
+    Input4  = 0b0000_1000,
+    Input5  = 0b0001_0000,
+    Input6  = 0b0010_0000,
+    Warning = 0b0100_0000,  // Bit 6: Warning condition
+    Reset   = 0b1000_0000,  // Bit 7: Reset requested
+}
+```
+
+---
+
+## Implementation Details
+
+### Critical Initialization Sequence
+
+⚠️ **This sequence MUST be followed exactly or the controller won't work:**
+
+1. **Set non-zero acceleration** (before enabling)
+2. **Set Enable + Stop2_N** (wait for ack)
+3. **Set operating mode** (0x18 for speed control, wait for ack)
+4. **Issue Start pulse** (set to 1, wait for ack, set to 0, wait for ack clear)
+5. **Running** (repeat step 4 every time velocity changes)
+
+### State Machine (Why It Exists)
+
+The state machine exists because **acknowledgments happen in different EtherCAT cycles**. You can't just set everything in one cycle.
+
+```rust
+#[derive(Debug, Clone)]
+pub enum InitState {
+    Off,               // Controller disabled
+    Enable,            // Setting Enable + Stop2_N, waiting for ack
+    SetMode,           // Setting speed control mode, waiting for ack
+    StartPulseStart,   // Setting Start bit, waiting for ack
+    StartPulseEnd,     // Clearing Start bit, waiting for ack clear
+    Running,           // Normal operation
+    ErrorQuit,         // Handling error
+    ResetQuit,         // Handling reset
+}
+```
+
+### State Machine Implementation
+
+Located in `Wago750_672::input()` method (runs every EtherCAT cycle):
+
+```rust
+fn input(&mut self, input: &BitSlice) -> Result<(), anyhow::Error> {
+    // 1. Read process image from controller
+    let base = self.tx_bit_offset;
+    let mut b = [0u8; 12];
+    for i in 0..12 {
+        b[i] = input[base + i * 8..base + (i + 1) * 8].load_le();
+    }
+    
+    self.txpdo = Wago750_672TxPdo {
+        s0: b[0],
+        actual_velocity: i16::from_le_bytes([b[2], b[3]]),
+        position_l: b[6],
+        position_m: b[7],
+        position_h: b[8],
+        s3: b[9],
+        s2: b[10],
+        s1: b[11],
+    };
+
+    // 2. State machine logic
+    match self.state {
+        InitState::Off => {
+            self.initialized = false;
+            // Do nothing until external enable request
+        }
+        
+        InitState::Enable => {
+            // Build C1 byte with Enable and Stop2_N
+            let c1 = ControlByteC1::new()
+                .with_flag(C1Flag::Enable)
+                .with_flag(C1Flag::Stop2N)
+                .bits();
+            self.rxpdo.c1 = c1;
+            
+            // Wait for acknowledgment
+            if self.txpdo.s1 == c1 {
+                self.state = InitState::SetMode;
+            }
+        }
+        
+        InitState::SetMode => {
+            // Add speed control command
+            let c1 = ControlByteC1::new()
+                .with_flag(C1Flag::Enable)
+                .with_flag(C1Flag::Stop2N)
+                .with_command(C1Command::SpeedControl)
+                .bits();
+            self.rxpdo.c1 = c1;
+            
+            // Wait for mode acknowledgment
+            if self.txpdo.s1 == c1 {
+                self.initialized = true;
+                self.state = InitState::StartPulseStart;
+            }
+        }
+        
+        InitState::StartPulseStart => {
+            // Set Start bit
+            let c1 = ControlByteC1::new()
+                .with_flag(C1Flag::Enable)
+                .with_flag(C1Flag::Stop2N)
+                .with_flag(C1Flag::Start)  // ← Rising edge
+                .with_command(C1Command::SpeedControl)
+                .bits();
+            self.rxpdo.c1 = c1;
+            
+            // Wait for Start acknowledgment
+            if self.txpdo.s1 == c1 {
+                self.state = InitState::StartPulseEnd;
+            }
+        }
+        
+        InitState::StartPulseEnd => {
+            // Clear Start bit
+            let c1 = ControlByteC1::new()
+                .with_flag(C1Flag::Enable)
+                .with_flag(C1Flag::Stop2N)
+                .with_command(C1Command::SpeedControl)
+                .bits();
+            self.rxpdo.c1 = c1;
+            
+            // Wait for acknowledgment to clear
+            if self.txpdo.s1 == c1 {
+                self.state = InitState::Running;
+            }
+        }
+        
+        InitState::Running => {
+            // Monitor for errors and resets
+            let c2_error_mask = ControlByteC2::new().with_flag(C2Flag::ErrorQuit).bits();
+            let c3_reset_mask = ControlByteC3::new().with_flag(C3Flag::ResetQuit).bits();
+            
+            if self.txpdo.s2 & c2_error_mask != 0 {
+                self.state = InitState::ErrorQuit;
+            } else if self.txpdo.s3 & c3_reset_mask != 0 {
+                self.state = InitState::ResetQuit;
+            }
+        }
+        
+        InitState::ErrorQuit => {
+            // Set Error_Quit bit to acknowledge
+            self.rxpdo.c2 |= ControlByteC2::new().with_flag(C2Flag::ErrorQuit).bits();
+            tracing::error!("Stepper Controller Errored. Trying to reenable...");
+            self.state = InitState::Enable;  // Restart initialization
+        }
+        
+        InitState::ResetQuit => {
+            // Set Reset_Quit bit to acknowledge
+            self.rxpdo.c3 |= ControlByteC3::new().with_flag(C3Flag::ResetQuit).bits();
+            tracing::error!("Stepper Controller Reset. Trying to reenable...");
+            self.state = InitState::Enable;  // Restart initialization
+        }
+    }
+    
+    Ok(())
+}
+```
+
+**Key Implementation Notes:**
+
+1. **State changes happen AFTER acknowledgment:** We wait for `self.txpdo.s1 == c1` before moving to next state
+2. **Enable and Stop2_N stay high:** They're included in every C1 byte after Enable state
+3. **Start pulse is a rising edge:** Must go 1 → 0, not just stay at 1
+4. **Error recovery:** Automatically attempts to re-enable on error/reset
+
+### High-Level API Implementation
+
+Located in `StepperVelocityWago750672`:
+
+```rust
+pub fn set_enabled(&mut self, enabled: bool) {
+    // Prevent redundant enables
+    if self.enabled && enabled {
+        return;
+    }
+    
+    // Safety check: acceleration must be non-zero
+    if self.get_target_acceleration() == 0 {
+        return;
+    }
+    
+    self.enabled = enabled;
+    if enabled {
+        self.change_init_state(InitState::Enable);
+    } else {
+        self.change_init_state(InitState::Off);
+        self.write_control_byte(ControlByte::C1, 0b00000000);
+    }
+}
+
+pub fn set_velocity(&mut self, velocity: i16) {
+    self.target_velocity = velocity;
+    
+    let mut dev = block_on(self.device.write());
+    
+    // Clamp to valid range
+    dev.rxpdo.velocity = velocity.clamp(-25000, 25000);
+    
+    // Trigger Start pulse if already initialized
+    if dev.initialized {
+        dev.state = InitState::StartPulseStart;
+    }
+}
+
+pub fn set_acceleration(&mut self, acceleration: u16) {
+    self.target_acceleration = acceleration;
+    
+    let mut dev = block_on(self.device.write());
+    dev.rxpdo.acceleration = acceleration;
+}
+```
+
+**Why the wrapper?**
+- Application code doesn't need to know about state machine
+- Handles common errors (zero acceleration check)
+- Thread-safe access to device
+- Clamping and validation in one place
+
+### Changing Velocity at Runtime
+
+⚠️ **Critical:** Must issue a **new Start pulse** for every velocity change:
+
+```rust
+// User calls this
+stepper.set_velocity(15000);
+
+// Internally, set_velocity() does:
+dev.rxpdo.velocity = 15000;
+if dev.initialized {
+    dev.state = InitState::StartPulseStart;  // ← Triggers new pulse
+}
+
+// State machine then handles:
+// StartPulseStart → StartPulseEnd → Running
+// (Takes 2-3 EtherCAT cycles)
+```
+
+**Common mistake:** Setting velocity without triggering Start pulse - motor won't change speed.
+
+---
+
+## Prescalers & Calculations
+
+Prescalers scale the velocity and acceleration values. They **can only be changed when disabled**.
+
+### Frequency Prescaler (Bits 0-1 of C2)
+
+Controls velocity scaling:
+
+| Freq_Range_Sel | Prescaler | Max Frequency | Resolution |
+|----------------|-----------|---------------|------------|
+| 00 | 200 (default) | 10 kHz | Configurable |
+| 01 | 80 | 25 kHz | 1 Hz |
+| 10 | 20 | 100 kHz | 20 Hz |
+| 11 | 4 | 500 kHz | 20 Hz |
+
+**Formula:**
+```
+Output Frequency (fp) = Velocity × 80 / Freq_Prescaler [Hz]
+```
+
+**Example:**
+```rust
+// Freq_Range_Sel = 01 (prescaler = 80)
+// Velocity = 10000
+// Output: 10000 × 80 / 80 = 10000 Hz
+
+stepper.set_freq_range_sel(1);  // Must be done BEFORE enable
+stepper.set_velocity(10000);
+```
+
+### Acceleration Prescaler (Bits 2-3 of C2)
+
+Controls acceleration scaling:
+
+| Acc_Range_Sel | Multiplier | Time to Max Speed |
+|---------------|------------|-------------------|
+| 00 | 8 (default) | 7600 ms |
+| 01 | 80 | 760 ms |
+| 10 | 800 | 76 ms |
+| 11 | 8000 | 7.6 ms |
+
+**Formula:**
+```
+Acceleration (a) = Acceleration_Value × Acc_Multiplier / Freq_Prescaler [Hz/s]
+```
+
+**Example:**
+```rust
+// Acc_Range_Sel = 01 (multiplier = 80)
+// Freq_Range_Sel = 01 (prescaler = 80)
+// Acceleration_Value = 10000
+// Output: 10000 × 80 / 80 = 10000 Hz/s
+
+stepper.set_acc_range_sel(1);   // Must be done BEFORE enable
+stepper.set_acceleration(10000);
+```
+
+### Setting Prescalers (Implementation)
+
+```rust
+pub fn set_freq_range_sel(&mut self, factor: u8) {
+    // Safety checks
+    if self.enabled || factor > 3 {
+        return;  // Can't change while enabled
+    }
+    
+    self.freq_range_sel = factor;
+    
+    let mut dev = block_on(self.device.write());
+    let c2 = ControlByteC2::from_bits(dev.rxpdo.c2)
+        .with_freq_range(factor)
+        .bits();
+    dev.rxpdo.c2 = c2;
+}
+
+pub fn set_acc_range_sel(&mut self, factor: u8) {
+    if self.enabled || factor > 3 {
+        return;
+    }
+    
+    self.acc_range_sel = factor;
+    
+    let mut dev = block_on(self.device.write());
+    let c2 = ControlByteC2::from_bits(dev.rxpdo.c2)
+        .with_acc_range(factor)
+        .bits();
+    dev.rxpdo.c2 = c2;
+}
+```
+
+**Usage:**
+```rust
+let mut stepper = StepperVelocityWago750672::new(device);
+
+// Set prescalers FIRST (before enabling)
+stepper.set_freq_range_sel(1);
+stepper.set_acc_range_sel(1);
+stepper.set_acceleration(10000);
+
+// Then enable
+stepper.set_enabled(true);
+
+// Now can set velocity
+stepper.set_velocity(15000);
+```
+
+---
+
+## Common Pitfalls & Debug Tips
+
+### 1. Controller Won't Enable
+
+**Symptoms:**
+- State stuck in `Enable`
+- `initialized` never becomes true
+- Motor doesn't move
+
+**Debug checklist:**
+```rust
+// Check acceleration is non-zero
+println!("Acceleration: {}", dev.rxpdo.acceleration);  // Must be > 0
+
+// Check DI1 if hardware enable is configured
+println!("DI1 state: {}", (dev.txpdo.s3 & 0x01) != 0);  // Should be 1
+
+// Check status byte acknowledgment
+println!("C1: {:#010b}", dev.rxpdo.c1);
+println!("S1: {:#010b}", dev.txpdo.s1);  // Should match C1
+```
+
+**Common causes:**
+```rust
+// ❌ Forgot to set acceleration
+stepper.set_acceleration(0);  // Won't enable!
+
+// ✅ Always set non-zero acceleration
+stepper.set_acceleration(10000);
+stepper.set_enabled(true);
+```
+
+### 2. Velocity Won't Change
+
+**Symptoms:**
+	- Motor running but won't change speed
+- `set_velocity()` called but no effect
+
+**Debug:**
+```rust
+// Check initialized flag
+println!("Initialized: {}", dev.initialized);
+
+// Check state after velocity change
+println!("State: {:?}", dev.state);  // Should become StartPulseStart
+
+// Manually trigger Start pulse (bypass wrapper)
+dev.state = InitState::StartPulseStart;
+```
+
+**Common causes:**
+```rust
+// ❌ Setting velocity before initialization
+stepper.set_velocity(10000);  // Controller not ready yet
+
+// ✅ Check initialized first
+if stepper.device.read().initialized {
+    stepper.set_velocity(10000);
+}
+```
+
+### 3. Prescaler Not Working
+
+**Symptoms:**
+- Velocity calculation seems wrong
+- Can't reach expected frequency
+
+**Debug:**
+```rust
+// Check prescalers were set BEFORE enabling
+println!("Freq prescaler: {}", stepper.freq_range_sel);
+println!("Acc prescaler: {}", stepper.acc_range_sel);
+println!("Enabled: {}", stepper.enabled);
+
+// Check C2 byte
+let dev = stepper.device.read();
+println!("C2: {:#010b}", dev.rxpdo.c2);
+// Bits 0-1: freq, Bits 2-3: acc
+```
+
+**Common causes:**
+```rust
+// ❌ Setting prescaler after enable
+stepper.set_enabled(true);
+stepper.set_freq_range_sel(1);  // Too late! Ignored.
+
+// ✅ Set prescalers FIRST
+stepper.set_freq_range_sel(1);
+stepper.set_acc_range_sel(1);
+stepper.set_enabled(true);
+```
+
+### 4. State Machine Stuck
+
+**Symptoms:**
+- State doesn't progress
+- Acknowledgments not received
+
+**Debug:**
+```rust
+// Add logging to state machine
+match self.state {
+    InitState::Enable => {
+        println!("Enable state: C1={:#010b}, S1={:#010b}", self.rxpdo.c1, self.txpdo.s1);
+        // ...
+    }
+}
+
+// Check EtherCAT communication
+// - Is cycle running?
+// - Are other devices working?
+// - Check bus topology
+```
+
+### 5. Error Bit Set
+
+**Symptoms:**
+- Error bit (S2 bit 7) is 1
+- LED H blinking
+- Controller stops
+
+**Debug:**
+```rust
+// Check error state
+let s2 = StatusByteS2::from_bits(dev.txpdo.s2);
+if s2.has_flag(S2Flag::Error) {
+    println!("ERROR DETECTED");
+    
+    // Count LED H blinks for error code
+    // See Wago manual section 3.3
+    
+    // Check other status flags for clues
+    println!("Busy: {}", s2.has_flag(S2Flag::Busy));
+    println!("StandStill: {}", s2.has_flag(S2Flag::StandStill));
+}
+```
+
+**Common error codes:**
+- **2 blinks:** Overcurrent
+- **3 blinks:** Position error
+- **4 blinks:** Encoder fault
+- See Wago manual for complete list
+	
+---
+
+### Supporting Wago 750-671
+
+The 750-671 uses different C1 bit layout:
+
+1. **Create separate enum:**
+```rust
+// For 750-671
+pub enum C1Flag671 {
+    Enable         = 0b0000_0001,  // Bit 0
+    Stop2N         = 0b0000_0010,  // Bit 1
+    Start          = 0b0000_0100,  // Bit 2
+    MSpeedControl  = 0b0000_1000,  // Bit 3 (instead of command field)
+    MProgram       = 0b0001_0000,  // Bit 4
+    MReference     = 0b0010_0000,  // Bit 5
+    MJog           = 0b0100_0000,  // Bit 6
+    MDriveByMBX    = 0b1000_0000,  // Bit 7
+}
+```
+
+---
+
+## Quick Reference Card
+
+### Initialization Checklist
+```rust
+// 1. Create and configure
+let stepper = StepperVelocityWago750672::new(device);
+
+// 2. Set prescalers (optional, before enable)
+stepper.set_freq_range_sel(1);   // 0-3
+stepper.set_acc_range_sel(1);    // 0-3
+
+// 3. Set non-zero acceleration (REQUIRED)
+stepper.set_acceleration(10000);
+
+// 4. Enable
+stepper.set_enabled(true);
+
+// 5. Set velocity (after initialized)
+stepper.set_velocity(15000);     // ±25000 max
+```
+
+### Key Constants
+```rust
+const SPEED_CONTROL_CMD: u8 = 0x18;  // C1 command for 750-672
+const MAX_VELOCITY: i16 = 25000;
+const MIN_VELOCITY: i16 = -25000;
+const DEFAULT_ACCELERATION: u16 = 10000;
+```
+
+### Critical Rules
+1. ⚠️ **Never enable with zero acceleration**
+2. ⚠️ **Always wait for acknowledgments**
+3. ⚠️ **Issue Start pulse for every velocity change**
+4. ⚠️ **Prescalers can only be changed when disabled**
+5. ⚠️ **Keep Enable and Stop2_N high during operation**
+
+### Common Bit Patterns
+```rust
+// Enable + Stop2_N
+0b0000_0011
+
+// Enable + Stop2_N + Speed Control
+0b0001_1011
+
+// Enable + Stop2_N + Speed Control + Start
+0b0001_1111
+```
+
+### Debug Commands
+```bash
+# View byte values
+println!("C1: {:#010b}", dev.rxpdo.c1);
+println!("S1: {:#010b}", dev.txpdo.s1);
+
+# Check specific flags
+let s2 = StatusByteS2::from_bits(dev.txpdo.s2);
+println!("Error: {}", s2.has_flag(S2Flag::Error));
+println!("OnSpeed: {}", s2.has_flag(S2Flag::OnSpeed));
+
+# Monitor state
+println!("State: {:?}", dev.state);
+println!("Initialized: {}", dev.initialized);
+```
+
+---
+
+## Additional Resources
+
+- **Wago Manual:** Section 2.1.2.3 (LEDs), 3.3 (Error Codes)
+- **WAGO I/O CHECK:** Configuration software for 750-671 application selector
+- **EtherCAT Specification:** www.ethercat.org
+- **Code Location:** 
+  - Device: `devices/wago_modules/wago_750_672.rs`
+  - Wrapper: `io/stepper_velocity_wago_750_672.rs`
+
+---
+
+## Changelog
+
+| Version | Date    | Changes                                     |
+| ------- | ------- | ------------------------------------------- |
+| 1.0     | 2025    | Initial implementation with state machine   |
+| 2.0     | 2026-02 | Added comprehensive developer documentation |
+
+---
+
+**Need help?** Check the troubleshooting section or add debug logging using the template above.

docs/developer-docs/getting-started.md

@@ -89,5 +89,86 @@ To get started with actual hardware, check out these step-by-step tutorials:
 
 - **[LED Control with EL2004](./minimal-example-el2004.md)** - Digital output control, the simplest possible hardware setup
 - **[Analog Input with EL3021](./minimal-example-el3021.md)** - Reading analog current measurements
+- **[Stepper Motor Control with EL7031-0030](./minimal-example-el7031-motor.md)** - Complete motor control integration with velocity control
 
 These examples provide complete hardware wiring diagrams and software setup instructions.
+
+
+# More Docs 
+
+- [x] [Architecture & Data Flow](./docs/architecture-overview.md)
+
+  - [x] Example Winder V2
+
+- [ ] Electron
+
+  - Folder Structure
+  - Routing with TanStack Router
+  - Design with Tailwind & Shadcn
+  - ...
+
+- [ ] Interfacing with Electron/Server
+
+  - [ ] SocketIO
+    - Machine Namespace
+    - Main Namespace
+  - [ ] REST
+    - Machine Mutations
+    - Write Device Identification
+
+- Server
+
+  - [x] [Threading](./docs/control-loop.md)
+  - [x] [Logging](./docs/logging.md)
+  - [ ] Control Loop Setup
+    - Control Loop Thread
+      - [ ] realtime
+    - Maindevice
+    - Group
+    - Extracting Device Identifications
+    - Identifying Groups
+    - Validating Machines
+    - Run Control Loop
+  - [x] [Control Loop](./docs/control-loop.md)
+  - [x] [Machine/Device Identification](./docs/identification.md)
+  - [ ] Machines
+    - When to create a new Machine?
+      - Versioning
+      - Code sharing
+    - Creating/Validating a Machine
+      - Validation
+      - Configuration
+  - [ ] Machine Implementation Guide
+    - Link: How to create a Device
+    - Link: How to create an Actor
+    - Link: How to create a Machine
+      - API (SocketIO + REST)
+      - Creation/Validation Logic
+        - Optional/Mandatory Devices
+        - Validate Devices
+      - Business Logic
+    - Link: How to create Machine Abstraction (Like Traverse/Puller/...)
+    - Forward `act` in winder.
+
+- [ ] Control Core
+
+  - [x] [Actors](./docs/actors.md)
+  - [ ] SocketIO
+    - Namespaces & Caching
+    - Joining leaving namespaces
+    - NamespaceId
+    - Caching
+      - Serverside Caching
+      - Clientside Caching
+  - [ ] REST
+
+- [x] Ethercat HAL
+
+  - [x] [Devices](./docs/devices.md)
+  - [x] [Configuration (CoE)](./docs/coe.md)
+  - [x] [IO](./docs/io.md)
+  - [x] [PDO](./docs/pdo.md)
+
+- [x] [Ethercat Basics](./docs/ethercat-basics.md)
+
+- [x] [NixOS Operating System](./docs/nixos/README.md)

docs/developer-docs/minimal-example-el7031-motor.md

@@ -0,0 +1,236 @@
+# Minimal Example — Beckhoff EL7031-0030 Stepper Motor Integration  
+A complete hardware + software walkthrough
+
+---
+
+## Table of Contents
+1. [Introduction](#1-introduction)
+2. [Requirements](#2-requirements)
+3. [Hardware Setup](#3-hardware-setup)
+   - [3.2 EK1100 Wiring](#32-ek1100-wiring)
+   - [3.2.1 Safe Wiring Procedure](#321-safe-wiring-procedure-beckhoff-recommended)
+   - [3.2.2 Wiring (EL7031-0030)](#322-wiring-el7031-0030)
+   - [3.3 Safety Warning](#33--safety-warning)
+4. [Software Setup](#4-software-setup)
+   - [4.1 Installing on Linux](#41-installing-on-linux-this-depends-on-your-distro)
+   - [4.2 Running the Backend](#42-running-the-backend)
+   - [4.3 Running the Frontend](#43-running-the-frontend)
+5. [Demo](#5-demo)
+   - [5.1 Assigning Devices in the Dashboard](#51-assigning-devices-in-the-dashboard)
+6. [Documentation](#6-documentation)
+7. [Software Architecture](#7-software-architecture)
+
+---
+
+## 1. Introduction
+
+This project documents the successful integration of a **Beckhoff EL7031-0030 Stepper Motor Terminal** into the QiTech control software stack. 
+The goal was to control a 24V stepper motor via EtherCAT using a custom Rust backend and a React/Electron frontend.
+
+---
+
+## 2. Requirements
+
+### Software
+- Rust toolchain
+- Node.js + npm
+- Git
+- QiTech Control repository
+- EtherCAT HAL (included inside repo)
+
+### Hardware
+- **EtherCAT Master:** Linux PC
+- **Bus Coupler:** EtherCAT Beckhoff EK1100
+- **Stepper Driver:** Beckhoff EL7031-0030 (THIS IS DIFFERENT FROM EL7031)
+- **Motor:** Standard 4-wire Stepper Motor
+- **Power Supply:** 24V DC
+- **Ethernet Cable:** Standard Ethernet cable
+- **Wiring Tools:** Screwdriver, wires
+
+---
+
+## 3. Hardware Setup
+
+### 3.2 EK1100 Wiring
+
+This wiring configuration powers the EL7031-0030.  
+It is not the only possible wiring but is the **simplest functional setup**.
+
+#### ⚠️ Safety Warning
+Always disconnect power before wiring.  
+Working on live EtherCAT terminals can cause serious damage or electrical shock.
+
+---
+
+#### 3.2.1 Safe Wiring Procedure (Beckhoff Recommended)
+
+1. Insert a screwdriver **straight** into the square release hole.
+2. Insert the stripped wire into the round opening.
+3. Remove the screwdriver — the spring clamp locks the wire.
+
+![](../assets/wiring.png)
+
+---
+
+We supply power using a **DC hollow-plug adapter**, like this one:  
+https://www.amazon.de/dp/B093FTFZ8Q
+
+Perform the following wiring on the EK1100:
+
+1. Red wire **(+24 V)** → Terminal **2**
+2. Black wire **(0 V)** → Terminal **3**
+3. Jumper wire from **Terminal 1 → Terminal 6**
+4. Jumper wire from **Terminal 5 → Terminal 7**
+
+After wiring, your module should look like **Figure 1**.
+
+---
+
+#### **Figure 1 — EK1100 Minimal Wiring**
+<img src="../assets/ek1100.jpeg" width="400">
+
+---
+
+#### **Figure 2 — EL7031-0030 Terminal**
+
+<img src="../assets/EL7031_0030.jpg" width="300">
+
+Slide the EL7031-0030 onto the right side of the EK1100 until it locks.
+The EtherCAT E-Bus and power contacts connect automatically — **no wiring required**.
+
+---
+
+#### **Figure 3 — Motor**
+<img src="../assets/motor.jpg" width="300">
+
+---
+
+#### **Figure 4 — Motor Wiring**
+<img src="../assets/motor_wiring.jpg" width="300">
+
+Now the motor is wired via the pins 4, 5, 12, 13 on the EL7031-0030.
+
+---
+
+#### **Figure 5 — EL7031 Integration Connected**
+
+<img src="../assets/EL7031_0030_connected.jpg" width="400">
+
+That's what the pin should look like.
+
+---
+
+### 3.2.2 Wiring (EL7031-0030)
+
+**Crucial:** The EL7031 requires two power sources: E-Bus (side contacts) for logic, and Front Terminal (6 & 14) for motor power.
+
+| Terminal Point | Function         | Cable Color (Example) |
+| :------------- | :--------------- | :-------------------- |
+| **4**          | Motor Coil A1    | Red                   |
+| **12**         | Motor Coil A2    | Blue                  |
+| **5**          | Motor Coil B1    | Green                 |
+| **13**         | Motor Coil B2    | Black                 |
+| **6**          | **Power +24V**   | PSU Red (+)           |
+| **14**         | **Power 0V/GND** | PSU Black (-)         |
+
+---
+
+### 3.3 ⚠️ Safety Warning
+
+- **Mandatory Power Supply:** Without 24V connected to **Pin 6 (+24V)** and **Pin 14 (GND)**, the terminal will remain in `PREOP` state or show a "Warning" LED (No Power). The motor will **not** move without this external supply.
+
+#### Risk of Destruction (Short Circuit):
+- **Never** connect the 24V Power Supply to the Motor Output pins (**4, 5, 12, 13**). This will instantly destroy the terminal (causing pins 12 & 13 to glow red/burn).
+- Ensure strict separation: **Pins 4/5/12/13 are for the MOTOR ONLY**.
+- **Pins 6/14 are for POWER ONLY**.
+
+Also, see the documentation of the EtherCAT terminal ([EL7031-0030](https://download.beckhoff.com/download/document/io/ethercat-terminals/el7031-0030de.pdf)) for the different power modes (page 46 ff.)
+
+---
+
+## 4. Software Setup
+
+### 4.1 Installing on Linux (this depends on your distro)
+
+Paste this into your terminal:
+
+```bash
+# Press Enter when prompted
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+
+sudo apt update
+sudo apt install -y npm nodejs git
+
+git clone git@github.com:qitechgmbh/control.git
+cd control/electron
+npm install
+```
+
+### 4.2 Running the Backend
+
+```bash
+./cargo_run_linux.sh
+```
+
+This script:
+- Builds the backend
+- Grants required system capabilities (raw sockets)
+- Starts EtherCAT communication
+
+### 4.3 Running the Frontend
+
+```bash
+# move to the control directory
+cd electron
+npm run start
+```
+
+This launches the QiTech Control dashboard.
+
+---
+
+## 5. Demo
+
+### 5.1 Assigning Devices in the Dashboard
+
+Once the backend + frontend are running, you should see:
+
+![](../assets/UI_start_motor.png)
+
+Make sure that under "Assign" → "Machine Assignment"
+the correct serial number is selected (each device should have the same one, here it is 1).
+Under "Machine" select your new Machine however you named it (I named it "TestMotor V1"), else it will detect that there is something connected to it but the connection won't work.
+
+![](../assets/machine_assigment_motor.png)
+
+**NOW THE MOTOR SHOULD TURN!**
+
+In the interface "TestMotor" on the left side, you can now control the motor (its state and its speed).
+
+![](../assets/UI_motor.png)
+
+---
+
+## 6. Documentation
+
+Use the official documentation of the EL7031-0030 for more information:  
+[Beckhoff EL7031-0030 Documentation](https://download.beckhoff.com/download/document/io/ethercat-terminals/el7031-0030de.pdf)
+
+---
+
+## 7. Software Architecture
+
+### Backend (Rust)
+Located in [machines/src/motor_test_machine/](/machines/src/motor_test_machine/).
+
+1. **`mod.rs`**: Defines the `MotorTestMachine` struct and holds the state (driver wrapper, enabled state, target velocity).
+2. **`api.rs`**: Handles incoming JSON commands from the frontend (Enable/Disable, Set Velocity) via WebSockets/SocketIO.
+3. **`act.rs`**: The real-time control loop. It updates the `StepperVelocityEL70x1` driver wrapper in every cycle based on the current state.
+4. **`new.rs`**: Initializes the hardware.
+
+### Frontend (TypeScript/React)
+Located in [electron/src/machines/motor_test_machine/](/electron/src/machines/motor_test_machine/) and [electron/src/routes/routes.tsx](/electron/src/routes/routes.tsx).
+
+1. **`useTestMotor.ts`**: Custom hook managing the optimistic state and communication with the backend.
+2. **`TestMotorControlPage.tsx`**: The UI using QiTech UI components (`ControlCard`, `EditValue`, `SelectionGroupBoolean`) to match the look and feel of the Winder2.
+3. **Routing**: Integrated into `routes.tsx` using TanStack Router, ensuring the machine appears in the sidebar and navigation works correctly.

docs/mitsubishi_inverter.md

@@ -136,7 +136,7 @@ A slave recognizes message data as one message when a **3.5 character long no-da
 
 # Inverter settings
 
-## Motor Constants
+## Motor Constants for ExtruderV2:
 
 The following is a table that shows which Registers need to be set on the Inverter for the safe operation of the Motor.
 
@@ -151,6 +151,22 @@ The following is a table that shows which Registers need to be set on the Invert
 | `3`                   | Base frequency               | 5000 (50 Hz)  |
 | `19`                  | Base frequency voltage       | 400 (Volt)    |
 
+
+## Motor Constants for ExtruderV3:
+
+The following is a table that shows which Registers need to be set on the Inverter for the safe operation of the Motor.
+
+| Parameter number (Pr) | Name                         | Value         |
+| --------------------- | ---------------------------- | ------------- |
+| `71`                  | Applied Motor                | 0             |
+| `80`                  | Motor Capacity               | 22 (2.2 kw)   |
+| `96`                  | Auto tuning setting/status   | 1             |
+| `1`                   | Max Frequency                | 5000          |
+| `2`                   | Min Frequency                | 0             |
+| `9`                   | Electronic Thermal O/L Relay | 4.40 (Ampere) |
+| `3`                   | Base frequency               | 5000 (50 Hz)  |
+| `19`                  | Base frequency voltage       | 400 (Volt)    |
+
 ## All Settings needed for the Inverter Communication/Operation with Extruder
 
 The Following settings are required to get the inverter Communication and Operation working properly

docs/rest-api.md

@@ -1,8 +1,8 @@
 # REST API `/api/v2`
 
-The Qitech Control Panel exposes a small HTTP interface for discovering machines and reading their current values. All examples below assume you are connected to the panel’s Ethernet subnet and talk directly to the panel at:
+The panel behaves like any other NetworkManager-managed linux and is able to either receive an IP-Address over DHCP or a statically defined one. Where the static IP is most likely the easiest to work with.
 
-- **Base URL:** `http://10.10.10.1:3001`
+- **Base URL:** `https://IP_ADDRESS`
 
 > **Schema note:** This documentation intentionally stays light on field details beyond what is shown in the examples. For the exact datatypes and complete payload shapes, refer to the corresponding Rust types (linked below).
 
@@ -10,17 +10,57 @@ The Qitech Control Panel exposes a small HTTP interface for discovering machines
 
 ## Authentication
 
-The panel does **not** perform HTTP authentication. The expected security model is **network-level isolation**: anything that can send packets to the panel’s Ethernet interface is treated as trusted. This matches common security assumptions in EtherCAT-style control networks. It is therefore suggested to run the entire production line in isolated operation.
+The panel performs Basic-Auth authentication. 
+For EVERY request made over HTTPS, Basic Auth is required.
 
-The panel is configured to administer its own subnet `10.10.10.0/24` via DHCP, while Wi-Fi can be used for upstream internet connectivity. To let the outside world communicate with the production line, a router should be placed at the network bondary bridging the production line's subnet and the rest of the network. The router can run in **client/bridge mode** on the line's subnet and expose the panel's API via **port forwading** or through a **reverse proxy** where one can add authentication, logging, rate limiting, etc.
+To set the password on the Panel for Basic Auth, do the following:
+1. Open a Terminal
+2. cd /home/qitech/control
+3. ./credentials.sh
 
-The following graphic depicts the suggested network topology for a single production line. Many lines could potentially share the same router.
+The credentials.sh script sets and prints the username and password for the api ONCE in the console. 
+Afterwards its accessible in machine_password in /tmp/ until the machine shuts down.
+If you ever forget your password you can simply run ./credentials.sh again, resetting the password used, however the username will always be machine 
 
-<p align="center">
-  <img width="769" height="528" alt="Suggested network topology" src="./assets/subnet.png" />
-</p>
+Example request with curl:
+```
+# username=machine
+# password=VoMZKZK4K4ZIvON+OU2ZcCXy
+# With -k you can ignore curl's self signed certificate error
+curl https://192.168.130.195/api/v2/machine -k -u machine:VoMZKZK4K4ZIvON+OU2ZcCXy
+```
+
+
+## Handling Self signed Certificate Warnings
+
+For HTTPS we use self-signed certificates.
+These are untrusted by default in browsers,tools like curl and https libraries.
+
+For most programs you can either ignore this warning or you can manually trust the certificate on your system.
+How these are installed depends on your system.
+
+On the panel pc, the root Certificate is located at: /var/lib/caddy/.local/share/caddy/pki/authorities/local/root.crt
+
+You need to copy this file to an usb drive or copy it some other way and add it as a trusted root certificate in your OS.
+
+Please refer to your OS' documentation or search the Internet about how to install a trusted SSL certificate.
+
+
+## Bypassing HTTPS and Authentication
+If you have an isolated network and dont wish to perform Authentication, then you can achieve this by: 
+1. Forking our repository
+2. Changing the Open Ports in nixos/os/configuration.nix:
+```
+  # All the way at the Bottom   
+  networking.firewall.allowedUDPPorts = [ 53 67 69 ];
+  # Change this 
+  networking.firewall.allowedTCPPorts = [ 443 ];
+  # To this
+  networking.firewall.allowedTCPPorts = [ 3001 ];
+```
+
+Again, you should only ever do this if you have your own reverse proxy with authentication or you have an isolated network.
 
-If DNS is available on the subnet, you may be able to resolve `qitech.control`; otherwise use the static address `10.10.10.1`.
 
 ---
 
@@ -38,7 +78,7 @@ Each machine also includes a `legacy_id` to support older **v1** workflows. If a
 ### Example request
 
 ```bash
-curl -X GET "http://10.10.10.1:3001/api/v2/machine"
+curl -X GET "https://IP_ADDRESS/api/v2/machine" -u machine:YOUR_PASSWORD
 ```
 
 ### Example response
@@ -119,7 +159,7 @@ To receive continuous updates (via WebSockets), subscribe to the machine namespa
 ### Example request (mock machine)
 
 ```bash
-curl -X GET "http://10.10.10.1:3001/api/v2/machine/mock/57922"
+curl -X GET "https://IP_ADDRESS/api/v2/machine/mock/57922" -u machine:YOUR_PASSWORD
 ```
 
 ### Example response
@@ -174,7 +214,7 @@ The API does **not** return the newly-applied state in the POST response. The pa
 curl -X POST \
   -d  \
   -H "Content-Type: application/json" \
-  "http://10.10.10.1:3001/api/v1/machine/mock/57922"
+  "https://IP_ADDRESS/api/v1/machine/mock/57922" -u machine:YOUR_PASSWORD
 ```
 
 ### Example response

electron/package.json

@@ -1,8 +1,8 @@
 {
   "name": "qitech-control-electron",
   "productName": "QiTech Control",
-  "version": "1.0.0",
-  "description": "",
+  "version": "2.4.1",
+  "description": "Next Generation Machine Interface ",
   "main": ".vite/build/main.js",
   "private": true,
   "scripts": {
@@ -34,9 +34,9 @@
     "@types/react": "^19.1.16",
     "@types/react-dom": "^19.0.4",
     "@types/react-virtualized": "^9.22.2",
-    "electron": "^37.3.1",
+    "electron": "^40.6.1",
     "electron-playwright-helpers": "^1.7.1",
-    "eslint": "^9.20.1",
+    "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.2",
     "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-react": "^7.37.4",
@@ -53,7 +53,7 @@
     "vite": "^6.4.1",
     "vite-plugin-electron": "^0.29.0",
     "vite-plugin-electron-renderer": "^0.14.6",
-    "vitest": "^3.0.6"
+    "vitest": "^4.0.18"
   },
   "dependencies": {
     "@hookform/resolvers": "^5.2.2",
@@ -88,12 +88,12 @@
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-hook-form": "^7.57.0",
-    "react-i18next": "^15.4.1",
+    "react-i18next": "^16.5.4",
     "react-markdown": "^10.1.0",
     "react-virtualized": "^9.22.6",
     "rehype-raw": "^7.0.0",
     "remark-gfm": "^4.0.1",
-    "socket.io-client": "^4.8.1",
+    "socket.io-client": "^4.8.3",
     "socket.io-msgpack-parser": "^3.0.2",
     "sonner": "^2.0.1",
     "tailwind-merge": "^3.0.1",
@@ -102,6 +102,6 @@
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
     "zod": "^4.3.5",
     "zod-validation-error": "^5.0.0",
-    "zustand": "^5.0.8"
+    "zustand": "^5.0.11"
   }
 }

electron/src/App.tsx

@@ -8,15 +8,11 @@ import { router } from "./routes/router";
 import { RouterProvider } from "@tanstack/react-router";
 import { Toaster } from "./components/ui/sonner";
 import { enableMapSet } from "immer";
-import { useGlobalLogStreaming } from "./hooks/useGlobalLogStreaming";
 import { GlobalLaserToastManager } from "./setup/GlobalLaserToastManager";
 
 export default function App() {
   const { i18n } = useTranslation();
 
-  // Start global log streaming
-  useGlobalLogStreaming();
-
   useEffect(() => {
     syncThemeWithLocal();
     updateAppLanguage(i18n);

electron/src/components/graph/AddMarkerDialog.tsx

@@ -0,0 +1,182 @@
+import React, { useState, useEffect } from "react";
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  DialogDescription,
+} from "@/components/ui/dialog";
+import { TouchButton } from "@/components/touch/TouchButton";
+import { TimeInput } from "@/components/time/TimeInput";
+import { Input } from "@/components/ui/input";
+import { Label } from "@/components/ui/label";
+import { Separator } from "@/components/ui/separator";
+import { Icon } from "@/components/Icon";
+
+type AddMarkerDialogProps = {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  onAddMarker: (name: string, timestamp: number, color?: string) => void;
+  currentTimestamp: number | null;
+  defaultName?: string;
+  // Existing marker names to prevent duplicates (case-insensitive)
+  existingNames?: string[];
+};
+
+export function AddMarkerDialog({
+  open,
+  onOpenChange,
+  onAddMarker,
+  currentTimestamp,
+  defaultName = "",
+  existingNames = [],
+}: AddMarkerDialogProps) {
+  const [name, setName] = useState(defaultName);
+  const [selectedTimestamp, setSelectedTimestamp] = useState<number | null>(
+    null,
+  );
+  const [color, setColor] = useState("#000000");
+  // Shown when user tries to add a marker whose name already exists
+  const [duplicateNameError, setDuplicateNameError] = useState(false);
+
+  // Reset form only when dialog opens or closes; do not reset when currentTimestamp
+  // updates while open (e.g. from graph) or we overwrite the user's time input
+  useEffect(() => {
+    if (open) {
+      setName(defaultName);
+      setSelectedTimestamp(currentTimestamp ?? Date.now());
+      setDuplicateNameError(false);
+    } else {
+      setName("");
+      setSelectedTimestamp(null);
+      setDuplicateNameError(false);
+    }
+  }, [open]);
+
+  const handleAdd = () => {
+    if (!name.trim()) return;
+
+    // Reject duplicate names (compare trimmed, case-insensitive)
+    const trimmedName = name.trim();
+    const isDuplicate = existingNames.some(
+      (existing) => existing.trim().toLowerCase() === trimmedName.toLowerCase(),
+    );
+    if (isDuplicate) {
+      setDuplicateNameError(true);
+      return;
+    }
+
+    setDuplicateNameError(false);
+
+    // Use selected time if set, else context/graph time, else now
+    const timestamp = selectedTimestamp ?? currentTimestamp ?? Date.now();
+    if (!timestamp) return;
+
+    onAddMarker(trimmedName, timestamp, color);
+    onOpenChange(false);
+  };
+
+  const handleCancel = () => {
+    onOpenChange(false);
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="sm:max-w-md">
+        <DialogHeader>
+          <DialogTitle className="flex flex-row items-center gap-2">
+            <Icon name="lu:Bookmark" />
+            Add Marker
+          </DialogTitle>
+          <DialogDescription>
+            Create a marker for all graphs of this machine at the current time.
+          </DialogDescription>
+        </DialogHeader>
+        <Separator />
+
+        <div className="flex flex-col gap-4">
+          {/* Name Input */}
+          <div className="flex flex-col gap-2">
+            <Label htmlFor="marker-name">Marker Name</Label>
+            <Input
+              id="marker-name"
+              type="text"
+              value={name}
+              onChange={(e) => {
+                setName(e.target.value);
+                setDuplicateNameError(false);
+              }}
+              placeholder="Enter marker name"
+              autoFocus
+              onKeyDown={(e) => {
+                if (e.key === "Enter") {
+                  handleAdd();
+                }
+              }}
+            />
+            {duplicateNameError && (
+              <p className="text-destructive text-sm">
+                A marker with this name already exists.
+              </p>
+            )}
+          </div>
+
+          {/* Time Input (optional) */}
+          <div className="flex flex-col gap-2">
+            <Label>Time (optional)</Label>
+            <TimeInput
+              timestamp={selectedTimestamp}
+              onTimeChange={setSelectedTimestamp}
+              onClear={() =>
+                setSelectedTimestamp(currentTimestamp ?? Date.now())
+              }
+            />
+            <p className="text-muted-foreground text-xs">
+              Leave empty to use current time
+            </p>
+          </div>
+
+          {/* Color Input */}
+          <div className="flex flex-col gap-2">
+            <Label htmlFor="marker-color">Color</Label>
+            <div className="flex items-center gap-3">
+              <input
+                id="marker-color"
+                type="color"
+                value={color}
+                onChange={(e) => setColor(e.target.value)}
+                className="border-input h-9 w-20 cursor-pointer rounded-md border"
+              />
+              <Input
+                type="text"
+                value={color}
+                onChange={(e) => setColor(e.target.value)}
+                placeholder="#000000"
+              />
+            </div>
+          </div>
+        </div>
+
+        <Separator />
+        <div className="flex flex-row gap-4">
+          <TouchButton
+            variant="outline"
+            icon="lu:X"
+            className="h-21 flex-1"
+            onClick={handleCancel}
+          >
+            Abort
+          </TouchButton>
+          <TouchButton
+            className="h-21 flex-1 flex-shrink-0"
+            onClick={handleAdd}
+            icon="lu:Bookmark"
+            disabled={!name.trim()}
+          >
+            Add Marker
+          </TouchButton>
+        </div>
+      </DialogContent>
+    </Dialog>
+  );
+}

electron/src/components/graph/BigGraph.tsx

@@ -20,6 +20,7 @@ import { TouchButton } from "../touch/TouchButton";
 import { seriesToUPlotData } from "@/lib/timeseries";
 import { ControlCard } from "@/control/ControlCard";
 import { getAllTimeSeries } from "./createChart";
+import { TargetDashOverlay } from "./TargetDashOverlay";
 
 // Collects lines connected to visible series for rendering
 const getVisibleLines = (data: any, visibleSeries: boolean[]) => {
@@ -92,6 +93,7 @@ export function BigGraph({
   config,
   graphId,
   syncGraph,
+  uplotRefOut,
   onRegisterForExport,
   onUnregisterFromExport,
 }: BigGraphProps & {
@@ -456,6 +458,7 @@ export function BigGraph({
   useBigGraphEffects({
     containerRef,
     uplotRef,
+    uplotRefOut,
     startTimeRef,
     manualScaleRef,
     lastProcessedCountRef,
@@ -494,8 +497,8 @@ export function BigGraph({
   return (
     <div className="h-[50vh] w-full">
       <div className="flex h-full w-full flex-col overflow-hidden rounded-3xl border border-gray-200 bg-white shadow">
-        <div className="flex items-center justify-between pt-4 pr-5 pb-6 pl-6">
-          <div className="mt-1 flex items-center gap-4">
+        <div className="flex shrink-0 items-center justify-between gap-4 pt-4 pr-5 pb-6 pl-6">
+          <div className="mt-1 flex min-w-0 flex-1 items-center gap-4">
             <Icon
               name={unit ? getUnitIcon(unit) : "lu:TrendingUp"}
               className="size-6 text-gray-600"
@@ -506,9 +509,9 @@ export function BigGraph({
             </h2>
           </div>
 
-          <div className="flex items-center gap-4">
+          <div className="flex shrink-0 items-center gap-4">
             {normalizedSeries.length === 1 && (
-              <ControlCard className="rounded-md px-4 py-3">
+              <ControlCard className="rounded-lg border-gray-200/80 bg-gray-50/80 px-4 py-3 shadow-sm">
                 <div className="flex items-center gap-2 text-base text-gray-600">
                   <span className="font-mono leading-none font-bold text-gray-900">
                     {formatDisplayValue(displayValue, renderValue)}
@@ -595,10 +598,18 @@ export function BigGraph({
 
         <div className="flex-1 overflow-hidden rounded-b-3xl pt-4">
           <div
-            ref={containerRef}
-            className={`h-full w-full overflow-hidden transition-opacity duration-100`}
+            className={`relative h-full w-full overflow-hidden transition-opacity duration-100`}
             style={{ backgroundColor: colors.background }}
-          />
+          >
+            <div ref={containerRef} className="h-full w-full overflow-hidden" />
+            <TargetDashOverlay
+              uplotRef={uplotRef}
+              newData={newData}
+              config={enhancedConfig}
+              selectedTimeWindow={selectedTimeWindow}
+              isLiveMode={isLiveMode}
+            />
+          </div>
         </div>
       </div>
     </div>

electron/src/components/graph/GraphControls.tsx

@@ -21,6 +21,7 @@ export function GraphControls({
   onSwitchToLive,
   onSwitchToHistorical,
   onExport,
+  onAddMarker,
   timeWindowOptions = DEFAULT_TIME_WINDOW_OPTIONS,
   showFromTimestamp,
   onShowFromChange,
@@ -80,7 +81,7 @@ export function GraphControls({
           )}
 
           <TouchButton
-            onClick={onSwitchToHistorical}
+            onClick={() => onSwitchToHistorical("button")}
             variant="outline"
             className={`h-auto px-3 py-3 text-base font-medium transition-colors ${
               !isLiveMode
@@ -102,16 +103,27 @@ export function GraphControls({
             Live
           </TouchButton>
 
-          {onExport && (
+          {(onExport || onAddMarker) && (
             <>
               <div className="mx-2 h-8 w-px bg-gray-200"></div>
-              <TouchButton
-                onClick={onExport}
-                variant="outline"
-                className="h-auto bg-green-600 px-3 py-3 text-base font-medium text-white hover:bg-green-700"
-              >
-                Export
-              </TouchButton>
+              {onAddMarker && (
+                <TouchButton
+                  onClick={onAddMarker}
+                  variant="outline"
+                  className="h-auto bg-blue-600 px-3 py-3 text-base font-medium text-white hover:bg-blue-700"
+                >
+                  Add Marker
+                </TouchButton>
+              )}
+              {onExport && (
+                <TouchButton
+                  onClick={onExport}
+                  variant="outline"
+                  className="h-auto bg-green-600 px-3 py-3 text-base font-medium text-white hover:bg-green-700"
+                >
+                  Export
+                </TouchButton>
+              )}
             </>
           )}
         </div>
@@ -127,6 +139,7 @@ export function FloatingControlPanel({
   onSwitchToLive,
   onSwitchToHistorical,
   onExport,
+  onAddMarker,
   timeWindowOptions = DEFAULT_TIME_WINDOW_OPTIONS,
   showFromTimestamp,
   onShowFromChange,
@@ -197,7 +210,7 @@ export function FloatingControlPanel({
             )}
 
             <TouchButton
-              onClick={onSwitchToHistorical}
+              onClick={() => onSwitchToHistorical("button")}
               variant="outline"
               className={`h-auto px-3 py-3 text-base font-medium transition-colors ${
                 !isLiveMode
@@ -218,10 +231,19 @@ export function FloatingControlPanel({
             >
               Live
             </TouchButton>
-            {isExpanded && onExport && (
+            {isExpanded && (onExport || onAddMarker) && (
               <div className="h-8 w-px bg-gray-200"></div>
             )}
-            {onExport && (
+            {isExpanded && onAddMarker && (
+              <TouchButton
+                onClick={onAddMarker}
+                variant="outline"
+                className="h-auto bg-blue-600 px-3 py-3 text-base font-medium text-white hover:bg-blue-700"
+              >
+                Add Marker
+              </TouchButton>
+            )}
+            {isExpanded && onExport && (
               <TouchButton
                 onClick={onExport}
                 variant="outline"

electron/src/components/graph/GraphWithMarkerControls.tsx

@@ -0,0 +1,393 @@
+import React, { useState, useRef, useEffect } from "react";
+import type uPlot from "uplot";
+import {
+  AutoSyncedBigGraph,
+  useGraphSync,
+  type GraphConfig,
+} from "@/components/graph";
+import { TimeSeries, TimeSeriesValue } from "@/lib/timeseries";
+import { Unit } from "@/control/units";
+import { useMarkerManager } from "./useMarkerManager";
+import { useMarkerContext } from "./MarkerContext";
+
+type TimeSeriesData = {
+  newData: TimeSeries | null;
+  title?: string;
+  color?: string;
+  lines?: any[];
+};
+
+type GraphWithMarkerControlsProps = {
+  syncHook: ReturnType<typeof useGraphSync>;
+  newData: TimeSeriesData | TimeSeriesData[];
+  config: GraphConfig;
+  unit?: Unit;
+  renderValue?: (value: number) => string;
+  graphId: string;
+  currentTimeSeries: TimeSeries | null;
+  machineId?: string;
+  markers?: Array<{
+    timestamp: number;
+    name: string;
+    value?: number;
+    color?: string;
+  }>;
+};
+
+const MARKER_HIT_WIDTH = 28;
+
+const LABEL_TOP_OFFSET = 30;
+
+function applyLabelHighlight(label: HTMLDivElement, highlighted: boolean) {
+  if (highlighted) {
+    label.style.zIndex = "20";
+    label.style.boxShadow = "0 4px 12px rgba(0,0,0,0.2)";
+    label.style.borderColor = "rgb(59 130 246)";
+  } else {
+    label.style.zIndex = "";
+    label.style.boxShadow = "0 2px 6px rgba(0,0,0,0.15)";
+    label.style.borderColor = "rgba(0,0,0,0.12)";
+  }
+}
+
+function unhighlightAllLabels(container: HTMLElement) {
+  container.querySelectorAll<HTMLDivElement>(".marker-label").forEach((el) => {
+    applyLabelHighlight(el, false);
+  });
+}
+
+// Apply or restore overlay styles (avoids React Compiler "mutates immutable" on inline DOM writes)
+function setOverlayOverflow(
+  container: HTMLElement,
+  parent: HTMLElement | null,
+  visible: boolean,
+  previous: { overflow: string; position: string; parentOverflow: string },
+) {
+  if (visible) {
+    container.style.overflow = "visible";
+    container.style.position = "relative";
+    if (parent) parent.style.overflow = "visible";
+  } else {
+    container.style.overflow = previous.overflow;
+    container.style.position = previous.position;
+    if (parent) parent.style.overflow = previous.parentOverflow;
+  }
+}
+
+// Duration (ms) to hold pointer on marker before it is deleted
+const LONG_PRESS_DELETE_MS = 5000;
+
+// Build marker DOM: one wrapper (hit area) for hover/tap, contains line, point, label.
+// Optional onLongPress: called after LONG_PRESS_DELETE_MS hold (e.g. to delete marker).
+function createMarkerElement(
+  u: uPlot,
+  overlayRect: DOMRect,
+  timestamp: number,
+  name: string,
+  value: number,
+  color?: string,
+  onLongPress?: () => void,
+): HTMLDivElement {
+  const plotRect = u.rect;
+  const plotLeftInOverlay = plotRect.left - overlayRect.left;
+  const plotTopInOverlay = plotRect.top - overlayRect.top;
+  const plotHeight = plotRect.height;
+  const plotWidth = plotRect.width;
+
+  let xInPlot = u.valToPos(timestamp, "x", false);
+  xInPlot = Math.max(0, Math.min(plotWidth, xInPlot));
+  const xPos = plotLeftInOverlay + xInPlot;
+  let yInPlot = u.valToPos(value, "y", false);
+  yInPlot = Math.max(0, Math.min(plotHeight, yInPlot));
+
+  const lineColor = color || "rgba(0, 0, 0, 0.5)";
+  const pointColor = color || "rgba(0, 0, 0, 0.8)";
+  const half = MARKER_HIT_WIDTH / 2;
+
+  const wrapperTop = plotTopInOverlay - LABEL_TOP_OFFSET;
+  const plotStartInWrapper = LABEL_TOP_OFFSET;
+
+  const wrapper = document.createElement("div");
+  wrapper.style.position = "absolute";
+  wrapper.style.left = `${xPos - half}px`;
+  wrapper.style.top = `${wrapperTop}px`;
+  wrapper.style.width = `${MARKER_HIT_WIDTH}px`;
+  wrapper.style.height = `${plotHeight + 50 + plotStartInWrapper}px`;
+  wrapper.style.cursor = "pointer";
+  wrapper.style.touchAction = "manipulation";
+  wrapper.style.zIndex = "10";
+  wrapper.className = "marker-wrapper";
+
+  const line = document.createElement("div");
+  line.style.position = "absolute";
+  line.style.left = `${half - 1}px`;
+  line.style.top = `${plotStartInWrapper}px`;
+  line.style.height = `${plotHeight}px`;
+  line.style.width = "2px";
+  line.style.background = lineColor;
+  line.style.pointerEvents = "none";
+  line.title = name;
+  line.className = "vertical-marker";
+
+  const point = document.createElement("div");
+  point.style.position = "absolute";
+  point.style.left = `${half}px`;
+  point.style.top = `${plotStartInWrapper + yInPlot}px`;
+  point.style.width = "8px";
+  point.style.height = "8px";
+  point.style.borderRadius = "50%";
+  point.style.background = pointColor;
+  point.style.transform = "translate(-50%, -50%)";
+  point.style.border = "2px solid white";
+  point.style.pointerEvents = "none";
+  point.title = name;
+  point.className = "marker-point";
+
+  const label = document.createElement("div");
+  label.textContent = name;
+  label.title = name;
+  label.style.position = "absolute";
+  label.style.left = `${half}px`;
+  label.style.top = "6px";
+  label.style.transform = "translateX(-50%)";
+  label.style.color = "rgb(30 41 59)";
+  label.style.padding = "4px 8px";
+  label.style.fontSize = "12px";
+  label.style.fontWeight = "600";
+  label.style.whiteSpace = "nowrap";
+  label.style.maxWidth = "160px";
+  label.style.overflow = "hidden";
+  label.style.textOverflow = "ellipsis";
+  label.style.background = "rgba(255, 255, 255, 1)";
+  label.style.borderRadius = "6px";
+  label.style.boxShadow = "0 2px 8px rgba(0,0,0,0.2)";
+  label.style.border = "1px solid rgba(0,0,0,0.2)";
+  label.style.pointerEvents = "none";
+  label.style.transition = "box-shadow 0.15s ease, border-color 0.15s ease";
+  label.style.zIndex = "1";
+  label.className = "marker-label";
+
+  const highlight = () => applyLabelHighlight(label, true);
+  const unhighlight = () => applyLabelHighlight(label, false);
+
+  wrapper.addEventListener("mouseenter", highlight);
+  wrapper.addEventListener("mouseleave", unhighlight);
+  wrapper.addEventListener("click", () => highlight());
+
+  // Long-press: hold 5s on marker to delete it (timer on pointerdown, clear on up/leave/cancel)
+  let longPressTimer: ReturnType<typeof setTimeout> | null = null;
+  const clearLongPressTimer = () => {
+    if (longPressTimer !== null) {
+      clearTimeout(longPressTimer);
+      longPressTimer = null;
+    }
+  };
+  wrapper.addEventListener("pointerdown", () => {
+    if (!onLongPress) return;
+    clearLongPressTimer();
+    longPressTimer = setTimeout(() => {
+      longPressTimer = null;
+      onLongPress(); // removes this marker
+    }, LONG_PRESS_DELETE_MS);
+  });
+  wrapper.addEventListener("pointerup", clearLongPressTimer);
+  wrapper.addEventListener("pointerleave", clearLongPressTimer);
+  wrapper.addEventListener("pointercancel", clearLongPressTimer);
+
+  wrapper.appendChild(line);
+  wrapper.appendChild(point);
+  wrapper.appendChild(label);
+  return wrapper;
+}
+
+function GraphWithMarkerControlsContent({
+  syncHook,
+  newData,
+  config,
+  unit,
+  renderValue,
+  graphId,
+  currentTimeSeries,
+  machineId: providedMachineId,
+  markers: providedMarkers,
+  graphWrapperRef,
+  uplotRefOut,
+}: GraphWithMarkerControlsProps & {
+  graphWrapperRef: React.RefObject<HTMLDivElement | null>;
+  uplotRefOut: React.MutableRefObject<uPlot | null>;
+}) {
+  const { setMachineId, setCurrentTimestamp, setCurrentValue } =
+    useMarkerContext();
+
+  // Auto-detect machineId from graphId if not provided (extract base name)
+  // e.g., "pressure-graph" -> "pressure", "extruder-graphs" -> "extruder-graphs"
+  const machineId = providedMachineId || graphId.split("-")[0] || "default";
+
+  // Update context with machineId, current timestamp and value for marker creation
+  useEffect(() => {
+    setMachineId(machineId);
+  }, [machineId, setMachineId]);
+
+  useEffect(() => {
+    const curr = currentTimeSeries?.current;
+    if (curr?.timestamp != null) {
+      setCurrentTimestamp(curr.timestamp);
+      setCurrentValue(curr.value);
+    } else {
+      setCurrentValue(null);
+    }
+  }, [
+    currentTimeSeries?.current?.timestamp,
+    currentTimeSeries?.current?.value,
+    setCurrentTimestamp,
+    setCurrentValue,
+  ]);
+
+  // Use provided markers or load from marker manager
+  const markerManager = useMarkerManager(machineId);
+  const markers = providedMarkers || markerManager.markers;
+
+  // Time Tick for forcing marker redraw
+  const [timeTick, setTimeTick] = useState(0);
+
+  // Set interval to force redraw the marker effect frequently (e.g., every 50ms)
+  useEffect(() => {
+    if (!currentTimeSeries?.current) return;
+    const intervalId = setInterval(() => {
+      setTimeTick((prev) => prev + 1);
+    }, 50);
+    return () => clearInterval(intervalId);
+  }, [currentTimeSeries?.current]);
+
+  // Marker Drawing Effect: use uPlot instance for exact valToPos so point sits on the curve
+  useEffect(() => {
+    const u = uplotRefOut.current;
+    if (!u?.root?.parentElement) return;
+
+    u.syncRect();
+
+    const overlayContainer = u.root.parentElement;
+    const overlayParent = overlayContainer.parentElement;
+
+    const previous = {
+      overflow: overlayContainer.style.overflow,
+      position: overlayContainer.style.position,
+      parentOverflow: overlayParent?.style.overflow ?? "",
+    };
+    setOverlayOverflow(overlayContainer, overlayParent, true, previous);
+
+    const overlayRect = overlayContainer.getBoundingClientRect();
+
+    // Only show markers within the visible time window (saved markers stay in store for export)
+    const xMin = u.scales.x?.min ?? -Infinity;
+    const xMax = u.scales.x?.max ?? Infinity;
+    const visibleMarkers = markers.filter(
+      (m) => m.timestamp >= xMin && m.timestamp <= xMax,
+    );
+
+    const wrappers: HTMLDivElement[] = visibleMarkers.map(
+      ({ timestamp, name, value, color }) => {
+        let markerValue = value;
+        if (markerValue === undefined && currentTimeSeries) {
+          const validValues = currentTimeSeries.long.values.filter(
+            (v): v is TimeSeriesValue => v !== null,
+          );
+          if (validValues.length > 0) {
+            // Use linear interpolation between surrounding points for stable positioning
+            // (avoids "closest" flipping between adjacent points which causes jumping)
+            const sorted = [...validValues].sort(
+              (a, b) => a.timestamp - b.timestamp,
+            );
+            const after = sorted.find((p) => p.timestamp >= timestamp);
+            const before = [...sorted]
+              .reverse()
+              .find((p) => p.timestamp <= timestamp);
+            if (after && before) {
+              if (after.timestamp === before.timestamp) {
+                markerValue = after.value;
+              } else {
+                const t =
+                  (timestamp - before.timestamp) /
+                  (after.timestamp - before.timestamp);
+                markerValue = before.value + t * (after.value - before.value);
+              }
+            } else if (after) {
+              markerValue = after.value;
+            } else if (before) {
+              markerValue = before.value;
+            }
+          }
+        }
+        if (markerValue === undefined) {
+          const yScale = u.scales.y;
+          markerValue =
+            yScale?.min != null && yScale?.max != null
+              ? (yScale.min + yScale.max) / 2
+              : 0;
+        }
+
+        // Pass remove callback so long-press (5s) on this marker deletes it
+        return createMarkerElement(
+          u,
+          overlayRect,
+          timestamp,
+          name,
+          markerValue,
+          color,
+          () => markerManager.removeMarker(timestamp),
+        );
+      },
+    );
+
+    overlayContainer
+      .querySelectorAll(".marker-wrapper")
+      .forEach((el) => el.remove());
+
+    wrappers.forEach((wrapper) => overlayContainer.appendChild(wrapper));
+
+    const onOverlayClick = (e: MouseEvent) => {
+      const target = e.target as HTMLElement;
+      if (!target.closest(".marker-wrapper")) {
+        unhighlightAllLabels(overlayContainer);
+      }
+    };
+    overlayContainer.addEventListener("click", onOverlayClick, true);
+
+    return () => {
+      overlayContainer.removeEventListener("click", onOverlayClick, true);
+      setOverlayOverflow(overlayContainer, overlayParent, false, previous);
+    };
+  }, [markers, currentTimeSeries, timeTick, uplotRefOut, graphWrapperRef]);
+
+  // Use original config without adding marker lines (markers are overlay elements)
+  const finalConfig = config;
+
+  return (
+    <div className="flex flex-col gap-2">
+      <div ref={graphWrapperRef} className="relative">
+        <AutoSyncedBigGraph
+          syncHook={syncHook}
+          newData={newData}
+          config={finalConfig}
+          unit={unit}
+          renderValue={renderValue}
+          graphId={graphId}
+          uplotRefOut={uplotRefOut}
+        />
+      </div>
+    </div>
+  );
+}
+
+export function GraphWithMarkerControls(props: GraphWithMarkerControlsProps) {
+  const graphWrapperRef = useRef<HTMLDivElement | null>(null);
+  const uplotRefOut = useRef<uPlot | null>(null);
+
+  return (
+    <GraphWithMarkerControlsContent
+      {...props}
+      graphWrapperRef={graphWrapperRef}
+      uplotRefOut={uplotRefOut}
+    />
+  );
+}

electron/src/components/graph/MarkerContext.tsx

@@ -0,0 +1,49 @@
+import React, { createContext, useContext, useState } from "react";
+
+type MarkerContextType = {
+  machineId: string | null;
+  setMachineId: (id: string) => void;
+  currentTimestamp: number | null;
+  setCurrentTimestamp: (timestamp: number) => void;
+  currentValue: number | null;
+  setCurrentValue: (value: number | null) => void;
+};
+
+const MarkerContext = createContext<MarkerContextType | null>(null);
+
+export function MarkerProvider({ children }: { children: React.ReactNode }) {
+  const [machineId, setMachineId] = useState<string | null>(null);
+  const [currentTimestamp, setCurrentTimestamp] = useState<number | null>(null);
+  const [currentValue, setCurrentValue] = useState<number | null>(null);
+
+  return (
+    <MarkerContext.Provider
+      value={{
+        machineId,
+        setMachineId,
+        currentTimestamp,
+        setCurrentTimestamp,
+        currentValue,
+        setCurrentValue,
+      }}
+    >
+      {children}
+    </MarkerContext.Provider>
+  );
+}
+
+export function useMarkerContext() {
+  const context = useContext(MarkerContext);
+  // Return a default context if not within a provider (for non-graph pages)
+  if (!context) {
+    return {
+      machineId: null,
+      setMachineId: () => {},
+      currentTimestamp: null,
+      setCurrentTimestamp: () => {},
+      currentValue: null,
+      setCurrentValue: () => {},
+    };
+  }
+  return context;
+}

electron/src/components/graph/SyncedComponents.tsx

@@ -1,9 +1,12 @@
-import React from "react";
+import React, { useState } from "react";
 import { BigGraph } from "./BigGraph";
 import { GraphControls, FloatingControlPanel } from "./GraphControls";
 import { useGraphSync } from "./useGraphSync";
 import { BigGraphProps, PropGraphSync, TimeWindowOption } from "./types";
 import { GraphExportData } from "./excelExport";
+import { useMarkerManager } from "./useMarkerManager";
+import { AddMarkerDialog } from "./AddMarkerDialog";
+import { useMarkerContext } from "./MarkerContext";
 
 export function SyncedBigGraph({
   syncGraph: externalSyncGraph,
@@ -50,21 +53,71 @@ export function SyncedGraphControls({
   );
 }
 
-export function SyncedFloatingControlPanel({
+function SyncedFloatingControlPanelInner({
   controlProps,
   timeWindowOptions,
+  machineId: machineIdProp,
   ...props
 }: {
   controlProps?: ReturnType<typeof useGraphSync>["controlProps"];
   timeWindowOptions?: TimeWindowOption[];
+  machineId?: string;
 }) {
   const defaultSync = useGraphSync();
   const finalProps = controlProps || defaultSync.controlProps;
+  const {
+    machineId: machineIdContext,
+    currentTimestamp,
+    currentValue,
+  } = useMarkerContext();
+
+  // Prefer explicit prop so panel and graphs always use the same store
+  const detectedMachineId = machineIdProp ?? machineIdContext ?? "default";
+  const { addMarker, markers } = useMarkerManager(detectedMachineId);
+  const [isMarkerDialogOpen, setIsMarkerDialogOpen] = useState(false);
+
+  // Always use current timestamp from context (live time from graphs) or current time
+  // As per requirement: "always use the current time"
+  const markerTimestamp = currentTimestamp || Date.now();
+
+  const handleAddMarker = (name: string, timestamp: number, color?: string) => {
+    addMarker(name, timestamp, color, currentValue ?? undefined);
+  };
 
   return (
-    <FloatingControlPanel
-      {...finalProps}
+    <>
+      <FloatingControlPanel
+        {...finalProps}
+        timeWindowOptions={timeWindowOptions}
+        onAddMarker={() => setIsMarkerDialogOpen(true)}
+        {...props}
+      />
+      <AddMarkerDialog
+        open={isMarkerDialogOpen}
+        onOpenChange={setIsMarkerDialogOpen}
+        onAddMarker={handleAddMarker}
+        currentTimestamp={markerTimestamp}
+        existingNames={markers.map((m) => m.name)}
+      />
+    </>
+  );
+}
+
+export function SyncedFloatingControlPanel({
+  controlProps,
+  timeWindowOptions,
+  machineId,
+  ...props
+}: {
+  controlProps?: ReturnType<typeof useGraphSync>["controlProps"];
+  timeWindowOptions?: TimeWindowOption[];
+  machineId?: string;
+}) {
+  return (
+    <SyncedFloatingControlPanelInner
+      controlProps={controlProps}
       timeWindowOptions={timeWindowOptions}
+      machineId={machineId}
       {...props}
     />
   );

electron/src/components/graph/TargetDashOverlay.tsx

@@ -0,0 +1,411 @@
+import React, { useEffect, useMemo, useState, useId } from "react";
+import uPlot from "uplot";
+import { BigGraphProps, GraphConfig } from "./types";
+import { getAllTimeSeries } from "./createChart";
+
+type OverlayLine = {
+  key: string;
+  color: string;
+  width: number;
+  dash: number[];
+  d: string;
+};
+
+type ClipRect = {
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+};
+
+function findFirstGe(arr: number[], value: number): number {
+  let lo = 0;
+  let hi = arr.length - 1;
+  let ans = arr.length;
+
+  while (lo <= hi) {
+    const mid = (lo + hi) >> 1;
+    if (arr[mid] >= value) {
+      ans = mid;
+      hi = mid - 1;
+    } else {
+      lo = mid + 1;
+    }
+  }
+
+  return ans;
+}
+
+function findLastLe(arr: number[], value: number): number {
+  let lo = 0;
+  let hi = arr.length - 1;
+  let ans = -1;
+
+  while (lo <= hi) {
+    const mid = (lo + hi) >> 1;
+    if (arr[mid] <= value) {
+      ans = mid;
+      lo = mid + 1;
+    } else {
+      hi = mid - 1;
+    }
+  }
+
+  return ans;
+}
+
+function buildSteppedPath(
+  u: uPlot,
+  xData: number[],
+  yData: Array<number | null>,
+): string {
+  const xMin = u.scales.x?.min;
+  const xMax = u.scales.x?.max;
+
+  if (xData.length < 2 || xMin === undefined || xMax === undefined) {
+    return "";
+  }
+
+  const firstVisibleIdx = Math.max(0, findFirstGe(xData, xMin) - 1);
+  const lastVisibleIdx = Math.min(
+    xData.length - 1,
+    findLastLe(xData, xMax) + 1,
+  );
+
+  if (lastVisibleIdx < firstVisibleIdx) {
+    return "";
+  }
+
+  const parts: string[] = [];
+  let started = false;
+  let prevX = 0;
+  let prevY = 0;
+
+  for (let i = firstVisibleIdx; i <= lastVisibleIdx; i++) {
+    const value = yData[i];
+    if (value === null || value === undefined) continue;
+
+    const x = u.valToPos(xData[i], "x", true);
+    const y = u.valToPos(value, "y", true);
+
+    if (!started) {
+      parts.push(`M ${x} ${y}`);
+      started = true;
+      prevX = x;
+      prevY = y;
+      continue;
+    }
+
+    if (x !== prevX) {
+      parts.push(`L ${x} ${prevY}`);
+    }
+    if (y !== prevY) {
+      parts.push(`L ${x} ${y}`);
+    }
+
+    prevX = x;
+    prevY = y;
+  }
+
+  return parts.join(" ");
+}
+
+function buildFlatLatestValuePath(
+  u: uPlot,
+  yData: Array<number | null>,
+): string {
+  let latestValue: number | null = null;
+
+  for (let i = yData.length - 1; i >= 0; i--) {
+    const value = yData[i];
+    if (value !== null && value !== undefined) {
+      latestValue = value;
+      break;
+    }
+  }
+
+  if (latestValue === null) {
+    return "";
+  }
+
+  const y = u.valToPos(latestValue, "y", true);
+  const left = u.bbox.left;
+  const right = u.bbox.left + u.bbox.width;
+
+  return `M ${left} ${y} L ${right} ${y}`;
+}
+
+function getHistoricalDashTargets(
+  data: BigGraphProps["newData"],
+  config: GraphConfig,
+): Array<{
+  dataIndex: number;
+  dash: number[];
+  color: string;
+  width: number;
+}> {
+  const allOriginalSeries = getAllTimeSeries(data);
+  const firstConfigLineDataIndex = 1 + allOriginalSeries.length;
+  let visibleLineIndex = 0;
+
+  const targets: Array<{
+    dataIndex: number;
+    dash: number[];
+    color: string;
+    width: number;
+  }> = [];
+
+  config.lines?.forEach((line) => {
+    if (line.show === false) return;
+
+    const dash = line.dash ?? (line.type === "threshold" ? [5, 5] : undefined);
+    const isHistoricalDashedTarget = !!line.targetSeries && !!dash?.length;
+
+    if (isHistoricalDashedTarget) {
+      targets.push({
+        dataIndex: firstConfigLineDataIndex + visibleLineIndex,
+        dash: dash!,
+        color: line.color,
+        width: line.width ?? 1,
+      });
+    }
+
+    visibleLineIndex++;
+  });
+
+  return targets;
+}
+
+function areDashArraysEqual(a: number[], b: number[]): boolean {
+  if (a.length !== b.length) return false;
+  for (let i = 0; i < a.length; i++) {
+    if (a[i] !== b[i]) return false;
+  }
+  return true;
+}
+
+function areOverlayLinesEqual(a: OverlayLine[], b: OverlayLine[]): boolean {
+  if (a.length !== b.length) return false;
+  for (let i = 0; i < a.length; i++) {
+    if (
+      a[i].key !== b[i].key ||
+      a[i].color !== b[i].color ||
+      a[i].width !== b[i].width ||
+      a[i].d !== b[i].d ||
+      !areDashArraysEqual(a[i].dash, b[i].dash)
+    ) {
+      return false;
+    }
+  }
+  return true;
+}
+
+function isSameClipRect(a: ClipRect | null, b: ClipRect): boolean {
+  return (
+    !!a &&
+    a.x === b.x &&
+    a.y === b.y &&
+    a.width === b.width &&
+    a.height === b.height
+  );
+}
+
+export function TargetDashOverlay({
+  uplotRef,
+  newData,
+  config,
+  selectedTimeWindow,
+  isLiveMode,
+}: {
+  uplotRef: React.RefObject<uPlot | null>;
+  newData: BigGraphProps["newData"];
+  config: GraphConfig;
+  selectedTimeWindow: number | "all";
+  isLiveMode: boolean;
+}) {
+  const targetMeta = useMemo(
+    () => getHistoricalDashTargets(newData, config),
+    [newData, config],
+  );
+  const clipPathId = useId().replace(/:/g, "");
+
+  const [lines, setLines] = useState<OverlayLine[]>([]);
+  const [clipRect, setClipRect] = useState<ClipRect | null>(null);
+
+  useEffect(() => {
+    if (targetMeta.length === 0) {
+      setLines([]);
+      setClipRect(null);
+    }
+  }, [targetMeta]);
+
+  useEffect(() => {
+    let rafId: number | null = null;
+    let bootstrapRafId: number | null = null;
+    let recalcScheduled = false;
+    let hooksAttached = false;
+    const removeHookFns: Array<() => void> = [];
+    let resizeObserver: ResizeObserver | null = null;
+
+    const recalc = () => {
+      recalcScheduled = false;
+      const u = uplotRef.current;
+      if (!u || targetMeta.length === 0) {
+        return;
+      }
+
+      const xData = u.data[0] as number[] | undefined;
+      if (!xData || xData.length < 2) {
+        return;
+      }
+
+      const nextLines = targetMeta
+        .map((meta, index) => {
+          const yData = u.data[meta.dataIndex] as
+            | Array<number | null>
+            | undefined;
+          if (!yData || yData.length < 2) return null;
+
+          const useFlatShortWindowPath =
+            isLiveMode &&
+            selectedTimeWindow !== "all" &&
+            selectedTimeWindow <= 60_000;
+
+          const d = useFlatShortWindowPath
+            ? buildFlatLatestValuePath(u, yData)
+            : buildSteppedPath(u, xData, yData);
+          if (!d) return null;
+
+          return {
+            key: `${meta.dataIndex}-${index}`,
+            color: meta.color,
+            width: meta.width,
+            dash: meta.dash,
+            d,
+          } as OverlayLine;
+        })
+        .filter((line): line is OverlayLine => !!line);
+
+      if (nextLines.length > 0) {
+        setLines((prev) =>
+          areOverlayLinesEqual(prev, nextLines) ? prev : nextLines,
+        );
+        const nextClipRect: ClipRect = {
+          x: u.bbox.left,
+          y: u.bbox.top,
+          width: u.bbox.width,
+          height: u.bbox.height,
+        };
+        setClipRect((prev) =>
+          isSameClipRect(prev, nextClipRect) ? prev : nextClipRect,
+        );
+      }
+    };
+
+    const scheduleRecalc = () => {
+      if (recalcScheduled) return;
+      recalcScheduled = true;
+      rafId = window.requestAnimationFrame(recalc);
+    };
+
+    scheduleRecalc();
+
+    if (targetMeta.length === 0) {
+      return;
+    }
+
+    const addHook = (u: any, hookName: string, fn: () => void) => {
+      const hooks = u.hooks?.[hookName];
+      if (!Array.isArray(hooks)) return;
+      hooks.push(fn);
+      removeHookFns.push(() => {
+        const idx = hooks.indexOf(fn);
+        if (idx >= 0) hooks.splice(idx, 1);
+      });
+    };
+
+    const onWindowResize = () => scheduleRecalc();
+    window.addEventListener("resize", onWindowResize);
+
+    const attachHooks = (): boolean => {
+      if (hooksAttached) return true;
+      const u = uplotRef.current as any;
+      if (!u) return false;
+
+      addHook(u, "draw", scheduleRecalc);
+      addHook(u, "setScale", scheduleRecalc);
+      addHook(u, "setData", scheduleRecalc);
+
+      const rootElement = u.root as HTMLElement | undefined;
+      if (rootElement && typeof ResizeObserver !== "undefined") {
+        resizeObserver = new ResizeObserver(() => scheduleRecalc());
+        resizeObserver.observe(rootElement);
+      }
+
+      hooksAttached = true;
+      scheduleRecalc();
+      return true;
+    };
+
+    if (!attachHooks()) {
+      const tryAttach = () => {
+        if (attachHooks()) return;
+        bootstrapRafId = window.requestAnimationFrame(tryAttach);
+      };
+      bootstrapRafId = window.requestAnimationFrame(tryAttach);
+    }
+
+    return () => {
+      if (rafId !== null) {
+        window.cancelAnimationFrame(rafId);
+      }
+      if (bootstrapRafId !== null) {
+        window.cancelAnimationFrame(bootstrapRafId);
+      }
+      removeHookFns.forEach((fn) => fn());
+      window.removeEventListener("resize", onWindowResize);
+      resizeObserver?.disconnect();
+    };
+  }, [uplotRef, targetMeta, isLiveMode, selectedTimeWindow]);
+
+  if (lines.length === 0) {
+    return null;
+  }
+
+  return (
+    <svg
+      className="pointer-events-none absolute inset-0 h-full w-full"
+      aria-hidden
+    >
+      {clipRect && (
+        <defs>
+          <clipPath id={clipPathId}>
+            <rect
+              x={clipRect.x}
+              y={clipRect.y}
+              width={clipRect.width}
+              height={clipRect.height}
+            />
+          </clipPath>
+        </defs>
+      )}
+
+      <g clipPath={clipRect ? `url(#${clipPathId})` : undefined}>
+        {lines.map((line) => {
+          return (
+            <path
+              key={line.key}
+              d={line.d}
+              fill="none"
+              stroke={line.color}
+              strokeWidth={line.width}
+              strokeLinecap="butt"
+              strokeDasharray={line.dash.join(" ")}
+              strokeDashoffset={0}
+            />
+          );
+        })}
+      </g>
+    </svg>
+  );
+}

electron/src/components/graph/animation.ts

@@ -5,8 +5,10 @@ import {
   AnimationRefs,
   AnimationState,
   BigGraphProps,
+  GraphLine,
   SeriesData,
 } from "./types";
+import { alignTargetSeriesToTimestamps } from "@/lib/timeseries";
 
 export function useAnimationRefs(): AnimationRefs {
   const animationFrameRef = useRef<number | null>(null);
@@ -50,7 +52,9 @@ export function buildUPlotData(
   values: number[],
   realPointsCount: number | undefined,
   realPointsCountRef: React.RefObject<number>,
-  config: { lines?: Array<{ show?: boolean; value: number }> },
+  config: {
+    lines?: Array<Partial<GraphLine> & { show?: boolean; value: number }>;
+  },
   allSeriesData?: number[][],
 ): uPlot.AlignedData {
   const uData: uPlot.AlignedData = [timestamps];
@@ -72,7 +76,14 @@ export function buildUPlotData(
   // Add config lines
   config.lines?.forEach((line) => {
     if (line.show !== false) {
-      uData.push(timestamps.map(() => line.value));
+      const lineData = line.targetSeries
+        ? alignTargetSeriesToTimestamps(
+            line.targetSeries,
+            timestamps,
+            line.value,
+          )
+        : timestamps.map(() => line.value);
+      uData.push(lineData);
     }
   });
 
@@ -88,7 +99,9 @@ export function animateNewPoint(
   viewMode: string,
   selectedTimeWindow: number | "all",
   startTimeRef: React.RefObject<number | null>,
-  config: { lines?: Array<{ show?: boolean; value: number }> },
+  config: {
+    lines?: Array<Partial<GraphLine> & { show?: boolean; value: number }>;
+  },
   updateYAxisScale: (xMin?: number, xMax?: number) => void, // Updated signature
   getAllSeriesData?: () => number[][],
 ): void {

electron/src/components/graph/createChart.ts

@@ -1,5 +1,9 @@
 import uPlot from "uplot";
-import { seriesToUPlotData, TimeSeries } from "@/lib/timeseries";
+import {
+  seriesToUPlotData,
+  TimeSeries,
+  alignTargetSeriesToTimestamps,
+} from "@/lib/timeseries";
 import {
   createEventHandlers,
   attachEventHandlers,
@@ -11,6 +15,7 @@ import { normalizeDataSeries } from "./animation";
 export function createChart({
   containerRef,
   uplotRef,
+  uplotRefOut,
   newData,
   config,
   colors,
@@ -59,7 +64,13 @@ export function createChart({
   // Add config lines data
   config.lines?.forEach((line) => {
     if (line.show !== false) {
-      const lineData = new Array(timestamps.length).fill(line.value);
+      const lineData = line.targetSeries
+        ? alignTargetSeriesToTimestamps(
+            line.targetSeries,
+            timestamps,
+            line.value,
+          )
+        : new Array(timestamps.length).fill(line.value);
       uPlotData.push(lineData as any);
     }
   });
@@ -169,11 +180,16 @@ export function createChart({
   // Add config lines
   config.lines?.forEach((line) => {
     if (line.show !== false) {
+      const dash =
+        line.dash ?? (line.type === "threshold" ? [5, 5] : undefined);
+      const isHistoricalDashedTarget = !!line.targetSeries && !!dash?.length;
+
       seriesConfig.push({
         label: line.label,
-        stroke: line.color,
+        // Historical dashed targets are rendered in an SVG overlay.
+        stroke: isHistoricalDashedTarget ? "rgba(0,0,0,0)" : line.color,
         width: line.width ?? 1,
-        dash: line.dash ?? (line.type === "threshold" ? [5, 5] : undefined),
+        dash: isHistoricalDashedTarget ? undefined : dash,
         show: true,
         points: { show: false },
       });
@@ -182,6 +198,9 @@ export function createChart({
 
   // Always destroy existing chart before creating new one
   if (uplotRef.current) {
+    if (uplotRefOut?.current != null) {
+      uplotRefOut.current = null;
+    }
     uplotRef.current.destroy();
     uplotRef.current = null;
   }
@@ -483,6 +502,10 @@ export function createChart({
     containerRef.current,
   );
 
+  if (uplotRefOut) {
+    uplotRefOut.current = uplotRef.current;
+  }
+
   // Create handler callbacks
   const handlerCallbacks: HandlerCallbacks = {
     updateYAxisScale,
@@ -512,7 +535,9 @@ export function createChart({
     values: [...primaryValues],
   };
 
-  return cleanup;
+  return () => {
+    cleanup();
+  };
 }
 
 // Helper function to get all valid TimeSeries from DataSeries

electron/src/components/graph/excelExport.ts

@@ -84,6 +84,27 @@ export function exportGraphsToExcel(
         XLSX.utils.book_append_sheet(workbook, dataWorksheet, dataSheetName);
       }
 
+      // Excel worksheet for timestamps and timestamp markers
+      if (graphLineData.targetLines.length > 0) {
+        const markerReportData =
+          createGraphLineMarkerReportSheet(graphLineData);
+        const markerReportWorksheet = XLSX.utils.aoa_to_sheet(markerReportData);
+        // Set column widths here (e.g., Column A = 15, Column B = 25)
+        markerReportWorksheet["!cols"] = [
+          { wch: 20 }, // Column A (Labels: 'Timestamp', 'Value', etc.)
+          { wch: 30 }, // Column B (Values, where the Date object resides)
+        ];
+        const markerReportSheetName = generateUniqueSheetName(
+          `${seriesTitle} Marker Report`,
+          usedSheetNames,
+        );
+        XLSX.utils.book_append_sheet(
+          workbook,
+          markerReportWorksheet,
+          markerReportSheetName,
+        );
+      }
+
       processedCount++;
     });
 
@@ -290,6 +311,119 @@ function createGraphLineDataSheet(graphLine: {
   });
 }
 
+function createGraphLineMarkerReportSheet(graphLine: {
+  graphTitle: string;
+  lineTitle: string;
+  series: TimeSeries;
+  color?: string;
+  unit?: Unit;
+  renderValue?: (value: number) => string;
+  config: GraphConfig;
+  targetLines: GraphLine[];
+}): any[][] {
+  const [timestamps, values] = seriesToUPlotData(graphLine.series.long);
+  const unitSymbol = renderUnitSymbol(graphLine.unit) || "";
+  // Initialize Report Data and Header
+  const reportData: any[][] = [
+    [`Marker Report: ${graphLine.lineTitle}`],
+    ["Graph", graphLine.graphTitle],
+    ["Line Name", graphLine.lineTitle],
+    ["", ""],
+    ["--- Data Point Marker Status ---", ""],
+    ["", ""],
+  ];
+
+  if (timestamps.length === 0) {
+    reportData.push(["No data points to report"]);
+    return reportData;
+  }
+
+  // Filter User Markers
+  const allTargetLines = graphLine.targetLines.filter(
+    (line) => line.show !== false,
+  );
+  const userMarkers = allTargetLines.filter(
+    (line) => line.type === "user_marker" && line.label,
+  );
+
+  // Map Markers to Closest Data Point Index
+  const markerIndexMap = new Map<
+    number,
+    { label: string; originalTimestamp: number }
+  >();
+
+  userMarkers.forEach((line) => {
+    const markerTime = line.markerTimestamp || line.value; // Use the correct high-precision timestamp
+    let closestDataPointIndex = -1;
+    let minTimeDifference = Infinity;
+
+    // Find the data point with the closest timestamp
+    timestamps.forEach((ts, index) => {
+      const difference = Math.abs(ts - markerTime);
+      if (difference < minTimeDifference) {
+        minTimeDifference = difference;
+        closestDataPointIndex = index;
+      }
+    });
+
+    // Store the marker data at the index of the closest data point
+    if (closestDataPointIndex !== -1) {
+      markerIndexMap.set(closestDataPointIndex, {
+        label: line.label || "User Marker",
+        originalTimestamp: markerTime,
+      });
+    }
+  });
+
+  // Add the final header before the timestamp report starts
+  reportData.push(["--- BEGIN DETAILED REPORT ---", ""], ["", ""]);
+
+  // Handle case where no user markers were created
+  if (userMarkers.length === 0) {
+    reportData.push(["No user-created markers found.", ""]);
+  }
+
+  timestamps.forEach((dataPointTimestamp, index) => {
+    const value = values[index];
+    const markerData = markerIndexMap.get(index);
+
+    let finalMarkerLabel = "";
+    let timeToDisplay = dataPointTimestamp; // Default to data sample time
+
+    if (markerData) {
+      finalMarkerLabel = `${markerData.label}`;
+      timeToDisplay = markerData.originalTimestamp;
+    }
+
+    // Format the time (using timeToDisplay)
+    const formattedTime = new Date(timeToDisplay)
+      .toLocaleTimeString("en-US", {
+        hour: "2-digit",
+        minute: "2-digit",
+        second: "2-digit",
+        hour12: false,
+      })
+      .replace(/ /g, "");
+
+    // Row 1: Timestamp
+    reportData.push(["Timestamp", formattedTime]);
+
+    // Row 2: Value
+    const formattedValue = graphLine.renderValue
+      ? graphLine.renderValue(value)
+      : value?.toFixed(3) || "";
+    reportData.push([`Value (${unitSymbol})`, formattedValue]);
+
+    // Row 3: Marker Name
+    reportData.push(["Marker", finalMarkerLabel]);
+
+    // Separator
+    reportData.push(["", ""]);
+  });
+
+  return reportData;
+}
+
 // Ensure sheet names are unique and valid for Excel
 function generateUniqueSheetName(
   name: string,

electron/src/components/graph/historicalMode.ts

@@ -3,7 +3,12 @@ import { useRef, useCallback } from "react";
 import uPlot from "uplot";
 import { seriesToUPlotData } from "@/lib/timeseries";
 import { getPrimarySeriesData, stopAnimations } from "./animation";
-import { BigGraphProps, HistoricalModeHandlers, AnimationRefs } from "./types";
+import {
+  BigGraphProps,
+  HistoricalModeHandlers,
+  AnimationRefs,
+  SwitchOrigin,
+} from "./types";
 
 export function useHistoricalMode({
   newData,
@@ -120,12 +125,43 @@ export function useHistoricalMode({
   );
 
   // Switch to historical mode
-  const switchToHistoricalMode = useCallback(() => {
-    isInHistoricalModeRef.current = true;
-    captureHistoricalFreezeTimestamp();
-    stopAnimations(animationRefs);
-    lastProcessedCountRef.current = 0; // Reset processed count
-  }, [captureHistoricalFreezeTimestamp, animationRefs, lastProcessedCountRef]);
+  const switchToHistoricalMode = useCallback(
+    (origin?: SwitchOrigin) => {
+      isInHistoricalModeRef.current = true;
+
+      // Preserve current scale
+      if (origin === "gesture") {
+        try {
+          if (uplotRef.current) {
+            const xScale = uplotRef.current.scales.x;
+            const yScale = uplotRef.current.scales.y;
+            manualScaleRef.current = {
+              x: {
+                min: xScale?.min ?? 0,
+                max: xScale?.max ?? 0,
+              },
+              y: {
+                min: yScale?.min ?? 0,
+                max: yScale?.max ?? 1,
+              },
+            };
+          }
+        } catch (err) {
+          console.warn(
+            "Error preserving chart scales when switching to historical mode:",
+            err,
+          );
+        }
+      } else {
+        manualScaleRef.current = null;
+      }
+
+      captureHistoricalFreezeTimestamp();
+      stopAnimations(animationRefs);
+      lastProcessedCountRef.current = 0; // Reset processed count
+    },
+    [captureHistoricalFreezeTimestamp, animationRefs, lastProcessedCountRef],
+  );
 
   // Switch back to live mode
   const switchToLiveMode = useCallback(() => {

electron/src/components/graph/index.ts

@@ -10,6 +10,9 @@ export {
   AutoSyncedBigGraph,
 } from "./SyncedComponents";
 
+// Context
+export { MarkerProvider } from "./MarkerContext";
+
 // Hooks
 export { useGraphSync } from "./useGraphSync";
 

electron/src/components/graph/types.ts

@@ -1,8 +1,11 @@
+import type uPlot from "uplot";
 import { IconName } from "@/components/Icon";
 import { Unit } from "@/control/units";
 import { TimeSeries } from "@/lib/timeseries";
 import { RefObject } from "react";
 
+export type SwitchOrigin = "button" | "gesture";
+
 // Prop-based sync types
 export type PropGraphSync = {
   timeWindow: number | "all";
@@ -11,6 +14,7 @@ export type PropGraphSync = {
   xRange?: { min: number; max: number };
   historicalFreezeTimestamp?: number | null;
   showFromTimestamp?: number | null;
+  historicalSwitchOrigin: SwitchOrigin;
   onTimeWindowChange?: (graphId: string, timeWindow: number | "all") => void;
   onViewModeChange?: (
     graphId: string,
@@ -25,13 +29,15 @@ export type PropGraphSync = {
 
 // Configuration types for additional lines
 export type GraphLine = {
-  type: "threshold" | "target";
+  type: "threshold" | "target" | "user_marker"; // TODO: redundant or not?
   value: number;
+  targetSeries?: TimeSeries;
   color: string;
   label?: string;
   width?: number;
   dash?: number[];
   show?: boolean;
+  markerTimestamp?: number;
 };
 
 export type GraphConfig = {
@@ -71,6 +77,8 @@ export type BigGraphProps = {
   config: GraphConfig;
   graphId: string;
   syncGraph?: PropGraphSync;
+  /** Optional ref to receive the uPlot instance when chart is created (e.g. for marker positioning) */
+  uplotRefOut?: React.MutableRefObject<uPlot | null>;
 };
 
 export type TimeWindowOption = {
@@ -83,8 +91,9 @@ export type ControlProps = {
   isLiveMode: boolean;
   onTimeWindowChange: (timeWindow: number | "all") => void;
   onSwitchToLive: () => void;
-  onSwitchToHistorical: () => void;
+  onSwitchToHistorical: (origin: SwitchOrigin) => void;
   onExport?: () => void;
+  onAddMarker?: () => void;
   timeWindowOptions?: TimeWindowOption[];
   showFromTimestamp?: number | null;
   onShowFromChange?: (timestamp: number | null) => void;
@@ -100,13 +109,15 @@ export interface HistoricalModeHandlers {
   captureHistoricalFreezeTimestamp: () => number;
   getHistoricalEndTimestamp: () => number;
   handleHistoricalTimeWindow: (timeWindow: number | "all") => void;
-  switchToHistoricalMode: () => void;
+  switchToHistoricalMode: (origin?: SwitchOrigin) => void;
   switchToLiveMode: () => void;
 }
 
 export interface CreateChartParams {
   containerRef: React.RefObject<HTMLDivElement | null>;
   uplotRef: React.RefObject<uPlot | null>;
+  /** Optional ref to expose uPlot instance (e.g. for marker overlay positioning) */
+  uplotRefOut?: React.MutableRefObject<uPlot | null>;
   newData: BigGraphProps["newData"];
   config: BigGraphProps["config"];
   colors: {

electron/src/components/graph/useBigGraphEffects.ts

@@ -1,5 +1,11 @@
 /* eslint-disable react-compiler/react-compiler */
-import { useEffect, RefObject, useRef, useState } from "react";
+import {
+  useEffect,
+  MutableRefObject,
+  RefObject,
+  useRef,
+  useState,
+} from "react";
 import uPlot from "uplot";
 import { seriesToUPlotData } from "@/lib/timeseries";
 import { BigGraphProps, SeriesData, AnimationRefs, HandlerRefs } from "./types";
@@ -13,6 +19,7 @@ interface UseBigGraphEffectsProps {
   // Refs
   containerRef: RefObject<HTMLDivElement | null>;
   uplotRef: RefObject<uPlot | null>;
+  uplotRefOut?: MutableRefObject<uPlot | null>;
   startTimeRef: RefObject<number | null>;
   manualScaleRef: RefObject<{
     x: { min: number; max: number };
@@ -71,6 +78,7 @@ interface UseBigGraphEffectsProps {
 export function useBigGraphEffects({
   containerRef,
   uplotRef,
+  uplotRefOut,
   startTimeRef,
   manualScaleRef,
   lastProcessedCountRef,
@@ -175,7 +183,7 @@ export function useBigGraphEffects({
       const newIsLiveMode = syncGraph.isLiveMode;
 
       if (lastState.isLiveMode && !newIsLiveMode) {
-        historicalMode.switchToHistoricalMode();
+        historicalMode.switchToHistoricalMode(syncGraph.historicalSwitchOrigin);
       } else if (!lastState.isLiveMode && newIsLiveMode) {
         historicalMode.switchToLiveMode();
 
@@ -257,6 +265,7 @@ export function useBigGraphEffects({
     const cleanup = createChart({
       containerRef,
       uplotRef,
+      uplotRefOut,
       newData,
       config,
       colors,
@@ -291,6 +300,7 @@ export function useBigGraphEffects({
       cleanup?.();
       uplotRef.current?.destroy();
       uplotRef.current = null;
+      if (uplotRefOut) uplotRefOut.current = null;
       stopAnimations(animationRefs);
       setIsChartCreated(false);
       chartCreatedRef.current = false;

electron/src/components/graph/useGraphSync.ts

@@ -1,5 +1,5 @@
 import { useState, useCallback, useRef } from "react";
-import { PropGraphSync } from "./types";
+import { PropGraphSync, SwitchOrigin } from "./types";
 import { GraphExportData, exportGraphsToExcel } from "./excelExport";
 import { useGraphSettingsStore } from "@/stores/graphSettingsStore";
 
@@ -19,6 +19,7 @@ export function useGraphSync(exportGroupId?: string) {
     null,
   );
 
+  const historicalSwitchOriginRef = useRef<SwitchOrigin>("gesture");
   const historicalFreezeTimestampRef = useRef<number | null>(null);
   const graphDataRef = useRef<Map<string, () => GraphExportData | null>>(
     new Map(),
@@ -65,6 +66,7 @@ export function useGraphSync(exportGroupId?: string) {
         showFromTimestamp?: number | null;
         clearHistoricalFreeze?: boolean;
         setHistoricalFreeze?: boolean;
+        historicalSwitchOrigin?: SwitchOrigin;
       },
       requestId?: number,
     ) => {
@@ -104,6 +106,10 @@ export function useGraphSync(exportGroupId?: string) {
           historicalFreezeTimestampRef.current = Date.now();
         }
 
+        if (updates.historicalSwitchOrigin !== undefined) {
+          historicalSwitchOriginRef.current = updates.historicalSwitchOrigin;
+        }
+
         clearChangeSource();
       });
     },
@@ -164,6 +170,7 @@ export function useGraphSync(exportGroupId?: string) {
         viewMode: "manual",
         isLiveMode: false,
         setHistoricalFreeze: historicalFreezeTimestampRef.current === null,
+        historicalSwitchOrigin: "gesture",
       });
     },
     [updateSyncState],
@@ -210,6 +217,7 @@ export function useGraphSync(exportGroupId?: string) {
       isLiveMode: false,
       viewMode: "manual",
       setHistoricalFreeze: true,
+      historicalSwitchOrigin: "button",
     });
   }, [updateSyncState]);
 
@@ -242,6 +250,7 @@ export function useGraphSync(exportGroupId?: string) {
     xRange,
     historicalFreezeTimestamp: historicalFreezeTimestampRef.current,
     showFromTimestamp,
+    historicalSwitchOrigin: historicalSwitchOriginRef.current,
     onTimeWindowChange: handleTimeWindowChange,
     onViewModeChange: handleViewModeChange,
     onZoomChange: handleZoomChangeThrottled,

electron/src/components/graph/useMarkerManager.ts

@@ -0,0 +1,41 @@
+import { useCallback } from "react";
+import { useMarkerStore, type Marker } from "@/stores/markerStore";
+
+// Stable empty array to avoid "getSnapshot should be cached" infinite loop
+const EMPTY_MARKERS: Marker[] = [];
+
+export function useMarkerManager(machineId: string) {
+  const markers = useMarkerStore((state) => {
+    const list = state.markersByMachine[machineId];
+    return list ?? EMPTY_MARKERS;
+  });
+  const addMarkerAction = useMarkerStore((state) => state.addMarker);
+  const removeMarkerAction = useMarkerStore((state) => state.removeMarker);
+  const clearMarkersAction = useMarkerStore((state) => state.clearMarkers);
+
+  const addMarker = useCallback(
+    (name: string, timestamp: number, color?: string, value?: number) => {
+      addMarkerAction(machineId, { name, timestamp, color, value });
+      return { name, timestamp, color, value } as Marker;
+    },
+    [machineId, addMarkerAction],
+  );
+
+  const removeMarker = useCallback(
+    (timestamp: number) => {
+      removeMarkerAction(machineId, timestamp);
+    },
+    [machineId, removeMarkerAction],
+  );
+
+  const clearMarkers = useCallback(() => {
+    clearMarkersAction(machineId);
+  }, [machineId, clearMarkersAction]);
+
+  return {
+    markers,
+    addMarker,
+    removeMarker,
+    clearMarkers,
+  };
+}

electron/src/components/ui/dialog.tsx

@@ -36,7 +36,7 @@ function DialogOverlay({
     <DialogPrimitive.Overlay
       data-slot="dialog-overlay"
       className={cn(
-        "data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/80",
+        "data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-[100] bg-black/80",
         className,
       )}
       {...props}
@@ -55,7 +55,7 @@ function DialogContent({
       <DialogPrimitive.Content
         data-slot="dialog-content"
         className={cn(
-          "bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-50 grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg",
+          "bg-background data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 fixed top-[50%] left-[50%] z-[100] grid w-full max-w-[calc(100%-2rem)] translate-x-[-50%] translate-y-[-50%] gap-4 rounded-lg border p-6 shadow-lg duration-200 sm:max-w-lg",
           className,
         )}
         {...props}

electron/src/helpers/ipc/troubleshoot/troubleshoot-channels.ts

@@ -1,5 +1,3 @@
 export const TROUBLESHOOT_REBOOT_HMI = "troubleshoot:reboot-hmi";
 export const TROUBLESHOOT_RESTART_BACKEND = "troubleshoot:restart-backend";
-export const TROUBLESHOOT_START_LOG_STREAM = "troubleshoot:start-log-stream";
-export const TROUBLESHOOT_STOP_LOG_STREAM = "troubleshoot:stop-log-stream";
-export const TROUBLESHOOT_LOG_DATA = "troubleshoot:log-data";
+export const TROUBLESHOOT_EXPORT_LOGS = "troubleshoot:export-logs";

electron/src/helpers/ipc/troubleshoot/troubleshoot-context.ts

@@ -1,9 +1,7 @@
 import {
   TROUBLESHOOT_REBOOT_HMI,
   TROUBLESHOOT_RESTART_BACKEND,
-  TROUBLESHOOT_START_LOG_STREAM,
-  TROUBLESHOOT_STOP_LOG_STREAM,
-  TROUBLESHOOT_LOG_DATA,
+  TROUBLESHOOT_EXPORT_LOGS,
 } from "./troubleshoot-channels";
 
 export function exposeTroubleshootContext() {
@@ -11,11 +9,6 @@ export function exposeTroubleshootContext() {
   contextBridge.exposeInMainWorld("troubleshoot", {
     rebootHmi: () => ipcRenderer.invoke(TROUBLESHOOT_REBOOT_HMI),
     restartBackend: () => ipcRenderer.invoke(TROUBLESHOOT_RESTART_BACKEND),
-    startLogStream: () => ipcRenderer.invoke(TROUBLESHOOT_START_LOG_STREAM),
-    stopLogStream: () => ipcRenderer.invoke(TROUBLESHOOT_STOP_LOG_STREAM),
-    onLogData: (callback: (log: string) => void) =>
-      ipcRenderer.on(TROUBLESHOOT_LOG_DATA, (_event, log: string) => {
-        callback(log);
-      }),
+    exportLogs: () => ipcRenderer.invoke(TROUBLESHOOT_EXPORT_LOGS),
   });
 }

electron/src/helpers/ipc/troubleshoot/troubleshoot-listeners.ts

@@ -1,14 +1,13 @@
-import { ipcMain } from "electron";
-import { spawn, ChildProcess } from "child_process";
+import { ipcMain, dialog } from "electron";
+import { spawn, exec, ChildProcess } from "child_process";
 import {
   TROUBLESHOOT_REBOOT_HMI,
   TROUBLESHOOT_RESTART_BACKEND,
-  TROUBLESHOOT_START_LOG_STREAM,
-  TROUBLESHOOT_STOP_LOG_STREAM,
-  TROUBLESHOOT_LOG_DATA,
+  TROUBLESHOOT_EXPORT_LOGS,
 } from "./troubleshoot-channels";
 
-let logStreamProcess: ChildProcess | null = null;
+import fs from "fs";
+import path from "path";
 
 export function addTroubleshootEventListeners() {
   ipcMain.handle(TROUBLESHOOT_REBOOT_HMI, async () => {
@@ -60,62 +59,45 @@ export function addTroubleshootEventListeners() {
     }
   });
 
-  ipcMain.handle(TROUBLESHOOT_START_LOG_STREAM, async (event) => {
+  ipcMain.handle(TROUBLESHOOT_EXPORT_LOGS, async () => {
     try {
-      // Stop any existing log stream
-      if (logStreamProcess) {
-        logStreamProcess.kill();
-        logStreamProcess = null;
+      const now = new Date();
+      const datePart = now.toISOString().split("T")[0]; // YYYY-MM-DD
+      const timePart = now.toTimeString().split(" ")[0].replace(/:/g, "-"); // HH-mm-ss
+      const fileName = `journal_${datePart}_${timePart}.log`;
+
+      // 1. Open a Save Dialog so the user can choose the location
+      const { canceled, filePath } = await dialog.showSaveDialog({
+        title: "Export System Logs",
+        defaultPath: fileName,
+        filters: [{ name: "Log Files", extensions: ["log"] }],
+      });
+
+      if (canceled || !filePath) {
+        return { success: false, error: "Export cancelled by user" };
       }
 
-      logStreamProcess = spawn(
-        "journalctl",
-        ["-u", "qitech-control-server", "-n", "10000", "-f"],
-        {
-          shell: true,
+      // 2. Wrap the exec in a typed Promise to match the backend restart pattern
+      // This resolves the TS2794 error by explicitly defining the return type
+      return await new Promise<{ success: boolean; error?: string }>(
+        (resolve) => {
+          // Note: journalctl -xb usually requires sudo or journal group membership
+          exec(`journalctl -xb > "${filePath}"`, (error, stdout, stderr) => {
+            if (error) {
+              console.error("Exec error:", error);
+              resolve({
+                success: false,
+                error: error instanceof Error ? error.message : String(error),
+              });
+              return;
+            }
+
+            resolve({ success: true });
+          });
         },
       );
-
-      logStreamProcess.stdout?.on("data", (data) => {
-        const logLine = data.toString();
-        event.sender.send(TROUBLESHOOT_LOG_DATA, logLine);
-      });
-
-      logStreamProcess.stderr?.on("data", (data) => {
-        const logLine = data.toString();
-        event.sender.send(TROUBLESHOOT_LOG_DATA, logLine);
-      });
-
-      logStreamProcess.on("close", (code) => {
-        console.log(`Log stream process exited with code ${code}`);
-        logStreamProcess = null;
-      });
-
-      logStreamProcess.on("error", (error) => {
-        console.error("Log stream process error:", error);
-        logStreamProcess = null;
-      });
-
-      return { success: true };
     } catch (error) {
-      console.error("Failed to start log stream:", error);
-      return {
-        success: false,
-        error: error instanceof Error ? error.message : String(error),
-      };
-    }
-  });
-
-  ipcMain.handle(TROUBLESHOOT_STOP_LOG_STREAM, async () => {
-    try {
-      if (logStreamProcess) {
-        logStreamProcess.kill();
-        logStreamProcess = null;
-        console.log("Log stream stopped");
-      }
-      return { success: true };
-    } catch (error) {
-      console.error("Failed to stop log stream:", error);
+      console.error("Failed to export logs: ", error);
       return {
         success: false,
         error: error instanceof Error ? error.message : String(error),

electron/src/helpers/troubleshoot_helpers.ts

@@ -39,12 +39,12 @@ export async function restartBackend(): Promise<{
   }
 }
 
-export async function startLogStream(): Promise<{
+export async function exportLogs(): Promise<{
   success: boolean;
   error?: string;
 }> {
   try {
-    return await window.troubleshoot.startLogStream();
+    return await window.troubleshoot.exportLogs();
   } catch (error) {
     return {
       success: false,
@@ -53,35 +53,6 @@ export async function startLogStream(): Promise<{
   }
 }
 
-export async function stopLogStream(): Promise<{
-  success: boolean;
-  error?: string;
-}> {
-  try {
-    return await window.troubleshoot.stopLogStream();
-  } catch (error) {
-    return {
-      success: false,
-      error: error instanceof Error ? error.message : String(error),
-    };
-  }
-}
-
-/**
- * Setup log data streaming with callback
- * @param onLogData Callback function to handle incoming log data
- */
-export function setupLogDataListener(onLogData: (log: string) => void): void {
-  window.troubleshoot.onLogData(onLogData);
-}
-
-/**
- * Cleanup log data listener
- */
-export function cleanupLogDataListener(): void {
-  window.troubleshoot.onLogData(() => {});
-}
-
 /**
  * Combined function to restart backend and show appropriate toast messages
  */
@@ -99,10 +70,10 @@ export async function restartBackendWithToast(): Promise<boolean> {
 
 /**
  * Combined function to reboot HMI and show appropriate toast messages
+ * ?????? How would you see this?
  */
 export async function rebootHmiWithToast(): Promise<boolean> {
   const result = await rebootHmi();
-
   if (result.success) {
     return true;
   } else {

electron/src/hooks/useGlobalLogStreaming.ts

@@ -1,78 +0,0 @@
-import { useEffect } from "react";
-import { useLogsStore } from "@/stores/logsStore";
-import {
-  startLogStream,
-  stopLogStream,
-  setupLogDataListener,
-  isTroubleshootAvailable,
-} from "@/helpers/troubleshoot_helpers";
-
-/**
- * Hook to manage global log streaming
- * This should be used once at the app level to start log streaming
- */
-export function useGlobalLogStreaming() {
-  const { isStreaming, addLogEntry, setStreaming } = useLogsStore();
-
-  useEffect(() => {
-    // Only proceed if troubleshoot context is available
-    if (!isTroubleshootAvailable()) {
-      return;
-    }
-
-    if (!isStreaming) {
-      startLogStreamHelper();
-    }
-
-    // Setup log data listener
-    const handleLogData = (logData: string) => {
-      // Parse systemd journal log format
-      const lines = logData.split("\n").filter((line) => line.trim());
-
-      lines.forEach((line) => {
-        if (line.trim()) {
-          // Simple log level detection
-          let level: "info" | "warn" | "error" | "debug" = "info";
-          if (line.includes("ERROR") || line.includes("error")) level = "error";
-          else if (line.includes("WARN") || line.includes("warn"))
-            level = "warn";
-          else if (line.includes("DEBUG") || line.includes("debug"))
-            level = "debug";
-
-          addLogEntry({
-            source: "qitech-control-server",
-            level,
-            message: line.trim(),
-            raw: line,
-          });
-        }
-      });
-    };
-
-    // Setup log data listener using helper
-    setupLogDataListener(handleLogData);
-
-    return () => {
-      // Cleanup on unmount
-      if (isStreaming && isTroubleshootAvailable()) {
-        stopLogStream();
-        setStreaming(false);
-      }
-    };
-  }, [isStreaming, addLogEntry, setStreaming]);
-
-  const startLogStreamHelper = async () => {
-    try {
-      const result = await startLogStream();
-      if (result.success) {
-        setStreaming(true);
-      } else {
-        console.warn("Failed to start log stream:", result.error);
-      }
-    } catch (error) {
-      console.warn("Failed to start log stream:", error);
-    }
-  };
-
-  return { isStreaming };
-}

electron/src/lib/timeseries.ts

@@ -304,3 +304,46 @@ export function resetSeries(series: Series): void {
   series.lastTimestamp = 0;
   series.validCount = 0;
 }
+
+/**
+ * Aligns target series values with a given set of timestamps.
+ * For each timestamp in dataTimestamps, finds the most recent target value
+ * that was set before or at that timestamp (step function interpolation).
+ */
+export function alignTargetSeriesToTimestamps(
+  targetSeries: TimeSeries,
+  dataTimestamps: number[],
+  fallbackValue: number,
+): number[] {
+  if (dataTimestamps.length === 0) {
+    return [];
+  }
+
+  const [targetTimestamps, targetValues] = extractDataFromSeries(
+    targetSeries.long,
+  );
+
+  if (targetTimestamps.length === 0) {
+    return new Array(dataTimestamps.length).fill(fallbackValue);
+  }
+
+  const result: number[] = [];
+  let targetIndex = 0;
+
+  for (const dataTs of dataTimestamps) {
+    while (
+      targetIndex < targetTimestamps.length - 1 &&
+      targetTimestamps[targetIndex + 1] <= dataTs
+    ) {
+      targetIndex++;
+    }
+
+    if (targetTimestamps[targetIndex] > dataTs) {
+      result.push(fallbackValue);
+    } else {
+      result.push(targetValues[targetIndex]);
+    }
+  }
+
+  return result;
+}

electron/src/machines/aquapath/aquapath1/Aquapath1Page.tsx

@@ -18,7 +18,7 @@ export function Aquapath1Page() {
           link: "graph",
           title: "Graph",
           icon: "lu:ChartSpline",
-          activeLink: "graphs",
+          activeLink: "graph",
         },
         {
           link: "settings",

electron/src/machines/extruder/HeatingZone.tsx

@@ -16,6 +16,7 @@ type Props = {
   min: number;
   max: number;
   onChangeTargetTemp?: (temperature: number) => void;
+  targetTemperatureEnabled: boolean;
 };
 export function HeatingZone({
   title,
@@ -25,6 +26,7 @@ export function HeatingZone({
   heatingTimeSeries,
   heatingPower,
   onChangeTargetTemp,
+  targetTemperatureEnabled,
 }: Props) {
   const targetTemperature = heatingState?.target_temperature ?? 150;
 
@@ -41,19 +43,20 @@ export function HeatingZone({
             timeseries={heatingTimeSeries}
           />
         </div>
-
-        <Label label="Target Temperature">
-          <EditValue
-            value={targetTemperature}
-            defaultValue={150}
-            min={min}
-            max={max}
-            unit="C"
-            title="Target Temperature"
-            renderValue={(value) => roundToDecimals(value, 1)}
-            onChange={onChangeTargetTemp}
-          />
-        </Label>
+        {targetTemperatureEnabled && (
+          <Label label="Target Temperature">
+            <EditValue
+              value={targetTemperature}
+              defaultValue={150}
+              min={min}
+              max={max}
+              unit="C"
+              title="Target Temperature"
+              renderValue={(value) => roundToDecimals(value, 1)}
+              onChange={onChangeTargetTemp}
+            />
+          </Label>
+        )}
       </div>
 
       <TimeSeriesValueNumeric
@@ -65,7 +68,7 @@ export function HeatingZone({
         timeseries={heatingPower}
       />
 
-      {heatingState?.wiring_error && (
+      {heatingState?.wiring_error && targetTemperatureEnabled && (
         <StatusBadge variant="error">
           Cant Read Temperature! Check Temperature Sensor Wiring!
         </StatusBadge>

electron/src/machines/extruder/extruder2/Extruder2ControlPage.tsx

@@ -68,10 +68,12 @@ export function Extruder2ControlPage() {
       backTemperature.current?.value ?? 0,
       state?.heating_states.back.target_temperature ?? 1,
     );
-    const nozzleReady = isZoneReadyForExtrusion(
-      nozzleTemperature.current?.value ?? 0,
-      state?.heating_states.nozzle.target_temperature ?? 1,
-    );
+    const nozzleReady =
+      !state?.extruder_settings_state.nozzle_temperature_target_enabled ||
+      isZoneReadyForExtrusion(
+        nozzleTemperature.current?.value ?? 0,
+        state?.heating_states.nozzle.target_temperature ?? 1,
+      );
 
     return frontReady && middleReady && backReady && nozzleReady;
   };
@@ -87,6 +89,7 @@ export function Extruder2ControlPage() {
           onChangeTargetTemp={setFrontHeatingTemperature}
           min={0}
           max={300}
+          targetTemperatureEnabled={true}
         />
         <HeatingZone
           title={"Heating Middle"}
@@ -96,6 +99,7 @@ export function Extruder2ControlPage() {
           onChangeTargetTemp={setMiddleHeatingTemperature}
           min={0}
           max={300}
+          targetTemperatureEnabled={true}
         />
         <HeatingZone
           title={"Heating Back"}
@@ -105,6 +109,7 @@ export function Extruder2ControlPage() {
           onChangeTargetTemp={setBackHeatingTemperature}
           min={0}
           max={300}
+          targetTemperatureEnabled={true}
         />
         <HeatingZone
           title={"Heating Nozzle"}
@@ -114,6 +119,10 @@ export function Extruder2ControlPage() {
           onChangeTargetTemp={setNozzleHeatingTemperature}
           min={0}
           max={300}
+          targetTemperatureEnabled={
+            state?.extruder_settings_state.nozzle_temperature_target_enabled ??
+            true
+          }
         />
         <ControlCard className="bg-red" title="Screw Drive">
           {state?.inverter_status_state.overload_warning == true ? (

electron/src/machines/extruder/extruder2/Extruder2Graph.tsx

@@ -1,12 +1,13 @@
 import { Page } from "@/components/Page";
 import {
-  AutoSyncedBigGraph,
+  MarkerProvider,
   SyncedFloatingControlPanel,
   useGraphSync,
   type GraphConfig,
 } from "@/components/graph";
 import React from "react";
 import { useExtruder2 } from "./useExtruder";
+import { GraphWithMarkerControls } from "@/components/graph/GraphWithMarkerControls";
 
 export function Extruder2GraphsPage() {
   const {
@@ -24,6 +25,13 @@ export function Extruder2GraphsPage() {
     motorCurrent,
     motorPower,
     combinedPower,
+    // Target value history for graph target lines
+    targetPressure,
+    targetScrewRpm,
+    targetNozzleTemperature,
+    targetFrontTemperature,
+    targetMiddleTemperature,
+    targetBackTemperature,
   } = useExtruder2();
 
   const syncHook = useGraphSync("extruder-graphs");
@@ -49,6 +57,7 @@ export function Extruder2GraphsPage() {
                     {
                       type: "target" as const,
                       value: state.heating_states.nozzle.target_temperature,
+                      targetSeries: targetNozzleTemperature,
                       color: "#ef4444",
                       show: true,
                     },
@@ -69,6 +78,7 @@ export function Extruder2GraphsPage() {
                     {
                       type: "target" as const,
                       value: state.heating_states.front.target_temperature,
+                      targetSeries: targetFrontTemperature,
                       color: "#f59e0b",
                       show: true,
                     },
@@ -89,6 +99,7 @@ export function Extruder2GraphsPage() {
                     {
                       type: "target" as const,
                       value: state.heating_states.middle.target_temperature,
+                      targetSeries: targetMiddleTemperature,
                       color: "#8b5cf6",
                       show: true,
                     },
@@ -109,6 +120,7 @@ export function Extruder2GraphsPage() {
                     {
                       type: "target" as const,
                       value: state.heating_states.back.target_temperature,
+                      targetSeries: targetBackTemperature,
                       color: "#3b82f6",
                       show: true,
                     },
@@ -241,85 +253,102 @@ export function Extruder2GraphsPage() {
 
   return (
     <Page className="pb-25">
-      <div className="flex flex-col gap-4">
-        <AutoSyncedBigGraph
-          syncHook={syncHook}
-          newData={{
-            newData: pressure,
-            color: "#3b82f6",
-            lines:
-              state?.pressure_state.target_bar !== undefined
-                ? [
-                    {
-                      type: "target" as const,
-                      value: state.pressure_state.target_bar,
-                      color: "#3b82f6",
-                      show: true,
-                    },
-                  ]
-                : [],
-          }}
-          config={pressureConfig}
-          unit="bar"
-          renderValue={(value) => value.toFixed(2)}
-          graphId="pressure-graph"
-        />
+      <MarkerProvider>
+        <div className="flex flex-col gap-4">
+          <GraphWithMarkerControls
+            syncHook={syncHook}
+            newData={{
+              newData: pressure,
+              color: "#3b82f6",
+              lines:
+                state?.pressure_state.target_bar !== undefined
+                  ? [
+                      {
+                        type: "target" as const,
+                        value: state.pressure_state.target_bar,
+                        targetSeries: targetPressure,
+                        color: "#3b82f6",
+                        show: true,
+                      },
+                    ]
+                  : [],
+            }}
+            config={pressureConfig}
+            unit="bar"
+            renderValue={(value) => value.toFixed(2)}
+            graphId="pressure-graph"
+            currentTimeSeries={pressure}
+            machineId="extruder-graphs"
+          />
 
-        <AutoSyncedBigGraph
-          syncHook={syncHook}
-          newData={temperatureData}
-          config={temperatureConfig}
-          unit="C"
-          renderValue={(value) => value.toFixed(1)}
-          graphId="combined-temperatures"
-        />
+          <GraphWithMarkerControls
+            syncHook={syncHook}
+            newData={temperatureData}
+            config={temperatureConfig}
+            unit="C"
+            renderValue={(value) => value.toFixed(1)}
+            graphId="combined-temperatures"
+            currentTimeSeries={nozzleTemperature}
+            machineId="extruder-graphs"
+          />
 
-        <AutoSyncedBigGraph
-          syncHook={syncHook}
-          newData={powerData}
-          config={powerConfig}
-          unit="W"
-          renderValue={(value) => value.toFixed(1)}
-          graphId="combined-power"
-        />
+          <GraphWithMarkerControls
+            syncHook={syncHook}
+            newData={powerData}
+            config={powerConfig}
+            unit="W"
+            renderValue={(value) => value.toFixed(1)}
+            graphId="combined-power"
+            currentTimeSeries={combinedPower}
+            machineId="extruder-graphs"
+          />
 
-        <AutoSyncedBigGraph
-          syncHook={syncHook}
-          newData={{
-            newData: motorCurrent,
-            color: "#3b82f6",
-          }}
-          config={currentConfig}
-          unit="A"
-          renderValue={(value) => value.toFixed(2)}
-          graphId="motor-current"
-        />
+          <GraphWithMarkerControls
+            syncHook={syncHook}
+            newData={{
+              newData: motorCurrent,
+              color: "#3b82f6",
+            }}
+            config={currentConfig}
+            unit="A"
+            renderValue={(value) => value.toFixed(2)}
+            graphId="motor-current"
+            currentTimeSeries={motorCurrent}
+            machineId="extruder-graphs"
+          />
 
-        <AutoSyncedBigGraph
-          syncHook={syncHook}
-          newData={{
-            newData: motorScrewRpm,
-            color: "#8b5cf6",
-            lines:
-              state?.screw_state.target_rpm !== undefined
-                ? [
-                    {
-                      type: "target" as const,
-                      value: state.screw_state.target_rpm,
-                      color: "#8b5cf6",
-                      show: true,
-                    },
-                  ]
-                : [],
-          }}
-          config={rpmConfig}
-          unit="rpm"
-          renderValue={(value) => value.toFixed(0)}
-          graphId="rpm-graph"
-        />
-      </div>
+          <GraphWithMarkerControls
+            syncHook={syncHook}
+            newData={{
+              newData: motorScrewRpm,
+              color: "#8b5cf6",
+              lines:
+                state?.screw_state.target_rpm !== undefined
+                  ? [
+                      {
+                        type: "target" as const,
+                        value: state.screw_state.target_rpm,
+                        targetSeries: targetScrewRpm,
+                        color: "#8b5cf6",
+                        show: true,
+                      },
+                    ]
+                  : [],
+            }}
+            config={rpmConfig}
+            unit="rpm"
+            renderValue={(value) => value.toFixed(0)}
+            graphId="rpm-graph"
+            currentTimeSeries={motorScrewRpm}
+            machineId="extruder-graphs"
+          />
+        </div>
 
-      <SyncedFloatingControlPanel controlProps={syncHook.controlProps} />
+        <SyncedFloatingControlPanel
+          controlProps={syncHook.controlProps}
+          machineId="extruder-graphs"
+        />
+      </MarkerProvider>
     </Page>
   );
 }

electron/src/machines/extruder/extruder2/Extruder2Settings.tsx

@@ -20,6 +20,7 @@ export function Extruder2SettingsPage() {
     setPressurePidKi,
     setPressurePidKd,
     setTemperaturePidValue,
+    setTemperatureTargetEnabled,
   } = useExtruder2();
 
   const [showAdvanced, setShowAdvanced] = useState(false);
@@ -68,6 +69,16 @@ export function Extruder2SettingsPage() {
             onChange={setExtruderPressureLimitEnabled}
           />
         </Label>
+        <Label label="Nozzle Temperature Target Enabled">
+          <SelectionGroupBoolean
+            value={
+              state?.extruder_settings_state.nozzle_temperature_target_enabled
+            }
+            optionTrue={{ children: "Enabled" }}
+            optionFalse={{ children: "Disabled" }}
+            onChange={setTemperatureTargetEnabled}
+          />
+        </Label>
         <Label label="Show Advanced PID Settings">
           <SelectionGroupBoolean
             value={showAdvanced}

electron/src/machines/extruder/extruder2/extruder2Namespace.ts

@@ -109,6 +109,7 @@ export const heatingStatesSchema = z.object({
 export const extruderSettingsStateSchema = z.object({
   pressure_limit: z.number(),
   pressure_limit_enabled: z.boolean(),
+  nozzle_temperature_target_enabled: z.boolean(),
 });
 
 /**
@@ -221,6 +222,14 @@ export type Extruder2NamespaceStore = {
   // Combined power consumption and energy
   combinedPower: TimeSeries;
   totalEnergyKWh: TimeSeries;
+
+  // Target value history (for graph target lines)
+  targetPressure: TimeSeries;
+  targetScrewRpm: TimeSeries;
+  targetNozzleTemperature: TimeSeries;
+  targetFrontTemperature: TimeSeries;
+  targetMiddleTemperature: TimeSeries;
+  targetBackTemperature: TimeSeries;
 };
 
 const { initialTimeSeries: pressure, insert: addPressure } = createTimeSeries();
@@ -253,6 +262,28 @@ const { initialTimeSeries: motorScrewRpm, insert: addMotorScrewRpm } =
 const { initialTimeSeries: motorPower, insert: addMotorPower } =
   createTimeSeries();
 
+// Target value time series (for historical target lines on graphs)
+const { initialTimeSeries: targetPressure, insert: addTargetPressure } =
+  createTimeSeries();
+const { initialTimeSeries: targetScrewRpm, insert: addTargetScrewRpm } =
+  createTimeSeries();
+const {
+  initialTimeSeries: targetNozzleTemperature,
+  insert: addTargetNozzleTemperature,
+} = createTimeSeries();
+const {
+  initialTimeSeries: targetFrontTemperature,
+  insert: addTargetFrontTemperature,
+} = createTimeSeries();
+const {
+  initialTimeSeries: targetMiddleTemperature,
+  insert: addTargetMiddleTemperature,
+} = createTimeSeries();
+const {
+  initialTimeSeries: targetBackTemperature,
+  insert: addTargetBackTemperature,
+} = createTimeSeries();
+
 export function extruder2MessageHandler(
   store: StoreApi<Extruder2NamespaceStore>,
   throttledUpdater: ThrottledStoreUpdater<Extruder2NamespaceStore>,
@@ -271,6 +302,17 @@ export function extruder2MessageHandler(
       if (eventName === "StateEvent") {
         console.log(event);
         const stateEvent = stateEventSchema.parse(event);
+        const timestamp = event.ts;
+        const nextTargetPressure = stateEvent.data.pressure_state.target_bar;
+        const nextTargetScrewRpm = stateEvent.data.screw_state.target_rpm;
+        const nextTargetNozzleTemperature =
+          stateEvent.data.heating_states.nozzle.target_temperature;
+        const nextTargetFrontTemperature =
+          stateEvent.data.heating_states.front.target_temperature;
+        const nextTargetMiddleTemperature =
+          stateEvent.data.heating_states.middle.target_temperature;
+        const nextTargetBackTemperature =
+          stateEvent.data.heating_states.back.target_temperature;
         updateStore((state) => ({
           ...state,
           state: stateEvent,
@@ -278,6 +320,53 @@ export function extruder2MessageHandler(
           defaultState: stateEvent.data.is_default_state
             ? stateEvent
             : state.defaultState,
+          // Update target value history
+          targetPressure:
+            state.targetPressure.current?.value === nextTargetPressure
+              ? state.targetPressure
+              : addTargetPressure(state.targetPressure, {
+                  value: nextTargetPressure,
+                  timestamp,
+                }),
+          targetScrewRpm:
+            state.targetScrewRpm.current?.value === nextTargetScrewRpm
+              ? state.targetScrewRpm
+              : addTargetScrewRpm(state.targetScrewRpm, {
+                  value: nextTargetScrewRpm,
+                  timestamp,
+                }),
+          targetNozzleTemperature:
+            state.targetNozzleTemperature.current?.value ===
+            nextTargetNozzleTemperature
+              ? state.targetNozzleTemperature
+              : addTargetNozzleTemperature(state.targetNozzleTemperature, {
+                  value: nextTargetNozzleTemperature,
+                  timestamp,
+                }),
+          targetFrontTemperature:
+            state.targetFrontTemperature.current?.value ===
+            nextTargetFrontTemperature
+              ? state.targetFrontTemperature
+              : addTargetFrontTemperature(state.targetFrontTemperature, {
+                  value: nextTargetFrontTemperature,
+                  timestamp,
+                }),
+          targetMiddleTemperature:
+            state.targetMiddleTemperature.current?.value ===
+            nextTargetMiddleTemperature
+              ? state.targetMiddleTemperature
+              : addTargetMiddleTemperature(state.targetMiddleTemperature, {
+                  value: nextTargetMiddleTemperature,
+                  timestamp,
+                }),
+          targetBackTemperature:
+            state.targetBackTemperature.current?.value ===
+            nextTargetBackTemperature
+              ? state.targetBackTemperature
+              : addTargetBackTemperature(state.targetBackTemperature, {
+                  value: nextTargetBackTemperature,
+                  timestamp,
+                }),
         }));
       } else if (eventName === "LiveValuesEvent") {
         const liveValuesEvent = liveValuesEventSchema.parse(event);
@@ -378,6 +467,14 @@ export const createExtruder2NamespaceStore =
         middlePower,
         combinedPower,
         totalEnergyKWh,
+
+        // Target value history
+        targetPressure,
+        targetScrewRpm,
+        targetNozzleTemperature,
+        targetFrontTemperature,
+        targetMiddleTemperature,
+        targetBackTemperature,
       };
     });
 

electron/src/machines/extruder/extruder2/useExtruder.ts

@@ -57,6 +57,14 @@ export function useExtruder2() {
     backPower,
     combinedPower,
     totalEnergyKWh,
+
+    // Target value history for graph target lines
+    targetPressure,
+    targetScrewRpm,
+    targetNozzleTemperature,
+    targetFrontTemperature,
+    targetMiddleTemperature,
+    targetBackTemperature,
   } = useExtruder2Namespace(machineIdentification);
 
   // Single optimistic state for all state management
@@ -224,6 +232,20 @@ export function useExtruder2() {
     );
   };
 
+  const setTemperatureTargetEnabled = (enabled: boolean) => {
+    updateStateOptimistically(
+      (current) => {
+        current.data.extruder_settings_state.nozzle_temperature_target_enabled =
+          enabled;
+      },
+      () =>
+        requestNozzleTemperatureTargetEnabled({
+          machine_identification_unique: machineIdentification,
+          data: { SetNozzleTemperatureTargetEnabled: enabled },
+        }),
+    );
+  };
+
   const setPressurePidKp = (kp: number) => {
     updateStateOptimistically(
       (current) => {
@@ -373,6 +395,10 @@ export function useExtruder2() {
     z.object({ SetExtruderPressureLimitIsEnabled: z.boolean() }),
   );
 
+  const { request: requestNozzleTemperatureTargetEnabled } = useMachineMutation(
+    z.object({ SetNozzleTemperatureTargetEnabled: z.boolean() }),
+  );
+
   const { request: requestPressurePidSettings } = useMachineMutation(
     z.object({
       SetPressurePidSettings: z.object({
@@ -423,6 +449,14 @@ export function useExtruder2() {
     combinedPower,
     totalEnergyKWh,
 
+    // Target value history for graph target lines
+    targetPressure,
+    targetScrewRpm,
+    targetNozzleTemperature,
+    targetFrontTemperature,
+    targetMiddleTemperature,
+    targetBackTemperature,
+
     // Loading states
     isLoading: stateOptimistic.isOptimistic,
     isDisabled: !stateOptimistic.isInitialized,
@@ -443,6 +477,7 @@ export function useExtruder2() {
     setPressurePidKi,
     setPressurePidKd,
     setTemperaturePidValue,
+    setTemperatureTargetEnabled,
     resetInverter,
   };
 }

electron/src/machines/extruder/extruder3/Extruder3ControlPage.tsx

@@ -68,10 +68,12 @@ export function Extruder3ControlPage() {
       backTemperature.current?.value ?? 0,
       state?.heating_states.back.target_temperature ?? 1,
     );
-    const nozzleReady = isZoneReadyForExtrusion(
-      nozzleTemperature.current?.value ?? 0,
-      state?.heating_states.nozzle.target_temperature ?? 1,
-    );
+    const nozzleReady =
+      !state?.extruder_settings_state.nozzle_temperature_target_enabled ||
+      isZoneReadyForExtrusion(
+        nozzleTemperature.current?.value ?? 0,
+        state?.heating_states.nozzle.target_temperature ?? 1,
+      );
 
     return frontReady && middleReady && backReady && nozzleReady;
   };
@@ -87,6 +89,7 @@ export function Extruder3ControlPage() {
           onChangeTargetTemp={setFrontHeatingTemperature}
           min={0}
           max={300}
+          targetTemperatureEnabled={true}
         />
         <HeatingZone
           title={"Heating Middle"}
@@ -96,6 +99,7 @@ export function Extruder3ControlPage() {
           onChangeTargetTemp={setMiddleHeatingTemperature}
           min={0}
           max={300}
+          targetTemperatureEnabled={true}
         />
         <HeatingZone
           title={"Heating Back"}
@@ -105,6 +109,7 @@ export function Extruder3ControlPage() {
           onChangeTargetTemp={setBackHeatingTemperature}
           min={0}
           max={300}
+          targetTemperatureEnabled={true}
         />
         <HeatingZone
           title={"Heating Nozzle"}
@@ -114,6 +119,10 @@ export function Extruder3ControlPage() {
           onChangeTargetTemp={setNozzleHeatingTemperature}
           min={0}
           max={300}
+          targetTemperatureEnabled={
+            state?.extruder_settings_state.nozzle_temperature_target_enabled ??
+            true
+          }
         />
         <ControlCard className="bg-red" title="Screw Drive">
           {state?.inverter_status_state.overload_warning == true ? (

electron/src/machines/extruder/extruder3/Extruder3Graph.tsx

@@ -1,10 +1,11 @@
 import { Page } from "@/components/Page";
 import {
-  AutoSyncedBigGraph,
+  MarkerProvider,
   SyncedFloatingControlPanel,
   useGraphSync,
   type GraphConfig,
 } from "@/components/graph";
+import { GraphWithMarkerControls } from "@/components/graph/GraphWithMarkerControls";
 import React from "react";
 import { useExtruder3 } from "./useExtruder";
 
@@ -24,6 +25,13 @@ export function Extruder3GraphsPage() {
     motorCurrent,
     motorPower,
     combinedPower,
+    // Target value history for graph target lines
+    targetPressure,
+    targetScrewRpm,
+    targetNozzleTemperature,
+    targetFrontTemperature,
+    targetMiddleTemperature,
+    targetBackTemperature,
   } = useExtruder3();
 
   const syncHook = useGraphSync("extruder-graphs");
@@ -49,6 +57,7 @@ export function Extruder3GraphsPage() {
                     {
                       type: "target" as const,
                       value: state.heating_states.nozzle.target_temperature,
+                      targetSeries: targetNozzleTemperature,
                       color: "#ef4444",
                       show: true,
                     },
@@ -69,6 +78,7 @@ export function Extruder3GraphsPage() {
                     {
                       type: "target" as const,
                       value: state.heating_states.front.target_temperature,
+                      targetSeries: targetFrontTemperature,
                       color: "#f59e0b",
                       show: true,
                     },
@@ -89,6 +99,7 @@ export function Extruder3GraphsPage() {
                     {
                       type: "target" as const,
                       value: state.heating_states.middle.target_temperature,
+                      targetSeries: targetMiddleTemperature,
                       color: "#8b5cf6",
                       show: true,
                     },
@@ -109,6 +120,7 @@ export function Extruder3GraphsPage() {
                     {
                       type: "target" as const,
                       value: state.heating_states.back.target_temperature,
+                      targetSeries: targetBackTemperature,
                       color: "#3b82f6",
                       show: true,
                     },
@@ -241,85 +253,102 @@ export function Extruder3GraphsPage() {
 
   return (
     <Page className="pb-25">
-      <div className="flex flex-col gap-4">
-        <AutoSyncedBigGraph
-          syncHook={syncHook}
-          newData={{
-            newData: pressure,
-            color: "#3b82f6",
-            lines:
-              state?.pressure_state.target_bar !== undefined
-                ? [
-                    {
-                      type: "target" as const,
-                      value: state.pressure_state.target_bar,
-                      color: "#3b82f6",
-                      show: true,
-                    },
-                  ]
-                : [],
-          }}
-          config={pressureConfig}
-          unit="bar"
-          renderValue={(value) => value.toFixed(2)}
-          graphId="pressure-graph"
-        />
+      <MarkerProvider>
+        <div className="flex flex-col gap-4">
+          <GraphWithMarkerControls
+            syncHook={syncHook}
+            newData={{
+              newData: pressure,
+              color: "#3b82f6",
+              lines:
+                state?.pressure_state.target_bar !== undefined
+                  ? [
+                      {
+                        type: "target" as const,
+                        value: state.pressure_state.target_bar,
+                        targetSeries: targetPressure,
+                        color: "#3b82f6",
+                        show: true,
+                      },
+                    ]
+                  : [],
+            }}
+            config={pressureConfig}
+            unit="bar"
+            renderValue={(value) => value.toFixed(2)}
+            graphId="pressure-graph"
+            currentTimeSeries={pressure}
+            machineId="extruder-graphs"
+          />
 
-        <AutoSyncedBigGraph
-          syncHook={syncHook}
-          newData={temperatureData}
-          config={temperatureConfig}
-          unit="C"
-          renderValue={(value) => value.toFixed(1)}
-          graphId="combined-temperatures"
-        />
+          <GraphWithMarkerControls
+            syncHook={syncHook}
+            newData={temperatureData}
+            config={temperatureConfig}
+            unit="C"
+            renderValue={(value) => value.toFixed(1)}
+            graphId="combined-temperatures"
+            currentTimeSeries={nozzleTemperature ?? null}
+            machineId="extruder-graphs"
+          />
 
-        <AutoSyncedBigGraph
-          syncHook={syncHook}
-          newData={powerData}
-          config={powerConfig}
-          unit="W"
-          renderValue={(value) => value.toFixed(1)}
-          graphId="combined-power"
-        />
+          <GraphWithMarkerControls
+            syncHook={syncHook}
+            newData={powerData}
+            config={powerConfig}
+            unit="W"
+            renderValue={(value) => value.toFixed(1)}
+            graphId="combined-power"
+            currentTimeSeries={combinedPower ?? null}
+            machineId="extruder-graphs"
+          />
 
-        <AutoSyncedBigGraph
-          syncHook={syncHook}
-          newData={{
-            newData: motorCurrent,
-            color: "#3b82f6",
-          }}
-          config={currentConfig}
-          unit="A"
-          renderValue={(value) => value.toFixed(2)}
-          graphId="motor-current"
-        />
+          <GraphWithMarkerControls
+            syncHook={syncHook}
+            newData={{
+              newData: motorCurrent,
+              color: "#3b82f6",
+            }}
+            config={currentConfig}
+            unit="A"
+            renderValue={(value) => value.toFixed(2)}
+            graphId="motor-current"
+            currentTimeSeries={motorCurrent}
+            machineId="extruder-graphs"
+          />
 
-        <AutoSyncedBigGraph
-          syncHook={syncHook}
-          newData={{
-            newData: motorScrewRpm,
-            color: "#8b5cf6",
-            lines:
-              state?.screw_state.target_rpm !== undefined
-                ? [
-                    {
-                      type: "target" as const,
-                      value: state.screw_state.target_rpm,
-                      color: "#8b5cf6",
-                      show: true,
-                    },
-                  ]
-                : [],
-          }}
-          config={rpmConfig}
-          unit="rpm"
-          renderValue={(value) => value.toFixed(0)}
-          graphId="rpm-graph"
-        />
-      </div>
+          <GraphWithMarkerControls
+            syncHook={syncHook}
+            newData={{
+              newData: motorScrewRpm,
+              color: "#8b5cf6",
+              lines:
+                state?.screw_state.target_rpm !== undefined
+                  ? [
+                      {
+                        type: "target" as const,
+                        value: state.screw_state.target_rpm,
+                        targetSeries: targetScrewRpm,
+                        color: "#8b5cf6",
+                        show: true,
+                      },
+                    ]
+                  : [],
+            }}
+            config={rpmConfig}
+            unit="rpm"
+            renderValue={(value) => value.toFixed(0)}
+            graphId="rpm-graph"
+            currentTimeSeries={motorScrewRpm}
+            machineId="extruder-graphs"
+          />
+        </div>
 
-      <SyncedFloatingControlPanel controlProps={syncHook.controlProps} />
+        <SyncedFloatingControlPanel
+          controlProps={syncHook.controlProps}
+          machineId="extruder-graphs"
+        />
+      </MarkerProvider>
     </Page>
   );
 }

electron/src/machines/extruder/extruder3/Extruder3Settings.tsx

@@ -20,6 +20,7 @@ export function Extruder3SettingsPage() {
     setPressurePidKi,
     setPressurePidKd,
     setTemperaturePidValue,
+    setTemperatureTargetEnabled,
   } = useExtruder3();
 
   const [showAdvanced, setShowAdvanced] = useState(false);
@@ -68,6 +69,16 @@ export function Extruder3SettingsPage() {
             onChange={setExtruderPressureLimitEnabled}
           />
         </Label>
+        <Label label="Nozzle Temperature Target Enabled">
+          <SelectionGroupBoolean
+            value={
+              state?.extruder_settings_state.nozzle_temperature_target_enabled
+            }
+            optionTrue={{ children: "Enabled" }}
+            optionFalse={{ children: "Disabled" }}
+            onChange={setTemperatureTargetEnabled}
+          />
+        </Label>
         <Label label="Show Advanced PID Settings">
           <SelectionGroupBoolean
             value={showAdvanced}

electron/src/machines/extruder/extruder3/GlobalHeatingFaultToastManager.tsx

@@ -0,0 +1,153 @@
+import React, { useEffect, useRef } from "react";
+import { toast } from "sonner";
+import { Icon } from "@/components/Icon";
+
+type HeatingFaultState = {
+  heating_fault_state?: {
+    fault_zone?: string | null;
+    fault_acknowledged?: boolean;
+  };
+  is_default_state?: boolean;
+};
+
+type HeatingFaultToastProps = {
+  zoneName: string;
+  onAcknowledge: () => void;
+  children?: React.ReactNode;
+};
+
+function HeatingFaultToast({
+  zoneName,
+  onAcknowledge,
+  children,
+}: HeatingFaultToastProps) {
+  return (
+    <div className="flex w-100 flex-col gap-3 rounded-xl border border-red-400 bg-red-600 p-4 text-white shadow-xl backdrop-blur-sm transition-all duration-300">
+      <div className="flex items-center justify-between">
+        <div className="flex items-center gap-2">
+          <Icon name="lu:TriangleAlert" className="h-5 w-5 text-yellow-200" />
+          <strong className="text-lg font-semibold tracking-wide">
+            Heating Fault
+          </strong>
+        </div>
+        <button
+          className="rounded-md p-1 text-2xl font-bold text-white/80 hover:bg-red-500 hover:text-white focus:ring-2 focus:ring-white/30 focus:outline-none"
+          onClick={onAcknowledge}
+          aria-label="Close"
+        >
+          ×
+        </button>
+      </div>
+
+      {children ?? (
+        <p className="text-base leading-snug text-red-50">
+          The <strong>{zoneName}</strong> heating zone did not increase in
+          temperature by at least 5°C within 60 seconds. The extruder has been
+          automatically set to standby mode.
+        </p>
+      )}
+    </div>
+  );
+}
+
+function toZoneName(faultZone: string | null): string {
+  switch (faultZone) {
+    case "front":
+      return "Front";
+    case "middle":
+      return "Middle";
+    case "back":
+      return "Back";
+    case "nozzle":
+      return "Nozzle";
+    default:
+      return "Unknown";
+  }
+}
+
+function useHeatingFaultToastEffect({
+  state,
+  onAcknowledgeHeatingFault,
+}: {
+  state: HeatingFaultState | null | undefined;
+  onAcknowledgeHeatingFault: () => void;
+}) {
+  // Deduplicate by active fault zone
+  const activeFaultZone = useRef<string | null>(null);
+  const currentToastId = useRef<string | null>(null);
+
+  useEffect(() => {
+    if (!state) return;
+    const faultZone = state.heating_fault_state?.fault_zone ?? null;
+    const faultAcknowledged =
+      state.heating_fault_state?.fault_acknowledged ?? false;
+    const isDefault = !!state.is_default_state;
+
+    if (isDefault) return;
+
+    const faultZoneStr = faultZone ?? "unknown";
+    const zoneName = toZoneName(faultZone);
+
+    if (
+      faultZone &&
+      !faultAcknowledged &&
+      activeFaultZone.current !== faultZone
+    ) {
+      activeFaultZone.current = faultZone;
+      const toastId = `heating-fault-${faultZoneStr}`;
+      currentToastId.current = toastId;
+
+      toast(
+        <HeatingFaultToast
+          zoneName={zoneName}
+          onAcknowledge={() => {
+            onAcknowledgeHeatingFault();
+            toast.dismiss(toastId);
+            activeFaultZone.current = null;
+            currentToastId.current = null;
+          }}
+        />,
+        {
+          id: toastId,
+          duration: Infinity,
+          position: "top-center",
+          style: {
+            background: "transparent",
+            padding: 0,
+            boxShadow: "none",
+            border: "none",
+          },
+        },
+      );
+    }
+
+    if (faultAcknowledged || !faultZone) {
+      if (currentToastId.current) {
+        toast.dismiss(currentToastId.current);
+        currentToastId.current = null;
+      }
+      activeFaultZone.current = null;
+    }
+  }, [state, onAcknowledgeHeatingFault]);
+}
+
+export function GlobalHeatingFaultToastManager({
+  state,
+  onAcknowledgeHeatingFault,
+}: {
+  state:
+    | {
+        heating_fault_state?: {
+          fault_zone?: string | null;
+          fault_acknowledged?: boolean;
+        };
+        is_default_state?: boolean;
+      }
+    | null
+    | undefined;
+  onAcknowledgeHeatingFault: () => void;
+}) {
+  useHeatingFaultToastEffect({ state, onAcknowledgeHeatingFault });
+
+  return null;
+}

electron/src/machines/extruder/extruder3/extruder3Namespace.ts

@@ -109,6 +109,7 @@ export const heatingStatesSchema = z.object({
 export const extruderSettingsStateSchema = z.object({
   pressure_limit: z.number(),
   pressure_limit_enabled: z.boolean(),
+  nozzle_temperature_target_enabled: z.boolean(),
 });
 
 /**
@@ -221,6 +222,14 @@ export type Extruder3NamespaceStore = {
   // Combined power consumption and energy
   combinedPower: TimeSeries;
   totalEnergyKWh: TimeSeries;
+
+  // Target value history (for graph target lines)
+  targetPressure: TimeSeries;
+  targetScrewRpm: TimeSeries;
+  targetNozzleTemperature: TimeSeries;
+  targetFrontTemperature: TimeSeries;
+  targetMiddleTemperature: TimeSeries;
+  targetBackTemperature: TimeSeries;
 };
 
 const { initialTimeSeries: pressure, insert: addPressure } = createTimeSeries();
@@ -253,6 +262,28 @@ const { initialTimeSeries: motorScrewRpm, insert: addMotorScrewRpm } =
 const { initialTimeSeries: motorPower, insert: addMotorPower } =
   createTimeSeries();
 
+// Target value time series (for historical target lines on graphs)
+const { initialTimeSeries: targetPressure, insert: addTargetPressure } =
+  createTimeSeries();
+const { initialTimeSeries: targetScrewRpm, insert: addTargetScrewRpm } =
+  createTimeSeries();
+const {
+  initialTimeSeries: targetNozzleTemperature,
+  insert: addTargetNozzleTemperature,
+} = createTimeSeries();
+const {
+  initialTimeSeries: targetFrontTemperature,
+  insert: addTargetFrontTemperature,
+} = createTimeSeries();
+const {
+  initialTimeSeries: targetMiddleTemperature,
+  insert: addTargetMiddleTemperature,
+} = createTimeSeries();
+const {
+  initialTimeSeries: targetBackTemperature,
+  insert: addTargetBackTemperature,
+} = createTimeSeries();
+
 export function extruder3MessageHandler(
   store: StoreApi<Extruder3NamespaceStore>,
   throttledUpdater: ThrottledStoreUpdater<Extruder3NamespaceStore>,
@@ -271,6 +302,17 @@ export function extruder3MessageHandler(
       if (eventName === "StateEvent") {
         console.log(event);
         const stateEvent = stateEventSchema.parse(event);
+        const timestamp = event.ts;
+        const nextTargetPressure = stateEvent.data.pressure_state.target_bar;
+        const nextTargetScrewRpm = stateEvent.data.screw_state.target_rpm;
+        const nextTargetNozzleTemperature =
+          stateEvent.data.heating_states.nozzle.target_temperature;
+        const nextTargetFrontTemperature =
+          stateEvent.data.heating_states.front.target_temperature;
+        const nextTargetMiddleTemperature =
+          stateEvent.data.heating_states.middle.target_temperature;
+        const nextTargetBackTemperature =
+          stateEvent.data.heating_states.back.target_temperature;
         updateStore((state) => ({
           ...state,
           state: stateEvent,
@@ -278,6 +320,53 @@ export function extruder3MessageHandler(
           defaultState: stateEvent.data.is_default_state
             ? stateEvent
             : state.defaultState,
+          // Update target value history
+          targetPressure:
+            state.targetPressure.current?.value === nextTargetPressure
+              ? state.targetPressure
+              : addTargetPressure(state.targetPressure, {
+                  value: nextTargetPressure,
+                  timestamp,
+                }),
+          targetScrewRpm:
+            state.targetScrewRpm.current?.value === nextTargetScrewRpm
+              ? state.targetScrewRpm
+              : addTargetScrewRpm(state.targetScrewRpm, {
+                  value: nextTargetScrewRpm,
+                  timestamp,
+                }),
+          targetNozzleTemperature:
+            state.targetNozzleTemperature.current?.value ===
+            nextTargetNozzleTemperature
+              ? state.targetNozzleTemperature
+              : addTargetNozzleTemperature(state.targetNozzleTemperature, {
+                  value: nextTargetNozzleTemperature,
+                  timestamp,
+                }),
+          targetFrontTemperature:
+            state.targetFrontTemperature.current?.value ===
+            nextTargetFrontTemperature
+              ? state.targetFrontTemperature
+              : addTargetFrontTemperature(state.targetFrontTemperature, {
+                  value: nextTargetFrontTemperature,
+                  timestamp,
+                }),
+          targetMiddleTemperature:
+            state.targetMiddleTemperature.current?.value ===
+            nextTargetMiddleTemperature
+              ? state.targetMiddleTemperature
+              : addTargetMiddleTemperature(state.targetMiddleTemperature, {
+                  value: nextTargetMiddleTemperature,
+                  timestamp,
+                }),
+          targetBackTemperature:
+            state.targetBackTemperature.current?.value ===
+            nextTargetBackTemperature
+              ? state.targetBackTemperature
+              : addTargetBackTemperature(state.targetBackTemperature, {
+                  value: nextTargetBackTemperature,
+                  timestamp,
+                }),
         }));
       } else if (eventName === "LiveValuesEvent") {
         const liveValuesEvent = liveValuesEventSchema.parse(event);
@@ -378,6 +467,14 @@ export const createExtruder3NamespaceStore =
         middlePower,
         combinedPower,
         totalEnergyKWh,
+
+        // Target value history
+        targetPressure,
+        targetScrewRpm,
+        targetNozzleTemperature,
+        targetFrontTemperature,
+        targetMiddleTemperature,
+        targetBackTemperature,
       };
     });
 

electron/src/machines/extruder/extruder3/useExtruder.ts

@@ -57,6 +57,14 @@ export function useExtruder3() {
     backPower,
     combinedPower,
     totalEnergyKWh,
+
+    // Target value history for graph target lines
+    targetPressure,
+    targetScrewRpm,
+    targetNozzleTemperature,
+    targetFrontTemperature,
+    targetMiddleTemperature,
+    targetBackTemperature,
   } = useExtruder3Namespace(machineIdentification);
 
   // Single optimistic state for all state management
@@ -224,6 +232,28 @@ export function useExtruder3() {
     );
   };
 
+  const setTemperatureTargetEnabled = (enabled: boolean) => {
+    const res = enabled
+      ? true
+      : confirm(
+          "This will disable the ability to set a temperature target for the nozzle heating element and will any wiring error message. Only proceed if you understand the risks.",
+        );
+
+    if (res) {
+      updateStateOptimistically(
+        (current) => {
+          current.data.extruder_settings_state.nozzle_temperature_target_enabled =
+            enabled;
+        },
+        () =>
+          requestNozzleTemperatureTargetEnabled({
+            machine_identification_unique: machineIdentification,
+            data: { SetNozzleTemperatureTargetEnabled: enabled },
+          }),
+      );
+    }
+  };
+
   const setPressurePidKp = (kp: number) => {
     updateStateOptimistically(
       (current) => {
@@ -373,6 +403,10 @@ export function useExtruder3() {
     z.object({ SetExtruderPressureLimitIsEnabled: z.boolean() }),
   );
 
+  const { request: requestNozzleTemperatureTargetEnabled } = useMachineMutation(
+    z.object({ SetNozzleTemperatureTargetEnabled: z.boolean() }),
+  );
+
   const { request: requestPressurePidSettings } = useMachineMutation(
     z.object({
       SetPressurePidSettings: z.object({
@@ -423,6 +457,14 @@ export function useExtruder3() {
     combinedPower,
     totalEnergyKWh,
 
+    // Target value history for graph target lines
+    targetPressure,
+    targetScrewRpm,
+    targetNozzleTemperature,
+    targetFrontTemperature,
+    targetMiddleTemperature,
+    targetBackTemperature,
+
     // Loading states
     isLoading: stateOptimistic.isOptimistic,
     isDisabled: !stateOptimistic.isInitialized,
@@ -439,6 +481,7 @@ export function useExtruder3() {
     setMiddleHeatingTemperature,
     setExtruderPressureLimit,
     setExtruderPressureLimitEnabled,
+    setTemperatureTargetEnabled,
     setPressurePidKp,
     setPressurePidKi,
     setPressurePidKd,

electron/src/machines/laser/laser1/Laser1Graph.tsx

@@ -10,10 +10,17 @@ import React from "react";
 import { useLaser1 } from "./useLaser1";
 
 export function Laser1GraphsPage() {
-  const { diameter, x_diameter, y_diameter, roundness, state } = useLaser1();
+  const {
+    diameter,
+    x_diameter,
+    y_diameter,
+    roundness,
+    state,
+    targetDiameter: targetDiameterSeries,
+  } = useLaser1();
 
   const syncHook = useGraphSync("diameter-roundness-group");
-  const targetDiameter = state?.laser_state?.target_diameter ?? 0;
+  const targetDiameterValue = state?.laser_state?.target_diameter ?? 0;
   const lowerTolerance = state?.laser_state?.lower_tolerance ?? 0;
   const higherTolerance = state?.laser_state?.higher_tolerance ?? 0;
 
@@ -71,21 +78,22 @@ export function Laser1GraphsPage() {
         // Tolerance for diameter
         {
           type: "threshold" as const,
-          value: targetDiameter + higherTolerance,
+          value: targetDiameterValue + higherTolerance,
           label: "Upper Tolerance",
           color: diameterColor,
           dash: [5, 5],
         },
         {
           type: "threshold" as const,
-          value: targetDiameter - lowerTolerance,
+          value: targetDiameterValue - lowerTolerance,
           label: "Lower Tolerance",
           color: diameterColor,
           dash: [5, 5],
         },
         {
           type: "target" as const,
-          value: targetDiameter,
+          value: targetDiameterValue,
+          targetSeries: targetDiameterSeries,
           label: "Target",
           color: diameterColor,
         },

electron/src/machines/laser/laser1/laser1Namespace.ts

@@ -14,7 +14,7 @@ import {
   NamespaceId,
   createNamespaceHookImplementation,
   ThrottledStoreUpdater,
-} from "../../../client/socketioStore";
+} from "@/client/socketioStore";
 import { MachineIdentificationUnique } from "@/machines/types";
 import {
   createTimeSeries,
@@ -64,21 +64,18 @@ export type Laser1NamespaceStore = {
   x_diameter: TimeSeries;
   y_diameter: TimeSeries;
   roundness: TimeSeries;
+  targetDiameter: TimeSeries;
 };
 
-// Constants for time durations
-const HALF_SECOND = 500;
-
-const { initialTimeSeries: diameter, insert: addDiameter } = createTimeSeries({
-  sampleIntervalLong: HALF_SECOND,
-});
+const { initialTimeSeries: diameter, insert: addDiameter } = createTimeSeries();
 const { initialTimeSeries: x_diameter, insert: addXDiameter } =
-  createTimeSeries({ sampleIntervalLong: HALF_SECOND });
+  createTimeSeries();
 const { initialTimeSeries: y_diameter, insert: addYDiameter } =
-  createTimeSeries({ sampleIntervalLong: HALF_SECOND });
-const { initialTimeSeries: roundness, insert: addRoundness } = createTimeSeries(
-  { sampleIntervalLong: HALF_SECOND },
-);
+  createTimeSeries();
+const { initialTimeSeries: roundness, insert: addRoundness } =
+  createTimeSeries();
+const { initialTimeSeries: targetDiameter, insert: addTargetDiameter } =
+  createTimeSeries();
 
 /**
  * Factory function to create a new Laser1 namespace store
@@ -93,6 +90,7 @@ export const createLaser1NamespaceStore = (): StoreApi<Laser1NamespaceStore> =>
       x_diameter,
       y_diameter,
       roundness,
+      targetDiameter,
     };
   });
 
@@ -120,9 +118,17 @@ export function laser1MessageHandler(
       // Apply appropriate caching strategy based on event type
       if (eventName === "StateEvent") {
         const stateEvent = stateEventSchema.parse(event);
+        const nextTargetDiameter = stateEvent.data.laser_state.target_diameter;
         updateStore((state) => ({
           ...state,
           state: stateEvent,
+          targetDiameter:
+            state.targetDiameter.current?.value === nextTargetDiameter
+              ? state.targetDiameter
+              : addTargetDiameter(state.targetDiameter, {
+                  value: nextTargetDiameter,
+                  timestamp: event.ts,
+                }),
           // only set default state if is_default_state is true
           defaultState: stateEvent.data.is_default_state
             ? stateEvent

electron/src/machines/laser/laser1/useLaser1.ts

@@ -11,8 +11,15 @@ import { produce } from "immer";
 
 function useLaser(machine_identification_unique: MachineIdentificationUnique) {
   // Get consolidated state and live values from namespace
-  const { state, defaultState, diameter, x_diameter, y_diameter, roundness } =
-    useLaser1Namespace(machine_identification_unique);
+  const {
+    state,
+    defaultState,
+    diameter,
+    x_diameter,
+    y_diameter,
+    roundness,
+    targetDiameter,
+  } = useLaser1Namespace(machine_identification_unique);
 
   // Single optimistic state for all state management
   const stateOptimistic = useStateOptimistic<StateEvent>();
@@ -113,6 +120,7 @@ function useLaser(machine_identification_unique: MachineIdentificationUnique) {
     x_diameter,
     y_diameter,
     roundness,
+    targetDiameter,
 
     // Loading states
     isLoading: stateOptimistic.isOptimistic,

electron/src/machines/mock/mock1/Mock1Graph.tsx

@@ -1,6 +1,7 @@
 import { Page } from "@/components/Page";
 import {
   AutoSyncedBigGraph,
+  MarkerProvider,
   SyncedFloatingControlPanel,
   useGraphSync,
   type GraphConfig,
@@ -8,6 +9,8 @@ import {
 import React from "react";
 import { useMock1 } from "./useMock";
 import { TimeSeriesValue, type Series, TimeSeries } from "@/lib/timeseries";
+import { GraphWithMarkerControls } from "@/components/graph/GraphWithMarkerControls";
+import { Unit } from "@/control/units";
 
 export function Mock1GraphPage() {
   const { sineWaveSum } = useMock1();
@@ -97,45 +100,58 @@ export function Mock1GraphPage() {
 
   return (
     <Page className="pb-27">
-      <div className="flex flex-col gap-4">
-        <AutoSyncedBigGraph
-          syncHook={syncHook}
-          newData={singleData}
-          config={singleGraphConfig}
-          unit={"mm"}
-          renderValue={(value) => value.toFixed(3)}
-          graphId="single-graph1"
-        />
-        <AutoSyncedBigGraph
-          syncHook={syncHook}
-          newData={combinedData}
-          config={{
-            ...config,
-            title: "Combined Sine Waves",
-          }}
-          unit={"mm"}
-          renderValue={(value) => value.toFixed(3)}
-          graphId="combined-graph"
-        />
-        <AutoSyncedBigGraph
-          syncHook={syncHook}
-          newData={singleData}
-          config={singleGraphConfig}
-          unit={"mm"}
-          renderValue={(value) => value.toFixed(3)}
-          graphId="single-graph2"
-        />
-        <AutoSyncedBigGraph
-          syncHook={syncHook}
-          newData={singleData}
-          config={singleGraphConfig}
-          unit={"mm"}
-          renderValue={(value) => value.toFixed(3)}
-          graphId="single-graph"
-        />
-      </div>
+      <MarkerProvider>
+        <div className="flex flex-col gap-4">
+          <GraphWithMarkerControls
+            syncHook={syncHook}
+            newData={singleData}
+            config={singleGraphConfig}
+            unit={"mm" as Unit}
+            renderValue={(value) => value.toFixed(3)}
+            graphId="single-graph1"
+            currentTimeSeries={sineWaveSum}
+            machineId="mock-graphs"
+          />
+          <GraphWithMarkerControls
+            syncHook={syncHook}
+            newData={combinedData}
+            config={{
+              ...config,
+              title: "Combined Sine Waves",
+            }}
+            unit={"mm" as Unit}
+            renderValue={(value) => value.toFixed(3)}
+            graphId="combined-graph"
+            currentTimeSeries={sineWaveSum}
+            machineId="mock-graphs"
+          />
+          <GraphWithMarkerControls
+            syncHook={syncHook}
+            newData={singleData}
+            config={singleGraphConfig}
+            unit={"mm" as Unit}
+            renderValue={(value) => value.toFixed(3)}
+            graphId="single-graph2"
+            currentTimeSeries={sineWaveSum}
+            machineId="mock-graphs"
+          />
+          <GraphWithMarkerControls
+            syncHook={syncHook}
+            newData={singleData}
+            config={singleGraphConfig}
+            unit={"mm" as Unit}
+            renderValue={(value) => value.toFixed(3)}
+            graphId="single-graph"
+            currentTimeSeries={sineWaveSum}
+            machineId="mock-graphs"
+          />
+        </div>
 
-      <SyncedFloatingControlPanel controlProps={syncHook.controlProps} />
+        <SyncedFloatingControlPanel
+          controlProps={syncHook.controlProps}
+          machineId="mock-graphs"
+        />
+      </MarkerProvider>
     </Page>
   );
 }

electron/src/machines/motor_test_machine/TestMotorControlPage.tsx

@@ -0,0 +1,53 @@
+import { ControlCard } from "@/control/ControlCard";
+import { Page } from "@/components/Page";
+import React from "react";
+import { ControlGrid } from "@/control/ControlGrid";
+import { SelectionGroupBoolean } from "@/control/SelectionGroup";
+import { EditValue } from "@/control/EditValue";
+import { Label } from "@/control/Label";
+import { useTestMotor } from "./useTestMotor";
+
+export function TestMotorControlPage() {
+  const { state, setMotorOn, setVelocity } = useTestMotor();
+
+  // Fallback in case state is still null
+  const safeState = state ?? { motor_enabled: false, motor_velocity: 0 };
+
+  return (
+    <Page>
+      <ControlGrid columns={2}>
+        {/* Basic control */}
+        <ControlCard title="Motor Status">
+          {/* On/Off switch */}
+          <Label label="Power State">
+            <SelectionGroupBoolean
+              value={safeState.motor_enabled}
+              // Icon mapping for True/False
+              optionTrue={{ children: "Enabled", icon: "lu:Play" }}
+              optionFalse={{ children: "Disabled", icon: "lu:CirclePause" }}
+              onChange={(val) => setMotorOn(val)}
+            />
+          </Label>
+        </ControlCard>
+
+        {/* Velocity */}
+        <ControlCard title="Settings">
+          {/* Velocity input with unit */}
+          <Label label="Target Velocity">
+            <EditValue
+              title="Velocity"
+              value={safeState.motor_velocity}
+              unit="rpm"
+              min={0}
+              max={1000} // Limit
+              step={1}
+              onChange={(val) => setVelocity(val)}
+              // Displays the value (as integer)
+              renderValue={(v) => v.toFixed(0)}
+            />
+          </Label>
+        </ControlCard>
+      </ControlGrid>
+    </Page>
+  );
+}

electron/src/machines/motor_test_machine/TestMotorPage.tsx

@@ -0,0 +1,22 @@
+import { Topbar } from "@/components/Topbar";
+import { testMotorSerialRoute } from "@/routes/routes";
+import React from "react";
+
+export function TestMotorPage() {
+  // Access is allowed here because this function is called later
+  const { serial } = testMotorSerialRoute.useParams();
+
+  return (
+    <Topbar
+      pathname={`/_sidebar/machines/testmotor/${serial}`}
+      items={[
+        {
+          link: "control",
+          activeLink: "control",
+          title: "Control",
+          icon: "lu:CirclePlay",
+        },
+      ]}
+    />
+  );
+}

electron/src/machines/motor_test_machine/testMotorNamespace.ts

@@ -0,0 +1,73 @@
+import { StoreApi } from "zustand";
+import { create } from "zustand";
+import { z } from "zod";
+import {
+  EventHandler,
+  eventSchema,
+  Event,
+  handleUnhandledEventError,
+  NamespaceId,
+  createNamespaceHookImplementation,
+  ThrottledStoreUpdater,
+} from "@/client/socketioStore";
+import { MachineIdentificationUnique } from "@/machines/types";
+
+// ========== Event Schema (Must match StateEvent) ==========
+export const stateEventDataSchema = z.object({
+  motor_enabled: z.boolean(),
+  motor_velocity: z.number(),
+});
+
+export const stateEventSchema = eventSchema(stateEventDataSchema);
+export type StateEvent = z.infer<typeof stateEventDataSchema>;
+
+// ========== Store ==========
+export type TestMotorNamespaceStore = {
+  state: StateEvent | null;
+};
+
+export const createTestMotorNamespaceStore =
+  (): StoreApi<TestMotorNamespaceStore> =>
+    create<TestMotorNamespaceStore>(() => ({
+      state: null,
+    }));
+
+// ========== Message Handler ==========
+export function testMotorMessageHandler(
+  chstore: StoreApi<TestMotorNamespaceStore>,
+  throttledUpdater: ThrottledStoreUpdater<TestMotorNamespaceStore>,
+): EventHandler {
+  return (event: Event<any>) => {
+    const updateStore = (
+      updater: (state: TestMotorNamespaceStore) => TestMotorNamespaceStore,
+    ) => throttledUpdater.updateWith(updater);
+    try {
+      if (event.name === "StateEvent") {
+        const parsed = stateEventSchema.parse(event);
+        updateStore(() => ({ state: parsed.data }));
+      } else {
+        handleUnhandledEventError(event.name);
+      }
+    } catch (error) {
+      console.error(`Error processing ${event.name}:`, error);
+      throw error;
+    }
+  };
+}
+
+// ========== Namespace Hook ==========
+const useTestMotorNamespaceImplementation =
+  createNamespaceHookImplementation<TestMotorNamespaceStore>({
+    createStore: createTestMotorNamespaceStore,
+    createEventHandler: testMotorMessageHandler,
+  });
+
+export function useTestMotorNamespace(
+  machine_identification_unique: MachineIdentificationUnique,
+): TestMotorNamespaceStore {
+  const namespaceId: NamespaceId = {
+    type: "machine",
+    machine_identification_unique,
+  };
+  return useTestMotorNamespaceImplementation(namespaceId);
+}

electron/src/machines/motor_test_machine/useTestMotor.ts

@@ -0,0 +1,96 @@
+import { toastError } from "@/components/Toast";
+import { useStateOptimistic } from "@/lib/useStateOptimistic";
+import { testMotorSerialRoute } from "@/routes/routes";
+import { MachineIdentificationUnique } from "@/machines/types";
+import { useTestMotorNamespace, StateEvent } from "./testMotorNamespace";
+import { useMachineMutate } from "@/client/useClient";
+import { produce } from "immer";
+import { useEffect, useMemo } from "react";
+import { TestMotor } from "@/machines/properties";
+import { z } from "zod";
+
+export function useTestMotor() {
+  const { serial: serialString } = testMotorSerialRoute.useParams();
+
+  // Memoize machine identification
+  const machineIdentification: MachineIdentificationUnique = useMemo(() => {
+    const serial = parseInt(serialString);
+    if (isNaN(serial)) {
+      toastError(
+        "Invalid Serial Number",
+        `"${serialString}" is not a valid serial number.`,
+      );
+      return {
+        machine_identification: { vendor: 0, machine: 0 },
+        serial: 0,
+      };
+    }
+    return {
+      machine_identification: TestMotor.machine_identification,
+      serial,
+    };
+  }, [serialString]);
+
+  // Namespace state from backend
+  const { state } = useTestMotorNamespace(machineIdentification);
+
+  // Optimistic state
+  const stateOptimistic = useStateOptimistic<StateEvent>();
+
+  useEffect(() => {
+    if (state) stateOptimistic.setReal(state);
+  }, [state, stateOptimistic]);
+
+  // Generic mutation sender
+  const { request: sendMutation } = useMachineMutate(
+    z.object({
+      type: z.string(),
+      payload: z.any(),
+    }),
+  );
+
+  const updateStateOptimistically = (
+    producer: (current: StateEvent) => void,
+    serverRequest?: () => void,
+  ) => {
+    const currentState = stateOptimistic.value;
+    if (currentState)
+      stateOptimistic.setOptimistic(produce(currentState, producer));
+    serverRequest?.();
+  };
+
+  // --- ACTIONS ---
+
+  const setMotorOn = (on: boolean) => {
+    updateStateOptimistically(
+      (current) => {
+        current.motor_enabled = on;
+      },
+      () =>
+        sendMutation({
+          machine_identification_unique: machineIdentification,
+          // Must exactly match the 'Mutation' enum!
+          data: { type: "SetMotorOn", payload: on },
+        }),
+    );
+  };
+
+  const setVelocity = (velocity: number) => {
+    updateStateOptimistically(
+      (current) => {
+        current.motor_velocity = velocity;
+      },
+      () =>
+        sendMutation({
+          machine_identification_unique: machineIdentification,
+          data: { type: "SetMotorVelocity", payload: velocity },
+        }),
+    );
+  };
+
+  return {
+    state: stateOptimistic.value,
+    setMotorOn,
+    setVelocity,
+  };
+}

electron/src/machines/properties.ts

@@ -390,6 +390,11 @@ export const aquapath1: MachineProperties = {
           product_id: 0x7d83052,
           revision: 0x110000,
         },
+        {
+          vendor_id: 2,
+          product_id: 0x7d83052,
+          revision: 0x120000,
+        },
       ],
     },
     {
@@ -473,6 +478,30 @@ export const digitalInputTestMachine: MachineProperties = {
   },
   device_roles: [],
 };
+
+export const wago8chDioTestMachine: MachineProperties = {
+  name: "WAGO 8ch DIO Test",
+  version: "V1",
+  slug: "wago8chdiotestmachine",
+  icon: "lu:Disc3",
+  machine_identification: {
+    vendor: VENDOR_QITECH,
+    machine: 0x0041,
+  },
+  device_roles: [
+    {
+      role: 0,
+      role_label: "Wago 750-354 Bus Coupler",
+      allowed_devices: [
+        {
+          vendor_id: 0x21,
+          product_id: 0x07500354,
+          revision: 0x2,
+        },
+      ],
+    },
+  ],
+};
 export const wagoPower1: MachineProperties = {
   name: "WAGO Power",
   version: "V1",
@@ -544,6 +573,64 @@ export const ip20TestMachine: MachineProperties = {
   ],
 };
 
+export const TestMotor: MachineProperties = {
+  name: "TestMotor",
+  version: "V1",
+  slug: "testmotor",
+  icon: "lu:Disc3",
+  machine_identification: {
+    vendor: VENDOR_QITECH,
+    machine: 0x0011,
+  },
+  device_roles: [
+    {
+      role: 0,
+      role_label: "Bus Coupler",
+      allowed_devices: [
+        {
+          vendor_id: 0x2,
+          product_id: 0x44c2c52,
+          revision: 0x120000,
+        },
+      ],
+    },
+    {
+      role: 1,
+      role_label: "Stepper Motor",
+      allowed_devices: [
+        {
+          vendor_id: 0x2,
+          product_id: 0x1b773052,
+          revision: 0x10001e,
+        },
+      ],
+    },
+  ],
+};
+
+export const wagoDoTestMachine: MachineProperties = {
+  name: "Wago DO Test",
+  version: "V1",
+  slug: "wagodotestmachine",
+  icon: "lu:ToggleRight",
+  machine_identification: {
+    vendor: VENDOR_QITECH,
+    machine: 0x000e,
+  },
+  device_roles: [
+    {
+      role: 0,
+      role_label: "Wago 750-354 Bus Coupler",
+      allowed_devices: [
+        {
+          vendor_id: 0x21,
+          product_id: 0x07500354,
+          revision: 0x2,
+        },
+      ],
+    },
+  ],
+};
 export const wagoAiTestMachine: MachineProperties = {
   name: "Wago AI Test",
   version: "V1",
@@ -568,6 +655,41 @@ export const wagoAiTestMachine: MachineProperties = {
   ],
 };
 
+export const testmachinestepper: MachineProperties = {
+  name: "TestMachineStepper",
+  version: "V1",
+  slug: "testmachinestepper",
+  icon: "lu:Disc3",
+  machine_identification: {
+    vendor: VENDOR_QITECH,
+    machine: 0x0037,
+  },
+  device_roles: [
+    {
+      role: 0,
+      role_label: "Bus Coupler",
+      allowed_devices: [
+        {
+          vendor_id: 0x00000021,
+          product_id: 0x07500354,
+          revision: 0x2,
+        },
+      ],
+    },
+    {
+      role: 1,
+      role_label: "Stepper Motor",
+      allowed_devices: [
+        {
+          vendor_id: 0x00000021,
+          product_id: 0x67214e8,
+          revision: 0x2,
+        },
+      ],
+    },
+  ],
+};
+
 export const machineProperties: MachineProperties[] = [
   winder2,
   extruder3,
@@ -581,7 +703,11 @@ export const machineProperties: MachineProperties[] = [
   analogInputTestMachine,
   wagoAiTestMachine,
   digitalInputTestMachine,
+  wago8chDioTestMachine,
   ip20TestMachine,
+  wagoDoTestMachine,
+  TestMotor,
+  testmachinestepper,
 ];
 
 export const getMachineProperties = (

electron/src/machines/testmachinestepper/TestMachineStepperControlPage.tsx

@@ -0,0 +1,130 @@
+import { ControlCard } from "@/control/ControlCard";
+import { Page } from "@/components/Page";
+import React from "react";
+import { ControlGrid } from "@/control/ControlGrid";
+import { useTestMachineStepper } from "./useTestMachineStepper";
+import { Label } from "@/control/Label";
+import { EditValue } from "@/control/EditValue";
+import { roundToDecimals } from "@/lib/decimal";
+import { TouchButton } from "@/components/touch/TouchButton";
+
+export function TestMachineStepperControlPage() {
+  const { state, setTargetSpeed, setEnabled, setFreq, setAccFreq } =
+    useTestMachineStepper();
+
+  return (
+    <Page>
+      <ControlGrid columns={2}>
+        <ControlCard title="Stepper Speed">
+          <Label label="Target Speed">
+            <EditValue
+              value={state?.target_speed}
+              unit="rpm"
+              title="Target Speed"
+              defaultValue={0}
+              min={-25000}
+              max={25000}
+              step={1}
+              renderValue={(value) => roundToDecimals(value, 0)}
+              onChange={setTargetSpeed}
+            />
+            <TouchButton
+              variant="outline"
+              icon="lu:CirclePower"
+              onClick={() => setEnabled(true)}
+              disabled={false}
+              isLoading={false}
+            >
+              Enable
+            </TouchButton>
+            <TouchButton
+              variant="outline"
+              icon="lu:CirclePower"
+              onClick={() => setEnabled(false)}
+              disabled={false}
+              isLoading={false}
+            >
+              Disable
+            </TouchButton>
+          </Label>
+        </ControlCard>
+        <ControlCard height={2} title="Frequency Prescaler">
+          <TouchButton
+            variant="outline"
+            icon="lu:CirclePower"
+            onClick={() => setFreq(0)}
+            disabled={false}
+            isLoading={false}
+          >
+            Default (00)
+          </TouchButton>
+          <TouchButton
+            variant="outline"
+            icon="lu:CirclePower"
+            onClick={() => setFreq(1)}
+            disabled={false}
+            isLoading={false}
+          >
+            Low (01)
+          </TouchButton>
+          <TouchButton
+            variant="outline"
+            icon="lu:CirclePower"
+            onClick={() => setFreq(2)}
+            disabled={false}
+            isLoading={false}
+          >
+            Mid (10)
+          </TouchButton>
+          <TouchButton
+            variant="outline"
+            icon="lu:CirclePower"
+            onClick={() => setFreq(3)}
+            disabled={false}
+            isLoading={false}
+          >
+            High (11)
+          </TouchButton>
+        </ControlCard>
+        <ControlCard height={2} title="Acceleration Factor">
+          <TouchButton
+            variant="outline"
+            icon="lu:CirclePower"
+            onClick={() => setAccFreq(0)}
+            disabled={false}
+            isLoading={false}
+          >
+            Default (00)
+          </TouchButton>
+          <TouchButton
+            variant="outline"
+            icon="lu:CirclePower"
+            onClick={() => setAccFreq(1)}
+            disabled={false}
+            isLoading={false}
+          >
+            Low (01)
+          </TouchButton>
+          <TouchButton
+            variant="outline"
+            icon="lu:CirclePower"
+            onClick={() => setAccFreq(2)}
+            disabled={false}
+            isLoading={false}
+          >
+            Mid (10)
+          </TouchButton>
+          <TouchButton
+            variant="outline"
+            icon="lu:CirclePower"
+            onClick={() => setAccFreq(3)}
+            disabled={false}
+            isLoading={false}
+          >
+            High (11)
+          </TouchButton>
+        </ControlCard>
+      </ControlGrid>
+    </Page>
+  );
+}

electron/src/machines/testmachinestepper/TestMachineStepperPage.tsx

@@ -0,0 +1,20 @@
+import { Topbar } from "@/components/Topbar";
+import { testMachineStepperSerialRoute } from "@/routes/routes";
+import React from "react";
+
+export function TestMachineStepperPage() {
+  const { serial } = testMachineStepperSerialRoute.useParams();
+  return (
+    <Topbar
+      pathname={`/_sidebar/machines/testmachinestepper/${serial}`}
+      items={[
+        {
+          link: "control",
+          activeLink: "control",
+          title: "Control",
+          icon: "lu:CirclePlay",
+        },
+      ]}
+    />
+  );
+}

electron/src/machines/testmachinestepper/testMachineStepperNamespace.ts

@@ -0,0 +1,81 @@
+import { StoreApi } from "zustand";
+import { create } from "zustand";
+import { z } from "zod";
+import {
+  EventHandler,
+  eventSchema,
+  Event,
+  handleUnhandledEventError,
+  NamespaceId,
+  createNamespaceHookImplementation,
+  ThrottledStoreUpdater,
+} from "@/client/socketioStore";
+import { MachineIdentificationUnique } from "@/machines/types";
+
+// ========== Event Schema ==========
+
+export const stateEventDataSchema = z.object({
+  target_speed: z.number(),
+  enabled: z.boolean(),
+  freq: z.number(),
+  acc_freq: z.number(),
+});
+
+export const stateEventSchema = eventSchema(stateEventDataSchema);
+
+export type StateEvent = z.infer<typeof stateEventDataSchema>;
+
+// ========== Store ==========
+export type TestMachineStepperNamespaceStore = {
+  state: StateEvent | null;
+};
+
+export const createTestMachineStepperNamespaceStore =
+  (): StoreApi<TestMachineStepperNamespaceStore> =>
+    create<TestMachineStepperNamespaceStore>(() => ({
+      state: null,
+    }));
+
+// ========== Message Handler ==========
+export function testMachineStepperMessageHandler(
+  store: StoreApi<TestMachineStepperNamespaceStore>,
+  throttledUpdater: ThrottledStoreUpdater<TestMachineStepperNamespaceStore>,
+): EventHandler {
+  return (event: Event<any>) => {
+    const updateStore = (
+      updater: (
+        state: TestMachineStepperNamespaceStore,
+      ) => TestMachineStepperNamespaceStore,
+    ) => throttledUpdater.updateWith(updater);
+
+    try {
+      if (event.name === "StateEvent") {
+        const parsed = stateEventSchema.parse(event);
+        updateStore(() => ({ state: parsed.data }));
+      } else {
+        handleUnhandledEventError(event.name);
+      }
+    } catch (error) {
+      console.error(`Error processing ${event.name}:`, error);
+      throw error;
+    }
+  };
+}
+
+// ========== Namespace Hook ==========
+const useTestMachineStepperNamespaceImplementation =
+  createNamespaceHookImplementation<TestMachineStepperNamespaceStore>({
+    createStore: createTestMachineStepperNamespaceStore,
+    createEventHandler: testMachineStepperMessageHandler,
+  });
+
+export function useTestMachineStepperNamespace(
+  machine_identification_unique: MachineIdentificationUnique,
+): TestMachineStepperNamespaceStore {
+  const namespaceId: NamespaceId = {
+    type: "machine",
+    machine_identification_unique,
+  };
+
+  return useTestMachineStepperNamespaceImplementation(namespaceId);
+}

electron/src/machines/testmachinestepper/useTestMachineStepper.ts

@@ -0,0 +1,126 @@
+import { toastError } from "@/components/Toast";
+import { useStateOptimistic } from "@/lib/useStateOptimistic";
+import { testMachineStepperSerialRoute } from "@/routes/routes";
+import { MachineIdentificationUnique } from "@/machines/types";
+import {
+  useTestMachineStepperNamespace,
+  StateEvent,
+} from "./testMachineStepperNamespace";
+import { useMachineMutate } from "@/client/useClient";
+import { produce } from "immer";
+import { useEffect, useMemo } from "react";
+import { testmachinestepper } from "@/machines/properties";
+import { z } from "zod";
+export function useTestMachineStepper() {
+  const { serial: serialString } = testMachineStepperSerialRoute.useParams();
+
+  // Memoize machine identification
+  const machineIdentification: MachineIdentificationUnique = useMemo(() => {
+    const serial = parseInt(serialString);
+
+    if (isNaN(serial)) {
+      toastError(
+        "Invalid Serial Number",
+        `"${serialString}" is not a valid serial number.`,
+      );
+
+      return {
+        machine_identification: { vendor: 0, machine: 0 },
+        serial: 0,
+      };
+    }
+
+    return {
+      machine_identification: testmachinestepper.machine_identification,
+      serial,
+    };
+  }, [serialString]);
+
+  // Namespace state from backend
+  const { state } = useTestMachineStepperNamespace(machineIdentification);
+
+  // Optimistic state
+  const stateOptimistic = useStateOptimistic<StateEvent>();
+
+  useEffect(() => {
+    if (state) stateOptimistic.setReal(state);
+  }, [state, stateOptimistic]);
+
+  // Generic mutation sender
+  const { request: sendMutation } = useMachineMutate(
+    z.object({
+      action: z.string(),
+      value: z.any(),
+    }),
+  );
+
+  const updateStateOptimistically = (
+    producer: (current: StateEvent) => void,
+    serverRequest?: () => void,
+  ) => {
+    const currentState = stateOptimistic.value;
+    if (currentState)
+      stateOptimistic.setOptimistic(produce(currentState, producer));
+    serverRequest?.();
+  };
+
+  const setTargetSpeed = (target: number) => {
+    updateStateOptimistically(
+      (current) => {
+        current.target_speed = target;
+      },
+      () =>
+        sendMutation({
+          machine_identification_unique: machineIdentification,
+          data: { action: "SetTargetSpeed", value: { target } },
+        }),
+    );
+  };
+
+  const setEnabled = (enabled: boolean) => {
+    updateStateOptimistically(
+      (current) => {
+        current.enabled = enabled;
+      },
+      () =>
+        sendMutation({
+          machine_identification_unique: machineIdentification,
+          data: { action: "SetEnabled", value: { enabled } },
+        }),
+    );
+  };
+
+  const setFreq = (factor: number) => {
+    updateStateOptimistically(
+      (current) => {
+        current.freq = factor;
+      },
+      () =>
+        sendMutation({
+          machine_identification_unique: machineIdentification,
+          data: { action: "SetFreq", value: { factor } },
+        }),
+    );
+  };
+
+  const setAccFreq = (factor: number) => {
+    updateStateOptimistically(
+      (current) => {
+        current.acc_freq = factor;
+      },
+      () =>
+        sendMutation({
+          machine_identification_unique: machineIdentification,
+          data: { action: "SetAccFreq", value: { factor } },
+        }),
+    );
+  };
+
+  return {
+    state: stateOptimistic.value,
+    setTargetSpeed,
+    setEnabled,
+    setFreq,
+    setAccFreq,
+  };
+}

electron/src/machines/wago8chdiotestmachine/useWago8chDioTestMachine.ts

@@ -0,0 +1,84 @@
+import { toastError } from "@/components/Toast";
+import { useStateOptimistic } from "@/lib/useStateOptimistic";
+import { wago8chDioTestMachineRoute } from "@/routes/routes";
+import { MachineIdentificationUnique } from "@/machines/types";
+import { useMachineMutate } from "@/client/useClient";
+import { produce } from "immer";
+import { useEffect, useMemo } from "react";
+import { wago8chDioTestMachine } from "@/machines/properties";
+import { z } from "zod";
+import {
+  StateEvent,
+  useWago8chDioTestMachineNamespace,
+} from "./wago8chDioTestMachineNameSpace";
+export function useWago8chDioTestMachine() {
+  const { serial: serialString } = wago8chDioTestMachineRoute.useParams();
+
+  // Memoize machine identification
+  const machineIdentification: MachineIdentificationUnique = useMemo(() => {
+    const serial = parseInt(serialString);
+
+    if (isNaN(serial)) {
+      toastError(
+        "Invalid Serial Number",
+        `"${serialString}" is not a valid serial number.`,
+      );
+
+      return {
+        machine_identification: { vendor: 0, machine: 0 },
+        serial: 0,
+      };
+    }
+
+    return {
+      machine_identification: wago8chDioTestMachine.machine_identification,
+      serial,
+    };
+  }, [serialString]);
+
+  // Namespace state from backend
+  const { state } = useWago8chDioTestMachineNamespace(machineIdentification);
+
+  // Optimistic state
+  const stateOptimistic = useStateOptimistic<StateEvent>();
+
+  useEffect(() => {
+    if (state) stateOptimistic.setReal(state);
+  }, [state, stateOptimistic]);
+
+  // Generic mutation sender
+  const { request: sendMutation } = useMachineMutate(
+    z.object({
+      action: z.string(),
+      value: z.any(),
+    }),
+  );
+
+  const updateStateOptimistically = (
+    producer: (current: StateEvent) => void,
+    serverRequest?: () => void,
+  ) => {
+    const currentState = stateOptimistic.value;
+    if (currentState)
+      stateOptimistic.setOptimistic(produce(currentState, producer));
+    serverRequest?.();
+  };
+
+  const setOutputAtIndex = (index: number, value: boolean) => {
+    updateStateOptimistically(
+      (current) => {
+        current.digital_output[index] = value;
+      },
+      () =>
+        sendMutation({
+          machine_identification_unique: machineIdentification,
+          data: { action: "SetOutput", value: { index, value } },
+        }),
+    );
+  };
+
+  return {
+    state: stateOptimistic.value,
+    setOutputAtIndex: setOutputAtIndex,
+  };
+}

electron/src/machines/wago8chdiotestmachine/wago8chDioTestMachineControlPage.tsx

@@ -0,0 +1,66 @@
+import { ControlCard } from "@/control/ControlCard";
+import { Page } from "@/components/Page";
+import React from "react";
+import { ControlGrid } from "@/control/ControlGrid";
+import { SelectionGroup } from "@/control/SelectionGroup";
+import { Label } from "@/control/Label";
+import { useWago8chDioTestMachine } from "./useWago8chDioTestMachine";
+import { Badge } from "@/components/ui/badge";
+
+export function Wago8chDioTestMachineControlRoute() {
+  const { state, setOutputAtIndex } = useWago8chDioTestMachine();
+
+  const safeState = state ?? {
+    digital_input: [false, false, false, false, false, false, false, false],
+    digital_output: [false, false, false, false, false, false, false, false],
+  };
+
+  return (
+    <Page>
+      <ControlGrid columns={2}>
+        {/* Digital Inputs */}
+        <ControlCard title="Digital Inputs">
+          <div className="grid grid-cols-2 gap-4">
+            {safeState.digital_input.map((input, index) => (
+              <Label key={index} label={`Input ${index + 1}`}>
+                <Badge variant={input ? "outline" : "destructive"}>
+                  {input ? "ON" : "OFF"}
+                </Badge>
+              </Label>
+            ))}
+          </div>
+        </ControlCard>
+
+        {/* Digital Outputs */}
+        <ControlCard title="Digital Outputs">
+          <div className="grid grid-cols-2 gap-4">
+            {safeState.digital_output.map((output, index) => (
+              <Label key={index} label={`Output ${index + 1}`}>
+                <SelectionGroup<"On" | "Off">
+                  value={output ? "On" : "Off"}
+                  orientation="vertical"
+                  className="grid h-full grid-cols-2 gap-2"
+                  options={{
+                    Off: {
+                      children: "Off",
+                      icon: "lu:CirclePause",
+                      isActiveClassName: "bg-red-600",
+                      className: "h-full",
+                    },
+                    On: {
+                      children: "On",
+                      icon: "lu:CirclePlay",
+                      isActiveClassName: "bg-green-600",
+                      className: "h-full",
+                    },
+                  }}
+                  onChange={(value) => setOutputAtIndex(index, value === "On")}
+                />
+              </Label>
+            ))}
+          </div>
+        </ControlCard>
+      </ControlGrid>
+    </Page>
+  );
+}

electron/src/machines/wago8chdiotestmachine/wago8chDioTestMachineNameSpace.ts

@@ -0,0 +1,79 @@
+import { StoreApi } from "zustand";
+import { create } from "zustand";
+import { z } from "zod";
+import {
+  EventHandler,
+  eventSchema,
+  Event,
+  handleUnhandledEventError,
+  NamespaceId,
+  createNamespaceHookImplementation,
+  ThrottledStoreUpdater,
+} from "@/client/socketioStore";
+import { MachineIdentificationUnique } from "@/machines/types";
+
+// ========== Event Schema ==========
+
+export const stateEventDataSchema = z.object({
+  digital_input: z.array(z.boolean()).length(8),
+  digital_output: z.array(z.boolean()).length(8),
+});
+
+export const stateEventSchema = eventSchema(stateEventDataSchema);
+
+export type StateEvent = z.infer<typeof stateEventDataSchema>;
+
+// ========== Store ==========
+export type Wago8chDioTestMachineNamespaceStore = {
+  state: StateEvent | null;
+};
+
+export const createWago8chDioTestMachineNamespaceStore =
+  (): StoreApi<Wago8chDioTestMachineNamespaceStore> =>
+    create<Wago8chDioTestMachineNamespaceStore>(() => ({
+      state: null,
+    }));
+
+// ========== Message Handler ==========
+export function wago8chDioTestMachineMessageHndler(
+  store: StoreApi<Wago8chDioTestMachineNamespaceStore>,
+  throttledUpdater: ThrottledStoreUpdater<Wago8chDioTestMachineNamespaceStore>,
+): EventHandler {
+  return (event: Event<any>) => {
+    const updateStore = (
+      updater: (
+        state: Wago8chDioTestMachineNamespaceStore,
+      ) => Wago8chDioTestMachineNamespaceStore,
+    ) => throttledUpdater.updateWith(updater);
+
+    try {
+      if (event.name === "StateEvent") {
+        const parsed = stateEventSchema.parse(event);
+        updateStore(() => ({ state: parsed.data }));
+      } else {
+        handleUnhandledEventError(event.name);
+      }
+    } catch (error) {
+      console.error(`Error processing ${event.name}:`, error);
+      throw error;
+    }
+  };
+}
+
+// ========== Namespace Hook ==========
+const useWago8chDioTestMachineImplementation =
+  createNamespaceHookImplementation<Wago8chDioTestMachineNamespaceStore>({
+    createStore: createWago8chDioTestMachineNamespaceStore,
+    createEventHandler: wago8chDioTestMachineMessageHndler,
+  });
+
+export function useWago8chDioTestMachineNamespace(
+  machine_identification_unique: MachineIdentificationUnique,
+): Wago8chDioTestMachineNamespaceStore {
+  const namespaceId: NamespaceId = {
+    type: "machine",
+    machine_identification_unique,
+  };
+
+  return useWago8chDioTestMachineImplementation(namespaceId);
+}

electron/src/machines/wago8chdiotestmachine/wago8chDioTestMachinePage.tsx

@@ -0,0 +1,20 @@
+import { Topbar } from "@/components/Topbar";
+import { wago8chDioTestMachineRoute } from "@/routes/routes";
+import React from "react";
+
+export function Wago8chDioTestMachinePage() {
+  const { serial } = wago8chDioTestMachineRoute.useParams();
+  return (
+    <Topbar
+      pathname={`/_sidebar/machines/wago8chdiotestmachine/${serial}`}
+      items={[
+        {
+          link: "control",
+          activeLink: "control",
+          title: "Control",
+          icon: "lu:CirclePlay",
+        },
+      ]}
+    />
+  );
+}

electron/src/machines/wago_power/wago_power1/wagoPower1Namespace.ts

@@ -75,7 +75,7 @@ function wagoPower1MessageHandler(
     };
 
     try {
-      if (eventName === "StateEvent") {
+      if (eventName === "State") {
         const stateEvent = stateEventSchema.parse(event);
 
         updateStore((state) => ({
@@ -86,7 +86,7 @@ function wagoPower1MessageHandler(
             ? stateEvent
             : state.defaultState,
         }));
-      } else if (eventName === "LiveValuesEvent") {
+      } else if (eventName === "LiveValues") {
         console.log(event);
         const liveValues = liveValuesEventSchema.parse(event);
         const { voltage, current } = liveValues.data;

electron/src/machines/wagodotestmachine/WagoDoTestMachineControlPage.tsx

@@ -0,0 +1,64 @@
+import { ControlCard } from "@/control/ControlCard";
+import { Page } from "@/components/Page";
+import React from "react";
+import { ControlGrid } from "@/control/ControlGrid";
+import { SelectionGroup } from "@/control/SelectionGroup";
+import { Label } from "@/control/Label";
+import { useWagoDoTestMachine } from "./useWagoDoTestMachine";
+
+export function WagoDoTestMachineControlPage() {
+  const { state, setLed, setAllLeds } = useWagoDoTestMachine();
+
+  const safeState = state ?? {
+    led_on: Array(8).fill(false),
+  };
+
+  return (
+    <Page>
+      <ControlGrid columns={2}>
+        {/* Digital Output Controls */}
+        <ControlCard title="Digital Outputs (Do1-Do8)">
+          <div className="grid grid-cols-2 gap-6">
+            {safeState.led_on.map((output, index) => (
+              <Label key={index} label={`Do${index + 1}`}>
+                <SelectionGroup<"On" | "Off">
+                  value={output ? "On" : "Off"}
+                  orientation="vertical"
+                  className="flex flex-col gap-3"
+                  options={{
+                    Off: {
+                      children: "Off",
+                      icon: "lu:CirclePause",
+                      isActiveClassName: "bg-red-600",
+                      className: "flex-1",
+                    },
+                    On: {
+                      children: "On",
+                      icon: "lu:CirclePlay",
+                      isActiveClassName: "bg-green-600",
+                      className: "flex-1",
+                    },
+                  }}
+                  onChange={(value) => setLed(index, value === "On")}
+                />
+              </Label>
+            ))}
+          </div>
+        </ControlCard>
+
+        {/* Master Output Control */}
+        <ControlCard title="Master Output Control">
+          <SelectionGroup<"On" | "Off">
+            value={safeState.led_on.every(Boolean) ? "On" : "Off"}
+            orientation="horizontal"
+            options={{
+              Off: { children: "Turn All Off" },
+              On: { children: "Turn All On" },
+            }}
+            onChange={(value) => setAllLeds(value === "On")}
+          />
+        </ControlCard>
+      </ControlGrid>
+    </Page>
+  );
+}

electron/src/machines/wagodotestmachine/WagoDoTestMachineNamespace.ts

@@ -0,0 +1,78 @@
+import { StoreApi } from "zustand";
+import { create } from "zustand";
+import { z } from "zod";
+import {
+  EventHandler,
+  eventSchema,
+  Event,
+  handleUnhandledEventError,
+  NamespaceId,
+  createNamespaceHookImplementation,
+  ThrottledStoreUpdater,
+} from "@/client/socketioStore";
+import { MachineIdentificationUnique } from "@/machines/types";
+
+// ========== Event Schema ==========
+
+export const stateEventDataSchema = z.object({
+  led_on: z.array(z.boolean()).length(8),
+});
+
+export const stateEventSchema = eventSchema(stateEventDataSchema);
+
+export type StateEvent = z.infer<typeof stateEventDataSchema>;
+
+// ========== Store ==========
+export type WagoDoTestMachineNamespaceStore = {
+  state: StateEvent | null;
+};
+
+export const createWagoDoTestMachineNamespaceStore =
+  (): StoreApi<WagoDoTestMachineNamespaceStore> =>
+    create<WagoDoTestMachineNamespaceStore>(() => ({
+      state: null,
+    }));
+
+// ========== Message Handler ==========
+export function wagoDoTestMachineMessageHandler(
+  store: StoreApi<WagoDoTestMachineNamespaceStore>,
+  throttledUpdater: ThrottledStoreUpdater<WagoDoTestMachineNamespaceStore>,
+): EventHandler {
+  return (event: Event<any>) => {
+    const updateStore = (
+      updater: (
+        state: WagoDoTestMachineNamespaceStore,
+      ) => WagoDoTestMachineNamespaceStore,
+    ) => throttledUpdater.updateWith(updater);
+
+    try {
+      if (event.name === "StateEvent") {
+        const parsed = stateEventSchema.parse(event);
+        updateStore(() => ({ state: parsed.data }));
+      } else {
+        handleUnhandledEventError(event.name);
+      }
+    } catch (error) {
+      console.error(`Error processing ${event.name}:`, error);
+      throw error;
+    }
+  };
+}
+
+// ========== Namespace Hook ==========
+const useWagoDoTestMachineNamespaceImplementation =
+  createNamespaceHookImplementation<WagoDoTestMachineNamespaceStore>({
+    createStore: createWagoDoTestMachineNamespaceStore,
+    createEventHandler: wagoDoTestMachineMessageHandler,
+  });
+
+export function useWagoDoTestMachineNamespace(
+  machine_identification_unique: MachineIdentificationUnique,
+): WagoDoTestMachineNamespaceStore {
+  const namespaceId: NamespaceId = {
+    type: "machine",
+    machine_identification_unique,
+  };
+
+  return useWagoDoTestMachineNamespaceImplementation(namespaceId);
+}