added unfinished wago750_455 ethercat-hal device

2026-01-08 18:18:16 +01:00
169 changed files with 1730 additions and 6724 deletions
@@ -0,0 +1,3 @@
+.png filter=lfs diff=lfs merge=lfs -text
+.jpg filter=lfs diff=lfs merge=lfs -text
+.jpeg filter=lfs diff=lfs merge=lfs -text
@@ -1,40 +0,0 @@
---
-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).
@@ -1,33 +0,0 @@
---
-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.
@@ -1,80 +0,0 @@
-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```'
-            })
@@ -7,5 +7,4 @@ build.sh
 shell.nix
 node_modules/
 runtime_metrics.csv
-compile_metrics.csv
-.idea/
+compile_metrics.csv
@@ -1,15 +1,3 @@
-# `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_

@@ -17,6 +5,7 @@ _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
@@ -204,7 +204,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -221,7 +221,7 @@ checksum = "99e1aca718ea7b89985790c94aad72d77533063fe00bc497bb79a7c2dae6a661"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -232,9 +232,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"

 [[package]]
 name = "axum"
-version = "0.8.8"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8"
+checksum = "5b098575ebe77cb6d14fc7f32749631a6e44edbef6b796f89b020e99ba20d425"
 dependencies = [
 "axum-core",
 "axum-macros",
@@ -291,7 +291,7 @@ checksum = "604fde5e028fea851ce1d8570bbdc034bec850d157f7569d10f347d06808c05c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -390,9 +390,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"

 [[package]]
 name = "bytes"
-version = "1.11.1"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3"
 dependencies = [
 "serde",
 ]
@@ -539,7 +539,7 @@ version = "0.1.0"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -682,7 +682,7 @@ dependencies = [
 "deluxe-macros",
 "once_cell",
 "proc-macro2",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -695,7 +695,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "strsim",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -710,7 +710,7 @@ dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -721,7 +721,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -962,13 +962,14 @@ dependencies = [
 "deluxe",
 "proc-macro2",
 "quote",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]

 [[package]]
 name = "ethercrab"
 version = "0.6.0"
-source = "git+https://github.com/v-morlock/ethercrab?branch=main#d297d13389d85a4edb4e69cc98f9dd7f12626cac"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbb13becfa15713adb09b27fdb74468b827cdc78aa99aea638a89c1b0db3ce94"
 dependencies = [
 "async-io",
 "atomic-waker",
@@ -997,7 +998,8 @@ dependencies = [
 [[package]]
 name = "ethercrab-wire"
 version = "0.2.0"
-source = "git+https://github.com/v-morlock/ethercrab?branch=main#d297d13389d85a4edb4e69cc98f9dd7f12626cac"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d15828cb020fb44c92ca67e1ee3c122c9621c2e00d383d066e488f0619023ba2"
 dependencies = [
 "ethercrab-wire-derive",
 "heapless",
@@ -1006,19 +1008,20 @@ dependencies = [
 [[package]]
 name = "ethercrab-wire-derive"
 version = "0.2.0"
-source = "git+https://github.com/v-morlock/ethercrab?branch=main#d297d13389d85a4edb4e69cc98f9dd7f12626cac"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e790b8011211ed70babfcacbd4277b91ee21402ad5ba6a2c293db02e2f12919"
 dependencies = [
 "criterion",
 "proc-macro2",
 "quote",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]

 [[package]]
 name = "euclid"
-version = "0.22.13"
+version = "0.22.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df61bf483e837f88d5c2291dcf55c67be7e676b3a51acc48db3a7b163b91ed63"
+checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48"
 dependencies = [
 "num-traits",
 ]
@@ -1875,7 +1878,7 @@ dependencies = [
 "pest_meta",
 "proc-macro2",
 "quote",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -1905,7 +1908,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -2218,7 +2221,7 @@ checksum = "22f968c5ea23d555e670b449c1c5e7b2fc399fdaec1d304a17cd48e288abc107"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -2248,20 +2251,20 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.149"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
 "itoa",
 "memchr",
+ "ryu",
 "serde",
 "serde_core",
- "zmij",
 ]

 [[package]]
@@ -2329,7 +2332,6 @@ dependencies = [
 "smol",
 "socketioxide",
 "spin_sleep",
- "ta",
 "textplots",
 "tokio",
 "tower-http",
@@ -2571,9 +2573,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.114"
+version = "2.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a"
+checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2586,12 +2588,6 @@ 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"
@@ -2625,7 +2621,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -2685,7 +2681,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -2847,7 +2843,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -2884,9 +2880,9 @@ dependencies = [

 [[package]]
 name = "tracing-subscriber"
-version = "0.3.22"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e"
+checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
 dependencies = [
 "chrono",
 "matchers",
@@ -3078,7 +3074,7 @@ dependencies = [
 "bumpalo",
 "proc-macro2",
 "quote",
- "syn 2.0.114",
+ "syn 2.0.111",
 "wasm-bindgen-shared",
 ]

@@ -3143,7 +3139,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -3154,7 +3150,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]

 [[package]]
@@ -3430,11 +3426,5 @@ checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.114",
+ "syn 2.0.111",
 ]
-
-[[package]]
-name = "zmij"
-version = "1.0.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff05f8caa9038894637571ae6b9e29466c1f4f829d26c9b28f869a29cbe3445"
@@ -2,67 +2,167 @@

 # QiTech Control

-QiTech Control is an open-source framework designed to bring modern software development practices to certified industrial hardware.
+QiTech Control is an open-source framework designed to bring modern software paradigms 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

-**[View Full Documentation Wiki](https://github.com/qitechgmbh/control/wiki)**
+[![](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.*

- [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)
+[![](https://img.youtube.com/vi/55egCAkQgyM/maxresdefault.jpg)](https://youtu.be/55egCAkQgyM) 
+*Click here to watch a full explainer Video of our Software.*

-## Videos
+# Repo Structure

-| Software Demo | Full Explainer |
-|---------------|----------------|
-| [![](https://img.youtube.com/vi/KI3YeBwfV-s/maxresdefault.jpg)](https://www.youtube.com/watch?v=KI3YeBwfV-s)<br/>*Click to watch a demo of the control software in action* | [![](https://img.youtube.com/vi/55egCAkQgyM/maxresdefault.jpg)](https://youtu.be/55egCAkQgyM)<br/>*Click to watch a complete overview of QiTech Control* |
+Frontend

-## Repository Structure
+- `/electron`: Frontend code for the control software built with React and Electron.

- **`/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
+Backend

-## Technology Stack
+- `/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.

-**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
+Operating System

-**Frontend:** [Electron](https://www.electronjs.org/) + [React](https://react.dev/) with [Shadcn](https://ui.shadcn.com/) components and [Tailwind](https://tailwindcss.com/) styling
+- `/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


-## Hardware Examples
+# More Docs

-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] [Architecture & Data Flow](./docs/architecture-overview.md)

-**[View all hardware examples and tutorials on the wiki](https://github.com/qitechgmbh/control/wiki/Hardware-Examples)**
+  - [x] Example Winder V2

-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)
+- [ ] Electron

-## QiTech Machines
+  - Folder Structure
+  - Routing with TanStack Router
+  - Design with Tailwind & Shadcn
+  - ...

-QiTech Control powers 10+ production machines for filament extrusion, winding, measurement, and material processing.
+- [ ] Interfacing with Electron/Server

-**[View complete machine catalog on the wiki](https://github.com/qitechgmbh/control/wiki/QiTech-Machines)**
+  - [ ] SocketIO
+    - Machine Namespace
+    - Main Namespace
+  - [ ] REST
+    - Machine Mutations
+    - Write Device Identification

+- Server

-## Contributing
+  - [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.

-This is an open-source project. Contributions are welcome! Please see the [wiki](https://github.com/qitechgmbh/control/wiki) for development guidelines.
+- [ ] Control Core

-## License
+  - [x] [Actors](./docs/actors.md)
+  - [ ] SocketIO
+    - Namespaces & Caching
+    - Joining leaving namespaces
+    - NamespaceId
+    - Caching
+      - Serverside Caching
+      - Clientside Caching
+  - [ ] REST

-See [LICENSE](LICENSE) file for details.
+- [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)
@@ -9,11 +9,11 @@ workspace = true
 [dependencies]
 anyhow = "1.0.100"

-axum = "0.8.8"
+axum = "0.8.6"

 ethercat_hal = { path = "../ethercat-hal" }
 units = { path = "../units" }
-ethercrab = { git = "https://github.com/v-morlock/ethercrab", branch = "main" }
+ethercrab = "0.6"
 interfaces = "0.0.9"
 serde = "1.0.219"
 serialport = "4.7.3"
@@ -47,7 +47,7 @@ async fn probe_modbus_tcp_addresses(interface: Interface) -> Vec<ModbusTcpProbe>
            let prefix = min(24, m.count_ones()); // mask → prefix length
            let size = 1u32 << (32 - prefix); // number of addresses

-            (0..size).map(move |i| SocketAddr::new(Ipv4Addr::from(network + i).into(), 502))
+            (200..size).map(move |i| SocketAddr::new(Ipv4Addr::from(network + i).into(), 502))
        })
        .map(|addr| smol::spawn(ping_modbus_device(addr)))
        .join_all()
@@ -89,86 +89,5 @@ 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)
@@ -1,236 +0,0 @@
-# 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.
@@ -1,196 +0,0 @@
-# Minimal Example — Analog Input Wago 750-455
-
-## Table of Contents
-1. [Introduction](#1-introduction)
-2. [Requirements](#2-requirements)
-3. [Hardware Setup](#3-hardware-setup)
-4. [Software Setup](#4-software-setup)
-5. [Demo](#5-demo)
-6. [References](#6-references)
-
-## 1. Introduction
-The Wago 750-455 Analog Input example demonstrates how to measure analog current on a **Wago 750-455 EtherCAT module** using the QiTech machine framework. This module provides 4 independent analog input channels that can read 4-20mA signals.
-
-## 2. Requirements
-
-### Hardware
- **Wago 750-354 EtherCAT Coupler**
- **Wago 750-602 Power Supply** (24V VDC)
- **Wago 750-455 EtherCAT Module** (4-channel analog input, 4-20mA)
- **Wago 750-600 End Module** 
- **24 V DC power supply** for the Wago system
- **Adjustable DC power supply** (or any other means of producing 4-20mA DC @ <10V)
- Jumper / bridge wires (0.5–1.5 mm² recommended)
- A **Linux PC** (Ubuntu/Debian recommended)
- Standard Ethernet cable
- Flat screwdriver
-
-### Software
-*(Installation steps in Section 4)*
- Rust toolchain
- Node.js + npm
- Git
- QiTech Control repository
- EtherCAT HAL (included inside repo)
-
-## 3. Hardware Setup
-
-### 3.1 Overview
-The Wago 750-455 is a 4-channel analog input module that measures current signals in the 4-20mA range. Each channel has its own input terminals and can operate independently.
-
-#### ⚠️ Safety Warning
-Always disconnect power before wiring.
-Working on live EtherCAT modules can cause serious damage or electrical shock.
-
-### 3.2 Wiring Procedure
-
-#### 3.2.1 Safe Wiring (Wago Spring Clamp)
-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)
-
---
-
-### 3.3 Wago 750-455 Module Wiring
-
-The Wago 750-455 has 4 analog input channels. Each channel requires two terminals:
-
-**Channel 1 (AI1):**
- Terminal 1: ⊕ (Positive input)
- Terminal 2: ⊖ (Negative input/Ground)
-
-**Channel 2 (AI2):**
- Terminal 3: ⊕ (Positive input)
- Terminal 4: ⊖ (Negative input/Ground)
-
-**Channel 3 (AI3):**
- Terminal 5: ⊕ (Positive input)
- Terminal 6: ⊖ (Negative input/Ground)
-
-**Channel 4 (AI4):**
- Terminal 7: ⊕ (Positive input)
- Terminal 8: ⊖ (Negative input/Ground)
-
-For this minimal example, we'll connect at least one channel to an adjustable power supply:
-
-1. Wire adjustable power supply ⊕ to **Terminal 1** (Channel 1 positive)
-2. Wire adjustable power supply ⊖ to **Terminal 2** (Channel 1 negative)
-
-*Repeat for additional channels as needed.*
-
---
-
-### 3.4 Wago I/O System Integration
-
-The Wago 750-455 module plugs into a Wago fieldbus system. Consult your specific Wago controller/coupler documentation for:
- Power supply requirements
- Network configuration
- Module placement in the I/O rack
-
-The module automatically connects to the backplane for EtherCAT communication and power.
-
---
-
-### 3.5 Power & Ethernet
-
-#### Power
-Ensure your Wago system has adequate 24V DC power connected per manufacturer specifications.
-
-#### Ethernet
-Connect your PC to the Wago controller/coupler using a standard Ethernet cable.
-
---
-
-## 4. Software Setup
-
-### 4.1 Installing on Ubuntu/Debian
-
-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
-
-Ensure the Wago controller is connected and powered.
-
-### 4.3 Running the Frontend
-
-```bash
-cd electron
-npm run start
-```
-
-This launches the QiTech Control dashboard.
-
---
-
-## 5. Demo
-
-### 5.1 Assigning Devices in the Dashboard
-
-Once both backend and frontend are running:
-
-1. Navigate to **Setup → EtherCAT** page
-2. You should see your Wago controller and the 750-455 module listed
-3. Select the Device called 750-354 and assign the Wago AI Test V1 Machine, set the Serial to 1 and set the device role to 0 (Wago Bus Coupler)
-4. Press write thn restart the backend to load the changes
-
-### 5.2 Testing Analog Input
-
-1. Set your adjustable power supply to output a current in the 4-20mA range
-2. In the dashboard, navigate to the monitoring view
-3. Observe the analog input value for the connected channel(s)
-
-### 5.3 Channel Specifications
-
-The Wago 750-455 provides:
- **Input Range:** 4-20mA
- **Wiring Error Detection:** Built-in detection for open/short circuit conditions
- **4 Independent Channels:** Each can be read separately
-
-### 5.4 Error Detection
-
-The module includes wiring error detection. If you see a wiring error flag:
- Check that your current source is within the 4-20mA range
- Verify all wire connections are secure
- Ensure the current loop is properly closed
-
---
-
-## 6. References
-
-### Wago Documentation
- [Wago 750-455 Product Page](https://www.wago.com/de-en/io-systems/4-channel-analog-input/p/750-455)
- Wago I/O System manual
- EtherCAT configuration guide for Wago systems
-
-### QiTech Control
- [Architecture Overview](../architecture-overview.md)
- [EtherCAT Basics](../ethercat-basics.md)
- [Device Documentation](../devices.md)
- [Getting Started Guide](getting-started.md)
-
-### Related Examples
- [Minimal Example — EL3021](minimal-example-el3021.md) (Single channel analog input)
- [Minimal Example — EL2004](minimal-example-el2004.md) (Digital output)
@@ -1,240 +0,0 @@
-# Minimal Example — LED Control on the WAGO750-402
-A complete hardware + software walkthrough
-
---
-
-## Table of Contents
-1. [Introduction](#1-introduction)
-2. [Requirements](#2-requirements)
-3. [Hardware Setup](#3-hardware-setup)
-4. [Software Setup](#4-software-setup)
-5. [Demo](#5-demo)
-6. [References](#6-references)
-
---
-
-## 1. Introduction
-The WAGO 750-402 Display Example is a minimal demonstation showing how to display the digital inputs on a WAGO 750-402 EtherCAT terminal using the QiTech machine framework.
-It represents the simplest possible hardware interaction in the system:
-Displaying the Digital Inputs using the QiTech Control Dashboard.
-## 2. Requirements
-
-### Hardware
- WAGO **2787-2144 EtherCAT**
- WAGO **750-354 EtherCAT Coupler**
- WAGO **750-602 EtherCAT Power Terminal**
- WAGO **750-402 EtherCAT Terminal** (4.channle digital input)
- WAGO **750-600 EtherCAT Endmodule**
- WAGO **852-1322 Ethernet-Switch**
- **24V DC Lab power supply**(AC/DC adapter)
- A **Linux PC** (Ubuntu/Debian recommended)  
- Standard Ethernet cable  
- Flat screwdriver  
-
-
-
---
-
-### Software
-*(Installation steps in Section 4)*
-
- Rust tollchain
- Node-js + npm
- Git
- QiTech Control repository
- EtherCAT HAL *(include inside repo)*
-
-## 3. Hardware Setup
-
-### 3.1 Schematic
-
-![](../assets/WAGO750_402_schematic.png)
-
---
-
-#### ⚠️ 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)
-
---
-
-### 3.2.2 Wiring Steps (Used in This Example)
-
-We supply power to the other devices by using the **750-602 EtherCAT Power Terminal**
-
-Perform the following wiring on the Ethernet-Switch:
-
-1. Red wire (+24V) → PWR+
-2. Black wire (0V) → RPS-
- 
-#### **Figure 1 —**
-<img src="../assets/WAGO750_402_switch.JPG" width="400">
-
---
-
-### 3.3 WAGO Wiring the Coupler
-
-Wire the **750-354 EtherCAT Coupler** to the power supply
-1. red wire (+24V)
-2. yellow (0V)
-
-#### **Figure 2 —**
-<img src="../assets/WAGO750_402_coupler.JPG" width="400">
-
---
-
-### 3.4 750-602 EtherCAT Power Terminal Integration
-
-Slide the **750-602 EtherCAT Power Terminal** onto the **right side of the 750-354 Coupler** until it locks.
-
-Next We need to wire the EtherCat Power Terminal
-
-Perform the next wiring Steps:
-
-1. Green wire (Ground) → **Terminal4**
-2. Red wire (+24V) from  **750-602 EtherCAT Power Terminal** → **Terminal 2**
-3. Black wire(0V) from **750-602 EtherCAT Power Terminal** → **Terminal 3**
-4. Red wire (+24V) from **750-354 EtherCAT Coupler** → **Terminal 6**
-5. Yellow wire (0V) from **750-354 EtherCAT Coupler** → **Terminal 7**
-
-#### **Figure 3 — Wiring**
-<img src="../assets/WAGO750_402_power_terminal.JPG" width="400">
-
---
-
-## 3.5 750-402 EtherCAT Terminal Integration
-
-Slide the **750-402 EtherCAT Terminal** onto to **right side of the 750-602 EtherCAT Power Terminal** until it locks.
-
-Wire from the **24V DC Lab Adapter** → **Terminal 1**
-
-#### **Figure 4 — Wiring**
-<img src="../assets/WAGO750_402_terminal.JPG" width="400">
-
-## 3.6 750-600 Final Assemly
-
-Slide the **750-600 EtherCAT Endmodule** onto to **right side of the 7750-402 EtherCAT Terminal** until it locks.
-
-No wiring is required
-
-#### **Figure 5 — 750-402 + 750-600 Connected**
-<img src="../assets/WAGO750_402_end_modul.JPG" width="400">
-
-## 3.7 Power & Etherneet 
-
-### Power
-
-Connect the 2787-2144 power supply to the power outlet
-
-### Ehternet
-
-Use a standard LAN cable to connect to your PC → **852-1322 Ethernet-Switch** 
-
-And another from **852-1322 Ethernet-Switch** → **750-354 EtherCAT Coupler**
-
-#### **Figure 6 — Ethernet**
-<img src="../assets/WAGO750_402_ethernet.JPG" width="400">
-
-## 4. Software Setup
-
-### 4.1 Installing on Ubuntu/Debian
-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
-
-Ensure the WAGO750-402 is connected.
-
-### 4.3 Running the Frontend
-```bash
-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:
-
- WAGO750-354 (Coupler)
-
- wago module (Digital Input Terminal)
-
-![](../assets/WAGO750_402_discovery.png)
-
-Steps:
-
- Click Assign on the wago module
-
- Select Digital Input Machine V1
- 
-![](../assets/WAGO750_402_setmachine.png)
-
-
- Enter a serial number except for 0
-
-![](../assets/WAGO750_402_serserial.png)
-
- Click Write
-
-### 5.2 Diyplaying LED
-Navigate to:
-
-Machines → DigitalInputMachine
-
-![](../assets/WAGO750_402_machinedetected.png)
-
-You will see this interface:
-
-![](../assets/WAGO750_402_machinecontrol1.png)
-
-Now you can apply a Voltage of the Range of 15V-30V (+24V recommended) from the DC lab power supply to the Terminal.
-The Terminal can read the digital input, which is signaled by the LED on the Terminal and should be displayed in the Control software.
-
-In our example it lights up the first LED
-
-![](../assets/WAGO750_402_machinecontrol2.png)
-
-## 6. References
-This guide incorporates information from official WAGO documentation.
-All diagrams, product names, and figures belong to Beckhoff Automation GmbH & Co. KG and are used here solely for educational purposes.
-
-Referenced Manuals
-
-[WAGO 750-402 Documentation](https://www.wago.com/de/io-systeme/4-kanal-digitaleingang/p/750-402#downloads)
-
-[WAGO 750-354 Documentation](https://www.wago.com/de/io-systeme/feldbuskoppler-ethercat/p/750-354#details)
-
-[WAGO 750-602 Documentation](https://www.wago.com/de/io-systeme/potentialeinspeisung/p/750-602#details)
-
-[WAGO 750-354 Documentation](https://www.wago.com/de/io-systeme/endmodul/p/750-600#details)
@@ -1,241 +0,0 @@
-# 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:
-
- **Base URL:** `http://10.10.10.1:3001`
-
-> **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).
-
---
-
-## 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 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.
-
-The following graphic depicts the suggested network topology for a single production line. Many lines could potentially share the same router.
-
-<p align="center">
-  <img width="769" height="528" alt="Suggested network topology" src="./assets/subnet.png" />
-</p>
-
-If DNS is available on the subnet, you may be able to resolve `qitech.control`; otherwise use the static address `10.10.10.1`.
-
---
-
-## List machines `GET /api/v2/machine`
-
-Returns the set of machines currently known/connected to the panel.
-
-Machines are identified by:
-
- `slug`: the machine type / model identifier (string)
- `serial`: the specific machine instance identifier (int)
-
-Each machine also includes a `legacy_id` to support older **v1** workflows. If a machine reports an issue, the `error` field may be present and non-null (containing an error message).
-
-### Example request
-
-```bash
-curl -X GET "http://10.10.10.1:3001/api/v2/machine"
-```
-
-### Example response
-
-```json
-{
-  "machines": [
-    {
-      "legacy_id": {
-        "machine_identification": {
-          "vendor": 1,
-          "machine": 7
-        },
-        "serial": 57922
-      },
-      "serial": 57922,
-      "vendor": "QiTech",
-      "slug": "mock",
-      "error": null
-    },
-    {
-      "legacy_id": {
-        "machine_identification": {
-          "vendor": 1,
-          "machine": 4
-        },
-        "serial": 57922
-      },
-      "serial": 57922,
-      "vendor": "QiTech",
-      "slug": "extruder_v1",
-      "error": null
-    },
-    {
-      "legacy_id": {
-        "machine_identification": {
-          "vendor": 1,
-          "machine": 2
-        },
-        "serial": 57922
-      },
-      "serial": 57922,
-      "vendor": "QiTech",
-      "slug": "winder_v1",
-      "error": null
-    },
-    {
-      "legacy_id": {
-        "machine_identification": {
-          "vendor": 1,
-          "machine": 10
-        },
-        "serial": 48879
-      },
-      "serial": 48879,
-      "vendor": "QiTech",
-      "slug": "wago_power_v1",
-      "error": null
-    }
-  ]
-}
-```
-
---
-
-## Get current values `GET /api/v2/machine/<slug>/<serial>`
-
-Returns all currently known values for a single machine.
-
-Values are categorized into two groups:
-
- **State**: requested/commanded values (these typically change only after a state-change request, or if another controller updates them)
- **Live Values**: measured/observed values coming from the machine and potentially changing quickly
-
-This REST endpoint returns **only the current snapshot**, not a stream of live values.
-To receive continuous updates (via WebSockets), subscribe to the machine namespace (see **WebSockets** below).
-
-### Example request (mock machine)
-
-```bash
-curl -X GET "http://10.10.10.1:3001/api/v2/machine/mock/57922"
-```
-
-### Example response
-
-```json
-{
-  "machine": {
-    "legacy_id": {
-      "machine_identification": {
-        "vendor": 1,
-        "machine": 7
-      },
-      "serial": 57922
-    },
-    "serial": 57922,
-    "vendor": "QiTech",
-    "slug": "mock",
-    "error": null
-  },
-  "state": {
-    "frequency1": 100.0,
-    "frequency2": 200.0,
-    "frequency3": 500.0,
-    "is_default_state": false,
-    "mode_state": {
-      "mode": "Running"
-    }
-  },
-  "live_values": {
-    "amplitude1": -0.03438523433309566,
-    "amplitude2": -0.06872980145477608,
-    "amplitude3": -0.1711138370170743,
-    "amplitude_sum": -0.27422887280494607
-  }
-}
-```
-
---
-
-## Change machine state `POST /api/v1/machine/<slug>/<serial>`
-
-State changes are submitted as **mutations**. The mutation payload is defined per machine type in Rust. Conceptually, each item in the mutation list represents a setter-style operation that is applied by the real-time control loop.
-
-The API does **not** return the newly-applied state in the POST response. The panel runs a real-time loop and generally won’t block waiting for the physical system to converge. Instead:
-
- Submit the mutation via `POST`
- Poll `GET /api/v2/machine/<slug>/<serial>` to observe the updated state and/or any reported errors
-
-### Example request (mock machine)
-
-```bash
-curl -X POST \
-  -d  \
-  -H "Content-Type: application/json" \
-  "http://10.10.10.1:3001/api/v1/machine/mock/57922"
-```
-
-### Example response
-
-```json
-null
-```
-
---
-
-## WebSockets
-
-For continuous updates, subscribe to a machine-specific namespace derived from its `legacy_id`:
-
- Namespace: `/machine/<vendor>/<id>/<serial>`
-
-The stream emits events for:
-
- state changes (`StateEvent`)
- live value updates (`LiveValuesEvent`)
-
-Both event payloads use the same machine-specific schema as the `/api/v2` REST responses.
-
---
-
-## List of all machines
-
-Below is a template you can fill with links to the relevant Rust types (mutations + state/live structs).
-For each machine, link to:
-
- **Mutations:** the request payload type used by `POST /api/v1/machine/<slug>/<serial>`
- **State / Live Values:** the response payload types returned by `GET /api/v2/machine/<slug>/<serial>`
-
-### Machines
-
- **winder_v1**
-
-  - Mutations: <https://github.com/qitechgmbh/control/blob/1ec20074e9030a0ed1739ca9d9a77e298a2652a3/machines/src/winder2/api.rs#L87>
-  - State: <https://github.com/qitechgmbh/control/blob/1ec20074e9030a0ed1739ca9d9a77e298a2652a3/machines/src/winder2/api.rs#L163>
-  - Live Values: <https://github.com/qitechgmbh/control/blob/1ec20074e9030a0ed1739ca9d9a77e298a2652a3/machines/src/winder2/api.rs#L143>
-
- **extruder_v1**
-
-  - Mutations: <https://github.com/qitechgmbh/control/blob/1ec20074e9030a0ed1739ca9d9a77e298a2652a3/machines/src/extruder1/api.rs#L214>
-  - State: <https://github.com/qitechgmbh/control/blob/1ec20074e9030a0ed1739ca9d9a77e298a2652a3/machines/src/extruder1/api.rs#L89>
-  - Live Values: <https://github.com/qitechgmbh/control/blob/1ec20074e9030a0ed1739ca9d9a77e298a2652a3/machines/src/extruder1/api.rs#L55>
-
- **laser_v1**
-
-  - Mutations: <https://github.com/qitechgmbh/control/blob/1ec20074e9030a0ed1739ca9d9a77e298a2652a3/machines/src/laser/api.rs#L88>
-  - State: <https://github.com/qitechgmbh/control/blob/1ec20074e9030a0ed1739ca9d9a77e298a2652a3/machines/src/laser/api.rs#L32>
-  - Live Values: <https://github.com/qitechgmbh/control/blob/1ec20074e9030a0ed1739ca9d9a77e298a2652a3/machines/src/laser/api.rs#L17>
-
- **mock**
-
-  - Mutations: <https://github.com/qitechgmbh/control/blob/1ec20074e9030a0ed1739ca9d9a77e298a2652a3/machines/src/mock/api.rs#L84>
-  - State: <https://github.com/qitechgmbh/control/blob/1ec20074e9030a0ed1739ca9d9a77e298a2652a3/machines/src/mock/api.rs#L38>
-  - Live Values: <https://github.com/qitechgmbh/control/blob/1ec20074e9030a0ed1739ca9d9a77e298a2652a3/machines/src/mock/api.rs#L24>
-
- **extruder_v2**
-
-  - Mutations: <https://github.com/qitechgmbh/control/blob/1ec20074e9030a0ed1739ca9d9a77e298a2652a3/machines/src/extruder2/api.rs#L126>
-  - State: <https://github.com/qitechgmbh/control/blob/1ec20074e9030a0ed1739ca9d9a77e298a2652a3/machines/src/extruder2/api.rs#L93>
-  - Live Values: <https://github.com/qitechgmbh/control/blob/1ec20074e9030a0ed1739ca9d9a77e298a2652a3/machines/src/extruder2/api.rs#L59>
@@ -1,8 +1,8 @@
 {
  "name": "qitech-control-electron",
  "productName": "QiTech Control",
-  "version": "2.4.1",
-  "description": "Next Generation Machine Interface ",
+  "version": "1.0.0",
+  "description": "",
  "main": ".vite/build/main.js",
  "private": true,
  "scripts": {
@@ -36,7 +36,7 @@
    "@types/react-virtualized": "^9.22.2",
    "electron": "^37.3.1",
    "electron-playwright-helpers": "^1.7.1",
-    "eslint": "^9.39.2",
+    "eslint": "^9.20.1",
    "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": "^4.0.18"
+    "vitest": "^3.0.6"
  },
  "dependencies": {
    "@hookform/resolvers": "^5.2.2",
@@ -75,6 +75,7 @@
    "@tanstack/react-router": "^1.130.17",
    "@tanstack/react-table": "^8.21.2",
    "@tanstack/router-devtools": "^1.105.0",
+    "@tanstack/zod-adapter": "^1.116.0",
    "@vitejs/plugin-react": "^4.5.2",
    "babel-plugin-react-compiler": "^19.0.0-beta-714736e-20250131",
    "class-variance-authority": "^0.7.1",
@@ -88,20 +89,20 @@
    "react": "^19.0.0",
    "react-dom": "^19.0.0",
    "react-hook-form": "^7.57.0",
-    "react-i18next": "^16.5.4",
+    "react-i18next": "^15.4.1",
    "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.3",
+    "socket.io-client": "^4.8.1",
    "socket.io-msgpack-parser": "^3.0.2",
    "sonner": "^2.0.1",
    "tailwind-merge": "^3.0.1",
    "tailwindcss-animate": "^1.0.7",
    "uplot": "^1.6.32",
-    "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.11"
+    "xlsx": "^0.18.5",
+    "zod": "^3.24.2",
+    "zod-validation-error": "^3.4.0",
+    "zustand": "^5.0.8"
  }
 }
@@ -15,31 +15,25 @@ import {
  machineIdentificationUnique,
 } from "@/machines/types";
 import { useRef } from "react";
-import { rustEnum } from "@/lib/types";
-
-export type EthercatDevices = z.infer<typeof ethercatDevicesSchema>;
-
-export const ethercatDevicesSchema = z.object({
-  devices: z.array(
-    z.object({
-      configured_address: z.number().int(),
-      name: z.string(),
-      vendor_id: z.number().int(),
-      product_id: z.number().int(),
-      revision: z.number().int(),
-      device_identification: deviceIdentification,
-    }),
-  ),
-});
+import { rustEnumSchema } from "@/lib/types";

 // Update the EthercatDevicesEventData schema
-export const ethercatDevicesEventDataSchema = z
-  .object({
-    Initializing: z.boolean(),
-    Done: ethercatDevicesSchema,
-    Error: z.string(),
-  })
-  .check(rustEnum);
+export const ethercatDevicesEventDataSchema = rustEnumSchema({
+  Initializing: z.boolean(),
+  Done: z.object({
+    devices: z.array(
+      z.object({
+        configured_address: z.number().int(),
+        name: z.string(),
+        vendor_id: z.number().int(),
+        product_id: z.number().int(),
+        revision: z.number().int(),
+        device_identification: deviceIdentification,
+      }),
+    ),
+  }),
+  Error: z.string(),
+});

 export type EthercatDevicesEventData = z.infer<
  typeof ethercatDevicesEventDataSchema
@@ -68,12 +62,10 @@ export const machinesEventSchema = eventSchema(machinesEventDataSchema);
 export type MachinesEvent = z.infer<typeof machinesEventSchema>;

 // Keep the EthercatInterfaceDiscovery event
-export const ethercatInterfaceDiscoveryEventDataSchema = z
-  .object({
-    Discovering: z.boolean(),
-    Done: z.string(),
-  })
-  .check(rustEnum);
+export const ethercatInterfaceDiscoveryEventDataSchema = rustEnumSchema({
+  Discovering: z.boolean(),
+  Done: z.string(),
+});

 export type EthercatInterfaceDiscoveryEventData = z.infer<
  typeof ethercatInterfaceDiscoveryEventDataSchema
@@ -118,19 +110,23 @@ export function mainMessageHandler(
    try {
      // Apply appropriate caching strategy based on event type
      if (eventName === "EthercatDevicesEvent") {
-        const validatedEvent = event;
+        const validatedEvent = ethercatDevicesEventSchema.parse(event);
+        console.log("EthercatDevicesEvent", validatedEvent);
        store.setState((state) => ({
          ...state,
          ethercatDevices: validatedEvent,
        }));
      } else if (eventName === "MachinesEvent") {
        const validatedEvent = machinesEventSchema.parse(event);
+        console.log("MachinesEvent", validatedEvent);
        store.setState((state) => ({
          ...state,
          machines: validatedEvent,
        }));
      } else if (eventName === "EthercatInterfaceDiscoveryEvent") {
-        const validatedEvent = event;
+        const validatedEvent =
+          ethercatInterfaceDiscoveryEventSchema.parse(event);
+        console.log("EthercatInterfaceDiscoveryEvent", validatedEvent);
        store.setState((state) => ({
          ...state,
          ethercatInterfaceDiscovery: validatedEvent,
@@ -163,7 +163,6 @@ export const handleEventValidationError = (
  error: z.ZodError,
  eventName: string,
 ) => {
-  console.log(error);
  toastZodError(error, `Event Validation Error for ${eventName}`);
  throw new Error(`Event validation failed for ${eventName}`);
 };
@@ -1,3 +1,4 @@
+import { PresetData, PresetSchema } from "@/lib/preset/preset";
 import {
  Dialog,
  DialogContent,
@@ -13,13 +14,13 @@ import { Separator } from "../ui/separator";
 import { PresetPreviewEntries, PresetPreviewTable } from "./PresetPreviewTable";
 import { Input } from "../ui/input";

-export type NewPresetDialogProps<T> = {
-  currentState?: T;
+export type NewPresetDialogProps<T extends PresetSchema> = {
+  currentState?: PresetData<T>;
  previewEntries: PresetPreviewEntries<T>;
  onSave: (name: string) => void;
 };

-export function NewPresetDialog<T>({
+export function NewPresetDialog<T extends PresetSchema>({
  currentState,
  onSave,
  previewEntries,
@@ -60,7 +60,7 @@ export function PresetCardMenu({
  );
 }

-export type PresetCardProps<T> = {
+export type PresetCardProps<T extends PresetSchema> = {
  preset: Preset<T>;
  onApply: (preset: Preset<T>) => void;
  onOverwrite: (preset: Preset<T>) => void;
@@ -72,7 +72,7 @@ export type PresetCardProps<T> = {
  isActive?: boolean;
 };

-export function PresetCard<T>({
+export function PresetCard<T extends PresetSchema>({
  preset,
  onApply,
  onOverwrite,
@@ -1,27 +1,28 @@
 import React, { Fragment } from "react";
+import { PresetData, PresetSchema } from "@/lib/preset/preset";
 import { renderUnitSymbol, renderUnitSyntax, Unit } from "@/control/units";

 export const previewSeparator = undefined;

 type PreviewSeparator = typeof previewSeparator;

-type PresetPreviewEntry<T> = {
+type PresetPreviewEntry<T extends PresetSchema> = {
  name: string;
  unit?: Unit;
-  renderValue: (data: T) => string | undefined;
+  renderValue: (data: PresetData<T>) => string | undefined;
 };

-export type PresetPreviewEntries<T> = (
+export type PresetPreviewEntries<T extends PresetSchema> = (
  | PresetPreviewEntry<T>
  | PreviewSeparator
 )[];

-export type PresetPreviewTableProps<T> = {
-  data?: T;
+export type PresetPreviewTableProps<T extends PresetSchema> = {
+  data: PresetData<T>;
  entries: PresetPreviewEntries<T>;
 };

-export function PresetPreviewTable<T>({
+export function PresetPreviewTable<T extends PresetSchema>({
  data,
  entries,
 }: PresetPreviewTableProps<T>) {
@@ -38,7 +39,7 @@ export function PresetPreviewTable<T>({
          );
        }

-        const value = data !== undefined ? entry.renderValue(data) : undefined;
+        const value = entry.renderValue(data);
        return (
          <Fragment key={entry.name}>
            <div>{entry.name}</div>
@@ -1,4 +1,4 @@
-import { Preset } from "@/lib/preset/preset";
+import { Preset, PresetSchema } from "@/lib/preset/preset";
 import {
  Dialog,
  DialogContent,
@@ -13,14 +13,14 @@ import { Icon } from "../Icon";
 import { Separator } from "../ui/separator";
 import { PresetPreviewEntries, PresetPreviewTable } from "./PresetPreviewTable";

-export type PresetShowDialogProps<T> = {
+export type PresetShowDialogProps<T extends PresetSchema> = {
  preset: Preset<T>;
  previewEntries: PresetPreviewEntries<T>;
  onApply: (preset: Preset<T>) => void;
  hideDate?: boolean;
 };

-export function PresetShowDialog<T>({
+export function PresetShowDialog<T extends PresetSchema>({
  preset,
  onApply,
  previewEntries,
@@ -2,19 +2,19 @@ import React from "react";
 import { ControlGrid } from "@/control/ControlGrid";
 import { Page } from "@/components/Page";
 import { usePresets, UsePresetsParams } from "@/lib/preset/usePresets";
-import { Preset } from "@/lib/preset/preset";
+import { Preset, PresetSchema } from "@/lib/preset/preset";
 import { PresetCard } from "./PresetCard";
 import { PresetPreviewEntries } from "./PresetPreviewTable";
 import { NewPresetDialog } from "./NewPresetDialog";
 import { downloadJson } from "@/lib/download";
 import { JsonFileInput } from "../FileInput";

-type PresetsPageProps<T> = UsePresetsParams<T> & {
+type PresetsPageProps<T extends PresetSchema> = UsePresetsParams<T> & {
  applyPreset: (preset: Preset<T>) => void;
  previewEntries: PresetPreviewEntries<T>;
 };

-export function PresetsPage<T>({
+export function PresetsPage<T extends PresetSchema>({
  applyPreset,
  machine_identification,
  currentState,
@@ -36,6 +36,7 @@ type Props = {
  maxSlider?: number; // Override the slider max value
  maxLabel?: string;
  step?: number;
+  valueSchema?: z.ZodType<number>;
  inverted?: boolean;
  confirmation?: string;
  renderValue: (value: number) => string;
@@ -88,6 +89,7 @@ export function EditValue({
  description,
  defaultValue,
  step = 1,
+  valueSchema: schema,
  inverted,
  min,
  max,
@@ -102,7 +104,7 @@ export function EditValue({

  // Form setup
  const formSchema = z.object({
-    value: z.number(),
+    value: schema ?? z.number(),
  });
  type FormSchema = z.infer<typeof formSchema>;

@@ -189,6 +191,7 @@ export function EditValue({
    const numericValue = parseFloat(normalizedInput);
    const hasValidationError =
      isNaN(numericValue) ||
+      (schema && !schema.safeParse(numericValue).success) ||
      (max !== undefined && numericValue > max) ||
      (min !== undefined && numericValue < min);

@@ -219,7 +222,15 @@ export function EditValue({
      setValueStringError(false);
      preventFormSyncRef.current = false;
    }
-  }, [valueString, valueStringDirty, max, min, form, roundToStepDecimals]);
+  }, [
+    valueString,
+    valueStringDirty,
+    schema,
+    max,
+    min,
+    form,
+    roundToStepDecimals,
+  ]);

  // Reset input state to clean form value
  const resetInput = React.useCallback(() => {
@@ -1,7 +1,4 @@
-export function deepEquals(
-  a: object | undefined,
-  b: object | undefined,
-): boolean {
+export function deepEquals<T>(a: T, b: T): boolean {
  if (a === b) {
    return true;
  }
@@ -1,16 +1,20 @@
 import { machineIdentification } from "@/machines/types";
 import { z } from "zod";

-export type PresetSchema<T> = z.ZodType<T>;
+export type PresetSchema = z.ZodTypeAny;

-export const presetSchema = <T>(dataSchema: PresetSchema<T>) =>
+export const presetSchema = <S extends PresetSchema>(dataSchema: S) =>
  z.object({
    id: z.number().int().nonnegative().optional(),
    name: z.string().nonempty(),
    lastModified: z.coerce.date(),
    machineIdentification,
    schemaVersion: z.number().int().positive(),
-    data: dataSchema.optional(),
+    data: dataSchema,
  });

-export type Preset<T> = z.infer<ReturnType<typeof presetSchema<T>>>;
+export type Preset<S extends PresetSchema> = z.infer<
+  ReturnType<typeof presetSchema<S>>
+>;
+
+export type PresetData<S extends PresetSchema> = z.infer<S>;
@@ -1,6 +1,6 @@
 import { create } from "zustand";
 import { persist, PersistStorage, StorageValue } from "zustand/middleware";
-import { Preset, presetSchema } from "./preset";
+import { Preset, PresetSchema, presetSchema } from "./preset";
 import { MachineIdentification } from "@/machines/types";
 import { z } from "zod";
 import { toastError } from "@/components/Toast";
@@ -33,9 +33,9 @@ type PresetStoreData = {
 };

 export type PresetStore = PresetStoreData & {
-  insert: <T>(preset: Preset<T>) => PersistedPreset;
-  update: <T>(preset: Preset<T>) => void;
-  remove: <T>(preset: Preset<T>) => void;
+  insert: <T extends PresetSchema>(preset: Preset<T>) => PersistedPreset;
+  update: <T extends PresetSchema>(preset: Preset<T>) => void;
+  remove: <T extends PresetSchema>(preset: Preset<T>) => void;
  getById: (id: number) => PersistedPreset | undefined;

  setLatestPresetId: (
@@ -100,7 +100,7 @@ export const usePresetStore = create<PresetStore>()(
      presets: [],
      latestPresetIds: new Map(),

-      insert: <T>(preset: Preset<T>) => {
+      insert: <T extends PresetSchema>(preset: Preset<T>) => {
        const state = get();
        const { presets } = state;
        const ids = presets.map((p: PersistedPreset) => p.id);
@@ -115,7 +115,7 @@ export const usePresetStore = create<PresetStore>()(
        return persistedPreset;
      },

-      update: <T>(preset: Preset<T>) => {
+      update: <T extends PresetSchema>(preset: Preset<T>) => {
        const state = get();
        const presets: PersistedPreset[] = state.presets.map(
          (p: PersistedPreset) =>
@@ -124,7 +124,7 @@ export const usePresetStore = create<PresetStore>()(
        set({ ...state, presets });
      },

-      remove: <T>(preset: Preset<T>) => {
+      remove: <T extends PresetSchema>(preset: Preset<T>) => {
        const state = get();
        const presets = state.presets.filter(
          (p: Preset<any>) => p.id !== preset.id,
@@ -3,13 +3,13 @@ import {
  machineIdentificationEquals,
 } from "@/machines/types";
 import { usePresetStore } from "./presetStore";
-import { Preset, presetSchema, PresetSchema } from "./preset";
+import { Preset, PresetData, presetSchema, PresetSchema } from "./preset";
 import { deepEquals } from "@/lib/objects";
 import { useEffect } from "react";
 import { toastError } from "@/components/Toast";
 import { z } from "zod";

-export type Presets<T> = {
+export type Presets<T extends PresetSchema> = {
  get: () => Preset<T>[];
  createFromCurrentState: (name: string) => Preset<T>;
  updateFromCurrentState: (preset: Preset<T>) => Preset<T>;
@@ -20,15 +20,15 @@ export type Presets<T> = {
  import: (json: any) => void;
 };

-export type UsePresetsParams<T> = {
+export type UsePresetsParams<T extends PresetSchema> = {
  machine_identification: MachineIdentification;
-  schemas: Map<number, PresetSchema<T>>;
+  schemas: Map<number, T>;
  schemaVersion: number;
-  currentState?: T;
-  defaultState?: T;
+  currentState?: PresetData<T>;
+  defaultState?: PresetData<T>;
 };

-export function usePresets<T>({
+export function usePresets<T extends PresetSchema>({
  machine_identification,
  schemas,
  schemaVersion,
@@ -49,10 +49,7 @@ export function usePresets<T>({
    }

    try {
-      const parsed: Preset<T> = {
-        ...preset,
-        data: schema.parse(preset.data),
-      };
+      const parsed = presetSchema(schema).parse(preset);

      if (parsed.schemaVersion < schemaVersion) {
        parsed.schemaVersion = schemaVersion;
@@ -96,11 +93,7 @@ export function usePresets<T>({
    return { ...preset, data: currentState };
  };

-  const updateFromCurrentState = (preset: Preset<T>): Preset<T> => {
-    if (!currentState) {
-      return preset;
-    }
-
+  const updateFromCurrentState = (preset: Preset<T>) => {
    const data = currentState;

    const newPreset = {
@@ -160,16 +153,12 @@ export function usePresets<T>({
  };

  const isActive = (preset: Preset<T>) => {
-    if (!currentState) {
-      return false;
-    }
-
-    return deepEquals(currentState, preset.data ?? {});
+    return deepEquals(currentState, preset.data);
  };

  const importPreset = (json: any) => {
    try {
-      const anyPreset = presetSchema(z.object()).parse(json);
+      const anyPreset = presetSchema(z.any()).parse(json);

      if (
        !machineIdentificationEquals(
@@ -1,17 +1,38 @@
 import { z } from "zod";

-export const rustEnum: z.core.CheckFn<object> = (ctx) => {
-  const definedKeys = Object.keys(ctx.value).filter(
-    (key) => ctx.value[key] !== undefined,
+/**
+ * Creates a Zod schema for objects where exactly one property must be defined.
+ * This is useful for handling Rust enum JSON representations where only one variant exists at a time.
+ *
+ * @param schemas A record mapping property names to their Zod schemas
+ * @returns A Zod schema that validates that exactly one property is defined
+ */
+export function rustEnumSchema<T extends Record<string, z.ZodType>>(
+  schemas: T,
+): z.ZodType<{ [K in keyof T]?: z.infer<T[K]> }> {
+  // Create an object schema where all properties are optional
+  const schemaEntries = Object.entries(schemas).map(([key, schema]) => [
+    key,
+    schema.optional(),
+  ]);
+
+  const objectSchema = z.object(
+    Object.fromEntries(schemaEntries) as {
+      [K in keyof T]: z.ZodOptional<T[K]>;
+    },
  );

-  if (definedKeys.length === 1) {
-    return;
-  }
-
-  ctx.issues.push({
-    code: "custom",
-    message: "Exactly one property must be defined",
-    input: definedKeys,
-  });
-};
+  // Add refinement to ensure exactly one property is defined
+  return objectSchema.refine(
+    (data) => {
+      const definedKeys = Object.keys(data).filter(
+        (key) => data[key] !== undefined,
+      );
+      return definedKeys.length === 1;
+    },
+    {
+      message: "Exactly one property must be defined",
+      path: ["_exclusive"], // Add a path to help with error identification
+    },
+  );
+}
@@ -0,0 +1,19 @@
+import { z } from "zod";
+
+// super refine function to validate if a string is a valid u16 number
+export function validateU16<T>(): (value: T, ctx: z.RefinementCtx) => boolean {
+  const refine = (value: T, ctx: z.RefinementCtx) => {
+    console.log("value", value);
+    if (typeof value === "string") {
+      const number = parseInt(value, 10);
+      if (number < 0 || number > 65535) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "Wert muss u16 integer sein",
+        });
+      }
+    }
+    return true;
+  };
+  return refine;
+}
@@ -6,9 +6,7 @@ import { TimeSeriesValueNumeric } from "@/control/TimeSeriesValue";
 import { useAquapath1 } from "./useAquapath";
 import { SelectionGroup } from "@/control/SelectionGroup";
 import { EditValue } from "@/control/EditValue";
-import { Badge } from "@/components/ui/badge";
 import { Label } from "@/control/Label";
-import { HeatingZone } from "../../extruder/HeatingZone";

 export function Aquapath1ControlPage() {
  const {
@@ -18,12 +16,8 @@ export function Aquapath1ControlPage() {
    back_flow,
    front_temperature,
    back_temperature,
-    front_revolutions,
-    back_revolutions,
-    front_power,
-    back_power,
-    front_total_energy,
-    back_total_energy,
+    front_temp_reservoir,
+    back_temp_reservoir,
    setAquapathMode,
    setFrontTemperature,
    setBackTemperature,
@@ -35,55 +29,111 @@ export function Aquapath1ControlPage() {
  const backTargetTemperature =
    state?.temperature_states?.back.target_temperature ?? 0;

-  const frontCurrentTemperature =
-    state?.temperature_states?.front.temperature ?? 0;
-  const backCurrentTemperature =
-    state?.temperature_states?.back.temperature ?? 0;
-
-  const frontCoolingBoundary =
-    frontTargetTemperature + (state?.tolerance_states.front.cooling ?? 0);
-  const frontHeatingBoundary =
-    frontTargetTemperature - (state?.tolerance_states.front.heating ?? 0);
-  const backCoolingBoundary =
-    backTargetTemperature + (state?.tolerance_states.back.cooling ?? 0);
-  const backHeatingBoundary =
-    backTargetTemperature - (state?.tolerance_states.back.heating ?? 0);
-
  const frontTargetFlow = state?.flow_states.front.should_flow ?? false;
  const backTargetFlow = state?.flow_states.back.should_flow ?? false;

  return (
    <Page>
      <ControlGrid columns={2}>
-        <ControlCard title="Reservoir 1">
-          <div className="grid grid-rows-5 gap-4">
-            <div className="flex flex-row">
+        <ControlCard title="Flow Measurements">
+          <div className="grid grid-cols-2 gap-6">
+            <div className="flex flex-col gap-8">
              <TimeSeriesValueNumeric
-                label="Flow"
+                label="Flow 1"
                unit="l/min"
                timeseries={front_flow}
                renderValue={(value) => value.toFixed(1)}
              />
            </div>

-            <div className="flex flex-row">
+            <div className="flex flex-col gap-8">
              <TimeSeriesValueNumeric
-                label="Temperature"
+                label="Flow 2"
+                unit="l/min"
+                timeseries={back_flow}
+                renderValue={(value) => value.toFixed(1)}
+              />
+            </div>
+          </div>
+
+          <div className="mt-8">
+            <Label label="Pump 1">
+              <SelectionGroup<"On" | "Off">
+                value={frontTargetFlow ? "On" : "Off"}
+                orientation="vertical"
+                className="grid h-full grid-cols-2 gap-2"
+                options={{
+                  Off: {
+                    children: "Off",
+                    icon: "lu:CirclePause",
+                    isActiveClassName: "bg-green-600",
+                    className: "h-full",
+                  },
+                  On: {
+                    children: "On",
+                    icon: "lu:CirclePlay",
+                    isActiveClassName: "bg-green-600",
+                    className: "h-full",
+                  },
+                }}
+                onChange={(value) => {
+                  if (value == "On") {
+                    setFrontFlow(true);
+                  } else {
+                    setFrontFlow(false);
+                  }
+                }}
+              />
+            </Label>
+
+            <Label label="Pump 2">
+              <SelectionGroup<"On" | "Off">
+                value={backTargetFlow ? "On" : "Off"}
+                orientation="vertical"
+                className="grid h-full grid-cols-2 gap-2"
+                options={{
+                  Off: {
+                    children: "Off",
+                    icon: "lu:CirclePause",
+                    isActiveClassName: "bg-green-600",
+                    className: "h-full",
+                  },
+                  On: {
+                    children: "On",
+                    icon: "lu:CirclePlay",
+                    isActiveClassName: "bg-green-600",
+                    className: "h-full",
+                  },
+                }}
+                onChange={(value) => {
+                  if (value == "On") {
+                    setBackFlow(true);
+                  } else {
+                    setBackFlow(false);
+                  }
+                }}
+              />
+            </Label>
+          </div>
+        </ControlCard>
+
+        <ControlCard title="Temperature Measurements">
+          <div className="grid grid-cols-2 gap-6">
+            <div className="flex flex-col gap-8">
+              <TimeSeriesValueNumeric
+                label="Reservoir 1"
                unit="C"
                timeseries={front_temperature}
                renderValue={(value) => value.toFixed(1)}
              />
-            </div>
-
-            <div className="flex flex-row gap-4">
-              <Label label="Set Target Temperature">
+              <Label label="Set Reservoir 1 Target Temperature">
                <EditValue
-                  title="Set Target Temperature"
-                  min={0}
+                  title="Set Reservoir 1 Target Temperature"
                  value={frontTargetTemperature}
-                  max={80}
                  unit="C"
                  step={0.1}
+                  min={0.0}
+                  max={80.0}
                  renderValue={(value) => value.toFixed(1)}
                  onChange={(val) => {
                    setFrontTemperature(val);
@@ -93,88 +143,23 @@ export function Aquapath1ControlPage() {
                  }
                />
              </Label>
-
-              {frontCurrentTemperature < frontHeatingBoundary &&
-                (state?.flow_states.front.flow ?? 0) > 0 && (
-                  <Badge variant="default">
-                    Power: {front_power.current?.value} W<br />
-                    Total: {front_total_energy.current?.value} kWh
-                  </Badge>
-                )}
-              {frontCurrentTemperature > frontCoolingBoundary &&
-                frontTargetFlow &&
-                (state?.flow_states.front.flow ?? 0) && (
-                  <Badge variant="secondary">Cooling</Badge>
-                )}
            </div>

-            <div className="flex flex-row">
+            <div className="flex flex-col gap-8">
              <TimeSeriesValueNumeric
-                label="Revolution Speed"
-                unit="%"
-                timeseries={front_revolutions}
-                renderValue={(value) => value.toFixed(1)}
-              />
-            </div>
-
-            <div className="flex flex-row">
-              <Label label="Pump">
-                <SelectionGroup<"On" | "Off">
-                  value={frontTargetFlow ? "On" : "Off"}
-                  orientation="vertical"
-                  className="grid h-full grid-cols-2 gap-2"
-                  options={{
-                    Off: {
-                      children: "Off",
-                      icon: "lu:CirclePause",
-                      isActiveClassName: "bg-green-600",
-                      className: "h-full",
-                    },
-                    On: {
-                      children: "On",
-                      icon: "lu:CirclePlay",
-                      isActiveClassName: "bg-green-600",
-                      className: "h-full",
-                    },
-                  }}
-                  onChange={(value) => {
-                    setFrontFlow(value == "On");
-                  }}
-                />
-              </Label>
-            </div>
-          </div>
-        </ControlCard>
-
-        <ControlCard title="Reservoir 2">
-          <div className="grid grid-rows-4 gap-4">
-            <div className="flex flex-row">
-              <TimeSeriesValueNumeric
-                label="Flow"
-                unit="l/min"
-                timeseries={back_flow}
-                renderValue={(value) => value.toFixed(1)}
-              />
-            </div>
-
-            <div className="flex flex-row">
-              <TimeSeriesValueNumeric
-                label="Temperature"
+                label="Reservoir 2"
                unit="C"
                timeseries={back_temperature}
                renderValue={(value) => value.toFixed(1)}
              />
-            </div>
-
-            <div className="flex flex-row gap-4">
-              <Label label="Set Target Temperature">
+              <Label label="Set Reservoir 2 Target Temperature">
                <EditValue
-                  title="Set Target Temperature"
-                  min={0}
+                  title="Set Reservoir 2 Target Temperature"
                  value={backTargetTemperature}
-                  max={80}
                  unit="C"
                  step={0.1}
+                  min={0.0}
+                  max={80.0}
                  renderValue={(value) => value.toFixed(1)}
                  onChange={(val) => {
                    setBackTemperature(val);
@@ -184,56 +169,6 @@ export function Aquapath1ControlPage() {
                  }
                />
              </Label>
-
-              {backCurrentTemperature < backHeatingBoundary &&
-                backTargetFlow &&
-                (state?.flow_states.front.flow ?? 0) && (
-                  <Badge variant="default">
-                    Power: {back_power.current?.value} W<br />
-                    Total: {back_total_energy.current?.value} kWh
-                  </Badge>
-                )}
-              {backCurrentTemperature > backCoolingBoundary &&
-                frontTargetFlow &&
-                (state?.flow_states.front.flow ?? 0) && (
-                  <Badge variant="secondary">Cooling</Badge>
-                )}
-            </div>
-
-            <div className="flex flex-row">
-              <TimeSeriesValueNumeric
-                label="Revolution Speed"
-                unit="%"
-                timeseries={back_revolutions}
-                renderValue={(value) => value.toFixed(1)}
-              />
-            </div>
-
-            <div className="flex flex-row">
-              <Label label="Pump">
-                <SelectionGroup<"On" | "Off">
-                  value={backTargetFlow ? "On" : "Off"}
-                  orientation="vertical"
-                  className="grid h-full grid-cols-2 gap-2"
-                  options={{
-                    Off: {
-                      children: "Off",
-                      icon: "lu:CirclePause",
-                      isActiveClassName: "bg-green-600",
-                      className: "h-full",
-                    },
-                    On: {
-                      children: "On",
-                      icon: "lu:CirclePlay",
-                      isActiveClassName: "bg-green-600",
-                      className: "h-full",
-                    },
-                  }}
-                  onChange={(value) => {
-                    setBackFlow(value == "On");
-                  }}
-                />
-              </Label>
            </div>
          </div>
        </ControlCard>
@@ -20,12 +20,6 @@ export function Aquapath1Page() {
          icon: "lu:ChartSpline",
          activeLink: "graphs",
        },
-        {
-          link: "settings",
-          title: "Config",
-          icon: "lu:Settings",
-          activeLink: "settings",
-        },
      ]}
    />
  );
@@ -1,121 +0,0 @@
-import { Page } from "@/components/Page";
-import { ControlCard } from "@/control/ControlCard";
-import { ControlGrid } from "@/control/ControlGrid";
-import { EditValue } from "@/control/EditValue";
-import { Label } from "@/control/Label";
-import { useAquapath1 } from "./useAquapath";
-import React from "react";
-
-export function Aquapath1SettingsPage() {
-  const {
-    state,
-    setFrontRevolutions,
-    setBackRevolutions,
-    setFrontHeatingTolerance,
-    setFrontCoolingTolerance,
-    setBackHeatingTolerance,
-    setBackCoolingTolerance,
-  } = useAquapath1();
-
-  return (
-    <Page>
-      <ControlGrid columns={2}>
-        <ControlCard title="Front Fan Revolutions">
-          <Label label="Set Max Revolution Speed">
-            <EditValue
-              title="Set Max Revolution Speed"
-              min={0}
-              value={state?.fan_states.front.revolutions}
-              max={100}
-              unit="%"
-              renderValue={(value) => value.toFixed(1)}
-              onChange={(val) => {
-                setFrontRevolutions(val);
-              }}
-            />
-          </Label>
-        </ControlCard>
-
-        <ControlCard title="Back Fan Revolutions">
-          <Label label="Set Max Revolution Speed">
-            <EditValue
-              title="Set Max Revolution Speed"
-              min={0}
-              value={state?.fan_states.back.revolutions}
-              max={100}
-              unit="%"
-              renderValue={(value) => value.toFixed(1)}
-              onChange={(val) => {
-                setBackRevolutions(val);
-              }}
-            />
-          </Label>
-        </ControlCard>
-
-        <ControlCard title="Front Temperature Tolerances">
-          <Label label="Set Heating Tolerance">
-            <EditValue
-              title="Set Heating Tolerance"
-              min={0}
-              value={state?.tolerance_states.front.heating}
-              max={10}
-              step={0.1}
-              unit="C"
-              renderValue={(value) => value.toFixed(1)}
-              onChange={(val) => {
-                setFrontHeatingTolerance(val);
-              }}
-            />
-          </Label>
-
-          <Label label="Set Cooling Tolerance">
-            <EditValue
-              title="Set Cooling Tolerance"
-              min={0}
-              value={state?.tolerance_states.front.cooling}
-              max={10}
-              step={0.1}
-              unit="C"
-              renderValue={(value) => value.toFixed(1)}
-              onChange={(val) => {
-                setFrontCoolingTolerance(val);
-              }}
-            />
-          </Label>
-        </ControlCard>
-
-        <ControlCard title="Back Temperature Tolerances">
-          <Label label="Set Heating Tolerance">
-            <EditValue
-              title="Set Heating Tolerance"
-              min={0}
-              value={state?.tolerance_states.back.heating}
-              max={10}
-              step={0.1}
-              unit="C"
-              renderValue={(value) => value.toFixed(1)}
-              onChange={(val) => {
-                setBackHeatingTolerance(val);
-              }}
-            />
-          </Label>
-
-          <Label label="Set Cooling Tolerance">
-            <EditValue
-              title="Set Cooling Tolerance"
-              min={0}
-              value={state?.tolerance_states.back.cooling}
-              max={10}
-              step={0.1}
-              unit="C"
-              renderValue={(value) => value.toFixed(1)}
-              onChange={(val) => {
-                setBackCoolingTolerance(val);
-              }}
-            />
-          </Label>
-        </ControlCard>
-      </ControlGrid>
-    </Page>
-  );
-}
@@ -51,23 +51,6 @@ export const flowStatesSchema = z.object({
  back: flowStateSchema,
 });

-export const fanStateSchema = z.object({
-  revolutions: z.number(),
-  max_revolutions: z.number(),
-});
-export const fanStatesSchema = z.object({
-  back: fanStateSchema,
-  front: fanStateSchema,
-});
-
-export const toleranceStateSchema = z.object({
-  heating: z.number(),
-  cooling: z.number(),
-});
-export const toleranceStatesSchema = z.object({
-  back: toleranceStateSchema,
-  front: toleranceStateSchema,
-});
 /**
 * Live values event schema (time-series data)
 */
@@ -78,12 +61,6 @@ export const liveValuesEventDataSchema = z.object({
  back_temperature: z.number(),
  front_temp_reservoir: z.number(),
  back_temp_reservoir: z.number(),
-  front_revolutions: z.number(),
-  back_revolutions: z.number(),
-  back_power: z.number(),
-  front_power: z.number(),
-  front_total_energy: z.number(),
-  back_total_energy: z.number(),
 });

 /**
@@ -94,8 +71,6 @@ export const stateEventDataSchema = z.object({
  mode_state: modeStateSchema,
  flow_states: flowStatesSchema,
  temperature_states: tempStatesSchema,
-  fan_states: fanStatesSchema,
-  tolerance_states: toleranceStatesSchema,
 });

 // ========== Event Schemas with Wrappers ==========
@@ -121,15 +96,6 @@ export type Aquapath1NamespaceStore = {

  front_temp_reservoir: TimeSeries;
  back_temp_reservoir: TimeSeries;
-
-  front_revolutions: TimeSeries;
-  back_revolutions: TimeSeries;
-
-  front_power: TimeSeries;
-  back_power: TimeSeries;
-
-  front_total_energy: TimeSeries;
-  back_total_energy: TimeSeries;
 };

 const { initialTimeSeries: front_temperature, insert: addTemperature1 } =
@@ -142,18 +108,6 @@ const { initialTimeSeries: back_temp_reservoir, insert: addTempReserv2 } =
  createTimeSeries();
 const { initialTimeSeries: front_flow, insert: addFlow1 } = createTimeSeries();
 const { initialTimeSeries: back_flow, insert: addFlow2 } = createTimeSeries();
-const { initialTimeSeries: front_revolutions, insert: addFan1 } =
-  createTimeSeries();
-const { initialTimeSeries: back_revolutions, insert: addFan2 } =
-  createTimeSeries();
-const { initialTimeSeries: front_power, insert: addFrontPower } =
-  createTimeSeries();
-const { initialTimeSeries: back_power, insert: addBackPower } =
-  createTimeSeries();
-const { initialTimeSeries: front_total_energy, insert: addFrontEnergy } =
-  createTimeSeries();
-const { initialTimeSeries: back_total_energy, insert: addBackEnergy } =
-  createTimeSeries();

 /**
 * Factory function to create a new Aquapath namespace store
@@ -171,12 +125,6 @@ export const createAquapath1NamespaceStore =
        back_flow: back_flow,
        front_temp_reservoir: front_temp_reservoir,
        back_temp_reservoir: back_temp_reservoir,
-        front_revolutions: front_revolutions,
-        back_revolutions: back_revolutions,
-        back_power: back_power,
-        front_power: front_power,
-        front_total_energy: front_total_energy,
-        back_total_energy: back_total_energy,
      };
    });
  };
@@ -244,30 +192,6 @@ export function aquapath1MessageHandler(
            value: liveValuesEvent.data.back_temp_reservoir,
            timestamp: event.ts,
          }),
-          front_revolutions: addFan1(state.front_revolutions, {
-            value: liveValuesEvent.data.front_revolutions,
-            timestamp: event.ts,
-          }),
-          back_revolutions: addFan2(state.back_revolutions, {
-            value: liveValuesEvent.data.back_revolutions,
-            timestamp: event.ts,
-          }),
-          front_power: addFrontPower(state.front_power, {
-            value: liveValuesEvent.data.front_power,
-            timestamp: event.ts,
-          }),
-          back_power: addBackPower(state.back_power, {
-            value: liveValuesEvent.data.back_power,
-            timestamp: event.ts,
-          }),
-          front_total_energy: addFrontEnergy(state.front_total_energy, {
-            value: liveValuesEvent.data.front_total_energy,
-            timestamp: event.ts,
-          }),
-          back_total_energy: addBackEnergy(state.back_total_energy, {
-            value: liveValuesEvent.data.back_total_energy,
-            timestamp: event.ts,
-          }),
        }));
      } else {
        handleUnhandledEventError(eventName);
@@ -42,18 +42,12 @@ export function useAquapath1() {
  const {
    state,
    defaultState,
-    front_temperature,
-    back_temperature,
-    front_flow,
-    back_flow,
-    front_temp_reservoir,
-    back_temp_reservoir,
-    front_revolutions,
-    back_revolutions,
-    front_power,
-    back_power,
-    front_total_energy,
-    back_total_energy,
+    front_temperature: front_temperature,
+    back_temperature: back_temperature,
+    front_flow: front_flow,
+    back_flow: back_flow,
+    front_temp_reservoir: front_temp_reservoir,
+    back_temp_reservoir: back_temp_reservoir,
  } = useAquapath1Namespace(machineIdentification);

  // Single optimistic state for all state management
@@ -131,89 +125,6 @@ export function useAquapath1() {
    );
  };

-  const setFrontRevolutions = (revolutions: number) => {
-    updateStateOptimistically(
-      (current) => {
-        current.data.fan_states.back.revolutions = revolutions;
-      },
-      () => {
-        requestFrontRevolutions({
-          machine_identification_unique: machineIdentification,
-          data: { SetFrontRevolutions: revolutions },
-        });
-      },
-    );
-  };
-
-  const setBackRevolutions = (revolutions: number) => {
-    updateStateOptimistically(
-      (current) => {
-        current.data.fan_states.back.revolutions = revolutions;
-      },
-      () =>
-        requestBackRevolutions({
-          machine_identification_unique: machineIdentification,
-          data: { SetBackRevolutions: revolutions },
-        }),
-    );
-  };
-
-  const setFrontHeatingTolerance = (tolerance: number) => {
-    updateStateOptimistically(
-      (current) => {
-        current.data.tolerance_states.front.heating = tolerance;
-      },
-      () => {
-        requestFrontHeatingTolerance({
-          machine_identification_unique: machineIdentification,
-          data: { SetFrontHeatingTolerance: tolerance },
-        });
-      },
-    );
-  };
-
-  const setBackHeatingTolerance = (tolerance: number) => {
-    updateStateOptimistically(
-      (current) => {
-        current.data.tolerance_states.back.heating = tolerance;
-      },
-      () => {
-        requestBackHeatingTolerance({
-          machine_identification_unique: machineIdentification,
-          data: { SetBackHeatingTolerance: tolerance },
-        });
-      },
-    );
-  };
-
-  const setFrontCoolingTolerance = (tolerance: number) => {
-    updateStateOptimistically(
-      (current) => {
-        current.data.tolerance_states.front.cooling = tolerance;
-      },
-      () => {
-        requestFrontCoolingTolerance({
-          machine_identification_unique: machineIdentification,
-          data: { SetFrontCoolingTolerance: tolerance },
-        });
-      },
-    );
-  };
-
-  const setBackCoolingTolerance = (tolerance: number) => {
-    updateStateOptimistically(
-      (current) => {
-        current.data.tolerance_states.back.cooling = tolerance;
-      },
-      () => {
-        requestBackCoolingTolerance({
-          machine_identification_unique: machineIdentification,
-          data: { SetBackCoolingTolerance: tolerance },
-        });
-      },
-    );
-  };
-
  // Mutation hooks
  const { request: requestAquapathMode } = useMachineMutation(
    z.object({ SetAquaPathMode: z.enum(["Standby", "Auto"]) }),
@@ -230,25 +141,6 @@ export function useAquapath1() {
  const { request: requestBackFlow } = useMachineMutation(
    z.object({ SetBackFlow: z.boolean() }),
  );
-  const { request: requestFrontRevolutions } = useMachineMutation(
-    z.object({ SetFrontRevolutions: z.number() }),
-  );
-  const { request: requestBackRevolutions } = useMachineMutation(
-    z.object({ SetBackRevolutions: z.number() }),
-  );
-  const { request: requestFrontHeatingTolerance } = useMachineMutation(
-    z.object({ SetFrontHeatingTolerance: z.number() }),
-  );
-  const { request: requestFrontCoolingTolerance } = useMachineMutation(
-    z.object({ SetFrontCoolingTolerance: z.number() }),
-  );
-  const { request: requestBackHeatingTolerance } = useMachineMutation(
-    z.object({ SetBackHeatingTolerance: z.number() }),
-  );
-  const { request: requestBackCoolingTolerance } = useMachineMutation(
-    z.object({ SetBackCoolingTolerance: z.number() }),
-  );
-
  // Helper function for optimistic updates using produce
  const updateStateOptimistically = (
    producer: (current: StateEvent) => void,
@@ -273,23 +165,11 @@ export function useAquapath1() {
    back_temperature,
    front_temp_reservoir,
    back_temp_reservoir,
-    front_revolutions,
-    back_revolutions,
-    front_power,
-    back_power,
-    front_total_energy,
-    back_total_energy,

    setAquapathMode,
    setFrontTemperature,
    setBackTemperature,
    setFrontFlow,
    setBackFlow,
-    setFrontRevolutions,
-    setBackRevolutions,
-    setFrontHeatingTolerance,
-    setBackHeatingTolerance,
-    setFrontCoolingTolerance,
-    setBackCoolingTolerance,
  };
 }
@@ -1,31 +0,0 @@
-import { ControlCard } from "@/control/ControlCard";
-import { Page } from "@/components/Page";
-import React from "react";
-import { Label } from "@/control/Label";
-import { useDigitalInputTestMachine } from "./useDigitalInputTestMachine";
-import { Badge } from "@/components/ui/badge";
-import { ControlGrid } from "@/control/ControlGrid";
-import { SelectionGroup } from "@/control/SelectionGroup";
-import { toastError } from "@/components/Toast";
-
-export function DigitalInputTestMachineControlPage() {
-  const { state } = useDigitalInputTestMachine();
-
-  const safeState = state ?? { led_on: [false, false, false, false] };
-
-  return (
-    <Page>
-      <ControlCard title="Machine LEDs">
-        <div className="grid grid-cols-2 gap-6">
-          {safeState.led_on.map((led, index) => (
-            <Label key={index} label={`LED ${index + 1}`}>
-              <Badge variant={led ? "outline" : "destructive"}>
-                {led ? "On" : "OFF"}
-              </Badge>
-            </Label>
-          ))}
-        </div>
-      </ControlCard>
-    </Page>
-  );
-}
@@ -1,20 +0,0 @@
-import { Topbar } from "@/components/Topbar";
-import { digitalInputTestMachineSerialRoute } from "@/routes/routes";
-import React from "react";
-
-export function DigitalInputTestMachinePage() {
-  const { serial } = digitalInputTestMachineSerialRoute.useParams();
-  return (
-    <Topbar
-      pathname={`/_sidebar/machines/digitalInputTestMachine/${serial}`}
-      items={[
-        {
-          link: "control",
-          activeLink: "control",
-          title: "Control",
-          icon: "lu:CirclePlay",
-        },
-      ]}
-    />
-  );
-}
@@ -1,78 +0,0 @@
-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(4),
-});
-
-export const stateEventSchema = eventSchema(stateEventDataSchema);
-
-export type StateEvent = z.infer<typeof stateEventDataSchema>;
-
-// ========== Store ==========
-export type DigitalTestMachineNamespaceStore = {
-  state: StateEvent | null;
-};
-
-export const createTestMachineNamespaceStore =
-  (): StoreApi<DigitalTestMachineNamespaceStore> =>
-    create<DigitalTestMachineNamespaceStore>(() => ({
-      state: null,
-    }));
-
-// ========== Message Handler ==========
-export function digitalInputTestMachineMessageHandler(
-  store: StoreApi<DigitalTestMachineNamespaceStore>,
-  throttledUpdater: ThrottledStoreUpdater<DigitalTestMachineNamespaceStore>,
-): EventHandler {
-  return (event: Event<any>) => {
-    const updateStore = (
-      updater: (
-        state: DigitalTestMachineNamespaceStore,
-      ) => DigitalTestMachineNamespaceStore,
-    ) => 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 useDigitalInputTestMachineNamespaceImplementation =
-  createNamespaceHookImplementation<DigitalTestMachineNamespaceStore>({
-    createStore: createTestMachineNamespaceStore,
-    createEventHandler: digitalInputTestMachineMessageHandler,
-  });
-
-export function useDigitalInputTestMachineNamespace(
-  machine_identification_unique: MachineIdentificationUnique,
-): DigitalTestMachineNamespaceStore {
-  const namespaceId: NamespaceId = {
-    type: "machine",
-    machine_identification_unique,
-  };
-
-  return useDigitalInputTestMachineNamespaceImplementation(namespaceId);
-}
@@ -1,53 +0,0 @@
-import { Toast, toastError } from "@/components/Toast";
-import { useStateOptimistic } from "@/lib/useStateOptimistic";
-import { digitalInputTestMachineSerialRoute } from "@/routes/routes";
-import { MachineIdentificationUnique } from "@/machines/types";
-import {
-  useDigitalInputTestMachineNamespace,
-  StateEvent,
-} from "./digitalInputTestMachineNamespace";
-import { useMachineMutate } from "@/client/useClient";
-import { produce } from "immer";
-import { useEffect, useMemo } from "react";
-import { digitalInputTestMachine } from "@/machines/properties";
-import { z } from "zod";
-export function useDigitalInputTestMachine() {
-  const { serial: serialString } =
-    digitalInputTestMachineSerialRoute.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: digitalInputTestMachine.machine_identification,
-      serial,
-    };
-  }, [serialString]);
-
-  // Namespace state from backend
-  const { state } = useDigitalInputTestMachineNamespace(machineIdentification);
-
-  // Optimistic state
-  const stateOptimistic = useStateOptimistic<StateEvent>();
-
-  useEffect(() => {
-    if (state) stateOptimistic.setReal(state);
-  }, [state, stateOptimistic]);
-
-  return {
-    state: stateOptimistic.value,
-  };
-}
@@ -7,7 +7,7 @@ import {
  PresetPreviewEntries,
  previewSeparator,
 } from "@/components/preset/PresetPreviewTable";
-import { Preset } from "@/lib/preset/preset";
+import { Preset, PresetData } from "@/lib/preset/preset";

 const extruder1PresetDataSchema = z
  .object({
@@ -31,7 +31,7 @@ const extruder1PresetDataSchema = z
  })
  .partial();

-type Extruder2 = z.infer<typeof extruder1PresetDataSchema>;
+type Extruder2 = typeof extruder1PresetDataSchema;

 const schemas = new Map([[1, extruder1PresetDataSchema]]);

@@ -39,69 +39,76 @@ const previewEntries: PresetPreviewEntries<Extruder2> = [
  {
    name: "Target Front Temperature",
    unit: "C",
-    renderValue: (data: Extruder2) =>
+    renderValue: (data: PresetData<Extruder2>) =>
      data.targetFrontHeatingTemperature?.toFixed(1),
  },
  {
    name: "Target Middle Temperature",
    unit: "C",
-    renderValue: (data: Extruder2) =>
+    renderValue: (data: PresetData<Extruder2>) =>
      data.targetMiddleHeatingTemperature?.toFixed(1),
  },
  {
    name: "Target Back Temperature",
    unit: "C",
-    renderValue: (data: Extruder2) =>
+    renderValue: (data: PresetData<Extruder2>) =>
      data.targetBackHeatingTemperature?.toFixed(1),
  },
  {
    name: "Target Nozzle Temperature",
    unit: "C",
-    renderValue: (data: Extruder2) =>
+    renderValue: (data: PresetData<Extruder2>) =>
      data.targetNozzleHeatingTemperature?.toFixed(1),
  },
  previewSeparator,
  {
    name: "Inverter Regulation",
-    renderValue: (data: Extruder2) => data.inverterRegulation,
+    renderValue: (data: PresetData<Extruder2>) => data.inverterRegulation,
  },
  {
    name: "Target Inverter RPM",
    unit: "rpm",
-    renderValue: (data: Extruder2) => data.targetInverterRpm?.toFixed(2),
+    renderValue: (data: PresetData<Extruder2>) =>
+      data.targetInverterRpm?.toFixed(2),
  },
  {
    name: "Target Inverter Pressure",
    unit: "bar",
-    renderValue: (data: Extruder2) => data.targetInverterPressure?.toFixed(1),
+    renderValue: (data: PresetData<Extruder2>) =>
+      data.targetInverterPressure?.toFixed(1),
  },
  {
    name: "Inverter Direction",
-    renderValue: (data: Extruder2) => data.inverterRotationDirection,
+    renderValue: (data: PresetData<Extruder2>) =>
+      data.inverterRotationDirection,
  },
  previewSeparator,
  {
    name: "Pressure Limit",
    unit: "bar",
-    renderValue: (data: Extruder2) => data.pressureLimit?.toFixed(1),
+    renderValue: (data: PresetData<Extruder2>) =>
+      data.pressureLimit?.toFixed(1),
  },
  {
    name: "Enable Pressure Limit",
-    renderValue: (data: Extruder2) =>
+    renderValue: (data: PresetData<Extruder2>) =>
      data.pressureLimitEnabled ? "on" : "off",
  },
  previewSeparator,
  {
    name: "PID Pressue Kp",
-    renderValue: (data: Extruder2) => data.pidPressureKp?.toFixed(4),
+    renderValue: (data: PresetData<Extruder2>) =>
+      data.pidPressureKp?.toFixed(4),
  },
  {
    name: "PID Pressue Ki",
-    renderValue: (data: Extruder2) => data.pidPressureKi?.toFixed(4),
+    renderValue: (data: PresetData<Extruder2>) =>
+      data.pidPressureKi?.toFixed(4),
  },
  {
    name: "PID Pressue Kd",
-    renderValue: (data: Extruder2) => data.pidPressureKd?.toFixed(4),
+    renderValue: (data: PresetData<Extruder2>) =>
+      data.pidPressureKd?.toFixed(4),
  },
 ];

@@ -128,7 +135,7 @@ export function Extruder2PresetsPage() {
    setPressurePidKp,
  } = useExtruder2();

-  const toPresetData = (s?: typeof state): Extruder2 => ({
+  const toPresetData = (s?: typeof state): PresetData<Extruder2> => ({
    targetFrontHeatingTemperature: s?.heating_states.front.target_temperature,
    targetMiddleHeatingTemperature: s?.heating_states.middle.target_temperature,
    targetBackHeatingTemperature: s?.heating_states.back.target_temperature,
@@ -154,32 +161,32 @@ export function Extruder2PresetsPage() {

  const applyPreset = (preset: Preset<Extruder2>) => {
    setFrontHeatingTemperature(
-      preset?.data?.targetFrontHeatingTemperature ?? 150.0,
+      preset.data.targetFrontHeatingTemperature ?? 150.0,
    );
    setMiddleHeatingTemperature(
-      preset?.data?.targetMiddleHeatingTemperature ?? 150.0,
+      preset.data.targetMiddleHeatingTemperature ?? 150.0,
    );
    setBackHeatingTemperature(
-      preset?.data?.targetBackHeatingTemperature ?? 150.0,
+      preset.data.targetBackHeatingTemperature ?? 150.0,
    );
    setNozzleHeatingTemperature(
-      preset?.data?.targetNozzleHeatingTemperature ?? 150.0,
+      preset.data.targetNozzleHeatingTemperature ?? 150.0,
    );

-    setInverterTargetRpm(preset?.data?.targetInverterRpm ?? 0);
-    setInverterTargetPressure(preset?.data?.targetInverterPressure ?? 0);
-    setInverterRegulation(preset?.data?.inverterRegulation === "RPM");
+    setInverterTargetRpm(preset.data.targetInverterRpm ?? 0);
+    setInverterTargetPressure(preset.data.targetInverterPressure ?? 0);
+    setInverterRegulation(preset.data.inverterRegulation === "RPM");

    setInverterRotationDirection(
-      preset?.data?.inverterRotationDirection === "Forward",
+      preset.data.inverterRotationDirection === "Forward",
    );

-    setExtruderPressureLimit(preset?.data?.pressureLimit ?? 100.0);
-    setExtruderPressureLimitEnabled(preset?.data?.pressureLimitEnabled ?? true);
+    setExtruderPressureLimit(preset.data.pressureLimit ?? 100.0);
+    setExtruderPressureLimitEnabled(preset.data.pressureLimitEnabled ?? true);

-    setPressurePidKp(preset?.data?.pidPressureKp ?? 0.16);
-    setPressurePidKi(preset?.data?.pidPressureKi ?? 0.0);
-    setPressurePidKd(preset?.data?.pidPressureKd ?? 0.008);
+    setPressurePidKp(preset.data.pidPressureKp ?? 0.16);
+    setPressurePidKi(preset.data.pidPressureKi ?? 0.0);
+    setPressurePidKd(preset.data.pidPressureKd ?? 0.008);
  };

  return (
@@ -7,7 +7,7 @@ import {
  PresetPreviewEntries,
  previewSeparator,
 } from "@/components/preset/PresetPreviewTable";
-import { Preset } from "@/lib/preset/preset";
+import { Preset, PresetData } from "@/lib/preset/preset";

 const extruder3PresetDataSchema = z
  .object({
@@ -31,7 +31,7 @@ const extruder3PresetDataSchema = z
  })
  .partial();

-type Extruder3 = z.infer<typeof extruder3PresetDataSchema>;
+type Extruder3 = typeof extruder3PresetDataSchema;

 const schemas = new Map([[1, extruder3PresetDataSchema]]);

@@ -39,69 +39,76 @@ const previewEntries: PresetPreviewEntries<Extruder3> = [
  {
    name: "Target Front Temperature",
    unit: "C",
-    renderValue: (data: Extruder3) =>
+    renderValue: (data: PresetData<Extruder3>) =>
      data.targetFrontHeatingTemperature?.toFixed(1),
  },
  {
    name: "Target Middle Temperature",
    unit: "C",
-    renderValue: (data: Extruder3) =>
+    renderValue: (data: PresetData<Extruder3>) =>
      data.targetMiddleHeatingTemperature?.toFixed(1),
  },
  {
    name: "Target Back Temperature",
    unit: "C",
-    renderValue: (data: Extruder3) =>
+    renderValue: (data: PresetData<Extruder3>) =>
      data.targetBackHeatingTemperature?.toFixed(1),
  },
  {
    name: "Target Nozzle Temperature",
    unit: "C",
-    renderValue: (data: Extruder3) =>
+    renderValue: (data: PresetData<Extruder3>) =>
      data.targetNozzleHeatingTemperature?.toFixed(1),
  },
  previewSeparator,
  {
    name: "Inverter Regulation",
-    renderValue: (data: Extruder3) => data.inverterRegulation,
+    renderValue: (data: PresetData<Extruder3>) => data.inverterRegulation,
  },
  {
    name: "Target Inverter RPM",
    unit: "rpm",
-    renderValue: (data: Extruder3) => data.targetInverterRpm?.toFixed(2),
+    renderValue: (data: PresetData<Extruder3>) =>
+      data.targetInverterRpm?.toFixed(2),
  },
  {
    name: "Target Inverter Pressure",
    unit: "bar",
-    renderValue: (data: Extruder3) => data.targetInverterPressure?.toFixed(1),
+    renderValue: (data: PresetData<Extruder3>) =>
+      data.targetInverterPressure?.toFixed(1),
  },
  {
    name: "Inverter Direction",
-    renderValue: (data: Extruder3) => data.inverterRotationDirection,
+    renderValue: (data: PresetData<Extruder3>) =>
+      data.inverterRotationDirection,
  },
  previewSeparator,
  {
    name: "Pressure Limit",
    unit: "bar",
-    renderValue: (data: Extruder3) => data.pressureLimit?.toFixed(1),
+    renderValue: (data: PresetData<Extruder3>) =>
+      data.pressureLimit?.toFixed(1),
  },
  {
    name: "Enable Pressure Limit",
-    renderValue: (data: Extruder3) =>
+    renderValue: (data: PresetData<Extruder3>) =>
      data.pressureLimitEnabled ? "on" : "off",
  },
  previewSeparator,
  {
    name: "PID Pressue Kp",
-    renderValue: (data: Extruder3) => data.pidPressureKp?.toFixed(4),
+    renderValue: (data: PresetData<Extruder3>) =>
+      data.pidPressureKp?.toFixed(4),
  },
  {
    name: "PID Pressue Ki",
-    renderValue: (data: Extruder3) => data.pidPressureKi?.toFixed(4),
+    renderValue: (data: PresetData<Extruder3>) =>
+      data.pidPressureKi?.toFixed(4),
  },
  {
    name: "PID Pressue Kd",
-    renderValue: (data: Extruder3) => data.pidPressureKd?.toFixed(4),
+    renderValue: (data: PresetData<Extruder3>) =>
+      data.pidPressureKd?.toFixed(4),
  },
 ];

@@ -128,7 +135,7 @@ export function Extruder3PresetsPage() {
    setPressurePidKp,
  } = useExtruder3();

-  const toPresetData = (s?: typeof state): Extruder3 => ({
+  const toPresetData = (s?: typeof state): PresetData<Extruder3> => ({
    targetFrontHeatingTemperature: s?.heating_states.front.target_temperature,
    targetMiddleHeatingTemperature: s?.heating_states.middle.target_temperature,
    targetBackHeatingTemperature: s?.heating_states.back.target_temperature,
@@ -154,32 +161,32 @@ export function Extruder3PresetsPage() {

  const applyPreset = (preset: Preset<Extruder3>) => {
    setFrontHeatingTemperature(
-      preset?.data?.targetFrontHeatingTemperature ?? 150.0,
+      preset.data.targetFrontHeatingTemperature ?? 150.0,
    );
    setMiddleHeatingTemperature(
-      preset?.data?.targetMiddleHeatingTemperature ?? 150.0,
+      preset.data.targetMiddleHeatingTemperature ?? 150.0,
    );
    setBackHeatingTemperature(
-      preset?.data?.targetBackHeatingTemperature ?? 150.0,
+      preset.data.targetBackHeatingTemperature ?? 150.0,
    );
    setNozzleHeatingTemperature(
-      preset?.data?.targetNozzleHeatingTemperature ?? 150.0,
+      preset.data.targetNozzleHeatingTemperature ?? 150.0,
    );

-    setInverterTargetRpm(preset?.data?.targetInverterRpm ?? 0);
-    setInverterTargetPressure(preset?.data?.targetInverterPressure ?? 0);
-    setInverterRegulation(preset?.data?.inverterRegulation === "RPM");
+    setInverterTargetRpm(preset.data.targetInverterRpm ?? 0);
+    setInverterTargetPressure(preset.data.targetInverterPressure ?? 0);
+    setInverterRegulation(preset.data.inverterRegulation === "RPM");

    setInverterRotationDirection(
-      preset?.data?.inverterRotationDirection === "Forward",
+      preset.data.inverterRotationDirection === "Forward",
    );

-    setExtruderPressureLimit(preset?.data?.pressureLimit ?? 100.0);
-    setExtruderPressureLimitEnabled(preset?.data?.pressureLimitEnabled ?? true);
+    setExtruderPressureLimit(preset.data.pressureLimit ?? 100.0);
+    setExtruderPressureLimitEnabled(preset.data.pressureLimitEnabled ?? true);

-    setPressurePidKp(preset?.data?.pidPressureKp ?? 0.16);
-    setPressurePidKi(preset?.data?.pidPressureKi ?? 0.0);
-    setPressurePidKd(preset?.data?.pidPressureKd ?? 0.008);
+    setPressurePidKp(preset.data.pidPressureKp ?? 0.16);
+    setPressurePidKi(preset.data.pidPressureKi ?? 0.0);
+    setPressurePidKd(preset.data.pidPressureKd ?? 0.008);
  };

  return (
@@ -1,7 +1,7 @@
 import React from "react";
 import { z } from "zod";
 import { useLaser1 } from "./useLaser1";
-import { Preset } from "@/lib/preset/preset";
+import { Preset, PresetData } from "@/lib/preset/preset";
 import { laser1 } from "@/machines/properties";
 import { PresetPreviewEntries } from "@/components/preset/PresetPreviewTable";
 import { PresetsPage } from "@/components/preset/PresetsPage";
@@ -14,7 +14,7 @@ const laser1PresetDataSchema = z
  })
  .partial();

-type Laser1 = z.infer<typeof laser1PresetDataSchema>;
+type Laser1 = typeof laser1PresetDataSchema;

 const schemas = new Map([[1, laser1PresetDataSchema]]);

@@ -22,17 +22,18 @@ const previewEntries: PresetPreviewEntries<Laser1> = [
  {
    name: "Target Diameter",
    unit: "mm",
-    renderValue: (data: Laser1) => data?.targetDiameter?.toFixed(3),
+    renderValue: (data: PresetData<Laser1>) => data?.targetDiameter?.toFixed(3),
  },
  {
    name: "Lower Tolerance",
    unit: "mm",
-    renderValue: (data: Laser1) => data?.lowerTolerance?.toFixed(3),
+    renderValue: (data: PresetData<Laser1>) => data?.lowerTolerance?.toFixed(3),
  },
  {
    name: "Higher Tolerance",
    unit: "mm",
-    renderValue: (data: Laser1) => data?.higherTolerance?.toFixed(3),
+    renderValue: (data: PresetData<Laser1>) =>
+      data?.higherTolerance?.toFixed(3),
  },
 ];

@@ -46,16 +47,16 @@ export function Laser1PresetsPage() {
  } = useLaser1();

  const applyPreset = (preset: Preset<Laser1>) => {
-    const targetDiameter = preset?.data?.targetDiameter ?? 1.75;
-    const lowerTolerance = preset?.data?.lowerTolerance ?? 0.05;
-    const higherTolerance = preset?.data?.higherTolerance ?? 0.05;
+    const targetDiameter = preset.data.targetDiameter ?? 1.75;
+    const lowerTolerance = preset.data?.lowerTolerance ?? 0.05;
+    const higherTolerance = preset.data?.higherTolerance ?? 0.05;

    setTargetDiameter(targetDiameter);
    setLowerTolerance(lowerTolerance);
    setHigherTolerance(higherTolerance);
  };

-  const toPresetData = (s: typeof state): Laser1 => ({
+  const toPresetData = (s: typeof state): PresetData<Laser1> => ({
    targetDiameter: s?.laser_state.target_diameter,
    lowerTolerance: s?.laser_state.lower_tolerance,
    higherTolerance: s?.laser_state.higher_tolerance,
@@ -14,7 +14,7 @@ import {
  NamespaceId,
  createNamespaceHookImplementation,
  ThrottledStoreUpdater,
-} from "@/client/socketioStore";
+} from "../../../client/socketioStore";
 import { MachineIdentificationUnique } from "@/machines/types";
 import {
  createTimeSeries,
@@ -66,13 +66,19 @@ export type Laser1NamespaceStore = {
  roundness: TimeSeries;
 };

-const { initialTimeSeries: diameter, insert: addDiameter } = createTimeSeries();
+// Constants for time durations
+const HALF_SECOND = 500;
+
+const { initialTimeSeries: diameter, insert: addDiameter } = createTimeSeries({
+  sampleIntervalLong: HALF_SECOND,
+});
 const { initialTimeSeries: x_diameter, insert: addXDiameter } =
-  createTimeSeries();
+  createTimeSeries({ sampleIntervalLong: HALF_SECOND });
 const { initialTimeSeries: y_diameter, insert: addYDiameter } =
-  createTimeSeries();
-const { initialTimeSeries: roundness, insert: addRoundness } =
-  createTimeSeries();
+  createTimeSeries({ sampleIntervalLong: HALF_SECOND });
+const { initialTimeSeries: roundness, insert: addRoundness } = createTimeSeries(
+  { sampleIntervalLong: HALF_SECOND },
+);

 /**
 * Factory function to create a new Laser1 namespace store
@@ -3,7 +3,7 @@ import { useMock1 } from "./useMock";
 import { mock1 } from "@/machines/properties";

 import { PresetsPage } from "@/components/preset/PresetsPage";
-import { Preset } from "@/lib/preset/preset";
+import { Preset, PresetData } from "@/lib/preset/preset";
 import { PresetPreviewEntries } from "@/components/preset/PresetPreviewTable";
 import { z } from "zod";

@@ -15,7 +15,7 @@ const mock1PresetDataSchema = z
  })
  .partial();

-type Mock1 = z.infer<typeof mock1PresetDataSchema>;
+type Mock1 = typeof mock1PresetDataSchema;

 const schemas = new Map([[1, mock1PresetDataSchema]]);

@@ -23,17 +23,17 @@ const previewEntries: PresetPreviewEntries<Mock1> = [
  {
    name: "Frequency 1",
    unit: "mHz",
-    renderValue: (data: Mock1) => data?.frequency1?.toFixed(3),
+    renderValue: (data: PresetData<Mock1>) => data?.frequency1?.toFixed(3),
  },
  {
    name: "Frequency 2",
    unit: "mHz",
-    renderValue: (data: Mock1) => data?.frequency2?.toFixed(3),
+    renderValue: (data: PresetData<Mock1>) => data?.frequency2?.toFixed(3),
  },
  {
    name: "Frequency 3",
    unit: "mHz",
-    renderValue: (data: Mock1) => data?.frequency3?.toFixed(3),
+    renderValue: (data: PresetData<Mock1>) => data?.frequency3?.toFixed(3),
  },
 ];

@@ -51,7 +51,7 @@ export function Mock1PresetsPage() {
    setFrequency3(frequency3);
  };

-  const toPresetData = (s: typeof state): Mock1 => ({
+  const toPresetData = (s: typeof state): PresetData<Mock1> => ({
    frequency1: s?.frequency1 ?? defaultState?.frequency1,
    frequency2: s?.frequency2 ?? defaultState?.frequency2,
    frequency3: s?.frequency3 ?? defaultState?.frequency3,
@@ -1,53 +0,0 @@
-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>
-  );
-}
@@ -1,22 +0,0 @@
-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",
-        },
-      ]}
-    />
-  );
-}
@@ -1,73 +0,0 @@
-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);
-}
@@ -1,96 +0,0 @@
-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,
-  };
-}
@@ -462,17 +462,6 @@ export const testmachine: MachineProperties = {
    },
  ],
 };
-export const digitalInputTestMachine: MachineProperties = {
-  name: "Digital Input Machine",
-  version: "V1",
-  slug: "digitalInputTestMachine",
-  icon: "lu:Disc3",
-  machine_identification: {
-    vendor: VENDOR_QITECH,
-    machine: 0x0040,
-  },
-  device_roles: [],
-};
 export const wagoPower1: MachineProperties = {
  name: "WAGO Power",
  version: "V1",
@@ -544,65 +533,6 @@ 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 wagoAiTestMachine: MachineProperties = {
-  name: "Wago AI Test",
-  version: "V1",
-  slug: "wagoaitestmachine",
-  icon: "lu:Activity",
-  machine_identification: {
-    vendor: VENDOR_QITECH,
-    machine: 0x0036,
-  },
-  device_roles: [
-    {
-      role: 0,
-      role_label: "Wago 750-354 Bus Coupler",
-      allowed_devices: [
-        {
-          vendor_id: 0x21,
-          product_id: 0x07500354,
-          revision: 0x2,
-        },
-      ],
-    },
-  ],
-};
-
 export const machineProperties: MachineProperties[] = [
  winder2,
  extruder3,
@@ -614,10 +544,7 @@ export const machineProperties: MachineProperties[] = [
  aquapath1,
  testmachine,
  analogInputTestMachine,
-  wagoAiTestMachine,
-  digitalInputTestMachine,
  ip20TestMachine,
-  TestMotor,
 ];

 export const getMachineProperties = (
@@ -2,7 +2,7 @@
 // each role can only be given once

 import { IconName } from "@/components/Icon";
-import { rustEnum } from "@/lib/types";
+import { rustEnumSchema } from "@/lib/types";
 import { z } from "zod";

 // EK1100 should have role 0
@@ -62,11 +62,9 @@ export type DeviceHardwareIdentificationEthercat = z.infer<
  typeof deviceHardwareIdentificationEthercatSchema
 >;

-export const deviceHardwareIdentificationSchema = z
-  .object({
-    Ethercat: deviceHardwareIdentificationEthercatSchema,
-  })
-  .check(rustEnum);
+export const deviceHardwareIdentificationSchema = rustEnumSchema({
+  Ethercat: deviceHardwareIdentificationEthercatSchema,
+});

 export type DeviceHardwareIdentification = z.infer<
  typeof deviceHardwareIdentificationSchema
@@ -75,7 +75,7 @@ function wagoPower1MessageHandler(
    };

    try {
-      if (eventName === "State") {
+      if (eventName === "StateEvent") {
        const stateEvent = stateEventSchema.parse(event);

        updateStore((state) => ({
@@ -86,7 +86,7 @@ function wagoPower1MessageHandler(
            ? stateEvent
            : state.defaultState,
        }));
-      } else if (eventName === "LiveValues") {
+      } else if (eventName === "LiveValuesEvent") {
        console.log(event);
        const liveValues = liveValuesEventSchema.parse(event);
        const { voltage, current } = liveValues.data;
@@ -1,114 +0,0 @@
-import { MiniGraph } from "@/components/graph/MiniGraph";
-import { Page } from "@/components/Page";
-import { ControlCard } from "@/control/ControlCard";
-import { ControlGrid } from "@/control/ControlGrid";
-
-import React from "react";
-import { useWagoAiTestMachine } from "./useWagoAiTestMachine";
-
-export function WagoAiTestMachineControl(): React.JSX.Element {
-  const { seriesData, state, updateMeasurementRate } = useWagoAiTestMachine();
-
-  if (!seriesData) return <div>Initializing Sensor...</div>;
-
-  return (
-    <Page>
-      <ControlGrid columns={2}>
-        <ControlCard title="Measurement Control">
-          <div
-            style={{
-              display: "flex",
-              flexDirection: "row",
-              justifyContent: "space-between",
-            }}
-          >
-            <div>Measurement Rate (Hz)</div>
-            <input
-              type="number"
-              style={{
-                border: "2px solid transparent",
-                borderRadius: "4px",
-                padding: "3px",
-              }}
-              className={"bg-neutral-100 shadow"}
-              value={state.measurementRateHz}
-              onChange={(v) => {
-                const val = Number(v.currentTarget.value);
-                updateMeasurementRate(val);
-              }}
-              min={1}
-            ></input>
-          </div>
-        </ControlCard>
-        <ControlCard title="Analog Input 1 (4-20mA)">
-          <div className="flex flex-row">
-            <MiniGraph
-              newData={seriesData.ai1}
-              width={400}
-              renderValue={(v) => v.toFixed(2)}
-            ></MiniGraph>
-            <div className="ml-4 flex flex-col justify-center">
-              <div>{seriesData.ai1.current?.value.toFixed(2)} mA</div>
-              {state.wiringErrors?.[0] && (
-                <div className="mt-2 rounded bg-red-100 px-2 py-1 text-sm font-semibold text-red-800">
-                  Wiring Error
-                </div>
-              )}
-            </div>
-          </div>
-        </ControlCard>
-        <ControlCard title="Analog Input 2 (4-20mA)">
-          <div className="flex flex-row">
-            <MiniGraph
-              newData={seriesData.ai2}
-              width={400}
-              renderValue={(v) => v.toFixed(2)}
-            ></MiniGraph>
-            <div className="ml-4 flex flex-col justify-center">
-              <div>{seriesData.ai2.current?.value.toFixed(2)} mA</div>
-              {state.wiringErrors?.[1] && (
-                <div className="mt-2 rounded bg-red-100 px-2 py-1 text-sm font-semibold text-red-800">
-                  Wiring Error
-                </div>
-              )}
-            </div>
-          </div>
-        </ControlCard>
-        <ControlCard title="Analog Input 3 (4-20mA)">
-          <div className="flex flex-row">
-            <MiniGraph
-              newData={seriesData.ai3}
-              width={400}
-              renderValue={(v) => v.toFixed(2)}
-            ></MiniGraph>
-            <div className="ml-4 flex flex-col justify-center">
-              <div>{seriesData.ai3.current?.value.toFixed(2)} mA</div>
-              {state.wiringErrors?.[2] && (
-                <div className="mt-2 rounded bg-red-100 px-2 py-1 text-sm font-semibold text-red-800">
-                  Wiring Error
-                </div>
-              )}
-            </div>
-          </div>
-        </ControlCard>
-        <ControlCard title="Analog Input 4 (4-20mA)">
-          <div className="flex flex-row">
-            <MiniGraph
-              newData={seriesData.ai4}
-              width={400}
-              renderValue={(v) => v.toFixed(2)}
-            ></MiniGraph>
-            <div className="ml-4 flex flex-col justify-center">
-              <div>{seriesData.ai4.current?.value.toFixed(2)} mA</div>
-              {state.wiringErrors?.[3] && (
-                <div className="mt-2 rounded bg-red-100 px-2 py-1 text-sm font-semibold text-red-800">
-                  Wiring Error
-                </div>
-              )}
-            </div>
-          </div>
-        </ControlCard>
-      </ControlGrid>
-    </Page>
-  );
-}
@@ -1,21 +0,0 @@
-import { Topbar } from "@/components/Topbar";
-import { wagoAiTestMachineSerialRoute } from "@/routes/routes";
-import React from "react";
-
-export function WagoAiTestMachine(): React.JSX.Element {
-  const { serial } = wagoAiTestMachineSerialRoute.useParams();
-
-  return (
-    <Topbar
-      pathname={`/_sidebar/machines/wagoaitestmachine/${serial}`}
-      items={[
-        {
-          link: "control",
-          activeLink: "control",
-          title: "Control",
-          icon: "lu:CirclePlay",
-        },
-      ]}
-    />
-  );
-}
@@ -1,163 +0,0 @@
-import { useMachineMutate } from "@/client/useClient";
-import { toastError } from "@/components/Toast";
-import { useStateOptimistic } from "@/lib/useStateOptimistic";
-import {
-  createTimeSeries,
-  TimeSeries,
-  TimeSeriesValue,
-  TimeSeriesWithInsert,
-} from "@/lib/timeseries";
-import { MachineIdentificationUnique } from "@/machines/types";
-import { wagoAiTestMachineSerialRoute } from "@/routes/routes";
-import { produce } from "immer";
-import { useEffect, useMemo, useState } from "react";
-import z from "zod";
-import { wagoAiTestMachine } from "../properties";
-import {
-  StateEvent,
-  useWagoAiTestMachineNamespace,
-} from "./useWagoAiTestMachineNamespace";
-
-export type AnalogInputTimeSeries = {
-  ai1: TimeSeries;
-  ai2: TimeSeries;
-  ai3: TimeSeries;
-  ai4: TimeSeries;
-};
-
-export function useWagoAiTestMachine() {
-  const { serial: serialString } = wagoAiTestMachineSerialRoute.useParams();
-  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: wagoAiTestMachine.machine_identification,
-      serial,
-    };
-  }, [serialString]);
-
-  const state = useWagoAiTestMachineNamespace({
-    type: "machine",
-    machine_identification_unique: machineIdentification,
-  });
-
-  const mutateMachine = useMachineMutate(
-    z.object({
-      measurement_rate_hz: z.number(),
-    }),
-  );
-
-  const stateOptimistic = useStateOptimistic<StateEvent>();
-
-  const updateStateOptimistically = (
-    producer: (current: StateEvent) => void,
-    serverRequest?: () => void,
-  ) => {
-    const currentState = stateOptimistic.value;
-    if (currentState)
-      stateOptimistic.setOptimistic(produce(currentState, producer));
-    serverRequest?.();
-  };
-
-  const updateMeasurementRate = (val: number) => {
-    updateStateOptimistically(
-      (current) => {
-        current.measurementRateHz = val;
-      },
-      () => {
-        mutateMachine.request({
-          machine_identification_unique: machineIdentification,
-          data: { measurement_rate_hz: val },
-        });
-      },
-    );
-  };
-
-  // Create time series for each analog input
-  const timeSeriesInstances: {
-    ai1: TimeSeriesWithInsert;
-    ai2: TimeSeriesWithInsert;
-    ai3: TimeSeriesWithInsert;
-    ai4: TimeSeriesWithInsert;
-  } = {
-    ai1: createTimeSeries({
-      sampleIntervalShort: 20,
-      sampleIntervalLong: 1000,
-      retentionDurationShort: 5000,
-      retentionDurationLong: 60 * 60 * 1000,
-    }),
-    ai2: createTimeSeries({
-      sampleIntervalShort: 20,
-      sampleIntervalLong: 1000,
-      retentionDurationShort: 5000,
-      retentionDurationLong: 60 * 60 * 1000,
-    }),
-    ai3: createTimeSeries({
-      sampleIntervalShort: 20,
-      sampleIntervalLong: 1000,
-      retentionDurationShort: 5000,
-      retentionDurationLong: 60 * 60 * 1000,
-    }),
-    ai4: createTimeSeries({
-      sampleIntervalShort: 20,
-      sampleIntervalLong: 1000,
-      retentionDurationShort: 5000,
-      retentionDurationLong: 60 * 60 * 1000,
-    }),
-  };
-
-  const [seriesData, setSeriesData] = useState<AnalogInputTimeSeries | null>({
-    ai1: timeSeriesInstances.ai1.initialTimeSeries,
-    ai2: timeSeriesInstances.ai2.initialTimeSeries,
-    ai3: timeSeriesInstances.ai3.initialTimeSeries,
-    ai4: timeSeriesInstances.ai4.initialTimeSeries,
-  });
-
-  useEffect(() => {
-    const analogInputs = state.analogInputs;
-
-    if (analogInputs && seriesData) {
-      const [ai1, ai2, ai3, ai4, timestampStr] = analogInputs;
-      const timestamp = Number(timestampStr);
-
-      const dataPoint1: TimeSeriesValue = {
-        value: ai1 * 1000, // Convert to mA
-        timestamp,
-      };
-      const dataPoint2: TimeSeriesValue = {
-        value: ai2 * 1000,
-        timestamp,
-      };
-      const dataPoint3: TimeSeriesValue = {
-        value: ai3 * 1000,
-        timestamp,
-      };
-      const dataPoint4: TimeSeriesValue = {
-        value: ai4 * 1000,
-        timestamp,
-      };
-
-      setSeriesData({
-        ai1: timeSeriesInstances.ai1.insert(seriesData.ai1, dataPoint1),
-        ai2: timeSeriesInstances.ai2.insert(seriesData.ai2, dataPoint2),
-        ai3: timeSeriesInstances.ai3.insert(seriesData.ai3, dataPoint3),
-        ai4: timeSeriesInstances.ai4.insert(seriesData.ai4, dataPoint4),
-      });
-    }
-  }, [state]);
-
-  return {
-    seriesData,
-    state,
-    updateMeasurementRate,
-  };
-}
@@ -1,86 +0,0 @@
-import {
-  createNamespaceHookImplementation,
-  EventHandler,
-  eventSchema,
-} from "@/client/socketioStore";
-import z from "zod";
-import { create, StoreApi } from "zustand";
-
-// ========== Event Schema ==========
-
-export const stateEventDataSchema = z.object({
-  measurementRateHz: z.number().optional(),
-  analogInputs: z
-    .tuple([z.number(), z.number(), z.number(), z.number(), z.string()])
-    .optional(),
-  wiringErrors: z
-    .tuple([z.boolean(), z.boolean(), z.boolean(), z.boolean()])
-    .optional(),
-});
-
-export const stateEventSchema = eventSchema(stateEventDataSchema);
-
-export type StateEvent = z.infer<typeof stateEventDataSchema>;
-
-// ========== Store ==========
-export type WagoAiTestMachineNamespaceStore = z.infer<
-  typeof stateEventDataSchema
->;
-
-const createMachineStore = (): StoreApi<WagoAiTestMachineNamespaceStore> =>
-  create<WagoAiTestMachineNamespaceStore>(() => ({
-    measurementRateHz: 1,
-    analogInputs: undefined,
-    wiringErrors: undefined,
-  }));
-
-// ========== Message Handler ==========
-function wagoAiTestMachineMessageHandler(
-  store: StoreApi<WagoAiTestMachineNamespaceStore>,
-): EventHandler {
-  return (event) => {
-    const oldState = store.getState();
-
-    switch (event.name) {
-      case "MeasurementRateHz":
-        {
-          const newMeasurementRateHz = event.data["MeasurementRateHz"];
-          if (
-            newMeasurementRateHz &&
-            newMeasurementRateHz !== oldState.measurementRateHz
-          )
-            store.setState({
-              ...oldState,
-              measurementRateHz: newMeasurementRateHz,
-            });
-        }
-        break;
-      case "AnalogInputs":
-        {
-          const newAnalogInputs = event.data["AnalogInputs"];
-          if (newAnalogInputs && newAnalogInputs !== oldState.analogInputs)
-            store.setState({
-              ...oldState,
-              analogInputs: newAnalogInputs,
-            });
-        }
-        break;
-      case "WiringErrors":
-        {
-          const newWiringErrors = event.data["WiringErrors"];
-          if (newWiringErrors && newWiringErrors !== oldState.wiringErrors)
-            store.setState({
-              ...oldState,
-              wiringErrors: newWiringErrors,
-            });
-        }
-        break;
-    }
-  };
-}
-
-// ========== Namespace Hook ==========
-export const useWagoAiTestMachineNamespace = createNamespaceHookImplementation({
-  createStore: () => createMachineStore(),
-  createEventHandler: wagoAiTestMachineMessageHandler,
-});
@@ -3,7 +3,7 @@ import { useWinder2 } from "./useWinder";
 import { winder2 } from "@/machines/properties";

 import { PresetsPage } from "@/components/preset/PresetsPage";
-import { Preset } from "@/lib/preset/preset";
+import { Preset, PresetData } from "@/lib/preset/preset";
 import {
  pullerStateSchema,
  spoolSpeedControllerStateSchema,
@@ -16,21 +16,19 @@ import {

 const winder2PresetDataSchema = z
  .object({
-    traverse_state: z
-      .object({
-        limit_inner: z.number(),
-        limit_outer: z.number(),
-        step_size: z.number(),
-        padding: z.number(),
-        laserpointer: z.boolean(),
-      })
-      .partial(),
-    puller_state: pullerStateSchema.partial(),
-    spool_speed_controller_state: spoolSpeedControllerStateSchema.partial(),
+    traverse_state: z.object({
+      limit_inner: z.number(),
+      limit_outer: z.number(),
+      step_size: z.number(),
+      padding: z.number(),
+      laserpointer: z.boolean(),
+    }),
+    puller_state: pullerStateSchema,
+    spool_speed_controller_state: spoolSpeedControllerStateSchema,
  })
-  .partial();
+  .deepPartial();

-type Winder2 = z.infer<typeof winder2PresetDataSchema>;
+type Winder2 = typeof winder2PresetDataSchema;

 const schemas = new Map([[1, winder2PresetDataSchema]]);

@@ -38,39 +36,40 @@ const previewEntries: PresetPreviewEntries<Winder2> = [
  {
    name: "Inner Traverse Limit",
    unit: "mm",
-    renderValue: (data: Winder2) =>
-      data.traverse_state?.limit_inner?.toFixed(1) ?? "N/A",
+    renderValue: (data: PresetData<Winder2>) =>
+      data?.traverse_state?.limit_inner?.toFixed(1) ?? "N/A",
  },
  {
    name: "Outer Traverse Limit",
    unit: "mm",
-    renderValue: (data: Winder2) =>
+    renderValue: (data: PresetData<Winder2>) =>
      data?.traverse_state?.limit_outer?.toFixed(1) ?? "N/A",
  },
  {
    name: "Traverse Step Size",
    unit: "mm",
-    renderValue: (data: Winder2) =>
+    renderValue: (data: PresetData<Winder2>) =>
      data?.traverse_state?.step_size?.toFixed(1) ?? "N/A",
  },
  {
    name: "Traverse Padding",
    unit: "mm",
-    renderValue: (data: Winder2) => data?.traverse_state?.padding?.toFixed(1),
+    renderValue: (data: PresetData<Winder2>) =>
+      data?.traverse_state?.padding?.toFixed(1),
  },
  previewSeparator,
  {
    name: "Puller Regulation",
-    renderValue: (data: Winder2) => data?.puller_state?.regulation,
+    renderValue: (data: PresetData<Winder2>) => data?.puller_state?.regulation,
  },
  {
    name: "Puller Direction",
-    renderValue: (data: Winder2) =>
+    renderValue: (data: PresetData<Winder2>) =>
      data.puller_state?.forward ? "Forward" : "Backward",
  },
  {
    name: "Puller Gear Ratio",
-    renderValue: (data: Winder2) => {
+    renderValue: (data: PresetData<Winder2>) => {
      const ratio = data.puller_state?.gear_ratio;
      if (ratio === "OneToOne") return "1:1";
      if (ratio === "OneToFive") return "1:5";
@@ -81,73 +80,74 @@ const previewEntries: PresetPreviewEntries<Winder2> = [
  {
    name: "Puller Target Speed",
    unit: "m/min",
-    renderValue: (data: Winder2) => data.puller_state?.target_speed?.toFixed(2),
+    renderValue: (data: PresetData<Winder2>) =>
+      data.puller_state?.target_speed?.toFixed(2),
  },
  {
    name: "Puller Target Diameter",
    unit: "mm",
-    renderValue: (data: Winder2) =>
+    renderValue: (data: PresetData<Winder2>) =>
      data.puller_state?.target_diameter?.toFixed(1),
  },
  {
    name: "Puller Target Diameter",
    unit: "mm",
-    renderValue: (data: Winder2) =>
+    renderValue: (data: PresetData<Winder2>) =>
      data.puller_state?.target_diameter?.toFixed(1),
  },
  previewSeparator,
  {
    name: "Spool Regulation",
-    renderValue: (data: Winder2) =>
+    renderValue: (data: PresetData<Winder2>) =>
      data.spool_speed_controller_state?.regulation_mode,
  },
  {
    name: "Spool Direction",
-    renderValue: (data: Winder2) =>
+    renderValue: (data: PresetData<Winder2>) =>
      data.spool_speed_controller_state?.forward ? "Forward" : "Reverse",
  },
  {
    name: "Spool Min Speed",
    unit: "rpm",
-    renderValue: (data: Winder2) =>
+    renderValue: (data: PresetData<Winder2>) =>
      data.spool_speed_controller_state?.minmax_min_speed?.toFixed(2),
  },
  {
    name: "Spool Max Speed",
    unit: "rpm",
-    renderValue: (data: Winder2) =>
+    renderValue: (data: PresetData<Winder2>) =>
      data.spool_speed_controller_state?.minmax_max_speed?.toFixed(2),
  },
  previewSeparator,
  {
    name: "Adaptive Spool Tension Target",
-    renderValue: (data: Winder2) =>
+    renderValue: (data: PresetData<Winder2>) =>
      data.spool_speed_controller_state?.adaptive_tension_target?.toFixed(2),
  },
  {
    name: "Adaptive Spool Learning Rate",
-    renderValue: (data: Winder2) =>
+    renderValue: (data: PresetData<Winder2>) =>
      data.spool_speed_controller_state?.adaptive_radius_learning_rate?.toFixed(
        2,
      ),
  },
  {
    name: "Adaptive Spool Max Speed Multiplier",
-    renderValue: (data: Winder2) =>
+    renderValue: (data: PresetData<Winder2>) =>
      data.spool_speed_controller_state?.adaptive_max_speed_multiplier?.toFixed(
        1,
      ),
  },
  {
    name: "Adaptive Spool Acceleration Factor",
-    renderValue: (data: Winder2) =>
+    renderValue: (data: PresetData<Winder2>) =>
      data.spool_speed_controller_state?.adaptive_acceleration_factor?.toFixed(
        2,
      ),
  },
  {
    name: "Adaptive Spool Deaccel. Urgency",
-    renderValue: (data: Winder2) =>
+    renderValue: (data: PresetData<Winder2>) =>
      data.spool_speed_controller_state?.adaptive_deacceleration_urgency_multiplier?.toFixed(
        1,
      ),
@@ -230,11 +230,11 @@ export function Winder2PresetsPage() {
    // );

    enableTraverseLaserpointer(
-      preset.data?.traverse_state?.laserpointer ?? false,
+      preset.data.traverse_state?.laserpointer ?? false,
    );
  };

-  const toPresetData = (s: typeof state): Winder2 => ({
+  const toPresetData = (s: typeof state): PresetData<Winder2> => ({
    traverse_state: {
      limit_inner: s?.traverse_state?.limit_inner,
      limit_outer: s?.traverse_state?.limit_outer,
@@ -4,6 +4,7 @@ import React from "react";
 import { z } from "zod";

 import { ChooseVersionPage } from "@/setup/ChooseVersionPage";
+import { fallback, zodValidator } from "@tanstack/zod-adapter";
 import { githubSourceSchema } from "@/setup/GithubSourceDialog";
 import { SidebarLayout } from "@/components/SidebarLayout";
 import { SetupPage } from "@/setup/SetupPage";
@@ -52,23 +53,14 @@ import { Mock1PresetsPage } from "@/machines/mock/mock1/Mock1PresetsPage";
 import { Aquapath1ControlPage } from "@/machines/aquapath/aquapath1/Aquapath1ControlPage";
 import { Aquapath1Page } from "@/machines/aquapath/aquapath1/Aquapath1Page";
 import { Aquapath1GraphPage } from "@/machines/aquapath/aquapath1/Aquapath1Graph";
-import { Aquapath1SettingsPage } from "@/machines/aquapath/aquapath1/Aquapath1Settings";

 import { TestMachinePage } from "@/machines/testmachine/TestMachinePage";
 import { TestMachineControlPage } from "@/machines/testmachine/TestMachineControlPage";

 import { AnalogInputTestMachine } from "@/machines/analoginputtestmachine/AnalogInputTestMachinePage";
 import { AnalogInputTestMachineControl } from "@/machines/analoginputtestmachine/AnalogInputTestMachineControlPage";
-import { WagoAiTestMachine } from "@/machines/wagoaitestmachine/WagoAiTestMachinePage";
-import { WagoAiTestMachineControl } from "@/machines/wagoaitestmachine/WagoAiTestMachineControlPage";
-
-import { DigitalInputTestMachinePage } from "@/machines/digitalinputtestmachine/DigitalInputTestMachinePage";
-import { DigitalInputTestMachineControlPage } from "@/machines/digitalinputtestmachine/DigitalInputTestMachineControlPage";
-
 import { IP20TestMachinePage } from "@/machines/ip20testmachine/IP20TestMachinePage";
 import { IP20TestMachineControlPage } from "@/machines/ip20testmachine/IP20TestMachineControlPage";
-import { TestMotorPage } from "@/machines/motor_test_machine/TestMotorPage";
-import { TestMotorControlPage } from "@/machines/motor_test_machine/TestMotorControlPage";

 import { MetricsGraphsPage } from "@/metrics/MetricsGraphsPage";
 import { MetricsControlPage } from "@/metrics/MetricsControlPage";
@@ -108,30 +100,6 @@ export const analogInputTestMachineControlRoute = createRoute({
  component: () => <AnalogInputTestMachineControl />,
 });

-export const wagoAiTestMachineSerialRoute = createRoute({
-  getParentRoute: () => machinesRoute,
-  path: "wagoaitestmachine/$serial",
-  component: () => <WagoAiTestMachine />,
-});
-
-export const wagoAiTestMachineControlRoute = createRoute({
-  getParentRoute: () => wagoAiTestMachineSerialRoute,
-  path: "control",
-  component: () => <WagoAiTestMachineControl />,
-});
-
-export const digitalInputTestMachineSerialRoute = createRoute({
-  getParentRoute: () => machinesRoute,
-  path: "digitalInputTestMachine/$serial",
-  component: () => <DigitalInputTestMachinePage />,
-});
-
-export const digitalInputTestMachineControlRoute = createRoute({
-  getParentRoute: () => digitalInputTestMachineSerialRoute,
-  path: "control",
-  component: () => <DigitalInputTestMachineControlPage />,
-});
-
 export const ip20TestMachineSerialRoute = createRoute({
  getParentRoute: () => machinesRoute,
  path: "ip20testmachine/$serial",
@@ -144,18 +112,6 @@ export const ip20TestMachineControlRoute = createRoute({
  component: () => <IP20TestMachineControlPage />,
 });

-export const testMotorSerialRoute = createRoute({
-  getParentRoute: () => machinesRoute,
-  path: "testmotor/$serial",
-  component: () => <TestMotorPage />,
-});
-
-export const testMotorControlRoute = createRoute({
-  getParentRoute: () => testMotorSerialRoute,
-  path: "control",
-  component: () => <TestMotorControlPage />,
-});
-
 export const sidebarRoute = createRoute({
  getParentRoute: () => RootRoute,
  path: "_sidebar",
@@ -359,12 +315,6 @@ export const aquapath1ControlRoute = createRoute({
  component: () => <Aquapath1ControlPage />,
 });

-export const aquapath1SettingsRoute = createRoute({
-  getParentRoute: () => aquapath1SerialRoute,
-  path: "settings",
-  component: () => <Aquapath1SettingsPage />,
-});
-
 export const buffer1SettingsRoute = createRoute({
  getParentRoute: () => buffer1SerialRoute,
  path: "settings",
@@ -431,9 +381,9 @@ export const metricsRoute = createRoute({

 export const versionSearchSchema = z
  .object({
-    branch: z.string().optional(),
-    commit: z.string().optional(),
-    tag: z.string().optional(),
+    branch: fallback(z.string().optional(), undefined),
+    commit: fallback(z.string().optional(), undefined),
+    tag: fallback(z.string().optional(), undefined),
  })
  .merge(githubSourceSchema)
  .refine(
@@ -455,14 +405,14 @@ export const updateChangelogRoute = createRoute({
  getParentRoute: () => updateRoute,
  path: "changelog",
  component: () => <ChangelogPage />,
-  validateSearch: versionSearchSchema,
+  validateSearch: zodValidator(versionSearchSchema),
 });

 export const updateExecuteRoute = createRoute({
  getParentRoute: () => updateRoute,
  path: "execute",
  component: () => <UpdateExecutePage />,
-  validateSearch: versionSearchSchema,
+  validateSearch: zodValidator(versionSearchSchema),
 });

 export const rootTree = RootRoute.addChildren([
@@ -484,27 +434,17 @@ export const rootTree = RootRoute.addChildren([
        laser1GraphsRoute,
        laser1PresetsRoute,
      ]),
-
      testMachineSerialRoute.addChildren([testMachineControlRoute]),

      analogInputTestMachineSerialRoute.addChildren([
        analogInputTestMachineControlRoute,
      ]),

-      wagoAiTestMachineSerialRoute.addChildren([wagoAiTestMachineControlRoute]),
-
-      digitalInputTestMachineSerialRoute.addChildren([
-        digitalInputTestMachineControlRoute,
-      ]),
-
      ip20TestMachineSerialRoute.addChildren([ip20TestMachineControlRoute]),

-      testMotorSerialRoute.addChildren([testMotorControlRoute]),
-
      aquapath1SerialRoute.addChildren([
        aquapath1ControlRoute,
        aquapath1GraphRoute,
-        aquapath1SettingsRoute,
      ]),

      winder2SerialRoute.addChildren([
@@ -15,13 +15,7 @@ import {
  machineProperties,
  VENDOR_QITECH,
 } from "@/machines/properties";
-import React, {
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-} from "react";
+import React, { useEffect, useMemo, useRef, useState } from "react";
 import { z } from "zod";
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -43,6 +37,7 @@ import {
  SelectValue,
 } from "@/components/ui/select";
 import { useFormValues } from "@/lib/useFormValues";
+import { validateU16 } from "@/lib/validation";
 import { DeviceRoleComponent } from "@/components/DeviceRole";
 import { Alert } from "@/components/Alert";
 import { Separator } from "@/components/ui/separator";
@@ -59,15 +54,9 @@ type Props = {
 };

 const formSchema = z.object({
-  machine: z
-    .string()
-    .refine((v) => parseInt(v) < 0xffff, { error: "Value too big" }),
-  serial: z
-    .string()
-    .refine((v) => parseInt(v) < 0xffff, { error: "Value too big" }),
-  role: z
-    .string()
-    .refine((v) => parseInt(v) < 0xffff, { error: "Value too big" }),
+  machine: z.string().superRefine(validateU16),
+  serial: z.string().superRefine(validateU16),
+  role: z.string().superRefine(validateU16),
 });

 type FormSchema = z.infer<typeof formSchema>;
@@ -156,15 +145,6 @@ export function DeviceEeepromDialogContent({ device, setOpen }: ContentProps) {
      });
  };

-  const updateNumpadPosition = useCallback(() => {
-    if (!numpadOpen || !dialogRef.current) return;
-    const rect = dialogRef.current.getBoundingClientRect();
-    setNumpadPosition({
-      left: rect.right + 20,
-      top: rect.top + rect.height / 2,
-    });
-  }, [numpadOpen]);
-
  const machinePreset = useMemo(() => {
    if (!values.machine) return;
    return getMachineProperties({
@@ -202,7 +182,12 @@ export function DeviceEeepromDialogContent({ device, setOpen }: ContentProps) {

  // Position numpad once when it opens
  useEffect(() => {
-    updateNumpadPosition();
+    if (!numpadOpen || !dialogRef.current) return;
+    const rect = dialogRef.current.getBoundingClientRect();
+    setNumpadPosition({
+      left: rect.right + 20,
+      top: rect.top + rect.height / 2,
+    });
  }, [numpadOpen]);

  // Close numpad when clicking outside input/numpad
@@ -236,14 +221,6 @@ export function DeviceEeepromDialogContent({ device, setOpen }: ContentProps) {
    }
  }, [numpadOpen]);

-  // Update numpad position whenever the window resizes
-  useEffect(() => {
-    window.addEventListener("resize", updateNumpadPosition);
-    return () => {
-      window.removeEventListener("resize", updateNumpadPosition);
-    };
-  }, [updateNumpadPosition]);
-
  // Numpad handlers for serial input
  const numpadHandlers = useMemo(() => {
    const ensureFocus = () => {
@@ -24,6 +24,7 @@ import { Input } from "@/components/ui/input";
 import { Separator } from "@/components/ui/separator";
 import { Icon } from "@/components/Icon";
 import { TouchButton } from "@/components/touch/TouchButton";
+import { fallback } from "@tanstack/zod-adapter";

 type Props = {
  value: GithubSource;
@@ -31,9 +32,9 @@ type Props = {
 };

 export const githubSourceSchema = z.object({
-  githubRepoOwner: z.string().catch("qitechgmbh"),
-  githubRepoName: z.string().catch("control"),
-  githubToken: z.string().optional(),
+  githubRepoOwner: fallback(z.string(), "qitechgmbh"),
+  githubRepoName: fallback(z.string(), "control"),
+  githubToken: fallback(z.string().optional().nullable(), undefined),
 });

 export type GithubSource = z.infer<typeof githubSourceSchema>;
@@ -90,7 +91,7 @@ export function GithubSourceDialogContent({
  const onSubmit = (values: GithubSource) => {
    onChange({
      ...values,
-      githubToken: values.githubToken === "" ? undefined : values.githubToken,
+      githubToken: values.githubToken === "" ? null : values.githubToken,
    });
    setOpen(false);
  };
@@ -8,7 +8,7 @@ workspace = true

 [dependencies]
 anyhow = "1.0.100"
-ethercrab = { git = "https://github.com/v-morlock/ethercrab", branch = "main" }
+ethercrab = "0.6"
 ethercat_hal_derive = { version = "0.1.0", path = "../ethercat-hal-derive" }
 units = { path = "../units" }
 bitvec = { version = "1.0.1", features = ["alloc"] }
@@ -112,6 +112,11 @@ impl EL4002 {
            .write_channel_config(subdevice, 0x8010)
            .await?;

+        self.configuration
+            .pdo_assignment
+            .txpdo_assignment()
+            .write_config(subdevice)
+            .await?;
        self.configuration
            .pdo_assignment
            .rxpdo_assignment()
@@ -180,6 +180,7 @@ impl Configuration for EL5152Configuration {
    ) -> Result<(), anyhow::Error> {
        // Configure channel 1
        self.channel1.write_channel_config(device, 0x8000).await?;
+
        // Configure channel 2
        self.channel2.write_channel_config(device, 0x8010).await?;
        // Write PDO assignments
@@ -303,7 +304,6 @@ impl EL5152ChannelConfiguration {
        device
            .sdo_write(base_index, 0x11, self.frequency_window)
            .await?;
-
        device
            .sdo_write(base_index, 0x13, self.frequency_scaling)
            .await?;
@@ -328,8 +328,6 @@ impl TxPdoObject for Standard22ByteMdp600Input {
        self.status.overrun_error = bits[6];
        // Bit7 is reserved/unused
        self.length = bits[8..8 + 8].load_le::<u8>();
-        // the serial bytes start at bit 16, then we calculate the offset of when the serial bytes buffer is over, which for Standard22ByteMdp600Input is 22bytes
-        // to get the size in bits we do 22 * 8 -> 176bits
        let serial_bytes = bits[16..(16 + 22 * 8_usize)].chunks_exact(8);
        for (i, val) in serial_bytes.enumerate() {
            self.data[i] = val.load_le();
@@ -351,7 +351,6 @@ pub enum EL7031_0030AnalogInputPort {
 pub const EL7031_0030_VENDOR_ID: u32 = 0x2;
 pub const EL7031_0030_PRODUCT_ID: u32 = 0x1b773052;
 pub const EL7031_0030_REVISION_A: u32 = 0x10001E;
-
 pub const EL7031_0030_IDENTITY_A: SubDeviceIdentityTuple = (
    EL7031_0030_VENDOR_ID,
    EL7031_0030_PRODUCT_ID,
@@ -56,9 +56,8 @@ use std::{any::Any, fmt::Debug, sync::Arc};
 use wago_750_354::{WAGO_750_354_IDENTITY_A, Wago750_354};
 use wago_modules::ip20_ec_di8_do8::{IP20_EC_DI8_DO8_IDENTITY, IP20EcDi8Do8};

-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy)]
 pub struct Module {
-    pub name: String,
    pub slot: u16,
    pub belongs_to_addr: u16,
    pub has_tx: bool,
@@ -2,18 +2,12 @@ use super::{
    EthercatDevice, EthercatDeviceProcessing, EthercatDeviceUsed, NewEthercatDevice,
    SubDeviceIdentityTuple,
 };
-use crate::devices::wago_modules::wago_750_430::{
-    WAGO_750_430_MODULE_IDENT, WAGO_750_430_PRODUCT_ID,
-};
 use crate::devices::wago_modules::*;
 use crate::{
    devices::{
        DynamicEthercatDevice, Module,
        wago_modules::{
-            wago_750_402::{WAGO_750_402_MODULE_IDENT, WAGO_750_402_PRODUCT_ID},
-            wago_750_455::{WAGO_750_455_MODULE_IDENT, WAGO_750_455_PRODUCT_ID},
            wago_750_501::{WAGO_750_501_MODULE_IDENT, WAGO_750_501_PRODUCT_ID},
-            wago_750_530::{WAGO_750_530_MODULE_IDENT, WAGO_750_530_PRODUCT_ID},
            wago_750_652::{WAGO_750_652_MODULE_IDENT, WAGO_750_652_PRODUCT_ID},
            wago_750_1506::{WAGO_750_1506_MODULE_IDENT, WAGO_750_1506_PRODUCT_ID},
        },
@@ -23,25 +17,24 @@ use crate::{
 use anyhow::Error;
 use smol::lock::RwLock;
 use std::sync::Arc;
+
 const MODULE_COUNT_INDEX: (u16, u8) = (0xf050, 0x00);
 const TX_MAPPING_INDEX: (u16, u8) = (0x1c13, 0x00);
 const RX_MAPPING_INDEX: (u16, u8) = (0x1c12, 0x00);
-
-#[derive(Clone, Debug)]
-struct ModulePdoMapping {
-    pub offset: usize,
-    pub module_i: u32,
-}
-
 // For both the rx and tx The Wago Coupler has 4 bytes, which we dont care about and skip
+
+/// Wago750_354 bus coupler
+/*
+    The "Modules" simply write at an offset into rx and read at an offset in tx
+*/
 pub struct Wago750_354 {
    is_used: bool,
    pub slots: [Option<Module>; 64],
    pub slot_devices: [Option<Arc<RwLock<dyn DynamicEthercatDevice>>>; 64],
    pub dev_count: usize,
    pub module_count: usize,
-    rx_pdo_mappings: Vec<ModulePdoMapping>,
-    tx_pdo_mappings: Vec<ModulePdoMapping>,
+    rx_offsets: Vec<usize>,
+    tx_offsets: Vec<usize>,
    tx_size: usize,
    rx_size: usize,
 }
@@ -109,7 +102,7 @@ impl EthercatDevice for Wago750_354 {
    }

    fn set_module(&mut self, module: Module) {
-        self.slots[self.module_count] = Some(module.clone());
+        self.slots[self.module_count] = Some(module);
        self.module_count += 1;
        self.tx_size += module.tx_offset;
        self.rx_size += module.rx_offset;
@@ -138,8 +131,8 @@ impl NewEthercatDevice for Wago750_354 {
            dev_count: 0,
            tx_size: 0,
            rx_size: 0,
-            rx_pdo_mappings: vec![],
-            tx_pdo_mappings: vec![],
+            rx_offsets: vec![],
+            tx_offsets: vec![],
        }
    }
 }
@@ -151,76 +144,39 @@ impl std::fmt::Debug for Wago750_354 {
 }

 impl Wago750_354 {
-    pub fn calculate_module_index(pdo_mapping: u32, is_tx: bool) -> u32 {
-        let start_index = match is_tx {
-            true => 0x6000 as u32,
-            false => 0x7000 as u32,
-        };
-        let index_in_hex = ((pdo_mapping & 0xFFFF0000) >> 16) - start_index;
-        if index_in_hex < 16 {
-            return 0;
-        } else {
-            return index_in_hex / 16;
-        }
-    }
-
    pub async fn get_pdo_offsets<'a>(
        &mut self,
        device: &EthercrabSubDevicePreoperational<'a>,
        get_tx: bool,
    ) -> Result<(), Error> {
-        let mut vec: Vec<ModulePdoMapping> = vec![];
+        let mut vec: Vec<usize> = vec![];
        let mut bit_offset = 0;
-
-        let mut module_i;
-        let start_subindex = 0x2;
-
+        let start_subindex = 0x1;
        let index = match get_tx {
            true => (TX_MAPPING_INDEX.0, TX_MAPPING_INDEX.1),
            false => (RX_MAPPING_INDEX.0, RX_MAPPING_INDEX.1),
        };
+        let count = device.sdo_read::<u8>(index.0, index.1).await?;

-        let count_mappings = device.sdo_read::<u8>(index.0, index.1).await?;
-        let pdo_index = device.sdo_read::<u16>(index.0, 1).await?;
-        let pdo_map_count = device.sdo_read::<u8>(pdo_index, 0).await?;
-
-        for i in 0..pdo_map_count {
-            let pdo_mapping: u32 = device.sdo_read(pdo_index, 1 + i).await?;
-            let bit_length = (pdo_mapping & 0xFF) as u8;
-            bit_offset += bit_length as usize;
-        }
-
-        let mut mappings_without_coupler: Vec<u32> = vec![];
-        for i in start_subindex..count_mappings {
-            let pdo_index = device.sdo_read(index.0, i).await?;
-            let pdo_map_count = device.sdo_read::<u8>(pdo_index, 0).await?;
-            for j in 0..pdo_map_count {
-                let pdo_mapping: u32 = device.sdo_read(pdo_index, 1 + j).await?;
-                mappings_without_coupler.push(pdo_mapping);
+        for i in 0..count {
+            vec.push(bit_offset);
+            let pdo_index = device.sdo_read(index.0, start_subindex + i).await?;
+            if pdo_index != 0 {
+                let pdo_map_count = device.sdo_read::<u8>(pdo_index, 0).await?;
+                // Iterate over every PDO Mapped entry and add it to the cumulative bit offset
+                for j in 0..pdo_map_count {
+                    let pdo_mapping: u32 = device.sdo_read(pdo_index, 1 + j).await?;
+                    // We only need / Want the bit len, which we extract with a bitmask extracting the lsb
+                    let bit_length = (pdo_mapping & 0xFF) as u8;
+                    bit_offset += bit_length as usize;
+                }
            }
        }
-        mappings_without_coupler.sort();
-
-        for pdo_mapping in mappings_without_coupler {
-            module_i = Wago750_354::calculate_module_index(pdo_mapping, get_tx);
-            let bit_length = (pdo_mapping & 0xFF) as u8;
-            if module_i < 64 {
-                vec.push(ModulePdoMapping {
-                    offset: bit_offset,
-                    module_i,
-                });
-            }
-            bit_offset += bit_length as usize;
-        }
-
-        vec.sort_by_key(|e| (e.module_i, e.offset));
-        // deduplicate by module_i, so we only have the offset to the start of inputs/outputs
-        vec.dedup_by(|a, b| a.module_i == b.module_i);

        if get_tx {
-            self.tx_pdo_mappings = vec;
+            self.tx_offsets = vec;
        } else {
-            self.rx_pdo_mappings = vec;
+            self.rx_offsets = vec;
        }
        Ok(())
    }
@@ -263,7 +219,6 @@ impl Wago750_354 {
                has_rx: false,
                tx_offset: 0,
                rx_offset: 0,
-                name: "".to_string(),
            };

            match ident_iom {
@@ -271,37 +226,14 @@ impl Wago750_354 {
                WAGO_750_1506_PRODUCT_ID => {
                    module.has_tx = true;
                    module.has_rx = true;
-                    module.name = "750-1506".to_string();
-                }
-                WAGO_750_455_PRODUCT_ID => {
-                    module.has_tx = true;
-                    module.has_rx = false;
-                    module.name = "750-455".to_string();
                }
                WAGO_750_501_PRODUCT_ID => {
                    module.has_tx = false;
                    module.has_rx = true;
-                    module.name = "750-501".to_string();
-                }
-                WAGO_750_530_PRODUCT_ID => {
-                    module.has_tx = false;
-                    module.has_rx = true;
-                    module.name = "750-530".to_string();
                }
                WAGO_750_652_PRODUCT_ID => {
                    module.has_tx = true;
                    module.has_rx = true;
-                    module.name = "750-652".to_string();
-                }
-                WAGO_750_402_PRODUCT_ID => {
-                    module.has_tx = true;
-                    module.has_rx = false;
-                    module.name = "750-402".to_string();
-                }
-                WAGO_750_430_PRODUCT_ID => {
-                    module.has_tx = true;
-                    module.has_rx = false;
-                    module.name = "750-430".to_string();
                }
                _ => println!(
                    "Wago-750-354 found Unknown/Unimplemented Module: {}",
@@ -319,42 +251,15 @@ impl Wago750_354 {
        if self.dev_count != 0 {
            return;
        }
+        let mut tx_index = 1;
+        let mut rx_index = 1;

        smol::block_on(async {
            let _ = self.get_pdo_offsets(device, true).await;
            let _ = self.get_pdo_offsets(device, false).await;
        });

-        for module in &mut self.slots {
-            match module {
-                Some(m) => {
-                    let tx_pdo_mapping = self
-                        .tx_pdo_mappings
-                        .iter()
-                        .find(|map| map.module_i == m.slot.into());
-                    if m.has_tx {
-                        m.tx_offset = match tx_pdo_mapping {
-                            Some(map) => map.offset,
-                            None => 0,
-                        }
-                    }
-
-                    let rx_pdo_mapping = self
-                        .rx_pdo_mappings
-                        .iter()
-                        .find(|map| map.module_i == m.slot.into());
-                    if m.has_rx {
-                        m.rx_offset = match rx_pdo_mapping {
-                            Some(map) => map.offset,
-                            None => 0,
-                        }
-                    }
-                }
-                None => break,
-            }
-        }
-
-        for module in &self.slots {
+        for module in self.slots {
            match module {
                Some(m) => {
                    // Map ModuleIdent's to Terminals
@@ -362,28 +267,15 @@ impl Wago750_354 {
                        m.vendor_id,
                        m.product_id,
                    ) {
-                        WAGO_750_455_MODULE_IDENT => {
-                            Arc::new(RwLock::new(wago_750_455::Wago750_455::new()))
-                        }
                        WAGO_750_501_MODULE_IDENT => {
                            Arc::new(RwLock::new(wago_750_501::Wago750_501::new()))
                        }
-                        WAGO_750_530_MODULE_IDENT => {
-                            Arc::new(RwLock::new(wago_750_530::Wago750_530::new()))
-                        }
                        WAGO_750_1506_MODULE_IDENT => {
                            Arc::new(RwLock::new(wago_750_1506::Wago750_1506::new()))
                        }
                        WAGO_750_652_MODULE_IDENT => {
                            Arc::new(RwLock::new(wago_750_652::Wago750_652::new()))
                        }
-                        WAGO_750_402_MODULE_IDENT => {
-                            Arc::new(RwLock::new(wago_750_402::Wago750_402::new()))
-                        }
-                        WAGO_750_430_MODULE_IDENT => {
-                            Arc::new(RwLock::new(wago_750_430::Wago750_430::new()))
-                        }
-
                        _ => {
                            println!(
                                "{} Missing Implementation for Module Identification: vendor_id: {:?}, module ident: {:?} !",
@@ -394,10 +286,27 @@ impl Wago750_354 {
                            return;
                        }
                    };
+
+                    let tx_pdo_offset = self.tx_offsets.get(tx_index as usize);
+                    if m.has_tx {
+                        tx_index += 1;
+                    }
+
+                    let rx_pdo_offset = self.rx_offsets.get(rx_index as usize);
+                    if m.has_rx {
+                        rx_index += 1;
+                    }
+
                    let mut dev_guard = dev.write_blocking();
-                    //println!("For {:?} setting tx: {} rx: {}",m.name,m.tx_offset,m.rx_offset);
-                    dev_guard.set_tx_offset(m.tx_offset);
-                    dev_guard.set_rx_offset(m.rx_offset);
+                    match tx_pdo_offset {
+                        Some(offset) => dev_guard.set_tx_offset(*offset),
+                        None => (),
+                    }
+
+                    match rx_pdo_offset {
+                        Some(offset) => dev_guard.set_rx_offset(*offset),
+                        None => (),
+                    }
                    drop(dev_guard);
                    self.slot_devices[self.dev_count] = Some(dev);
                    self.dev_count += 1;
@@ -214,7 +214,7 @@ impl EthercatDevice for IP20EcDi8Do8 {
    }

    fn set_module(&mut self, module: Module) {
-        self.slots[self.module_count] = Some(module.clone());
+        self.slots[self.module_count] = Some(module);
        self.module_count += 1;
        self.tx_size += module.tx_offset;
        self.rx_size += module.rx_offset;
@@ -378,7 +378,6 @@ impl IP20EcDi8Do8 {
                has_rx: false,
                tx_offset: 0,
                rx_offset: 0,
-                name: "".to_string(),
            };

            match ident_iom {
@@ -416,7 +415,7 @@ impl IP20EcDi8Do8 {
            let _ = self.get_pdo_offsets(device, false).await;
        });

-        for module in &self.slots {
+        for module in self.slots {
            match module {
                Some(m) => {
                    // Map ModuleIdent's to Terminals
@@ -431,9 +430,6 @@ impl IP20EcDi8Do8 {
                            wago_750_652::WAGO_750_652_MODULE_IDENT => {
                                Arc::new(RwLock::new(wago_750_652::Wago750_652::new()))
                            }
-                            wago_750_402::WAGO_750_402_MODULE_IDENT => {
-                                Arc::new(RwLock::new(wago_750_402::Wago750_402::new()))
-                            }
                            _ => {
                                return;
                            }
@@ -1,8 +1,5 @@
 pub mod ip20_ec_di8_do8;
 pub mod wago_750_1506;
-pub mod wago_750_402;
-pub mod wago_750_430;
 pub mod wago_750_455;
 pub mod wago_750_501;
-pub mod wago_750_530;
 pub mod wago_750_652;
@@ -1,194 +0,0 @@
-use crate::{
-    devices::{
-        DynamicEthercatDevice, EthercatDevice, EthercatDeviceProcessing, EthercatDeviceUsed,
-        EthercatDynamicPDO, Module, NewEthercatDevice, SubDeviceProductTuple,
-    },
-    io::digital_input::{DigitalInputDevice, DigitalInputInput},
-};
-
-#[derive(Debug, Clone)]
-pub enum Wago750_402InputPort {
-    DI1,
-    DI2,
-    DI3,
-    DI4,
-}
-
-impl From<Wago750_402InputPort> for usize {
-    fn from(value: Wago750_402InputPort) -> Self {
-        match value {
-            Wago750_402InputPort::DI1 => 0,
-            Wago750_402InputPort::DI2 => 1,
-            Wago750_402InputPort::DI3 => 2,
-            Wago750_402InputPort::DI4 => 3,
-        }
-    }
-}
-
-#[derive(Clone, Default)]
-pub struct Wago750_402TxPdo {
-    port1: bool,
-    port2: bool,
-    port3: bool,
-    port4: bool,
-}
-
-impl DigitalInputDevice<Wago750_402InputPort> for Wago750_402 {
-    fn get_input(&self, port: Wago750_402InputPort) -> Result<DigitalInputInput, anyhow::Error> {
-        Ok(DigitalInputInput {
-            value: match port {
-                Wago750_402InputPort::DI1 => self.tx_pdo.port1,
-                Wago750_402InputPort::DI2 => self.tx_pdo.port2,
-                Wago750_402InputPort::DI3 => self.tx_pdo.port3,
-                Wago750_402InputPort::DI4 => self.tx_pdo.port4,
-            },
-        })
-    }
-}
-
-#[derive(Clone)]
-pub struct Wago750_402 {
-    is_used: bool,
-    tx_bit_offset: usize,
-    // Should always be on but not when calling a constructor
-    module: Option<Module>,
-    tx_pdo: Wago750_402TxPdo,
-}
-
-impl DynamicEthercatDevice for Wago750_402 {}
-
-impl EthercatDynamicPDO for Wago750_402 {
-    fn get_tx_offset(&self) -> usize {
-        self.tx_bit_offset
-    }
-
-    fn get_rx_offset(&self) -> usize {
-        0 //this device has no rx
-    }
-
-    fn set_tx_offset(&mut self, offset: usize) {
-        self.tx_bit_offset = offset
-    }
-
-    fn set_rx_offset(&mut self, _offset: usize) {
-        // it does nothing because the device has no rx
-    }
-}
-
-impl EthercatDeviceUsed for Wago750_402 {
-    fn is_used(&self) -> bool {
-        self.is_used
-    }
-
-    fn set_used(&mut self, used: bool) {
-        self.is_used = used;
-    }
-}
-
-impl Wago750_402 {}
-
-impl EthercatDevice for Wago750_402 {
-    // input_len 48 offset: 40
-    fn input(
-        &mut self,
-        input: &bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
-    ) -> Result<(), anyhow::Error> {
-        let base = self.tx_bit_offset;
-
-        let idx1 = base + Into::<usize>::into(Wago750_402InputPort::DI1);
-        self.tx_pdo.port1 = *input.get(idx1).expect("Bit 1 out of bounds");
-
-        let idx2 = base + Into::<usize>::into(Wago750_402InputPort::DI2);
-        self.tx_pdo.port2 = *input.get(idx2).expect("Bit 2 out of bounds");
-
-        let idx3 = base + Into::<usize>::into(Wago750_402InputPort::DI3);
-        self.tx_pdo.port3 = *input.get(idx3).expect("Bit 3 out of bounds");
-
-        let idx4 = base + Into::<usize>::into(Wago750_402InputPort::DI4);
-        self.tx_pdo.port4 = *input.get(idx4).expect("Bit 4 out of bounds");
-        Ok(())
-    }
-
-    fn input_len(&self) -> usize {
-        4
-    }
-
-    fn output(
-        &self,
-        _output: &mut bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
-    ) -> Result<(), anyhow::Error> {
-        //  println!("output: {} {}",self.rx_bit_offset,_output);
-        Ok(())
-    }
-
-    fn output_len(&self) -> usize {
-        0
-    }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
-        self
-    }
-
-    fn is_module(&self) -> bool {
-        true
-    }
-
-    fn input_checked(
-        &mut self,
-        _input: &bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
-    ) -> Result<(), anyhow::Error> {
-        Ok(())
-    }
-
-    fn output_checked(
-        &self,
-        _output: &mut bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
-    ) -> Result<(), anyhow::Error> {
-        Ok(())
-    }
-
-    fn get_module(&self) -> Option<Module> {
-        self.module.clone()
-    }
-
-    fn set_module(&mut self, module: Module) {
-        self.tx_bit_offset = module.tx_offset;
-        self.module = Some(module);
-    }
-}
-
-impl EthercatDeviceProcessing for Wago750_402 {
-    fn input_post_process(&mut self) -> Result<(), anyhow::Error> {
-        Ok(())
-    }
-
-    fn output_pre_process(&mut self) -> Result<(), anyhow::Error> {
-        Ok(())
-    }
-}
-
-impl NewEthercatDevice for Wago750_402 {
-    fn new() -> Self {
-        Self {
-            is_used: false,
-            tx_bit_offset: 0,
-            module: None,
-            tx_pdo: Wago750_402TxPdo::default(),
-        }
-    }
-}
-
-impl std::fmt::Debug for Wago750_402 {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "Wago750_402")
-    }
-}
-
-pub const WAGO_750_402_VENDOR_ID: u32 = 0x00000021;
-pub const WAGO_750_402_PRODUCT_ID: u32 = 2147483713;
-pub const WAGO_750_402_MODULE_IDENT: SubDeviceProductTuple =
-    (WAGO_750_402_VENDOR_ID, WAGO_750_402_PRODUCT_ID);
@@ -1,211 +0,0 @@
-use crate::devices::{
-    DynamicEthercatDevice, EthercatDevice, EthercatDeviceUsed, EthercatDynamicPDO, Module,
-    SubDeviceProductTuple,
-};
-use crate::devices::{EthercatDeviceProcessing, NewEthercatDevice};
-use crate::io::digital_input::{DigitalInputDevice, DigitalInputInput};
-
-#[derive(Clone)]
-pub struct Wago750_430 {
-    is_used: bool,
-    tx_bit_offset: usize,
-    rx_bit_offset: usize,
-    pub txpdo: Wago750_430TxPdo,
-    module: Option<Module>,
-}
-
-#[derive(Debug, Clone)]
-pub enum Wago750_430Port {
-    Port1,
-    Port2,
-    Port3,
-    Port4,
-    Port5,
-    Port6,
-    Port7,
-    Port8,
-}
-
-impl From<Wago750_430Port> for usize {
-    fn from(value: Wago750_430Port) -> Self {
-        match value {
-            Wago750_430Port::Port1 => 0,
-            Wago750_430Port::Port2 => 1,
-            Wago750_430Port::Port3 => 2,
-            Wago750_430Port::Port4 => 3,
-            Wago750_430Port::Port5 => 4,
-            Wago750_430Port::Port6 => 5,
-            Wago750_430Port::Port7 => 6,
-            Wago750_430Port::Port8 => 7,
-        }
-    }
-}
-
-#[derive(Clone, Default)]
-pub struct Wago750_430TxPdo {
-    pub port1: bool,
-    pub port2: bool,
-    pub port3: bool,
-    pub port4: bool,
-    pub port5: bool,
-    pub port6: bool,
-    pub port7: bool,
-    pub port8: bool,
-}
-
-impl DigitalInputDevice<Wago750_430Port> for Wago750_430 {
-    fn get_input(
-        &self,
-        port: Wago750_430Port,
-    ) -> Result<crate::io::digital_input::DigitalInputInput, anyhow::Error> {
-        match port {
-            Wago750_430Port::Port1 => Ok(DigitalInputInput {
-                value: self.txpdo.port1,
-            }),
-            Wago750_430Port::Port2 => Ok(DigitalInputInput {
-                value: self.txpdo.port2,
-            }),
-            Wago750_430Port::Port3 => Ok(DigitalInputInput {
-                value: self.txpdo.port3,
-            }),
-            Wago750_430Port::Port4 => Ok(DigitalInputInput {
-                value: self.txpdo.port4,
-            }),
-            Wago750_430Port::Port5 => Ok(DigitalInputInput {
-                value: self.txpdo.port5,
-            }),
-            Wago750_430Port::Port6 => Ok(DigitalInputInput {
-                value: self.txpdo.port6,
-            }),
-            Wago750_430Port::Port7 => Ok(DigitalInputInput {
-                value: self.txpdo.port7,
-            }),
-            Wago750_430Port::Port8 => Ok(DigitalInputInput {
-                value: self.txpdo.port8,
-            }),
-        }
-    }
-}
-
-impl EthercatDeviceUsed for Wago750_430 {
-    fn is_used(&self) -> bool {
-        self.is_used
-    }
-
-    fn set_used(&mut self, used: bool) {
-        self.is_used = used;
-    }
-}
-
-impl DynamicEthercatDevice for Wago750_430 {}
-
-impl EthercatDynamicPDO for Wago750_430 {
-    fn get_tx_offset(&self) -> usize {
-        self.tx_bit_offset
-    }
-
-    fn get_rx_offset(&self) -> usize {
-        self.rx_bit_offset
-    }
-
-    fn set_tx_offset(&mut self, offset: usize) {
-        self.tx_bit_offset = offset
-    }
-
-    fn set_rx_offset(&mut self, offset: usize) {
-        self.rx_bit_offset = offset
-    }
-}
-
-impl EthercatDevice for Wago750_430 {
-    fn input(
-        &mut self,
-        input: &bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
-    ) -> Result<(), anyhow::Error> {
-        self.txpdo.port1 = input[0];
-        self.txpdo.port2 = input[1];
-        self.txpdo.port3 = input[2];
-        self.txpdo.port4 = input[3];
-        self.txpdo.port5 = input[4];
-        self.txpdo.port6 = input[5];
-        self.txpdo.port7 = input[6];
-        self.txpdo.port8 = input[7];
-        Ok(())
-    }
-
-    fn input_len(&self) -> usize {
-        8
-    }
-
-    fn output(
-        &self,
-        _output: &mut bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
-    ) -> Result<(), anyhow::Error> {
-        Ok(())
-    }
-
-    fn output_len(&self) -> usize {
-        0
-    }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
-        self
-    }
-
-    fn is_module(&self) -> bool {
-        true
-    }
-
-    fn input_checked(
-        &mut self,
-        _input: &bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
-    ) -> Result<(), anyhow::Error> {
-        Ok(())
-    }
-
-    fn output_checked(
-        &self,
-        _output: &mut bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
-    ) -> Result<(), anyhow::Error> {
-        Ok(())
-    }
-
-    fn get_module(&self) -> Option<crate::devices::Module> {
-        self.module.clone()
-    }
-
-    fn set_module(&mut self, module: crate::devices::Module) {
-        self.tx_bit_offset = module.tx_offset;
-        self.rx_bit_offset = module.rx_offset;
-        self.module = Some(module)
-    }
-}
-
-impl EthercatDeviceProcessing for Wago750_430 {}
-
-impl NewEthercatDevice for Wago750_430 {
-    fn new() -> Self {
-        Self {
-            is_used: false,
-            tx_bit_offset: 0,
-            rx_bit_offset: 0,
-            module: None,
-            txpdo: Wago750_430TxPdo::default(),
-        }
-    }
-}
-
-impl std::fmt::Debug for Wago750_430 {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "Wago750_430")
-    }
-}
-
-pub const WAGO_750_430_VENDOR_ID: u32 = 0x00000021;
-pub const WAGO_750_430_PRODUCT_ID: u32 = 2147483777;
-pub const WAGO_750_430_MODULE_IDENT: SubDeviceProductTuple =
-    (WAGO_750_430_VENDOR_ID, WAGO_750_430_PRODUCT_ID);
@@ -1,64 +1,91 @@
-use bitvec::field::BitField;
+use units::{ElectricCurrent, electric_current::milliampere};

-use crate::devices::{
-    DynamicEthercatDevice, EthercatDevice, EthercatDeviceProcessing, EthercatDeviceUsed,
-    EthercatDynamicPDO, Module, NewEthercatDevice, SubDeviceProductTuple,
+use crate::{
+    devices::{
+        DynamicEthercatDevice, EthercatDevice, EthercatDeviceProcessing, EthercatDeviceUsed,
+        EthercatDynamicPDO, Module, NewEthercatDevice, SubDeviceProductTuple,
+    },
+    helpers::signing_converter_u16::U16SigningConverter,
+    io::{
+        analog_input::{AnalogInputDevice, AnalogInputInput, physical::AnalogInputRange},
+        digital_input::DigitalInputInput,
+    },
 };
-use crate::io::analog_input::physical::AnalogInputRange;
-use crate::io::analog_input::{AnalogInputDevice, AnalogInputInput};
-use units::electric_current::milliampere;
-use units::f64::ElectricCurrent;

-#[derive(Clone, Debug)]
-pub enum Wago750_455Port {
+Wago750_455Presentation {
+
+}
+
+#[derive(Clone)]
+pub struct Wago750_455 {
+    configuration: (),
+    txpdo: Wago750_455RxPdo,
+    isUsed: bool,
+}
+
+pub struct Wago750_455Configuration {
+
+}
+
+#[derive(Debug, Clone)]
+pub enum Wago750_455InputPort {
    AI1,
    AI2,
    AI3,
    AI4,
 }

-impl From<Wago750_455Port> for usize {
-    fn from(value: Wago750_455Port) -> Self {
+impl From<Wago750_455InputPort> for usize {
+    fn from(value: Wago750_455InputPort) -> Self {
        match value {
-            Wago750_455Port::AI1 => 0,
-            Wago750_455Port::AI2 => 16,
-            Wago750_455Port::AI3 => 32,
-            Wago750_455Port::AI4 => 48,
+            Wago750_455InputPort::AI1 => 0,
+            Wago750_455InputPort::AI2 => 1,
+            Wago750_455InputPort::AI3 => 2,
+            Wago750_455InputPort::AI4 => 3,
        }
    }
 }

 #[derive(Clone, Default)]
-pub struct Wago750_455TxPdo {
-    pub ai1: u16,
-    pub ai2: u16,
-    pub ai3: u16,
-    pub ai4: u16,
+/**
+# Data Word, 16 bits
+- B15 ... B4 hold the measured value (B15 is the sign bit which should always be 0)
+- B3 and B2 are 00 when measuring <~3.0mA, 11 when measuring >~21.0mA and undefined inbetween.
+- B1 and B0 are 11' on an overflow, underflow or wire break. 00' otherwise
+*/
+pub struct Wago750_455RxPdo {
+    /** Low Byte: D0, High Byte: D1 */
+    channel_1: u16,
+    /** Low Byte: D2, High Byte: D3 */
+    channel_2: u16,
+    /** Low Byte: D4, High Byte: D5 */
+    channel_3: u16,
+    /** Low Byte: D6, High Byte: D7 */
+    channel_4: u16,
 }

-#[derive(Clone)]
-pub struct Wago750_455 {
-    is_used: bool,
-    tx_bit_offset: usize,
-    rx_bit_offset: usize,
-    module: Option<Module>,
-    tx_pdo: Wago750_455TxPdo,
-}
-
-impl AnalogInputDevice<Wago750_455Port> for Wago750_455 {
-    fn get_input(&self, port: Wago750_455Port) -> AnalogInputInput {
-        let raw = match port {
-            Wago750_455Port::AI1 => self.tx_pdo.ai1,
-            Wago750_455Port::AI2 => self.tx_pdo.ai2,
-            Wago750_455Port::AI3 => self.tx_pdo.ai3,
-            Wago750_455Port::AI4 => self.tx_pdo.ai4,
+impl AnalogInputDevice<Wago750_455InputPort> for Wago750_455 {
+    fn get_input(&self, port: Wago750_455InputPort) -> AnalogInputInput {
+        let raw_value = match port {
+            Wago750_455InputPort::AI1 => self.txpdo.channel_1,
+            Wago750_455InputPort::AI2 => self.txpdo.channel_2,
+            Wago750_455InputPort::AI3 => self.txpdo.channel_3,
+            Wago750_455InputPort::AI4 => self.txpdo.channel_4,
        };
-        let wiring_error = (raw & 0x0003) == 0x0003;
-        let raw_value = (raw & 0x7FF0) as i16;
-        let normalized = self.analog_input_range().raw_to_normalized(raw_value) as f32;
+
+        let signing_bit = raw_value & 0x8000;
+        // The 4 least significant bits are reserved and diagnostic and the MSB is the signing bit.
+        let shifted_raw_value = (raw_value & 0x7FF0) >> 4;
+        // Since only 11 bits actually represent the measurement (ignoring the signing bit) only 2048 different states can be measured.
+        let prepared_value = U16SigningConverter::load_raw(shifted_raw_value | signing_bit);
+
+        let value = prepared_value.as_signed() as i16;
+
+        let normalized = f32::from(value) / f32::from(2047);
+
        AnalogInputInput {
            normalized,
-            wiring_error,
+            wiring_error: false,
        }
    }

@@ -67,132 +94,7 @@ impl AnalogInputDevice<Wago750_455Port> for Wago750_455 {
            min: ElectricCurrent::new::<milliampere>(4.0),
            max: ElectricCurrent::new::<milliampere>(20.0),
            min_raw: 0,
-            max_raw: 0x7FF0,
+            max_raw: 2047,
        }
    }
 }
-
-impl EthercatDeviceUsed for Wago750_455 {
-    fn is_used(&self) -> bool {
-        self.is_used
-    }
-
-    fn set_used(&mut self, used: bool) {
-        self.is_used = used;
-    }
-}
-
-impl DynamicEthercatDevice for Wago750_455 {}
-
-impl EthercatDynamicPDO for Wago750_455 {
-    fn get_tx_offset(&self) -> usize {
-        self.tx_bit_offset
-    }
-
-    fn get_rx_offset(&self) -> usize {
-        self.rx_bit_offset
-    }
-
-    fn set_tx_offset(&mut self, offset: usize) {
-        self.tx_bit_offset = offset
-    }
-
-    fn set_rx_offset(&mut self, offset: usize) {
-        self.rx_bit_offset = offset
-    }
-}
-
-impl EthercatDevice for Wago750_455 {
-    fn input(
-        &mut self,
-        input: &bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
-    ) -> Result<(), anyhow::Error> {
-        let base = self.tx_bit_offset;
-        let ai1 = input[base..(base + 16)].load_le::<u16>();
-        let ai2 = input[(base + 16)..(base + 32)].load_le::<u16>();
-        let ai3 = input[(base + 32)..(base + 48)].load_le::<u16>();
-        let ai4 = input[(base + 48)..(base + 64)].load_le::<u16>();
-
-        self.tx_pdo.ai1 = ai1;
-        self.tx_pdo.ai2 = ai2;
-        self.tx_pdo.ai3 = ai3;
-        self.tx_pdo.ai4 = ai4;
-        Ok(())
-    }
-
-    fn input_len(&self) -> usize {
-        64
-    }
-
-    fn output(
-        &self,
-        _output: &mut bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
-    ) -> Result<(), anyhow::Error> {
-        Ok(())
-    }
-
-    fn output_len(&self) -> usize {
-        0
-    }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
-        self
-    }
-
-    fn is_module(&self) -> bool {
-        true
-    }
-
-    fn input_checked(
-        &mut self,
-        input: &bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
-    ) -> Result<(), anyhow::Error> {
-        self.input(input)
-    }
-
-    fn output_checked(
-        &self,
-        _output: &mut bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
-    ) -> Result<(), anyhow::Error> {
-        Ok(())
-    }
-
-    fn get_module(&self) -> Option<Module> {
-        self.module.clone()
-    }
-
-    fn set_module(&mut self, module: Module) {
-        self.tx_bit_offset = module.tx_offset;
-        self.rx_bit_offset = module.rx_offset;
-        self.module = Some(module)
-    }
-}
-
-impl EthercatDeviceProcessing for Wago750_455 {}
-
-impl NewEthercatDevice for Wago750_455 {
-    fn new() -> Self {
-        Self {
-            is_used: false,
-            tx_bit_offset: 0,
-            rx_bit_offset: 0,
-            module: None,
-            tx_pdo: Wago750_455TxPdo::default(),
-        }
-    }
-}
-
-impl std::fmt::Debug for Wago750_455 {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "Wago750_455")
-    }
-}
-
-pub const WAGO_750_455_VENDOR_ID: u32 = 0x00000021;
-pub const WAGO_750_455_PRODUCT_ID: u32 = 0x045541b3;
-pub const WAGO_750_455_MODULE_IDENT: SubDeviceProductTuple =
-    (WAGO_750_455_VENDOR_ID, WAGO_750_455_PRODUCT_ID);
@@ -1,260 +0,0 @@
-use crate::devices::{
-    DynamicEthercatDevice, EthercatDevice, EthercatDeviceUsed, EthercatDynamicPDO, Module,
-    SubDeviceProductTuple,
-};
-use crate::devices::{EthercatDeviceProcessing, NewEthercatDevice};
-use crate::io::digital_output::{DigitalOutputDevice, DigitalOutputOutput};
-
-#[derive(Clone)]
-pub struct Wago750_530 {
-    is_used: bool,
-    tx_bit_offset: usize,
-    rx_bit_offset: usize,
-    pub rxpdo: Wago750_530RxPdo,
-    module: Option<Module>,
-}
-
-#[derive(Debug, Clone)]
-pub enum Wago750_530Port {
-    Port1,
-    Port2,
-    Port3,
-    Port4,
-    Port5,
-    Port6,
-    Port7,
-    Port8,
-}
-
-impl From<Wago750_530Port> for usize {
-    fn from(value: Wago750_530Port) -> Self {
-        match value {
-            Wago750_530Port::Port1 => 0,
-            Wago750_530Port::Port2 => 1,
-            Wago750_530Port::Port3 => 2,
-            Wago750_530Port::Port4 => 3,
-            Wago750_530Port::Port5 => 4,
-            Wago750_530Port::Port6 => 5,
-            Wago750_530Port::Port7 => 6,
-            Wago750_530Port::Port8 => 7,
-        }
-    }
-}
-
-#[derive(Clone, Default)]
-pub struct Wago750_530RxPdo {
-    pub port1: bool,
-    pub port2: bool,
-    pub port3: bool,
-    pub port4: bool,
-    pub port5: bool,
-    pub port6: bool,
-    pub port7: bool,
-    pub port8: bool,
-}
-
-impl DigitalOutputDevice<Wago750_530Port> for Wago750_530 {
-    /// Writes the new output value into the device's RXPDO structure (in-memory PDI).
-    fn set_output(&mut self, port: Wago750_530Port, value: DigitalOutputOutput) {
-        // The DigitalOutputOutput is converted to a bool using the From trait
-        let output_value: bool = value.into();
-        match port {
-            Wago750_530Port::Port1 => {
-                // Modify the internal PDO representation
-                self.rxpdo.port1 = output_value;
-            }
-            Wago750_530Port::Port2 => {
-                // Modify the internal PDO representation
-                self.rxpdo.port2 = output_value;
-            }
-            Wago750_530Port::Port3 => {
-                // Modify the internal PDO representation
-                self.rxpdo.port3 = output_value;
-            }
-            Wago750_530Port::Port4 => {
-                // Modify the internal PDO representation
-                self.rxpdo.port4 = output_value;
-            }
-            Wago750_530Port::Port5 => {
-                // Modify the internal PDO representation
-                self.rxpdo.port5 = output_value;
-            }
-            Wago750_530Port::Port6 => {
-                // Modify the internal PDO representation
-                self.rxpdo.port6 = output_value;
-            }
-            Wago750_530Port::Port7 => {
-                // Modify the internal PDO representation
-                self.rxpdo.port7 = output_value;
-            }
-            Wago750_530Port::Port8 => {
-                // Modify the internal PDO representation
-                self.rxpdo.port8 = output_value;
-            }
-        }
-    }
-
-    /// Reads the current output value from the device's RXPDO structure (in-memory PDI).
-    fn get_output(&self, port: Wago750_530Port) -> DigitalOutputOutput {
-        let current_value = match port {
-            Wago750_530Port::Port1 => self.rxpdo.port1,
-            Wago750_530Port::Port2 => self.rxpdo.port2,
-            Wago750_530Port::Port3 => self.rxpdo.port3,
-            Wago750_530Port::Port4 => self.rxpdo.port4,
-            Wago750_530Port::Port5 => self.rxpdo.port5,
-            Wago750_530Port::Port6 => self.rxpdo.port6,
-            Wago750_530Port::Port7 => self.rxpdo.port7,
-            Wago750_530Port::Port8 => self.rxpdo.port8,
-        };
-
-        // Wrap the bool back into the type-safe wrapper
-        DigitalOutputOutput(current_value)
-    }
-}
-
-impl EthercatDeviceUsed for Wago750_530 {
-    fn is_used(&self) -> bool {
-        self.is_used
-    }
-
-    fn set_used(&mut self, used: bool) {
-        self.is_used = used;
-    }
-}
-
-impl DynamicEthercatDevice for Wago750_530 {}
-
-impl EthercatDynamicPDO for Wago750_530 {
-    fn get_tx_offset(&self) -> usize {
-        self.tx_bit_offset
-    }
-
-    fn get_rx_offset(&self) -> usize {
-        self.rx_bit_offset
-    }
-
-    fn set_tx_offset(&mut self, offset: usize) {
-        self.tx_bit_offset = offset
-    }
-
-    fn set_rx_offset(&mut self, offset: usize) {
-        self.rx_bit_offset = offset
-    }
-}
-
-impl EthercatDevice for Wago750_530 {
-    fn input(
-        &mut self,
-        _input: &bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
-    ) -> Result<(), anyhow::Error> {
-        Ok(())
-    }
-
-    fn input_len(&self) -> usize {
-        0
-    }
-
-    fn output(
-        &self,
-        output: &mut bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
-    ) -> Result<(), anyhow::Error> {
-        output.set(
-            self.rx_bit_offset + Into::<usize>::into(Wago750_530Port::Port1),
-            self.rxpdo.port1,
-        );
-        output.set(
-            self.rx_bit_offset + Into::<usize>::into(Wago750_530Port::Port2),
-            self.rxpdo.port2,
-        );
-        output.set(
-            self.rx_bit_offset + Into::<usize>::into(Wago750_530Port::Port3),
-            self.rxpdo.port3,
-        );
-        output.set(
-            self.rx_bit_offset + Into::<usize>::into(Wago750_530Port::Port4),
-            self.rxpdo.port4,
-        );
-        output.set(
-            self.rx_bit_offset + Into::<usize>::into(Wago750_530Port::Port5),
-            self.rxpdo.port5,
-        );
-        output.set(
-            self.rx_bit_offset + Into::<usize>::into(Wago750_530Port::Port6),
-            self.rxpdo.port6,
-        );
-        output.set(
-            self.rx_bit_offset + Into::<usize>::into(Wago750_530Port::Port7),
-            self.rxpdo.port7,
-        );
-        output.set(
-            self.rx_bit_offset + Into::<usize>::into(Wago750_530Port::Port8),
-            self.rxpdo.port8,
-        );
-        Ok(())
-    }
-
-    fn output_len(&self) -> usize {
-        8
-    }
-
-    fn as_any(&self) -> &dyn std::any::Any {
-        self
-    }
-
-    fn as_any_mut(&mut self) -> &mut dyn std::any::Any {
-        self
-    }
-
-    fn is_module(&self) -> bool {
-        true
-    }
-
-    fn input_checked(
-        &mut self,
-        _input: &bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
-    ) -> Result<(), anyhow::Error> {
-        Ok(())
-    }
-
-    fn output_checked(
-        &self,
-        _output: &mut bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
-    ) -> Result<(), anyhow::Error> {
-        Ok(())
-    }
-
-    fn get_module(&self) -> Option<crate::devices::Module> {
-        self.module.clone()
-    }
-
-    fn set_module(&mut self, module: crate::devices::Module) {
-        self.tx_bit_offset = module.tx_offset;
-        self.rx_bit_offset = module.rx_offset;
-        self.module = Some(module)
-    }
-}
-
-impl EthercatDeviceProcessing for Wago750_530 {}
-
-impl NewEthercatDevice for Wago750_530 {
-    fn new() -> Self {
-        Self {
-            is_used: false,
-            tx_bit_offset: 0,
-            rx_bit_offset: 0,
-            module: None,
-            rxpdo: Wago750_530RxPdo::default(),
-        }
-    }
-}
-
-impl std::fmt::Debug for Wago750_530 {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "Wago750_530")
-    }
-}
-
-pub const WAGO_750_530_VENDOR_ID: u32 = 0x00000021;
-pub const WAGO_750_530_PRODUCT_ID: u32 = 2147483778;
-pub const WAGO_750_530_MODULE_IDENT: SubDeviceProductTuple =
-    (WAGO_750_530_VENDOR_ID, WAGO_750_530_PRODUCT_ID);
@@ -1,12 +1,8 @@
-use bitvec::field::BitField;
-
 use crate::devices::{
    DynamicEthercatDevice, EthercatDevice, EthercatDeviceUsed, EthercatDynamicPDO, Module,
    SubDeviceProductTuple,
 };
 use crate::devices::{EthercatDeviceProcessing, NewEthercatDevice};
-use crate::io::serial_interface::SerialInterfaceDevice;
-const WAGO750_652_MAX_BUF_LENGTH: usize = 48;

 #[derive(Clone)]
 pub struct Wago750_652 {
@@ -14,62 +10,6 @@ pub struct Wago750_652 {
    tx_bit_offset: usize,
    rx_bit_offset: usize,
    module: Option<Module>,
-    started_init: bool,
-    pub rx_pdo: Wago750_652RxPdo,
-    pub tx_pdo: Wago750_652TxPdo,
-    has_messages_last_toggle: bool,
-}
-
-#[derive(Clone, Default, Debug)]
-pub struct Wago750_652Control {
-    pub transmit_request: bool, // Transmit request
-    pub receive_ack: bool,      // Receive acknowledge
-    pub init_request: bool,     // Initialization request
-    pub send_continuous: bool,  // Send continuous
-    pub output_length: usize,
-}
-
-#[derive(Clone, Debug)]
-pub struct Wago750_652RxPdo {
-    pub control: Wago750_652Control,
-    pub out_buffer: [u8; WAGO750_652_MAX_BUF_LENGTH],
-}
-
-impl Default for Wago750_652RxPdo {
-    fn default() -> Self {
-        Self {
-            control: Default::default(),
-            out_buffer: [0u8; WAGO750_652_MAX_BUF_LENGTH],
-        }
-    }
-}
-
-#[derive(Clone, Default, Debug)]
-pub struct Wago750_652Status {
-    pub transmit_ack: bool, //
-    pub receive_request: bool,
-    pub init_ack: bool,
-    pub buf_full: bool,
-    pub buf_empty: bool, // Buffer is empty (Sending inactive)
-    pub error_parity: bool,
-    pub error_framing: bool, // Frame is corrupt?
-    pub error_overrun: bool, // Byte/s was lost on receive
-    pub input_length: usize,
-}
-
-#[derive(Clone, Debug)]
-pub struct Wago750_652TxPdo {
-    pub status: Wago750_652Status,
-    pub in_buffer: [u8; WAGO750_652_MAX_BUF_LENGTH],
-}
-
-impl Default for Wago750_652TxPdo {
-    fn default() -> Self {
-        Self {
-            status: Default::default(),
-            in_buffer: [0u8; WAGO750_652_MAX_BUF_LENGTH],
-        }
-    }
 }

 impl EthercatDeviceUsed for Wago750_652 {
@@ -83,6 +23,7 @@ impl EthercatDeviceUsed for Wago750_652 {
 }

 impl DynamicEthercatDevice for Wago750_652 {}
+
 impl EthercatDynamicPDO for Wago750_652 {
    fn get_tx_offset(&self) -> usize {
        self.tx_bit_offset
@@ -107,81 +48,24 @@ impl EthercatDevice for Wago750_652 {
    */
    fn input(
        &mut self,
-        input: &bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
+        _input: &bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
    ) -> Result<(), anyhow::Error> {
-        self.tx_pdo.in_buffer.fill(0u8);
-        let base = self.tx_bit_offset;
-
-        self.tx_pdo.status.transmit_ack = *input.get(base + 0).expect("Missing buf_empty bit");
-        self.tx_pdo.status.receive_request = *input.get(base + 1).expect("Missing buf_empty bit");
-        self.tx_pdo.status.init_ack = *input.get(base + 2).expect("Missing buf_empty bit");
-        self.tx_pdo.status.buf_full = *input.get(base + 6).expect("Missing buf_empty bit");
-        self.tx_pdo.status.buf_empty = *input.get(base + 11).expect("Missing buf_empty bit");
-        self.tx_pdo.status.error_parity = *input.get(base + 13).expect("Missing buf_empty bit");
-        self.tx_pdo.status.error_framing = *input.get(base + 14).expect("Missing buf_empty bit");
-        self.tx_pdo.status.error_overrun = *input.get(base + 15).expect("Missing buf_empty bit");
-        // Im sorry but this is what you get by splitting the len across different bytes ...
-        self.tx_pdo.status.input_length = ((*input.get(base + 3).expect("Missing buf_empty bit")
-            as u8)
-            ^ ((*input.get(base + 4).expect("Missing buf_empty bit") as u8) << 1)
-            ^ ((*input.get(base + 5).expect("Missing buf_empty bit") as u8) << 2)
-            ^ ((*input.get(base + 8).expect("Missing buf_empty bit") as u8) << 3)
-            ^ ((*input.get(base + 9).expect("Missing buf_empty bit") as u8) << 4)
-            ^ ((*input.get(base + 10).expect("Missing buf_empty bit") as u8) << 5))
-            as usize;
-
-        // the serial bytes start at bit 16,
-        // then we calculate the offset of when the serial bytes buffer is over, which for the 24byte pdo is 22bytes
-        // to get the size in bits we do 22 * 8 -> 176bits
-        let serial_bytes = input[(base + 16)..((base + 16) + 22 * 8_usize)].chunks_exact(8);
-        for (i, val) in serial_bytes.enumerate() {
-            self.tx_pdo.in_buffer[i] = val.load_le();
-        }
        Ok(())
    }

    fn input_len(&self) -> usize {
-        24
+        0
    }

    fn output(
        &self,
-        output: &mut bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
+        _output: &mut bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
    ) -> Result<(), anyhow::Error> {
-        let base = self.rx_bit_offset;
-        let mut ol0_i = 5; // Ol0 starts at bit 5 and goes to bit 7 (inclusive) 
-        let mut ol1_i = 8;
-
-        output.set(base + 0, self.rx_pdo.control.transmit_request);
-        output.set(base + 1, self.rx_pdo.control.receive_ack);
-        output.set(base + 2, self.rx_pdo.control.init_request);
-        output.set(base + 3, self.rx_pdo.control.send_continuous);
-
-        for i in 0..3 {
-            // Rust type system proceeds to annoy once again, we need to add a != at the end, because a cast to bool is just too dangeerous obviously
-            output.set(
-                base + ol0_i,
-                ((self.rx_pdo.control.output_length >> i) & 1) != 0,
-            );
-            ol0_i += 1;
-        }
-
-        for i in 3..6 {
-            output.set(
-                base + ol1_i,
-                ((self.rx_pdo.control.output_length >> i) & 1) != 0,
-            );
-            ol1_i += 1;
-        }
-        let data_start = base + 16;
-        for (i, &byte) in self.rx_pdo.out_buffer.iter().take(22).enumerate() {
-            output[(data_start + i * 8)..(data_start + (i + 1) * 8)].store_le(byte);
-        }
        Ok(())
    }

    fn output_len(&self) -> usize {
-        24
+        0
    }

    fn as_any(&self) -> &dyn std::any::Any {
@@ -200,6 +84,19 @@ impl EthercatDevice for Wago750_652 {
        &mut self,
        input: &bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
    ) -> Result<(), anyhow::Error> {
+        // validate input has correct length
+        let expected = self.input_len();
+        let actual = input.len();
+        if actual != expected {
+            return Err(anyhow::anyhow!(
+                "[{}::Device::input_checked] Input length is {} ({} bytes) and must be {} bits ({} bytes)",
+                module_path!(),
+                actual,
+                actual / 8,
+                expected,
+                expected / 8
+            ));
+        }
        self.input(input)
    }

@@ -208,6 +105,21 @@ impl EthercatDevice for Wago750_652 {
        output: &mut bitvec::prelude::BitSlice<u8, bitvec::prelude::Lsb0>,
    ) -> Result<(), anyhow::Error> {
        self.output(output)?;
+
+        // validate input has correct length
+        let expected = self.output_len();
+        let actual = output.len();
+        if output.len() != expected {
+            return Err(anyhow::anyhow!(
+                "[{}::Device::output_checked] Output length is {} ({} bytes) and must be {} bits ({} bytes)",
+                module_path!(),
+                actual,
+                actual / 8,
+                expected,
+                expected / 8
+            ));
+        }
+
        Ok(())
    }

@@ -231,10 +143,6 @@ impl NewEthercatDevice for Wago750_652 {
            tx_bit_offset: 0,
            rx_bit_offset: 0,
            module: None,
-            rx_pdo: Wago750_652RxPdo::default(),
-            tx_pdo: Wago750_652TxPdo::default(),
-            started_init: false,
-            has_messages_last_toggle: false,
        }
    }
 }
@@ -245,108 +153,6 @@ impl std::fmt::Debug for Wago750_652 {
    }
 }

-#[derive(Clone)]
-pub enum Wago750_652Port {
-    SI1, // Serial
-}
-
-impl SerialInterfaceDevice<Wago750_652Port> for Wago750_652 {
-    fn serial_interface_read_message(&mut self, port: Wago750_652Port) -> Option<Vec<u8>> {
-        if !self.serial_interface_has_messages(port) {
-            return None;
-        } else {
-            let in_len = self.tx_pdo.status.input_length;
-            let received_data = self.tx_pdo.in_buffer[0..in_len].to_vec();
-
-            if received_data.is_empty() {
-                return None;
-            }
-
-            self.has_messages_last_toggle = self.tx_pdo.status.receive_request;
-            self.rx_pdo.control.receive_ack = !self.rx_pdo.control.receive_ack;
-
-            Some(received_data)
-        }
-    }
-
-    fn serial_interface_write_message(
-        &mut self,
-        _port: Wago750_652Port,
-        message: Vec<u8>,
-    ) -> Result<bool, anyhow::Error> {
-        if message.len() > WAGO750_652_MAX_BUF_LENGTH {
-            return Err(anyhow::anyhow!(
-                "Message is too long for RxPdo Buffer of 22 bytes!"
-            ));
-        }
-
-        if message.is_empty() {
-            return Ok(self.rx_pdo.control.transmit_request == self.tx_pdo.status.transmit_ack);
-        }
-
-        let bytes = message.as_slice();
-        self.rx_pdo.control.output_length = message.len();
-        self.rx_pdo.out_buffer.fill(0u8);
-        self.rx_pdo.out_buffer[0..message.len()].copy_from_slice(&bytes[0..message.len()]);
-        self.rx_pdo.control.transmit_request = !self.rx_pdo.control.transmit_request;
-        Ok(true)
-    }
-
-    fn serial_interface_has_messages(&mut self, _port: Wago750_652Port) -> bool {
-        return self.tx_pdo.status.receive_request != self.has_messages_last_toggle;
-    }
-
-    fn get_serial_encoding(
-        &self,
-        _port: Wago750_652Port,
-    ) -> Option<crate::io::serial_interface::SerialEncoding> {
-        None
-    }
-
-    fn get_baudrate(&self, _port: Wago750_652Port) -> Option<u32> {
-        // Right now we cant change it on the fly because WAGO ONLY supports setting via
-        // Codesys OR WAGO I/O Check the way it is set with Codesys is also NOT documented ...
-        // My Hunch is that the 0x2010 0x2011 register can be used to configure that with COE its not documented though
-        None
-    }
-
-    /*
-        Needs to be called multiple times until it returns true, at which point it is ready to be used
-    */
-    fn serial_interface_initialize(&mut self, port: Wago750_652Port) -> bool {
-        match port {
-            Wago750_652Port::SI1 => {
-                if !self.rx_pdo.control.init_request
-                    && !self.tx_pdo.status.init_ack
-                    && !self.started_init
-                {
-                    self.rx_pdo.control.init_request = true;
-                    self.started_init = true;
-                    return false;
-                }
-
-                if self.rx_pdo.control.init_request && self.tx_pdo.status.init_ack {
-                    self.rx_pdo.control.init_request = false;
-                    return false;
-                }
-
-                if !self.rx_pdo.control.init_request && self.tx_pdo.status.init_ack {
-                    return false;
-                }
-
-                if !self.rx_pdo.control.init_request
-                    && !self.tx_pdo.status.init_ack
-                    && self.started_init
-                {
-                    self.has_messages_last_toggle = self.tx_pdo.status.receive_request;
-                    return true;
-                }
-                false
-            }
-        }
-    }
-}
-
 pub const WAGO_750_652_VENDOR_ID: u32 = 0x00000021;
 pub const WAGO_750_652_PRODUCT_ID: u32 = 106043250;
 pub const WAGO_750_652_MODULE_IDENT: SubDeviceProductTuple =
@@ -52,8 +52,6 @@

        devShells.default = pkgs.mkShell {
          packages = with pkgs; [
-            cargo
-            rustc
            pkg-config
            libudev-zero
            libpcap
@@ -0,0 +1,13 @@
+# Git Hooks
+
+This directory contains Git hooks for the project.
+
+## Installation
+
+To install the hooks, run the following command from the repository root:
+
+```bash
+# Copy the pre-commit hook to your local .git/hooks directory
+cp hooks/pre-commit .git/hooks/pre-commit
+chmod +x .git/hooks/pre-commit
+```