timeout fixed the el3062

Co-authored-by: Oshgnacknak <osh@oshgnacknak.de>

CHANGELOG.md

@@ -1,3 +1,35 @@
+# `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_
+
+## General
+- [#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
+
+## Laser
+- [#924](https://github.com/qitechgmbh/control/pull/924) Roundness is now displayed as a percentage
+- [#885](https://github.com/qitechgmbh/control/pull/885) Added Min and Max Diameter
+- [#849](https://github.com/qitechgmbh/control/pull/849) Added a Warning if Filament is out of Spec
+
+## Aquapath
+- [#976](https://github.com/qitechgmbh/control/pull/976) Improved Stability
+
+
 # `2.12.0`
 _17.11.2025_
 

README.md

@@ -17,22 +17,22 @@ QiTech Control combines the modularity and reliability of standard EtherCAT term
 
 # Repo Structure
 
-Frontend
+**Frontend**
 
 - `/electron`: Frontend code for the control software built with React and Electron.
 
-Backend
+**Backend**
 
 - `/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.
 
-Operating System
+**Operating System**
 
 - `/nixos`: Custom Linux with realtime kernel & preconfigured for touchscreens.
 
-Other
+**Other**
 
 - `/docs`: Documentation for the project.
 
@@ -54,115 +54,57 @@ We could combine the code of the frontend and backend using [Doxius](https://dio
 
 [Developer Documentation](./docs/developer-docs/)
 
-## Backend
+[API Documentation](https://github.com/qitechgmbh/control/blob/master/docs/rest-api.md)
 
+-> 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
-
+-> 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
+## 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
+| Example            | Vendor   | Hardware      | Description                             | How-To Video | Docs                          |
+| :----------------- | :------- | :------------ | :-------------------------------------- | :----------- | :---------------------------- |
+| **Digital Input** | WAGO     | 750-402       | 4-Channel Digital Input                 | [ ]          | -                             |
+| **Digital Output** | WAGO     | 750-753       | 8-Channel Digital Output                | [ ]          | -                             |
+| **Analog Input** | WAGO     | 750-455       | 4-Channel Analog Input                  | [ ]          | -                             |
+| **Analog Output** | WAGO     | 750-553       | 4-Channel Analog Output                 | [ ]          | -                             |
+| **Serial Comms** | WAGO     | 750-652       | RS-485 Modbus Module                    | [ ]          | -                             |
+| **Stepper Drive** | WAGO     | 750-67x       | Stepper Controller                      | [ ]          | -                             |
+| **Power Supply** | WAGO     | 2787-214      | Power Supply Unit                       | [ ]          | -                             |
+| **LED Control** | Beckhoff | EL2004        | Digital output control (simplest setup) | [ ]          | [](./docs/hardware/el2004.md) |
+| **Analog Input** | Beckhoff | EL3021        | Reading analog current measurements     | [ ]          | [](./docs/hardware/el3021.md) |
 
+# QiTech Machines
 
-# More Docs
+| Machine Name      | Description                 | Machine ID | Implemented | Video                                                           | Docs                            |
+| :---------------- | :-------------------------- | :--------- | :---------- | :-------------------------------------------------------------- | :------------------------------ |
+| Winder V1         | Winding Filaments & Similar | 1          | Legacy      | [Video](https://youtu.be/4aE4cFhioKA?si=Xdj_LVnFrAYWnLm6)       | -                               |
+| Winder V2         | Winding Filaments & Similar | 2          | Yes         | [Video](https://youtu.be/f2kzh6kpQWE?si=HEYcLOaC9gWSp2Wo)       | [](./docs/machines/winder-1.md) |
+| XL Winder V1      | Large Scale Winder          | 3          | Yes         | [Video](https://youtu.be/ynI6ioWIQQY?si=4EDVKXbgIqrvGGtY)       | -                               |
+| Buffer V1         | Filament buffering system   | 4          | In Progress | [Video](https://youtu.be/VR5mEdZDPA0?si=eip7dQXU4zaXK7Ev)       | -                               |
+| Extruder V1       | Single Screw Extruder       | 5          | Legacy      | [Video](https://youtu.be/gchoG-yGczI?si=bEM4daf5eOVaU5_2)       | -                               |
+| Extruder V2       | Single Screw Extruder       | 6          | Yes         | [Video](https://youtu.be/mexRYGDNWa4?si=h7JBz_XKMwKLPenG)       |                                 |
+| Waterway V1       | Filament Water Cooling      | 7          | In Progress | [Video](https://youtu.be/_T5z1J8bl_k?si=uOC1hIQ1EAP0cHIF)       |                                 |
+| Laser V1          | Diameter Measuring Laser    | 8          | Yes         | [Video](https://youtu.be/WDM34lj4afM?si=MZzUKkHCrzH4P0aA)       |                                 |
+| 2-Axis-Laser V1   | Dual Axis Laser             | 9          | Yes         | [Video](https://youtu.be/WDM34lj4afM?si=MZzUKkHCrzH4P0aA)       | -                               |
+| Mock              | Mock Machine for Testing    | 10         | Yes         |                                                                 | -                               |
+| Extruder V3       | Single Screw Extruder       | 11         | Yes         | [Video](https://youtu.be/ipHHuPzCvn4?si=hkZ1b93rVuwDxhFD)       |                                 |
+| Mini Schredder V1 | mini plastic crusher        | 12         | Legacy      | [Video](https://youtu.be/m8NplNqdu2Q?si=x6zjDktJtpbSMSmu)       | -                               |
+| Pro Schredder V1  | large plastic crusher       | 13         | Legacy      | [Video](https://youtu.be/pSaVMqp06pU?si=y61enutRpxKscBm4)       | -                               |
+| Dryer V1          | polymer dryer               | 14         | Reserved    | [Video](https://youtu.be/6hdmUUAdZp0?si=eKOW1WlgkqTpnfdS)       | -                               |
+| Pelletizier V1    | Filament chopper            | 15         | Reserved    |                                                                 | -                               |
 
-- [x] [Architecture & Data Flow](./docs/architecture-overview.md)
+# Current Restructuring Efforts
 
-  - [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)
+[![](https://img.youtube.com/vi/UlbnSVIhfLI/maxresdefault.jpg)](https://www.youtube.com/live/UlbnSVIhfLI?si=ZTotC5B7gd87tUim)
+*Video: Live stream of software dev meeting*

control-core/src/ethernet/mod.rs

@@ -0,0 +1,65 @@
+use std::process::Command;
+
+use anyhow::Result;
+use interfaces::Interface;
+
+pub mod modbus_tcp_discovery;
+
+/// Returns true if the given network interface is Ethernet.
+/// Prevents testing wlan,loopback and other non ethernet devices
+fn is_ethernet(interface: &str) -> std::io::Result<bool> {
+    #[cfg(target_os = "linux")]
+    {
+        let base_path = format!("/sys/class/net/{}", interface);
+        let type_path = std::path::Path::new(&base_path).join("type");
+        let iface_type = std::fs::read_to_string(&type_path)?.trim().to_string();
+        // 1 means Ethernet
+        let reports_as_ethernet = iface_type == "1";
+        // Double-check that it's not a wireless interface
+        let uevent_path = std::path::Path::new(&base_path).join("uevent");
+        let uevent = std::fs::read_to_string(&uevent_path).unwrap_or_default();
+        // If "DEVTYPE=wlan" appears, it's lying
+        let actually_wifi = uevent.contains("DEVTYPE=wlan");
+        Ok(reports_as_ethernet && !actually_wifi)
+    }
+    #[cfg(not(target_os = "linux"))]
+    return Ok(true);
+}
+
+pub fn get_interfaces() -> Result<Vec<Interface>> {
+    let vec = Interface::get_all()
+        .map_err(|e| anyhow::anyhow!("Failed to get network interfaces: {}", e))?
+        .into_iter()
+        .filter(|iface| {
+            iface.is_up()
+                && iface.is_running()
+                && !iface.is_loopback()
+                && is_ethernet(&iface.name).unwrap_or(false)
+                && !iface.name.starts_with("bridge")
+                && !iface.name.starts_with("utun")   // Exclude tunnel interfaces
+                && !iface.name.starts_with("awdl")   // Exclude Apple Wireless Direct Link
+                && !iface.name.starts_with("anpi")   // Exclude Apple Network Privacy Interface
+                && !iface.name.starts_with("llw") // Exclude Apple low-latency WLAN
+        })
+        .collect::<Vec<_>>();
+    Ok(vec)
+}
+
+/// Sets a network interface to unmanaged by NetworkManager.
+/// Returns true if the command succeeded.
+pub fn set_interface_managed(interface: &str, managed: bool) -> bool {
+    let managed_str = match managed {
+        true => "yes",
+        false => "no",
+    };
+    tracing::info!(
+        "set_interface_managed for {} managed was set to: {}",
+        interface,
+        managed_str
+    );
+    let status = Command::new("nmcli")
+        .args(["dev", "set", interface, "managed", managed_str])
+        .status();
+
+    matches!(status, Ok(s) if s.success())
+}

control-core/src/ethernet/modbus_tcp_discovery.rs

@@ -0,0 +1,78 @@
+use crate::ethernet::get_interfaces;
+use crate::{futures::FutureIteratorExt, modbus::tcp::ModbusTcpDevice};
+use anyhow::{Result, bail};
+use interfaces::Interface;
+use std::cmp::min;
+use std::net::{IpAddr, Ipv4Addr, SocketAddr};
+
+pub struct ModbusTcpProbe {
+    pub addr: SocketAddr,
+    pub serial: u16,
+}
+
+pub async fn probe_modbus_tcp() -> Vec<ModbusTcpProbe> {
+    let interfaces = match get_interfaces() {
+        Ok(x) => x,
+        Err(_) => return vec![],
+    };
+
+    interfaces
+        .into_iter()
+        .map(probe_modbus_tcp_addresses)
+        .join_all()
+        .await
+        .into_iter()
+        .flatten()
+        .collect()
+}
+
+async fn probe_modbus_tcp_addresses(interface: Interface) -> Vec<ModbusTcpProbe> {
+    let out: Vec<ModbusTcpProbe> = interface
+        .addresses
+        .iter()
+        .filter_map(|addr| {
+            let a = addr.addr.map(|a| a.ip());
+            let m = addr.mask.map(|a| a.ip());
+
+            match (a, m) {
+                (Some(IpAddr::V4(addr)), Some(IpAddr::V4(mask))) => Some((addr, mask)),
+                _ => None,
+            }
+        })
+        .flat_map(|(addr, mask)| {
+            let a = u32::from(addr);
+            let m = u32::from(mask);
+            let network = a & m;
+
+            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))
+        })
+        .map(|addr| smol::spawn(ping_modbus_device(addr)))
+        .join_all()
+        .await
+        .into_iter()
+        .filter_map(|x| x.ok())
+        .collect();
+
+    out
+}
+
+async fn ping_modbus_device(addr: SocketAddr) -> Result<ModbusTcpProbe> {
+    let mut device = ModbusTcpDevice::new(addr).await?;
+
+    let module_number1 = device.get_u32(0x2).await?;
+    let module_number2 = device.get_u32(0x4).await?;
+
+    if module_number1 != 0x2787_2144 || module_number2 != 0x0000_0000 {
+        bail!("Unknown modbus tcp device!");
+    }
+
+    let serial = device.get_u32(0x000A).await?;
+
+    Ok(ModbusTcpProbe {
+        addr,
+        serial: serial as u16,
+    })
+}

control-core/src/futures.rs

@@ -0,0 +1,26 @@
+use core::future::Future;
+
+// Extension trait for iterators of futures
+pub trait FutureIteratorExt<F>: Iterator<Item = F> + Sized
+where
+    F: Future,
+{
+    /// Await all futures and return their outputs
+    fn join_all(self) -> impl Future<Output = Vec<F::Output>>;
+}
+
+impl<I, F> FutureIteratorExt<F> for I
+where
+    I: Iterator<Item = F> + Sized,
+    F: Future,
+{
+    async fn join_all(self) -> Vec<F::Output> {
+        let mut out = Vec::new();
+
+        for fut in self {
+            out.push(fut.await);
+        }
+
+        out
+    }
+}

control-core/src/lib.rs

@@ -2,6 +2,8 @@ pub mod controllers;
 pub mod converters;
 pub mod downcast;
 pub mod ethercat;
+pub mod ethernet;
+pub mod futures;
 pub mod helpers;
 pub mod irq_handling;
 pub mod modbus;

control-core/src/modbus/mod.rs

@@ -1,4 +1,5 @@
 pub mod modbus_serial_interface;
+pub mod tcp;
 
 use anyhow::Error;
 use crc::{CRC_16_MODBUS, Crc};

control-core/src/modbus/tcp.rs

@@ -0,0 +1,263 @@
+use std::fmt::Debug;
+use std::io::ErrorKind;
+use std::net::SocketAddr;
+use std::time::Duration;
+
+use anyhow::Context;
+use anyhow::Result;
+use anyhow::bail;
+use smol::Timer;
+use smol::future::FutureExt;
+use smol::io;
+use smol::io::AsyncReadExt;
+use smol::io::AsyncWriteExt;
+use smol::net::TcpStream;
+
+const PROTOCOL_ID: u16 = 0;
+const UNIT_ID: u8 = 0;
+const READ_HOLDING_FUNCTION_CODE: u8 = 3;
+const WRITE_HOLDING_FUNCTION_CODE: u8 = 16;
+const READ_HOLDING_LENGTH: u16 = 6; // Unit ID 00 + Func Code 03 + Start Address XXXX + Quantity XXXX = 6 bytes
+const WRITE_HOLDING_LENGTH_WITHOUT_DATA: u16 = 7; // Unit ID 00 + Func Code 16 + Start Address XXXX + Quantity XXXX + Num Data Bytes XX = 7 bytes
+
+struct Packet {
+    buf: Vec<u8>,
+}
+
+impl Packet {
+    pub const fn new() -> Self {
+        Self { buf: Vec::new() }
+    }
+
+    pub fn add_u8(&mut self, x: u8) {
+        self.buf.push(x);
+    }
+
+    pub fn add_u16(&mut self, x: u16) {
+        let buf = x.to_be_bytes();
+        self.buf.push(buf[0]);
+        self.buf.push(buf[1]);
+    }
+
+    pub fn as_bytes(&self) -> &[u8] {
+        &self.buf
+    }
+}
+
+pub struct ModbusTcpDevice {
+    stream: TcpStream,
+    transactions: u16,
+}
+
+impl Debug for ModbusTcpDevice {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self.stream.peer_addr() {
+            Ok(addr) => write!(f, "ModbusTcpDevice({:?})", addr),
+            Err(_) => std::fmt::Result::Err(std::fmt::Error),
+        }
+    }
+}
+
+impl ModbusTcpDevice {
+    pub async fn new(addr: SocketAddr) -> Result<Self> {
+        let timeout = async {
+            Timer::after(Duration::from_millis(10)).await;
+            Err(io::Error::from(ErrorKind::TimedOut))
+        };
+
+        let stream = TcpStream::connect(addr)
+            .or(timeout)
+            .await
+            .context("Could not connect to modbus device!")?;
+
+        Ok(Self {
+            stream,
+            transactions: 0,
+        })
+    }
+
+    async fn read_and_check_responce_header(&mut self, func_code: u8) -> Result<()> {
+        if self.read_u16().await? != self.transactions {
+            bail!("Modbus device sent unexpected transaction id!");
+        }
+
+        if self.read_u16().await? != PROTOCOL_ID {
+            bail!("Modbus device sent unexpected protocol id!");
+        }
+
+        let length = self.read_u16().await?;
+        if length < 2 {
+            bail!("Modbus device will send too few bytes to understand the response!");
+        }
+
+        if self.read_u8().await? != UNIT_ID {
+            bail!("Modbus device sent unexpected unit id!");
+        }
+
+        let func_code_res = self.read_u8().await?;
+        if func_code != func_code_res {
+            let error_code = self.read_u8().await?;
+            bail!(
+                "Modbus device sent unexpected function code 0x{:x}! It probably encountered an error. Error code: 0x{:x}",
+                func_code_res,
+                error_code
+            );
+        }
+
+        Ok(())
+    }
+
+    async fn send_read_holding_request(&mut self, addr: u16, count: u16) -> Result<u16> {
+        let mut packet = Packet::new();
+
+        self.transactions += 1;
+        packet.add_u16(self.transactions);
+        packet.add_u16(PROTOCOL_ID);
+        packet.add_u16(READ_HOLDING_LENGTH);
+
+        packet.add_u8(UNIT_ID);
+        packet.add_u8(READ_HOLDING_FUNCTION_CODE);
+
+        packet.add_u16(addr);
+        packet.add_u16(count);
+
+        self.send(packet).await?;
+        self.read_and_check_responce_header(READ_HOLDING_FUNCTION_CODE)
+            .await?;
+
+        let num_data_bytes = self.read_u8().await? as u16;
+        if count * 2 != num_data_bytes {
+            bail!(
+                "Modbus device wants to send only a portion of the requested range - UNIMPLEMENTED!"
+            );
+        }
+
+        Ok(num_data_bytes)
+    }
+
+    pub async fn get_holding_registers(&mut self, addr: u16, count: u16) -> Result<Vec<u16>> {
+        self.send_read_holding_request(addr, count).await?;
+
+        let mut res: Vec<u16> = Vec::new();
+        while res.len() < count as usize {
+            res.push(self.read_u16().await?);
+        }
+
+        Ok(res)
+    }
+
+    pub async fn set_holding_registers(&mut self, addr: u16, values: &[u16]) -> Result<()> {
+        let count = values.len();
+        let num_bytes = count * 2;
+        assert!(
+            count <= 128,
+            "Cannot send that many bytes to modbus device in one go! Trying to send {} bytes of data.",
+            num_bytes
+        );
+
+        let mut packet = Packet::new();
+
+        self.transactions += 1;
+        packet.add_u16(self.transactions);
+        packet.add_u16(PROTOCOL_ID);
+        packet.add_u16(WRITE_HOLDING_LENGTH_WITHOUT_DATA + num_bytes as u16);
+
+        packet.add_u8(UNIT_ID);
+        packet.add_u8(WRITE_HOLDING_FUNCTION_CODE);
+
+        packet.add_u16(addr);
+        packet.add_u16(count as u16);
+
+        packet.add_u8(num_bytes as u8);
+
+        for value in values {
+            packet.add_u16(value.to_owned());
+        }
+
+        self.send(packet).await?;
+        self.read_and_check_responce_header(WRITE_HOLDING_FUNCTION_CODE)
+            .await?;
+
+        if self.read_u16().await? != addr {
+            bail!("Modbus device wrote to wrong register address!");
+        }
+
+        if self.read_u16().await? != count as u16 {
+            bail!("Modbus device wrote wrong number of registers!");
+        }
+
+        Ok(())
+    }
+
+    pub async fn get_string<const N: usize>(&mut self, addr: u16) -> Result<String> {
+        assert!(N % 2 == 0, "Strings are always of even length!");
+        assert!(N <= 256, "Cannot read long strings in a single swoop!");
+        let count = N / 2;
+
+        self.send_read_holding_request(addr, count as u16).await?;
+        let buf = self.read_bytes::<N>().await?;
+
+        let s = String::from_utf8_lossy(&buf);
+        let s = match s.split_once('\0') {
+            None => s.to_string(),
+            Some((l, _)) => l.to_string(),
+        };
+
+        Ok(s)
+    }
+
+    pub async fn set_string<const N: usize>(&mut self, _addr: u16, s: &str) -> Result<()> {
+        assert!(s.len() <= N, "String is too long to fit!");
+
+        todo!()
+    }
+
+    pub async fn get_u16(&mut self, addr: u16) -> Result<u16> {
+        let length = self.send_read_holding_request(addr, 1).await?;
+        assert_eq!(
+            length, 2,
+            "Expected modbus device to send exactly 2 bytes of data!"
+        );
+
+        self.read_u16().await
+    }
+
+    pub async fn get_u32(&mut self, addr: u16) -> Result<u32> {
+        let length = self.send_read_holding_request(addr, 2).await?;
+        assert_eq!(
+            length, 4,
+            "Expected modbus device to send exactly 4 bytes of data!"
+        );
+
+        let buf = self.read_bytes::<4>().await?;
+        Ok(u32::from_be_bytes(buf))
+    }
+
+    // We have to send the request in a single packet,
+    // otherwise the device may fail to respond correctly.
+    async fn send(&mut self, packet: Packet) -> Result<()> {
+        self.stream
+            .write_all(packet.as_bytes())
+            .await
+            .context("Could write to modbus device!")
+    }
+
+    async fn read_u8(&mut self) -> Result<u8> {
+        let buf = self.read_bytes::<1>().await?;
+        Ok(u8::from_be_bytes(buf))
+    }
+
+    async fn read_u16(&mut self) -> Result<u16> {
+        let buf = self.read_bytes::<2>().await?;
+        Ok(u16::from_be_bytes(buf))
+    }
+
+    async fn read_bytes<const N: usize>(&mut self) -> Result<[u8; N]> {
+        let mut buf = [0; N];
+        self.stream
+            .read_exact(&mut buf)
+            .await
+            .context("Could not read from modbus device!")?;
+        Ok(buf)
+    }
+}

docs/developer-docs/getting-started.md

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

docs/developer-docs/minimal-example-wago-750-455.md

@@ -0,0 +1,196 @@
+# 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)

docs/developer-docs/minimal-example-wago750-402.md

@@ -0,0 +1,240 @@
+# 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)

docs/rest-api.md

@@ -0,0 +1,241 @@
+# 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>

electron/package-lock.json

@@ -27,7 +27,6 @@
         "@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",
@@ -52,9 +51,9 @@
         "tailwind-merge": "^3.0.1",
         "tailwindcss-animate": "^1.0.7",
         "uplot": "^1.6.32",
-        "xlsx": "^0.18.5",
-        "zod": "^3.24.2",
-        "zod-validation-error": "^3.4.0",
+        "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
+        "zod": "^4.3.5",
+        "zod-validation-error": "^5.0.0",
         "zustand": "^5.0.8"
       },
       "devDependencies": {
@@ -3129,6 +3128,66 @@
         "node": ">=14.0.0"
       }
     },
+    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/core": {
+      "version": "1.7.1",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/wasi-threads": "1.1.0",
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": {
+      "version": "1.7.1",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
+      "version": "1.1.0",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": {
+      "version": "1.1.0",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@emnapi/core": "^1.7.1",
+        "@emnapi/runtime": "^1.7.1",
+        "@tybys/wasm-util": "^0.10.1"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@tybys/wasm-util": {
+      "version": "0.10.1",
+      "dev": true,
+      "inBundle": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/tslib": {
+      "version": "2.8.1",
+      "dev": true,
+      "inBundle": true,
+      "license": "0BSD",
+      "optional": true
+    },
     "node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
       "version": "4.1.18",
       "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.18.tgz",
@@ -3408,23 +3467,6 @@
         "url": "https://github.com/sponsors/tannerlinsley"
       }
     },
-    "node_modules/@tanstack/zod-adapter": {
-      "version": "1.141.1",
-      "resolved": "https://registry.npmjs.org/@tanstack/zod-adapter/-/zod-adapter-1.141.1.tgz",
-      "integrity": "sha512-ZsGxo+/AFZnVdut8g7VkDZ6+xZ94+bHUyXv6FnB5tSmuPVFXuVwRCZnVida7EYYd3SOWpyy222e4Qkpob1xwOw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/tannerlinsley"
-      },
-      "peerDependencies": {
-        "@tanstack/react-router": ">=1.43.2",
-        "zod": "^3.23.8"
-      }
-    },
     "node_modules/@testing-library/dom": {
       "version": "10.4.1",
       "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz",
@@ -4216,15 +4258,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/adler-32": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz",
-      "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/agent-base": {
       "version": "7.1.4",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
@@ -4726,19 +4759,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/cfb": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz",
-      "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "adler-32": "~1.3.0",
-        "crc-32": "~1.2.0"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/chai": {
       "version": "5.3.3",
       "resolved": "https://registry.npmjs.org/chai/-/chai-5.3.3.tgz",
@@ -4857,15 +4877,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/codepage": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz",
-      "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -4930,18 +4941,6 @@
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
       "license": "MIT"
     },
-    "node_modules/crc-32": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz",
-      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
-      "license": "Apache-2.0",
-      "bin": {
-        "crc32": "bin/crc32.njs"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/create-require": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
@@ -5964,6 +5963,29 @@
         "eslint": ">=7"
       }
     },
+    "node_modules/eslint-plugin-react-compiler/node_modules/zod": {
+      "version": "3.25.76",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
+      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/colinhacks"
+      }
+    },
+    "node_modules/eslint-plugin-react-compiler/node_modules/zod-validation-error": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-3.5.4.tgz",
+      "integrity": "sha512-+hEiRIiPobgyuFlEojnqjJnhFvg4r/i3cqgcm67eehZf/WBaK3g6cD02YU9mtdVxZjv8CzCA9n/Rhrs3yAAvAw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "peerDependencies": {
+        "zod": "^3.24.4"
+      }
+    },
     "node_modules/eslint-plugin-react/node_modules/resolve": {
       "version": "2.0.0-next.5",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
@@ -6248,15 +6270,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/frac": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz",
-      "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -10298,9 +10311,9 @@
       }
     },
     "node_modules/seroval": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/seroval/-/seroval-1.4.0.tgz",
-      "integrity": "sha512-BdrNXdzlofomLTiRnwJTSEAaGKyHHZkbMXIywOh7zlzp4uZnXErEwl9XZ+N1hJSNpeTtNxWvVwN0wUzAIQ4Hpg==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/seroval/-/seroval-1.4.2.tgz",
+      "integrity": "sha512-N3HEHRCZYn3cQbsC4B5ldj9j+tHdf4JZoYPlcI4rRYu0Xy4qN8MQf1Z08EibzB0WpgRG5BGK08FTrmM66eSzKQ==",
       "license": "MIT",
       "engines": {
         "node": ">=10"
@@ -10623,18 +10636,6 @@
       "license": "BSD-3-Clause",
       "optional": true
     },
-    "node_modules/ssf": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz",
-      "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "frac": "~1.1.2"
-      },
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/stackback": {
       "version": "0.0.2",
       "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
@@ -12060,24 +12061,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/wmf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz",
-      "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/word": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/word/-/word-0.3.0.tgz",
-      "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==",
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
     "node_modules/word-wrap": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
@@ -12118,19 +12101,10 @@
       }
     },
     "node_modules/xlsx": {
-      "version": "0.18.5",
-      "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz",
-      "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
+      "version": "0.20.3",
+      "resolved": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
+      "integrity": "sha512-oLDq3jw7AcLqKWH2AhCpVTZl8mf6X2YReP+Neh0SJUzV/BdZYjth94tG5toiMB1PPrYtxOCfaoUCkvtuH+3AJA==",
       "license": "Apache-2.0",
-      "dependencies": {
-        "adler-32": "~1.3.0",
-        "cfb": "~1.2.1",
-        "codepage": "~1.15.0",
-        "crc-32": "~1.2.1",
-        "ssf": "~0.11.2",
-        "wmf": "~1.0.1",
-        "word": "~0.3.0"
-      },
       "bin": {
         "xlsx": "bin/xlsx.njs"
       },
@@ -12210,24 +12184,24 @@
       }
     },
     "node_modules/zod": {
-      "version": "3.25.76",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
-      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.5.tgz",
+      "integrity": "sha512-k7Nwx6vuWx1IJ9Bjuf4Zt1PEllcwe7cls3VNzm4CQ1/hgtFUK2bRNG3rvnpPUhFjmqJKAKtjV576KnUkHocg/g==",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
     },
     "node_modules/zod-validation-error": {
-      "version": "3.5.4",
-      "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-3.5.4.tgz",
-      "integrity": "sha512-+hEiRIiPobgyuFlEojnqjJnhFvg4r/i3cqgcm67eehZf/WBaK3g6cD02YU9mtdVxZjv8CzCA9n/Rhrs3yAAvAw==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-5.0.0.tgz",
+      "integrity": "sha512-hmk+pkyKq7Q71PiWVSDUc3VfpzpvcRHZ3QPw9yEMVvmtCekaMeOHnbr3WbxfrgEnQTv6haGP4cmv0Ojmihzsxw==",
       "license": "MIT",
       "engines": {
         "node": ">=18.0.0"
       },
       "peerDependencies": {
-        "zod": "^3.24.4"
+        "zod": "^3.25.0 || ^4.0.0"
       }
     },
     "node_modules/zustand": {

electron/package.json

@@ -75,7 +75,6 @@
     "@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",
@@ -100,9 +99,9 @@
     "tailwind-merge": "^3.0.1",
     "tailwindcss-animate": "^1.0.7",
     "uplot": "^1.6.32",
-    "xlsx": "^0.18.5",
-    "zod": "^3.24.2",
-    "zod-validation-error": "^3.4.0",
+    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
+    "zod": "^4.3.5",
+    "zod-validation-error": "^5.0.0",
     "zustand": "^5.0.8"
   }
 }

electron/src/client/mainNamespace.ts

@@ -15,25 +15,31 @@ import {
   machineIdentificationUnique,
 } from "@/machines/types";
 import { useRef } from "react";
-import { rustEnumSchema } from "@/lib/types";
+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,
+    }),
+  ),
+});
 
 // Update the EthercatDevicesEventData schema
-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 const ethercatDevicesEventDataSchema = z
+  .object({
+    Initializing: z.boolean(),
+    Done: ethercatDevicesSchema,
+    Error: z.string(),
+  })
+  .check(rustEnum);
 
 export type EthercatDevicesEventData = z.infer<
   typeof ethercatDevicesEventDataSchema
@@ -62,10 +68,12 @@ export const machinesEventSchema = eventSchema(machinesEventDataSchema);
 export type MachinesEvent = z.infer<typeof machinesEventSchema>;
 
 // Keep the EthercatInterfaceDiscovery event
-export const ethercatInterfaceDiscoveryEventDataSchema = rustEnumSchema({
-  Discovering: z.boolean(),
-  Done: z.string(),
-});
+export const ethercatInterfaceDiscoveryEventDataSchema = z
+  .object({
+    Discovering: z.boolean(),
+    Done: z.string(),
+  })
+  .check(rustEnum);
 
 export type EthercatInterfaceDiscoveryEventData = z.infer<
   typeof ethercatInterfaceDiscoveryEventDataSchema
@@ -110,23 +118,19 @@ export function mainMessageHandler(
     try {
       // Apply appropriate caching strategy based on event type
       if (eventName === "EthercatDevicesEvent") {
-        const validatedEvent = ethercatDevicesEventSchema.parse(event);
-        console.log("EthercatDevicesEvent", validatedEvent);
+        const validatedEvent = event;
         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 =
-          ethercatInterfaceDiscoveryEventSchema.parse(event);
-        console.log("EthercatInterfaceDiscoveryEvent", validatedEvent);
+        const validatedEvent = event;
         store.setState((state) => ({
           ...state,
           ethercatInterfaceDiscovery: validatedEvent,

electron/src/client/socketioStore.ts

@@ -163,6 +163,7 @@ 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}`);
 };

electron/src/components/preset/NewPresetDialog.tsx

@@ -1,4 +1,3 @@
-import { PresetData, PresetSchema } from "@/lib/preset/preset";
 import {
   Dialog,
   DialogContent,
@@ -14,13 +13,13 @@ import { Separator } from "../ui/separator";
 import { PresetPreviewEntries, PresetPreviewTable } from "./PresetPreviewTable";
 import { Input } from "../ui/input";
 
-export type NewPresetDialogProps<T extends PresetSchema> = {
-  currentState?: PresetData<T>;
+export type NewPresetDialogProps<T> = {
+  currentState?: T;
   previewEntries: PresetPreviewEntries<T>;
   onSave: (name: string) => void;
 };
 
-export function NewPresetDialog<T extends PresetSchema>({
+export function NewPresetDialog<T>({
   currentState,
   onSave,
   previewEntries,

electron/src/components/preset/PresetCard.tsx

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

electron/src/components/preset/PresetPreviewTable.tsx

@@ -1,28 +1,27 @@
 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 extends PresetSchema> = {
+type PresetPreviewEntry<T> = {
   name: string;
   unit?: Unit;
-  renderValue: (data: PresetData<T>) => string | undefined;
+  renderValue: (data: T) => string | undefined;
 };
 
-export type PresetPreviewEntries<T extends PresetSchema> = (
+export type PresetPreviewEntries<T> = (
   | PresetPreviewEntry<T>
   | PreviewSeparator
 )[];
 
-export type PresetPreviewTableProps<T extends PresetSchema> = {
-  data: PresetData<T>;
+export type PresetPreviewTableProps<T> = {
+  data?: T;
   entries: PresetPreviewEntries<T>;
 };
 
-export function PresetPreviewTable<T extends PresetSchema>({
+export function PresetPreviewTable<T>({
   data,
   entries,
 }: PresetPreviewTableProps<T>) {
@@ -39,7 +38,7 @@ export function PresetPreviewTable<T extends PresetSchema>({
           );
         }
 
-        const value = entry.renderValue(data);
+        const value = data !== undefined ? entry.renderValue(data) : undefined;
         return (
           <Fragment key={entry.name}>
             <div>{entry.name}</div>

electron/src/components/preset/PresetShowDialog.tsx

@@ -1,4 +1,4 @@
-import { Preset, PresetSchema } from "@/lib/preset/preset";
+import { Preset } 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 extends PresetSchema> = {
+export type PresetShowDialogProps<T> = {
   preset: Preset<T>;
   previewEntries: PresetPreviewEntries<T>;
   onApply: (preset: Preset<T>) => void;
   hideDate?: boolean;
 };
 
-export function PresetShowDialog<T extends PresetSchema>({
+export function PresetShowDialog<T>({
   preset,
   onApply,
   previewEntries,

electron/src/components/preset/PresetsPage.tsx

@@ -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, PresetSchema } from "@/lib/preset/preset";
+import { Preset } 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 extends PresetSchema> = UsePresetsParams<T> & {
+type PresetsPageProps<T> = UsePresetsParams<T> & {
   applyPreset: (preset: Preset<T>) => void;
   previewEntries: PresetPreviewEntries<T>;
 };
 
-export function PresetsPage<T extends PresetSchema>({
+export function PresetsPage<T>({
   applyPreset,
   machine_identification,
   currentState,

electron/src/control/EditValue.tsx

@@ -36,7 +36,6 @@ 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;
@@ -89,7 +88,6 @@ export function EditValue({
   description,
   defaultValue,
   step = 1,
-  valueSchema: schema,
   inverted,
   min,
   max,
@@ -104,7 +102,7 @@ export function EditValue({
 
   // Form setup
   const formSchema = z.object({
-    value: schema ?? z.number(),
+    value: z.number(),
   });
   type FormSchema = z.infer<typeof formSchema>;
 
@@ -191,7 +189,6 @@ export function EditValue({
     const numericValue = parseFloat(normalizedInput);
     const hasValidationError =
       isNaN(numericValue) ||
-      (schema && !schema.safeParse(numericValue).success) ||
       (max !== undefined && numericValue > max) ||
       (min !== undefined && numericValue < min);
 
@@ -222,15 +219,7 @@ export function EditValue({
       setValueStringError(false);
       preventFormSyncRef.current = false;
     }
-  }, [
-    valueString,
-    valueStringDirty,
-    schema,
-    max,
-    min,
-    form,
-    roundToStepDecimals,
-  ]);
+  }, [valueString, valueStringDirty, max, min, form, roundToStepDecimals]);
 
   // Reset input state to clean form value
   const resetInput = React.useCallback(() => {

electron/src/control/units.tsx

@@ -28,10 +28,9 @@ export function getUnitIcon(unit: Unit): IconName {
     case "Hz":
       return "lu:AudioWaveform";
     case "W":
-      return "lu:Zap";
     case "V":
-      return "lu:Zap";
     case "A":
+    case "mA":
       return "lu:Zap";
     case "kWh":
       return "lu:BatteryFull";
@@ -82,6 +81,8 @@ export function renderUnitSymbol(unit: Unit | undefined): string {
       return "W";
     case "V":
       return "V";
+    case "mA":
+      return "mA";
     case "A":
       return "A";
     case "kWh":
@@ -105,11 +106,11 @@ export function renderUnitSymbol(unit: Unit | undefined): string {
   }
 }
 
+// this function will add prefix/suffix to the valueString but without unit symbol.
 // example
-// value: 10.0
-// -> valueString: "10" (custom input)
-// this function will add prefix/suffix to the valueString but without unit symbol
-// -> "10°"
+//   const f = 3.1415;
+//   renderUnitSyntax(f.toFixed(2), "deg")
+// result: "3.14°"
 export function renderUnitSyntax(
   valueString: string | undefined,
   unit: Unit | undefined,
@@ -155,6 +156,8 @@ export function renderUnitSymbolLong(unit: Unit): string {
       return "watts";
     case "V":
       return "volts";
+    case "mA":
+      return "milliamperes";
     case "A":
       return "amperes";
     case "kWh":
@@ -192,6 +195,7 @@ export const units = [
   "Hz",
   "W",
   "V",
+  "mA",
   "A",
   "kWh",
   "l/min",

electron/src/lib/objects.ts

@@ -1,4 +1,7 @@
-export function deepEquals<T>(a: T, b: T): boolean {
+export function deepEquals(
+  a: object | undefined,
+  b: object | undefined,
+): boolean {
   if (a === b) {
     return true;
   }

electron/src/lib/preset/preset.ts

@@ -1,20 +1,16 @@
 import { machineIdentification } from "@/machines/types";
 import { z } from "zod";
 
-export type PresetSchema = z.ZodTypeAny;
+export type PresetSchema<T> = z.ZodType<T>;
 
-export const presetSchema = <S extends PresetSchema>(dataSchema: S) =>
+export const presetSchema = <T>(dataSchema: PresetSchema<T>) =>
   z.object({
     id: z.number().int().nonnegative().optional(),
     name: z.string().nonempty(),
     lastModified: z.coerce.date(),
     machineIdentification,
     schemaVersion: z.number().int().positive(),
-    data: dataSchema,
+    data: dataSchema.optional(),
   });
 
-export type Preset<S extends PresetSchema> = z.infer<
-  ReturnType<typeof presetSchema<S>>
->;
-
-export type PresetData<S extends PresetSchema> = z.infer<S>;
+export type Preset<T> = z.infer<ReturnType<typeof presetSchema<T>>>;

electron/src/lib/preset/presetStore.ts

@@ -1,6 +1,6 @@
 import { create } from "zustand";
 import { persist, PersistStorage, StorageValue } from "zustand/middleware";
-import { Preset, PresetSchema, presetSchema } from "./preset";
+import { Preset, 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 extends PresetSchema>(preset: Preset<T>) => PersistedPreset;
-  update: <T extends PresetSchema>(preset: Preset<T>) => void;
-  remove: <T extends PresetSchema>(preset: Preset<T>) => void;
+  insert: <T>(preset: Preset<T>) => PersistedPreset;
+  update: <T>(preset: Preset<T>) => void;
+  remove: <T>(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 extends PresetSchema>(preset: Preset<T>) => {
+      insert: <T>(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 extends PresetSchema>(preset: Preset<T>) => {
+      update: <T>(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 extends PresetSchema>(preset: Preset<T>) => {
+      remove: <T>(preset: Preset<T>) => {
         const state = get();
         const presets = state.presets.filter(
           (p: Preset<any>) => p.id !== preset.id,

electron/src/lib/preset/usePresets.ts

@@ -3,13 +3,13 @@ import {
   machineIdentificationEquals,
 } from "@/machines/types";
 import { usePresetStore } from "./presetStore";
-import { Preset, PresetData, presetSchema, PresetSchema } from "./preset";
+import { Preset, 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 extends PresetSchema> = {
+export type Presets<T> = {
   get: () => Preset<T>[];
   createFromCurrentState: (name: string) => Preset<T>;
   updateFromCurrentState: (preset: Preset<T>) => Preset<T>;
@@ -20,15 +20,15 @@ export type Presets<T extends PresetSchema> = {
   import: (json: any) => void;
 };
 
-export type UsePresetsParams<T extends PresetSchema> = {
+export type UsePresetsParams<T> = {
   machine_identification: MachineIdentification;
-  schemas: Map<number, T>;
+  schemas: Map<number, PresetSchema<T>>;
   schemaVersion: number;
-  currentState?: PresetData<T>;
-  defaultState?: PresetData<T>;
+  currentState?: T;
+  defaultState?: T;
 };
 
-export function usePresets<T extends PresetSchema>({
+export function usePresets<T>({
   machine_identification,
   schemas,
   schemaVersion,
@@ -49,7 +49,10 @@ export function usePresets<T extends PresetSchema>({
     }
 
     try {
-      const parsed = presetSchema(schema).parse(preset);
+      const parsed: Preset<T> = {
+        ...preset,
+        data: schema.parse(preset.data),
+      };
 
       if (parsed.schemaVersion < schemaVersion) {
         parsed.schemaVersion = schemaVersion;
@@ -93,7 +96,11 @@ export function usePresets<T extends PresetSchema>({
     return { ...preset, data: currentState };
   };
 
-  const updateFromCurrentState = (preset: Preset<T>) => {
+  const updateFromCurrentState = (preset: Preset<T>): Preset<T> => {
+    if (!currentState) {
+      return preset;
+    }
+
     const data = currentState;
 
     const newPreset = {
@@ -153,12 +160,16 @@ export function usePresets<T extends PresetSchema>({
   };
 
   const isActive = (preset: Preset<T>) => {
-    return deepEquals(currentState, preset.data);
+    if (!currentState) {
+      return false;
+    }
+
+    return deepEquals(currentState, preset.data ?? {});
   };
 
   const importPreset = (json: any) => {
     try {
-      const anyPreset = presetSchema(z.any()).parse(json);
+      const anyPreset = presetSchema(z.object()).parse(json);
 
       if (
         !machineIdentificationEquals(

electron/src/lib/types.ts

@@ -1,38 +1,17 @@
 import { z } from "zod";
 
-/**
- * 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]>;
-    },
+export const rustEnum: z.core.CheckFn<object> = (ctx) => {
+  const definedKeys = Object.keys(ctx.value).filter(
+    (key) => ctx.value[key] !== undefined,
   );
 
-  // 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
-    },
-  );
-}
+  if (definedKeys.length === 1) {
+    return;
+  }
+
+  ctx.issues.push({
+    code: "custom",
+    message: "Exactly one property must be defined",
+    input: definedKeys,
+  });
+};

electron/src/lib/validation.ts

@@ -1,19 +0,0 @@
-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;
-}

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

@@ -6,7 +6,10 @@ 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";
+import { StatusBadge } from "@/control/StatusBadge";
 
 export function Aquapath1ControlPage() {
   const {
@@ -16,8 +19,12 @@ export function Aquapath1ControlPage() {
     back_flow,
     front_temperature,
     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,
@@ -29,111 +36,53 @@ 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;
-
+  console.log(state);
   return (
     <Page>
       <ControlGrid columns={2}>
-        <ControlCard title="Flow Measurements">
-          <div className="grid grid-cols-2 gap-6">
-            <div className="flex flex-col gap-8">
-              <TimeSeriesValueNumeric
-                label="Flow 1"
-                unit="l/min"
-                timeseries={front_flow}
-                renderValue={(value) => value.toFixed(1)}
-              />
+        <ControlCard title="Reservoir 1">
+          <div className="grid grid-rows-5 gap-4">
+            <div className="flex flex-row">
+              { state?.front_flow === true ? (
+            <StatusBadge variant="success">Flow: active</StatusBadge>
+            ) : (
+            <StatusBadge variant="error">Flow: inactive</StatusBadge>
+            )}
             </div>
-
-            <div className="flex flex-col gap-8">
+            <div className="flex flex-row">
               <TimeSeriesValueNumeric
-                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"
+                label="Temperature"
                 unit="C"
                 timeseries={front_temperature}
                 renderValue={(value) => value.toFixed(1)}
               />
-              <Label label="Set Reservoir 1 Target Temperature">
+            </div>
+
+            <div className="flex flex-row gap-4">
+              <Label label="Set Target Temperature">
                 <EditValue
-                  title="Set Reservoir 1 Target Temperature"
+                  title="Set Target Temperature"
+                  min={0}
                   value={frontTargetTemperature}
+                  max={80}
                   unit="C"
                   step={0.1}
-                  min={0.0}
-                  max={80.0}
                   renderValue={(value) => value.toFixed(1)}
                   onChange={(val) => {
                     setFrontTemperature(val);
@@ -143,23 +92,88 @@ 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-col gap-8">
+            <div className="flex flex-row">
               <TimeSeriesValueNumeric
-                label="Reservoir 2"
+                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">
+                <div className="flex flex-row">
+                  { state?.back_flow === true ? (
+                  <StatusBadge variant="success">Flow: active</StatusBadge>
+                  ) : (
+                  <StatusBadge variant="error">Flow: inactive</StatusBadge>
+                  )}
+              </div></div>
+
+            <div className="flex flex-row">
+              <TimeSeriesValueNumeric
+                label="Temperature"
                 unit="C"
                 timeseries={back_temperature}
                 renderValue={(value) => value.toFixed(1)}
               />
-              <Label label="Set Reservoir 2 Target Temperature">
+            </div>
+
+            <div className="flex flex-row gap-4">
+              <Label label="Set Target Temperature">
                 <EditValue
-                  title="Set Reservoir 2 Target Temperature"
+                  title="Set Target Temperature"
+                  min={0}
                   value={backTargetTemperature}
+                  max={80}
                   unit="C"
                   step={0.1}
-                  min={0.0}
-                  max={80.0}
                   renderValue={(value) => value.toFixed(1)}
                   onChange={(val) => {
                     setBackTemperature(val);
@@ -169,6 +183,56 @@ 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>

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

@@ -14,11 +14,17 @@ export function Aquapath1Page() {
           title: "Control",
           icon: "lu:CirclePlay",
         },
+        //{
+//          link: "graph",
+          //title: "Graph",
+          //icon: "lu:ChartSpline",
+          //activeLink: "graphs",
+        //},
         {
-          link: "graph",
-          title: "Graph",
-          icon: "lu:ChartSpline",
-          activeLink: "graphs",
+          link: "settings",
+          title: "Config",
+          icon: "lu:Settings",
+          activeLink: "settings",
         },
       ]}
     />

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

@@ -0,0 +1,121 @@
+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>
+  );
+}

electron/src/machines/aquapath/aquapath1/aquapath1Namespace.ts

@@ -51,16 +51,37 @@ 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)
  */
 export const liveValuesEventDataSchema = z.object({
-  front_flow: z.number(),
-  back_flow: z.number(),
   front_temperature: z.number(),
   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(),
 });
 
 /**
@@ -71,6 +92,10 @@ export const stateEventDataSchema = z.object({
   mode_state: modeStateSchema,
   flow_states: flowStatesSchema,
   temperature_states: tempStatesSchema,
+  fan_states: fanStatesSchema,
+  tolerance_states: toleranceStatesSchema,
+  front_flow: z.boolean(),
+  back_flow: z.boolean(),
 });
 
 // ========== Event Schemas with Wrappers ==========
@@ -88,14 +113,20 @@ export type Aquapath1NamespaceStore = {
   state: StateEvent | null;
   defaultState: StateEvent | null;
 
-  front_flow: TimeSeries;
-  back_flow: TimeSeries;
-
   front_temperature: TimeSeries;
   back_temperature: TimeSeries;
 
   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 } =
@@ -108,6 +139,18 @@ 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
@@ -125,6 +168,12 @@ 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,
       };
     });
   };
@@ -165,7 +214,7 @@ export function aquapath1MessageHandler(
       // Live values events (time-series data)
       else if (eventName === "LiveValuesEvent") {
         const liveValuesEvent = liveValuesEventSchema.parse(event);
-
+        console.log(liveValuesEvent);
         updateStore((state) => ({
           ...state,
           front_temperature: addTemperature1(state.front_temperature, {
@@ -192,6 +241,30 @@ 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);

electron/src/machines/aquapath/aquapath1/useAquapath.ts

@@ -42,12 +42,18 @@ export function useAquapath1() {
   const {
     state,
     defaultState,
-    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,
+    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,
   } = useAquapath1Namespace(machineIdentification);
 
   // Single optimistic state for all state management
@@ -125,6 +131,89 @@ 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"]) }),
@@ -141,6 +230,25 @@ 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,
@@ -165,11 +273,23 @@ 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,
   };
 }

electron/src/machines/digitalinputtestmachine/DigitalInputTestMachineControlPage.tsx

@@ -0,0 +1,31 @@
+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>
+  );
+}

electron/src/machines/digitalinputtestmachine/DigitalInputTestMachinePage.tsx

@@ -0,0 +1,20 @@
+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",
+        },
+      ]}
+    />
+  );
+}

electron/src/machines/digitalinputtestmachine/digitalInputTestMachineNamespace.ts

@@ -0,0 +1,78 @@
+import { StoreApi } from "zustand";
+import { create } from "zustand";
+import { z } from "zod";
+import {
+  EventHandler,
+  eventSchema,
+  Event,
+  handleUnhandledEventError,
+  NamespaceId,
+  createNamespaceHookImplementation,
+  ThrottledStoreUpdater,
+} from "@/client/socketioStore";
+import { MachineIdentificationUnique } from "@/machines/types";
+
+// ========== Event Schema ==========
+
+export const stateEventDataSchema = z.object({
+  led_on: z.array(z.boolean()).length(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);
+}

electron/src/machines/digitalinputtestmachine/useDigitalInputTestMachine.ts

@@ -0,0 +1,53 @@
+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,
+  };
+}

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

@@ -7,7 +7,7 @@ import {
   PresetPreviewEntries,
   previewSeparator,
 } from "@/components/preset/PresetPreviewTable";
-import { Preset, PresetData } from "@/lib/preset/preset";
+import { Preset } from "@/lib/preset/preset";
 
 const extruder1PresetDataSchema = z
   .object({
@@ -31,7 +31,7 @@ const extruder1PresetDataSchema = z
   })
   .partial();
 
-type Extruder2 = typeof extruder1PresetDataSchema;
+type Extruder2 = z.infer<typeof extruder1PresetDataSchema>;
 
 const schemas = new Map([[1, extruder1PresetDataSchema]]);
 
@@ -39,76 +39,69 @@ const previewEntries: PresetPreviewEntries<Extruder2> = [
   {
     name: "Target Front Temperature",
     unit: "C",
-    renderValue: (data: PresetData<Extruder2>) =>
+    renderValue: (data: Extruder2) =>
       data.targetFrontHeatingTemperature?.toFixed(1),
   },
   {
     name: "Target Middle Temperature",
     unit: "C",
-    renderValue: (data: PresetData<Extruder2>) =>
+    renderValue: (data: Extruder2) =>
       data.targetMiddleHeatingTemperature?.toFixed(1),
   },
   {
     name: "Target Back Temperature",
     unit: "C",
-    renderValue: (data: PresetData<Extruder2>) =>
+    renderValue: (data: Extruder2) =>
       data.targetBackHeatingTemperature?.toFixed(1),
   },
   {
     name: "Target Nozzle Temperature",
     unit: "C",
-    renderValue: (data: PresetData<Extruder2>) =>
+    renderValue: (data: Extruder2) =>
       data.targetNozzleHeatingTemperature?.toFixed(1),
   },
   previewSeparator,
   {
     name: "Inverter Regulation",
-    renderValue: (data: PresetData<Extruder2>) => data.inverterRegulation,
+    renderValue: (data: Extruder2) => data.inverterRegulation,
   },
   {
     name: "Target Inverter RPM",
     unit: "rpm",
-    renderValue: (data: PresetData<Extruder2>) =>
-      data.targetInverterRpm?.toFixed(2),
+    renderValue: (data: Extruder2) => data.targetInverterRpm?.toFixed(2),
   },
   {
     name: "Target Inverter Pressure",
     unit: "bar",
-    renderValue: (data: PresetData<Extruder2>) =>
-      data.targetInverterPressure?.toFixed(1),
+    renderValue: (data: Extruder2) => data.targetInverterPressure?.toFixed(1),
   },
   {
     name: "Inverter Direction",
-    renderValue: (data: PresetData<Extruder2>) =>
-      data.inverterRotationDirection,
+    renderValue: (data: Extruder2) => data.inverterRotationDirection,
   },
   previewSeparator,
   {
     name: "Pressure Limit",
     unit: "bar",
-    renderValue: (data: PresetData<Extruder2>) =>
-      data.pressureLimit?.toFixed(1),
+    renderValue: (data: Extruder2) => data.pressureLimit?.toFixed(1),
   },
   {
     name: "Enable Pressure Limit",
-    renderValue: (data: PresetData<Extruder2>) =>
+    renderValue: (data: Extruder2) =>
       data.pressureLimitEnabled ? "on" : "off",
   },
   previewSeparator,
   {
     name: "PID Pressue Kp",
-    renderValue: (data: PresetData<Extruder2>) =>
-      data.pidPressureKp?.toFixed(4),
+    renderValue: (data: Extruder2) => data.pidPressureKp?.toFixed(4),
   },
   {
     name: "PID Pressue Ki",
-    renderValue: (data: PresetData<Extruder2>) =>
-      data.pidPressureKi?.toFixed(4),
+    renderValue: (data: Extruder2) => data.pidPressureKi?.toFixed(4),
   },
   {
     name: "PID Pressue Kd",
-    renderValue: (data: PresetData<Extruder2>) =>
-      data.pidPressureKd?.toFixed(4),
+    renderValue: (data: Extruder2) => data.pidPressureKd?.toFixed(4),
   },
 ];
 
@@ -135,7 +128,7 @@ export function Extruder2PresetsPage() {
     setPressurePidKp,
   } = useExtruder2();
 
-  const toPresetData = (s?: typeof state): PresetData<Extruder2> => ({
+  const toPresetData = (s?: typeof state): Extruder2 => ({
     targetFrontHeatingTemperature: s?.heating_states.front.target_temperature,
     targetMiddleHeatingTemperature: s?.heating_states.middle.target_temperature,
     targetBackHeatingTemperature: s?.heating_states.back.target_temperature,
@@ -161,32 +154,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 (

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

@@ -7,7 +7,7 @@ import {
   PresetPreviewEntries,
   previewSeparator,
 } from "@/components/preset/PresetPreviewTable";
-import { Preset, PresetData } from "@/lib/preset/preset";
+import { Preset } from "@/lib/preset/preset";
 
 const extruder3PresetDataSchema = z
   .object({
@@ -31,7 +31,7 @@ const extruder3PresetDataSchema = z
   })
   .partial();
 
-type Extruder3 = typeof extruder3PresetDataSchema;
+type Extruder3 = z.infer<typeof extruder3PresetDataSchema>;
 
 const schemas = new Map([[1, extruder3PresetDataSchema]]);
 
@@ -39,76 +39,69 @@ const previewEntries: PresetPreviewEntries<Extruder3> = [
   {
     name: "Target Front Temperature",
     unit: "C",
-    renderValue: (data: PresetData<Extruder3>) =>
+    renderValue: (data: Extruder3) =>
       data.targetFrontHeatingTemperature?.toFixed(1),
   },
   {
     name: "Target Middle Temperature",
     unit: "C",
-    renderValue: (data: PresetData<Extruder3>) =>
+    renderValue: (data: Extruder3) =>
       data.targetMiddleHeatingTemperature?.toFixed(1),
   },
   {
     name: "Target Back Temperature",
     unit: "C",
-    renderValue: (data: PresetData<Extruder3>) =>
+    renderValue: (data: Extruder3) =>
       data.targetBackHeatingTemperature?.toFixed(1),
   },
   {
     name: "Target Nozzle Temperature",
     unit: "C",
-    renderValue: (data: PresetData<Extruder3>) =>
+    renderValue: (data: Extruder3) =>
       data.targetNozzleHeatingTemperature?.toFixed(1),
   },
   previewSeparator,
   {
     name: "Inverter Regulation",
-    renderValue: (data: PresetData<Extruder3>) => data.inverterRegulation,
+    renderValue: (data: Extruder3) => data.inverterRegulation,
   },
   {
     name: "Target Inverter RPM",
     unit: "rpm",
-    renderValue: (data: PresetData<Extruder3>) =>
-      data.targetInverterRpm?.toFixed(2),
+    renderValue: (data: Extruder3) => data.targetInverterRpm?.toFixed(2),
   },
   {
     name: "Target Inverter Pressure",
     unit: "bar",
-    renderValue: (data: PresetData<Extruder3>) =>
-      data.targetInverterPressure?.toFixed(1),
+    renderValue: (data: Extruder3) => data.targetInverterPressure?.toFixed(1),
   },
   {
     name: "Inverter Direction",
-    renderValue: (data: PresetData<Extruder3>) =>
-      data.inverterRotationDirection,
+    renderValue: (data: Extruder3) => data.inverterRotationDirection,
   },
   previewSeparator,
   {
     name: "Pressure Limit",
     unit: "bar",
-    renderValue: (data: PresetData<Extruder3>) =>
-      data.pressureLimit?.toFixed(1),
+    renderValue: (data: Extruder3) => data.pressureLimit?.toFixed(1),
   },
   {
     name: "Enable Pressure Limit",
-    renderValue: (data: PresetData<Extruder3>) =>
+    renderValue: (data: Extruder3) =>
       data.pressureLimitEnabled ? "on" : "off",
   },
   previewSeparator,
   {
     name: "PID Pressue Kp",
-    renderValue: (data: PresetData<Extruder3>) =>
-      data.pidPressureKp?.toFixed(4),
+    renderValue: (data: Extruder3) => data.pidPressureKp?.toFixed(4),
   },
   {
     name: "PID Pressue Ki",
-    renderValue: (data: PresetData<Extruder3>) =>
-      data.pidPressureKi?.toFixed(4),
+    renderValue: (data: Extruder3) => data.pidPressureKi?.toFixed(4),
   },
   {
     name: "PID Pressue Kd",
-    renderValue: (data: PresetData<Extruder3>) =>
-      data.pidPressureKd?.toFixed(4),
+    renderValue: (data: Extruder3) => data.pidPressureKd?.toFixed(4),
   },
 ];
 
@@ -135,7 +128,7 @@ export function Extruder3PresetsPage() {
     setPressurePidKp,
   } = useExtruder3();
 
-  const toPresetData = (s?: typeof state): PresetData<Extruder3> => ({
+  const toPresetData = (s?: typeof state): Extruder3 => ({
     targetFrontHeatingTemperature: s?.heating_states.front.target_temperature,
     targetMiddleHeatingTemperature: s?.heating_states.middle.target_temperature,
     targetBackHeatingTemperature: s?.heating_states.back.target_temperature,
@@ -161,32 +154,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 (

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

@@ -1,7 +1,7 @@
 import React from "react";
 import { z } from "zod";
 import { useLaser1 } from "./useLaser1";
-import { Preset, PresetData } from "@/lib/preset/preset";
+import { Preset } 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 = typeof laser1PresetDataSchema;
+type Laser1 = z.infer<typeof laser1PresetDataSchema>;
 
 const schemas = new Map([[1, laser1PresetDataSchema]]);
 
@@ -22,18 +22,17 @@ const previewEntries: PresetPreviewEntries<Laser1> = [
   {
     name: "Target Diameter",
     unit: "mm",
-    renderValue: (data: PresetData<Laser1>) => data?.targetDiameter?.toFixed(3),
+    renderValue: (data: Laser1) => data?.targetDiameter?.toFixed(3),
   },
   {
     name: "Lower Tolerance",
     unit: "mm",
-    renderValue: (data: PresetData<Laser1>) => data?.lowerTolerance?.toFixed(3),
+    renderValue: (data: Laser1) => data?.lowerTolerance?.toFixed(3),
   },
   {
     name: "Higher Tolerance",
     unit: "mm",
-    renderValue: (data: PresetData<Laser1>) =>
-      data?.higherTolerance?.toFixed(3),
+    renderValue: (data: Laser1) => data?.higherTolerance?.toFixed(3),
   },
 ];
 
@@ -47,16 +46,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): PresetData<Laser1> => ({
+  const toPresetData = (s: typeof state): Laser1 => ({
     targetDiameter: s?.laser_state.target_diameter,
     lowerTolerance: s?.laser_state.lower_tolerance,
     higherTolerance: s?.laser_state.higher_tolerance,

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

@@ -66,19 +66,13 @@ export type Laser1NamespaceStore = {
   roundness: TimeSeries;
 };
 
-// Constants for time durations
-const HALF_SECOND = 500;
-
-const { initialTimeSeries: diameter, insert: addDiameter } = createTimeSeries({
-  sampleIntervalLong: HALF_SECOND,
-});
+const { initialTimeSeries: diameter, insert: addDiameter } = createTimeSeries();
 const { initialTimeSeries: x_diameter, insert: addXDiameter } =
-  createTimeSeries({ sampleIntervalLong: HALF_SECOND });
+  createTimeSeries();
 const { initialTimeSeries: y_diameter, insert: addYDiameter } =
-  createTimeSeries({ sampleIntervalLong: HALF_SECOND });
-const { initialTimeSeries: roundness, insert: addRoundness } = createTimeSeries(
-  { sampleIntervalLong: HALF_SECOND },
-);
+  createTimeSeries();
+const { initialTimeSeries: roundness, insert: addRoundness } =
+  createTimeSeries();
 
 /**
  * Factory function to create a new Laser1 namespace store

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

@@ -3,7 +3,7 @@ import { useMock1 } from "./useMock";
 import { mock1 } from "@/machines/properties";
 
 import { PresetsPage } from "@/components/preset/PresetsPage";
-import { Preset, PresetData } from "@/lib/preset/preset";
+import { Preset } from "@/lib/preset/preset";
 import { PresetPreviewEntries } from "@/components/preset/PresetPreviewTable";
 import { z } from "zod";
 
@@ -15,7 +15,7 @@ const mock1PresetDataSchema = z
   })
   .partial();
 
-type Mock1 = typeof mock1PresetDataSchema;
+type Mock1 = z.infer<typeof mock1PresetDataSchema>;
 
 const schemas = new Map([[1, mock1PresetDataSchema]]);
 
@@ -23,17 +23,17 @@ const previewEntries: PresetPreviewEntries<Mock1> = [
   {
     name: "Frequency 1",
     unit: "mHz",
-    renderValue: (data: PresetData<Mock1>) => data?.frequency1?.toFixed(3),
+    renderValue: (data: Mock1) => data?.frequency1?.toFixed(3),
   },
   {
     name: "Frequency 2",
     unit: "mHz",
-    renderValue: (data: PresetData<Mock1>) => data?.frequency2?.toFixed(3),
+    renderValue: (data: Mock1) => data?.frequency2?.toFixed(3),
   },
   {
     name: "Frequency 3",
     unit: "mHz",
-    renderValue: (data: PresetData<Mock1>) => data?.frequency3?.toFixed(3),
+    renderValue: (data: Mock1) => data?.frequency3?.toFixed(3),
   },
 ];
 
@@ -51,7 +51,7 @@ export function Mock1PresetsPage() {
     setFrequency3(frequency3);
   };
 
-  const toPresetData = (s: typeof state): PresetData<Mock1> => ({
+  const toPresetData = (s: typeof state): Mock1 => ({
     frequency1: s?.frequency1 ?? defaultState?.frequency1,
     frequency2: s?.frequency2 ?? defaultState?.frequency2,
     frequency3: s?.frequency3 ?? defaultState?.frequency3,

electron/src/machines/properties.ts

@@ -416,12 +416,12 @@ export const aquapath1: MachineProperties = {
     },
     {
       role: 4,
-      role_label: "EL5152",
+      role_label: "EL1002",
       allowed_devices: [
         {
           vendor_id: 2,
-          product_id: 0x14203052,
-          revision: 0x140000,
+          product_id: 0x3ea3052,
+          revision: 0x120000,
         },
       ],
     },
@@ -462,6 +462,28 @@ 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",
+  slug: "wago_power1",
+  icon: "lu:PlugZap",
+  machine_identification: {
+    vendor: VENDOR_QITECH,
+    machine: 0x000a,
+  },
+  device_roles: [],
+};
 
 export const analogInputTestMachine: MachineProperties = {
   name: "AnalogTest",
@@ -522,6 +544,30 @@ export const ip20TestMachine: MachineProperties = {
   ],
 };
 
+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,
@@ -529,9 +575,12 @@ export const machineProperties: MachineProperties[] = [
   laser1,
   mock1,
   buffer1,
+  wagoPower1,
   aquapath1,
   testmachine,
   analogInputTestMachine,
+  wagoAiTestMachine,
+  digitalInputTestMachine,
   ip20TestMachine,
 ];
 

electron/src/machines/types.ts

@@ -2,7 +2,7 @@
 // each role can only be given once
 
 import { IconName } from "@/components/Icon";
-import { rustEnumSchema } from "@/lib/types";
+import { rustEnum } from "@/lib/types";
 import { z } from "zod";
 
 // EK1100 should have role 0
@@ -62,9 +62,11 @@ export type DeviceHardwareIdentificationEthercat = z.infer<
   typeof deviceHardwareIdentificationEthercatSchema
 >;
 
-export const deviceHardwareIdentificationSchema = rustEnumSchema({
-  Ethercat: deviceHardwareIdentificationEthercatSchema,
-});
+export const deviceHardwareIdentificationSchema = z
+  .object({
+    Ethercat: deviceHardwareIdentificationEthercatSchema,
+  })
+  .check(rustEnum);
 
 export type DeviceHardwareIdentification = z.infer<
   typeof deviceHardwareIdentificationSchema

electron/src/machines/wago_power/wago_power1/WagoPower1ControlPage.tsx

@@ -0,0 +1,67 @@
+import { Page } from "@/components/Page";
+import React from "react";
+import { useWagoPower1 } from "./useWagoPower1";
+import { ControlGrid } from "@/control/ControlGrid";
+import { ControlCard } from "@/control/ControlCard";
+import { TimeSeriesValueNumeric } from "@/control/TimeSeriesValue";
+import { SelectionGroup } from "@/control/SelectionGroup";
+import { Mode } from "./wagoPower1Namespace";
+
+export function WagoPower1ControlPage() {
+  const {
+    state,
+
+    voltage,
+    current,
+
+    setMode,
+
+    isLoading,
+    isDisabled,
+  } = useWagoPower1();
+
+  return (
+    <Page>
+      <ControlGrid columns={2}>
+        <ControlCard title="Power">
+          <TimeSeriesValueNumeric
+            label="Voltage"
+            unit="V"
+            timeseries={voltage}
+            renderValue={(value) => value.toFixed(2)}
+          />
+          <TimeSeriesValueNumeric
+            label="Current"
+            unit="mA"
+            timeseries={current}
+            renderValue={(value) => value.toFixed(2)}
+          />
+        </ControlCard>
+        <ControlCard title="Mode">
+          <SelectionGroup<Mode>
+            value={state?.mode}
+            disabled={isDisabled}
+            loading={isLoading}
+            onChange={setMode}
+            orientation="vertical"
+            className="grid h-full grid-cols-2 gap-2"
+            options={{
+              Off: {
+                children: "Off",
+                icon: "lu:PowerOff",
+                isActiveClassName: "bg-gray-600",
+                className: "h-full",
+              },
+              On24V: {
+                children: "On",
+                icon: "lu:Power",
+                isActiveClassName: "bg-green-600",
+                className: "h-full",
+              },
+            }}
+          />
+        </ControlCard>
+      </ControlGrid>
+    </Page>
+  );
+}

electron/src/machines/wago_power/wago_power1/WagoPower1Page.tsx

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

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

@@ -0,0 +1,104 @@
+import { toastError } from "@/components/Toast";
+import { wagoPower1 } from "@/machines/properties";
+import { MachineIdentificationUnique } from "@/machines/types";
+import { wagoPower1SerialRoute } from "@/routes/routes";
+import { useEffect, useMemo } from "react";
+import {
+  Mode,
+  modeSchema,
+  StateEvent,
+  useWagoPower1Namespace,
+} from "./wagoPower1Namespace";
+import { useStateOptimistic } from "@/lib/useStateOptimistic";
+import { produce } from "immer";
+import z from "zod";
+import { useMachineMutate } from "@/client/useClient";
+
+export function useWagoPower1() {
+  const { serial: serialString } = wagoPower1SerialRoute.useParams();
+
+  // Memoize the machine identification to keep it stable between renders
+  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: wagoPower1.machine_identification,
+      serial,
+    };
+  }, [serialString]);
+
+  const { request: requestModeSet } = useMachineMutate(
+    z.object({ SetMode: modeSchema }),
+  );
+
+  const { state, defaultState, voltage, current } = useWagoPower1Namespace(
+    machineIdentification,
+  );
+  //
+  // Single optimistic state for all state management
+  const stateOptimistic = useStateOptimistic<StateEvent>();
+
+  // Update optimistic state when real state changes
+  useEffect(() => {
+    if (state) {
+      stateOptimistic.setReal(state);
+    }
+  }, [state]);
+
+  // Helper function for optimistic updates using produce
+  const updateStateOptimistically = (
+    producer: (current: StateEvent) => void,
+    serverRequest: () => void,
+  ) => {
+    const currentState = stateOptimistic.value;
+    if (currentState && !stateOptimistic.isOptimistic) {
+      stateOptimistic.setOptimistic(produce(currentState, producer));
+    }
+    serverRequest();
+  };
+
+  const setMode = (mode: Mode) => {
+    updateStateOptimistically(
+      (current) => {
+        current.data.mode = mode;
+      },
+      () =>
+        requestModeSet({
+          machine_identification_unique: machineIdentification,
+          data: { SetMode: mode },
+        }),
+    );
+  };
+
+  // Calculate loading states
+  const isLoading = stateOptimistic.isOptimistic;
+  const isDisabled = !stateOptimistic.isInitialized;
+
+  return {
+    state: stateOptimistic.value?.data,
+    defaultState: defaultState?.data,
+
+    current,
+    voltage,
+
+    setMode,
+
+    isLoading,
+    isDisabled,
+  };
+}

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

@@ -0,0 +1,135 @@
+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";
+import { useMemo } from "react";
+import {
+  createTimeSeries,
+  TimeSeries,
+  TimeSeriesValue,
+} from "@/lib/timeseries";
+
+export const liveValuesEventSchema = eventSchema(
+  z.object({
+    voltage: z.number(),
+    current: z.number(),
+  }),
+);
+
+export type LiveValuesEvent = z.infer<typeof liveValuesEventSchema>;
+
+export const modeSchema = z.enum(["Off", "On24V"]);
+export type Mode = z.infer<typeof modeSchema>;
+
+export const stateEventSchema = eventSchema(
+  z.object({
+    mode: modeSchema,
+    is_default_state: z.boolean(),
+  }),
+);
+
+export type StateEvent = z.infer<typeof stateEventSchema>;
+
+export type WagoPower1NamespaceStore = {
+  state: StateEvent | null;
+  defaultState: StateEvent | null;
+
+  current: TimeSeries;
+  voltage: TimeSeries;
+};
+
+const { initialTimeSeries: voltage, insert: addVoltage } = createTimeSeries();
+const { initialTimeSeries: current, insert: addCurrent } = createTimeSeries();
+
+const createWagoPower1NamespaceStore = (): StoreApi<WagoPower1NamespaceStore> =>
+  create<WagoPower1NamespaceStore>(() => {
+    return {
+      state: null,
+      defaultState: null,
+      voltage,
+      current,
+    };
+  });
+
+function wagoPower1MessageHandler(
+  store: StoreApi<WagoPower1NamespaceStore>,
+  throttledUpdater: ThrottledStoreUpdater<WagoPower1NamespaceStore>,
+): EventHandler {
+  return (event: Event<any>) => {
+    const eventName = event.name;
+
+    // Helper function to update store through buffer
+    const updateStore = (
+      updater: (state: WagoPower1NamespaceStore) => WagoPower1NamespaceStore,
+    ) => {
+      throttledUpdater.updateWith(updater);
+    };
+
+    try {
+      if (eventName === "StateEvent") {
+        const stateEvent = stateEventSchema.parse(event);
+
+        updateStore((state) => ({
+          ...state,
+          state: stateEvent,
+          // only set default state if is_default_state is true
+          defaultState: stateEvent.data.is_default_state
+            ? stateEvent
+            : state.defaultState,
+        }));
+      } else if (eventName === "LiveValuesEvent") {
+        console.log(event);
+        const liveValues = liveValuesEventSchema.parse(event);
+        const { voltage, current } = liveValues.data;
+        const voltageValue: TimeSeriesValue = {
+          value: voltage,
+          timestamp: liveValues.ts,
+        };
+        const currentValue: TimeSeriesValue = {
+          value: current,
+          timestamp: liveValues.ts,
+        };
+        updateStore((store: WagoPower1NamespaceStore) => ({
+          ...store,
+          voltage: addVoltage(store.voltage, voltageValue),
+          current: addCurrent(store.current, currentValue),
+        }));
+      } else {
+        handleUnhandledEventError(eventName);
+      }
+    } catch (e) {
+      console.error(e);
+    }
+  };
+}
+
+const useWagoPower1NamespaceImplementation =
+  createNamespaceHookImplementation<WagoPower1NamespaceStore>({
+    createStore: createWagoPower1NamespaceStore,
+    createEventHandler: wagoPower1MessageHandler,
+  });
+
+export function useWagoPower1Namespace(
+  machine_identification_unique: MachineIdentificationUnique,
+): WagoPower1NamespaceStore {
+  // Generate namespace ID from validated machine ID
+  const namespaceId = useMemo<NamespaceId>(
+    () => ({
+      type: "machine",
+      machine_identification_unique,
+    }),
+    [machine_identification_unique],
+  );
+
+  // Use the implementation with validated namespace ID
+  return useWagoPower1NamespaceImplementation(namespaceId);
+}

electron/src/machines/wagoaitestmachine/WagoAiTestMachineControlPage.tsx

@@ -0,0 +1,114 @@
+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>
+  );
+}

electron/src/machines/wagoaitestmachine/WagoAiTestMachinePage.tsx

@@ -0,0 +1,21 @@
+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",
+        },
+      ]}
+    />
+  );
+}

electron/src/machines/wagoaitestmachine/useWagoAiTestMachine.ts

@@ -0,0 +1,163 @@
+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,
+  };
+}

electron/src/machines/wagoaitestmachine/useWagoAiTestMachineNamespace.ts

@@ -0,0 +1,86 @@
+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,
+});

electron/src/machines/winder/winder2/Winder2PresetsPage.tsx

@@ -3,7 +3,7 @@ import { useWinder2 } from "./useWinder";
 import { winder2 } from "@/machines/properties";
 
 import { PresetsPage } from "@/components/preset/PresetsPage";
-import { Preset, PresetData } from "@/lib/preset/preset";
+import { Preset } from "@/lib/preset/preset";
 import {
   pullerStateSchema,
   spoolSpeedControllerStateSchema,
@@ -16,19 +16,21 @@ 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(),
-    }),
-    puller_state: pullerStateSchema,
-    spool_speed_controller_state: spoolSpeedControllerStateSchema,
+    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(),
   })
-  .deepPartial();
+  .partial();
 
-type Winder2 = typeof winder2PresetDataSchema;
+type Winder2 = z.infer<typeof winder2PresetDataSchema>;
 
 const schemas = new Map([[1, winder2PresetDataSchema]]);
 
@@ -36,40 +38,39 @@ const previewEntries: PresetPreviewEntries<Winder2> = [
   {
     name: "Inner Traverse Limit",
     unit: "mm",
-    renderValue: (data: PresetData<Winder2>) =>
-      data?.traverse_state?.limit_inner?.toFixed(1) ?? "N/A",
+    renderValue: (data: Winder2) =>
+      data.traverse_state?.limit_inner?.toFixed(1) ?? "N/A",
   },
   {
     name: "Outer Traverse Limit",
     unit: "mm",
-    renderValue: (data: PresetData<Winder2>) =>
+    renderValue: (data: Winder2) =>
       data?.traverse_state?.limit_outer?.toFixed(1) ?? "N/A",
   },
   {
     name: "Traverse Step Size",
     unit: "mm",
-    renderValue: (data: PresetData<Winder2>) =>
+    renderValue: (data: Winder2) =>
       data?.traverse_state?.step_size?.toFixed(1) ?? "N/A",
   },
   {
     name: "Traverse Padding",
     unit: "mm",
-    renderValue: (data: PresetData<Winder2>) =>
-      data?.traverse_state?.padding?.toFixed(1),
+    renderValue: (data: Winder2) => data?.traverse_state?.padding?.toFixed(1),
   },
   previewSeparator,
   {
     name: "Puller Regulation",
-    renderValue: (data: PresetData<Winder2>) => data?.puller_state?.regulation,
+    renderValue: (data: Winder2) => data?.puller_state?.regulation,
   },
   {
     name: "Puller Direction",
-    renderValue: (data: PresetData<Winder2>) =>
+    renderValue: (data: Winder2) =>
       data.puller_state?.forward ? "Forward" : "Backward",
   },
   {
     name: "Puller Gear Ratio",
-    renderValue: (data: PresetData<Winder2>) => {
+    renderValue: (data: Winder2) => {
       const ratio = data.puller_state?.gear_ratio;
       if (ratio === "OneToOne") return "1:1";
       if (ratio === "OneToFive") return "1:5";
@@ -80,74 +81,73 @@ const previewEntries: PresetPreviewEntries<Winder2> = [
   {
     name: "Puller Target Speed",
     unit: "m/min",
-    renderValue: (data: PresetData<Winder2>) =>
-      data.puller_state?.target_speed?.toFixed(2),
+    renderValue: (data: Winder2) => data.puller_state?.target_speed?.toFixed(2),
   },
   {
     name: "Puller Target Diameter",
     unit: "mm",
-    renderValue: (data: PresetData<Winder2>) =>
+    renderValue: (data: Winder2) =>
       data.puller_state?.target_diameter?.toFixed(1),
   },
   {
     name: "Puller Target Diameter",
     unit: "mm",
-    renderValue: (data: PresetData<Winder2>) =>
+    renderValue: (data: Winder2) =>
       data.puller_state?.target_diameter?.toFixed(1),
   },
   previewSeparator,
   {
     name: "Spool Regulation",
-    renderValue: (data: PresetData<Winder2>) =>
+    renderValue: (data: Winder2) =>
       data.spool_speed_controller_state?.regulation_mode,
   },
   {
     name: "Spool Direction",
-    renderValue: (data: PresetData<Winder2>) =>
+    renderValue: (data: Winder2) =>
       data.spool_speed_controller_state?.forward ? "Forward" : "Reverse",
   },
   {
     name: "Spool Min Speed",
     unit: "rpm",
-    renderValue: (data: PresetData<Winder2>) =>
+    renderValue: (data: Winder2) =>
       data.spool_speed_controller_state?.minmax_min_speed?.toFixed(2),
   },
   {
     name: "Spool Max Speed",
     unit: "rpm",
-    renderValue: (data: PresetData<Winder2>) =>
+    renderValue: (data: Winder2) =>
       data.spool_speed_controller_state?.minmax_max_speed?.toFixed(2),
   },
   previewSeparator,
   {
     name: "Adaptive Spool Tension Target",
-    renderValue: (data: PresetData<Winder2>) =>
+    renderValue: (data: Winder2) =>
       data.spool_speed_controller_state?.adaptive_tension_target?.toFixed(2),
   },
   {
     name: "Adaptive Spool Learning Rate",
-    renderValue: (data: PresetData<Winder2>) =>
+    renderValue: (data: Winder2) =>
       data.spool_speed_controller_state?.adaptive_radius_learning_rate?.toFixed(
         2,
       ),
   },
   {
     name: "Adaptive Spool Max Speed Multiplier",
-    renderValue: (data: PresetData<Winder2>) =>
+    renderValue: (data: Winder2) =>
       data.spool_speed_controller_state?.adaptive_max_speed_multiplier?.toFixed(
         1,
       ),
   },
   {
     name: "Adaptive Spool Acceleration Factor",
-    renderValue: (data: PresetData<Winder2>) =>
+    renderValue: (data: Winder2) =>
       data.spool_speed_controller_state?.adaptive_acceleration_factor?.toFixed(
         2,
       ),
   },
   {
     name: "Adaptive Spool Deaccel. Urgency",
-    renderValue: (data: PresetData<Winder2>) =>
+    renderValue: (data: 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): PresetData<Winder2> => ({
+  const toPresetData = (s: typeof state): Winder2 => ({
     traverse_state: {
       limit_inner: s?.traverse_state?.limit_inner,
       limit_outer: s?.traverse_state?.limit_outer,

electron/src/machines/winder/winder2/winder2Namespace.ts

@@ -1,8 +1,3 @@
-/**
- * @file winder2Namespace.ts
- * @description TypeScript implementation of Winder2 namespace with Zod schema validation.
- */
-
 import { StoreApi } from "zustand";
 import { create } from "zustand";
 import { z } from "zod";

electron/src/routes/routes.tsx

@@ -4,7 +4,6 @@ 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";
@@ -42,6 +41,7 @@ import { Buffer1SettingsPage } from "@/machines/buffer/buffer1/Buffer1Settings";
 import { Laser1ControlPage } from "@/machines/laser/laser1/Laser1ControlPage";
 import { Laser1GraphsPage } from "@/machines/laser/laser1/Laser1Graph";
 import { Laser1Page } from "@/machines/laser/laser1/Laser1Page";
+import { Laser1PresetsPage } from "@/machines/laser/laser1/Laser1PresetsPage";
 
 import { Mock1ControlPage } from "@/machines/mock/mock1/Mock1ControlPage";
 import { Mock1GraphPage } from "@/machines/mock/mock1/Mock1Graph";
@@ -52,18 +52,28 @@ 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 { Laser1PresetsPage } from "@/machines/laser/laser1/Laser1PresetsPage";
+
 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 { MetricsGraphsPage } from "@/metrics/MetricsGraphsPage";
 import { MetricsControlPage } from "@/metrics/MetricsControlPage";
 
+import { WagoPower1Page } from "@/machines/wago_power/wago_power1/WagoPower1Page";
+import { WagoPower1ControlPage } from "@/machines/wago_power/wago_power1/WagoPower1ControlPage";
+
 // make a route tree like this
 // _mainNavigation/machines/winder2/$serial/control
 // _mainNavigation/configuration/a
@@ -96,6 +106,30 @@ 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",
@@ -311,12 +345,30 @@ export const aquapath1ControlRoute = createRoute({
   component: () => <Aquapath1ControlPage />,
 });
 
+export const aquapath1SettingsRoute = createRoute({
+  getParentRoute: () => aquapath1SerialRoute,
+  path: "settings",
+  component: () => <Aquapath1SettingsPage />,
+});
+
 export const buffer1SettingsRoute = createRoute({
   getParentRoute: () => buffer1SerialRoute,
   path: "settings",
   component: () => <Buffer1SettingsPage />,
 });
 
+export const wagoPower1SerialRoute = createRoute({
+  getParentRoute: () => machinesRoute,
+  path: "wago_power1/$serial",
+  component: () => <WagoPower1Page />,
+});
+
+export const wagoPower1ControlRoute = createRoute({
+  getParentRoute: () => wagoPower1SerialRoute,
+  path: "control",
+  component: () => <WagoPower1ControlPage />,
+});
+
 export const setupRoute = createRoute({
   getParentRoute: () => sidebarRoute,
   path: "setup",
@@ -365,9 +417,9 @@ export const metricsRoute = createRoute({
 
 export const versionSearchSchema = z
   .object({
-    branch: fallback(z.string().optional(), undefined),
-    commit: fallback(z.string().optional(), undefined),
-    tag: fallback(z.string().optional(), undefined),
+    branch: z.string().optional(),
+    commit: z.string().optional(),
+    tag: z.string().optional(),
   })
   .merge(githubSourceSchema)
   .refine(
@@ -389,14 +441,14 @@ export const updateChangelogRoute = createRoute({
   getParentRoute: () => updateRoute,
   path: "changelog",
   component: () => <ChangelogPage />,
-  validateSearch: zodValidator(versionSearchSchema),
+  validateSearch: versionSearchSchema,
 });
 
 export const updateExecuteRoute = createRoute({
   getParentRoute: () => updateRoute,
   path: "execute",
   component: () => <UpdateExecutePage />,
-  validateSearch: zodValidator(versionSearchSchema),
+  validateSearch: versionSearchSchema,
 });
 
 export const rootTree = RootRoute.addChildren([
@@ -424,11 +476,18 @@ export const rootTree = RootRoute.addChildren([
         analogInputTestMachineControlRoute,
       ]),
 
+      wagoAiTestMachineSerialRoute.addChildren([wagoAiTestMachineControlRoute]),
+
+      digitalInputTestMachineSerialRoute.addChildren([
+        digitalInputTestMachineControlRoute,
+      ]),
+
       ip20TestMachineSerialRoute.addChildren([ip20TestMachineControlRoute]),
 
       aquapath1SerialRoute.addChildren([
         aquapath1ControlRoute,
         aquapath1GraphRoute,
+        aquapath1SettingsRoute,
       ]),
 
       winder2SerialRoute.addChildren([
@@ -462,6 +521,8 @@ export const rootTree = RootRoute.addChildren([
         mock1PresetsRoute,
       ]),
 
+      wagoPower1SerialRoute.addChildren([wagoPower1ControlRoute]),
+
       buffer1SerialRoute.addChildren([buffer1ControlRoute]),
     ]),
   ]),

electron/src/setup/DeviceEepromDialog.tsx

@@ -15,7 +15,13 @@ import {
   machineProperties,
   VENDOR_QITECH,
 } from "@/machines/properties";
-import React, { useEffect, useMemo, useRef, useState } from "react";
+import React, {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
 import { z } from "zod";
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
@@ -37,7 +43,6 @@ 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";
@@ -54,9 +59,15 @@ type Props = {
 };
 
 const formSchema = z.object({
-  machine: z.string().superRefine(validateU16),
-  serial: z.string().superRefine(validateU16),
-  role: z.string().superRefine(validateU16),
+  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" }),
 });
 
 type FormSchema = z.infer<typeof formSchema>;
@@ -145,6 +156,15 @@ 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({
@@ -182,12 +202,7 @@ export function DeviceEeepromDialogContent({ device, setOpen }: ContentProps) {
 
   // Position numpad once when it opens
   useEffect(() => {
-    if (!numpadOpen || !dialogRef.current) return;
-    const rect = dialogRef.current.getBoundingClientRect();
-    setNumpadPosition({
-      left: rect.right + 20,
-      top: rect.top + rect.height / 2,
-    });
+    updateNumpadPosition();
   }, [numpadOpen]);
 
   // Close numpad when clicking outside input/numpad
@@ -221,6 +236,14 @@ 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 = () => {

electron/src/setup/GithubSourceDialog.tsx

@@ -24,7 +24,6 @@ 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;
@@ -32,9 +31,9 @@ type Props = {
 };
 
 export const githubSourceSchema = z.object({
-  githubRepoOwner: fallback(z.string(), "qitechgmbh"),
-  githubRepoName: fallback(z.string(), "control"),
-  githubToken: fallback(z.string().optional().nullable(), undefined),
+  githubRepoOwner: z.string().catch("qitechgmbh"),
+  githubRepoName: z.string().catch("control"),
+  githubToken: z.string().optional(),
 });
 
 export type GithubSource = z.infer<typeof githubSourceSchema>;
@@ -91,7 +90,7 @@ export function GithubSourceDialogContent({
   const onSubmit = (values: GithubSource) => {
     onChange({
       ...values,
-      githubToken: values.githubToken === "" ? null : values.githubToken,
+      githubToken: values.githubToken === "" ? undefined : values.githubToken,
     });
     setOpen(false);
   };

electron/vite.renderer.config.ts

@@ -1 +0,0 @@
-

ethercat-hal/src/devices/el3062_0030.rs

@@ -161,18 +161,12 @@ impl crate::coe::Configuration for EL3062_0030TxPdo {
             len += 1;
             device.sdo_write(0x1C13, len, 0x1A00u16).await?;
         }
-        if let Some(_) = &self.ai_compact_channel1 {
-            len += 1;
-            device.sdo_write(0x1C13, len, 0x1A01u16).await?;
-        }
+
         if let Some(_) = &self.ai_standard_channel2 {
             len += 1;
             device.sdo_write(0x1C13, len, 0x1A02u16).await?;
         }
-        if let Some(_) = &self.ai_compact_channel2 {
-            len += 1;
-            device.sdo_write(0x1C13, len, 0x1A03u16).await?;
-        }
+
         device.sdo_write(0x1C13, 0, len).await?;
         Ok(())
     }

ethercat-hal/src/devices/el6021.rs

@@ -328,6 +328,8 @@ 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();

ethercat-hal/src/devices/wago_750_354.rs

@@ -7,7 +7,10 @@ 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},
         },
@@ -227,14 +230,26 @@ impl Wago750_354 {
                     module.has_tx = true;
                     module.has_rx = true;
                 }
+                WAGO_750_455_PRODUCT_ID => {
+                    module.has_tx = true;
+                    module.has_rx = false;
+                }
                 WAGO_750_501_PRODUCT_ID => {
                     module.has_tx = false;
                     module.has_rx = true;
                 }
+                WAGO_750_530_PRODUCT_ID => {
+                    module.has_tx = false;
+                    module.has_rx = true;
+                }
                 WAGO_750_652_PRODUCT_ID => {
                     module.has_tx = true;
                     module.has_rx = true;
                 }
+                WAGO_750_402_PRODUCT_ID => {
+                    module.has_tx = true;
+                    module.has_rx = false;
+                }
                 _ => println!(
                     "Wago-750-354 found Unknown/Unimplemented Module: {}",
                     ident_iom
@@ -259,6 +274,8 @@ impl Wago750_354 {
             let _ = self.get_pdo_offsets(device, false).await;
         });
 
+        println!("{:?}\n\n{:?}", self.tx_offsets, self.rx_offsets);
+
         for module in self.slots {
             match module {
                 Some(m) => {
@@ -267,15 +284,24 @@ 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()))
+                        }
                         _ => {
                             println!(
                                 "{} Missing Implementation for Module Identification: vendor_id: {:?}, module ident: {:?} !",

ethercat-hal/src/devices/wago_modules/ip20_ec_di8_do8.rs

@@ -430,6 +430,9 @@ 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;
                             }

ethercat-hal/src/devices/wago_modules/mod.rs

@@ -1,4 +1,7 @@
 pub mod ip20_ec_di8_do8;
 pub mod wago_750_1506;
+pub mod wago_750_402;
+pub mod wago_750_455;
 pub mod wago_750_501;
+pub mod wago_750_530;
 pub mod wago_750_652;

ethercat-hal/src/devices/wago_modules/wago_750_402.rs

@@ -0,0 +1,194 @@
+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);

ethercat-hal/src/devices/wago_modules/wago_750_455.rs

@@ -0,0 +1,198 @@
+use bitvec::field::BitField;
+
+use crate::devices::{
+    DynamicEthercatDevice, EthercatDevice, EthercatDeviceProcessing, EthercatDeviceUsed,
+    EthercatDynamicPDO, Module, NewEthercatDevice, SubDeviceProductTuple,
+};
+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 {
+    AI1,
+    AI2,
+    AI3,
+    AI4,
+}
+
+impl From<Wago750_455Port> for usize {
+    fn from(value: Wago750_455Port) -> Self {
+        match value {
+            Wago750_455Port::AI1 => 0,
+            Wago750_455Port::AI2 => 16,
+            Wago750_455Port::AI3 => 32,
+            Wago750_455Port::AI4 => 48,
+        }
+    }
+}
+
+#[derive(Clone, Default)]
+pub struct Wago750_455TxPdo {
+    pub ai1: u16,
+    pub ai2: u16,
+    pub ai3: u16,
+    pub ai4: 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,
+        };
+        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;
+        AnalogInputInput {
+            normalized,
+            wiring_error,
+        }
+    }
+
+    fn analog_input_range(&self) -> AnalogInputRange {
+        AnalogInputRange::Current {
+            min: ElectricCurrent::new::<milliampere>(4.0),
+            max: ElectricCurrent::new::<milliampere>(20.0),
+            min_raw: 0,
+            max_raw: 0x7FF0,
+        }
+    }
+}
+
+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);

ethercat-hal/src/devices/wago_modules/wago_750_530.rs

@@ -0,0 +1,260 @@
+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);

ethercat-hal/src/devices/wago_modules/wago_750_652.rs

@@ -1,8 +1,12 @@
+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 {
@@ -10,6 +14,62 @@ 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 {
@@ -23,7 +83,6 @@ 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
@@ -48,24 +107,84 @@ 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 {
-        0
+        24
     }
 
     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 = 32;
+
+        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;
+        }
+        println!("{}", self.rx_pdo.control.output_length);
+        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);
+        }
+        //println!("{:?}",self.rx_pdo.out_buffer);
         Ok(())
     }
 
     fn output_len(&self) -> usize {
-        0
+        24
     }
 
     fn as_any(&self) -> &dyn std::any::Any {
@@ -84,19 +203,6 @@ 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)
     }
 
@@ -105,21 +211,6 @@ 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(())
     }
 
@@ -143,6 +234,10 @@ 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,
         }
     }
 }
@@ -153,6 +248,108 @@ 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 =

flake.nix

@@ -52,6 +52,8 @@
 
         devShells.default = pkgs.mkShell {
           packages = with pkgs; [
+            cargo
+            rustc
             pkg-config
             libudev-zero
             libpcap

machines/src/analog_input_test_machine/act.rs

@@ -1,21 +1,32 @@
 use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
 
-use crate::{MachineAct, analog_input_test_machine::AnalogInputTestMachine};
+use crate::{
+    MachineAct, MachineMessage, MachineValues, analog_input_test_machine::AnalogInputTestMachine,
+};
 
 impl MachineAct for AnalogInputTestMachine {
-    fn act_machine_message(&mut self, msg: crate::MachineMessage) {
+    fn act_machine_message(&mut self, msg: MachineMessage) {
         match msg {
-            crate::MachineMessage::SubscribeNamespace(namespace) => {
+            MachineMessage::SubscribeNamespace(namespace) => {
                 self.namespace.namespace = Some(namespace);
                 self.emit_measurement_rate();
             }
-            crate::MachineMessage::UnsubscribeNamespace => self.namespace.namespace = None,
-            crate::MachineMessage::HttpApiJsonRequest(value) => {
+            MachineMessage::UnsubscribeNamespace => self.namespace.namespace = None,
+            MachineMessage::HttpApiJsonRequest(value) => {
                 use crate::MachineApi;
                 let _res = self.api_mutate(value);
             }
             crate::MachineMessage::ConnectToMachine(_machine_connection) => {}
-            crate::MachineMessage::DisconnectMachine(_machine_connection) => {}
+            MachineMessage::DisconnectMachine(_machine_connection) => {}
+            MachineMessage::RequestValues(sender) => {
+                sender
+                    .send_blocking(MachineValues {
+                        state: serde_json::Value::Null,
+                        live_values: serde_json::Value::Null,
+                    })
+                    .expect("Failed to send values");
+                sender.close();
+            }
         }
     }
 

machines/src/analog_input_test_machine/new.rs

@@ -28,7 +28,7 @@ impl MachineNewTrait for AnalogInputTestMachine {
             MachineNewHardware::Ethercat(x) => x,
             _ => {
                 return Err(anyhow::anyhow!(
-                    "[{}::MachineNewTrait/TestMachine::new] MachineNewHardware is not Ethercat",
+                    "[{}::EtherCATMachine/TestMachine::new] MachineNewHardware is not Ethercat",
                     module_path!()
                 ));
             }
@@ -51,7 +51,7 @@ impl MachineNewTrait for AnalogInputTestMachine {
                 api_sender: sender,
                 machine_identification_unique: params.get_machine_identification_unique(),
                 main_sender: params.main_thread_channel.clone(),
-                namespace: namespace,
+                namespace,
 
                 last_measurement: Instant::now(),
                 measurement_rate_hz: 1.0,

machines/src/aquapath1/act.rs

@@ -1,5 +1,5 @@
 use super::{AquaPathV1, AquaPathV1Mode};
-use crate::{MachineAct, MachineMessage};
+use crate::{MachineAct, MachineMessage, MachineValues};
 use std::time::{Duration, Instant};
 
 impl MachineAct for AquaPathV1 {
@@ -23,8 +23,13 @@ impl MachineAct for AquaPathV1 {
 
         let now = Instant::now();
 
-        self.front_controller.update(now_ts);
-        self.back_controller.update(now_ts);
+        if self.front_controller.update(now_ts) {
+            self.emit_state();
+        }
+
+        if  self.back_controller.update(now_ts) {
+            self.emit_state();
+        }
 
         if now.duration_since(self.last_measurement_emit) > Duration::from_secs_f64(1.0 / 30.0) {
             self.emit_live_values();
@@ -45,14 +50,21 @@ impl MachineAct for AquaPathV1 {
                 let _res = self.api_mutate(value);
             }
             MachineMessage::ConnectToMachine(_machine_connection) =>
-            /*Doesnt connect to any Machine so do nothing*/
-            {
-                ()
-            }
+                /*Doesnt connect to any Machine so do nothing*/
+                {}
             MachineMessage::DisconnectMachine(_machine_connection) =>
-            /*Doesnt connect to any Machine so do nothing*/
-            {
-                ()
+                /*Doesnt connect to any Machine so do nothing*/
+                {}
+            MachineMessage::RequestValues(sender) => {
+                sender
+                    .send_blocking(MachineValues {
+                        state: serde_json::to_value(self.get_state())
+                            .expect("Failed to serialize state"),
+                        live_values: serde_json::to_value(self.get_live_values())
+                            .expect("Failed to serialize live values"),
+                    })
+                    .expect("Failed to send values");
+                sender.close();
             }
         }
     }

machines/src/aquapath1/api.rs

@@ -14,12 +14,16 @@ use tracing::instrument;
 
 #[derive(Serialize, Debug, Clone, Default)]
 pub struct LiveValuesEvent {
-    pub front_flow: f64,
-    pub back_flow: f64,
     pub front_temperature: f64,
     pub back_temperature: f64,
     pub front_temp_reservoir: f64,
     pub back_temp_reservoir: f64,
+    pub front_revolutions: f64,
+    pub back_revolutions: f64,
+    pub front_power: f64,
+    pub back_power: f64,
+    pub front_total_energy: f64,
+    pub back_total_energy: f64,
 }
 
 impl LiveValuesEvent {
@@ -35,6 +39,10 @@ pub struct StateEvent {
     pub mode_state: ModeState,
     pub flow_states: FlowStates,
     pub temperature_states: TempStates,
+    pub fan_states: FanStates,
+    pub tolerance_states: ToleranceStates,
+    pub front_flow: bool,
+    pub back_flow: bool,
 }
 
 impl StateEvent {
@@ -70,6 +78,28 @@ pub struct FlowState {
     pub should_flow: bool,
 }
 
+#[derive(Serialize, Debug, Clone)]
+pub struct FanState {
+    pub revolutions: f64,
+    pub max_revolutions: f64,
+}
+#[derive(Serialize, Debug, Clone)]
+pub struct FanStates {
+    pub front: FanState,
+    pub back: FanState,
+}
+
+#[derive(Serialize, Debug, Clone)]
+pub struct ToleranceState {
+    pub heating: f64,
+    pub cooling: f64,
+}
+#[derive(Serialize, Debug, Clone)]
+pub struct ToleranceStates {
+    pub front: ToleranceState,
+    pub back: ToleranceState,
+}
+
 pub enum AquaPathV1Events {
     LiveValues(Event<LiveValuesEvent>),
     State(Event<StateEvent>),
@@ -85,6 +115,14 @@ enum Mutation {
 
     SetFrontFlow(bool),
     SetBackFlow(bool),
+
+    SetFrontRevolutions(f64),
+    SetBackRevolutions(f64),
+
+    SetFrontHeatingTolerance(f64),
+    SetBackHeatingTolerance(f64),
+    SetFrontCoolingTolerance(f64),
+    SetBackCoolingTolerance(f64),
 }
 
 #[derive(Debug, Clone)]
@@ -145,6 +183,24 @@ impl MachineApi for AquaPathV1 {
             Mutation::SetFrontFlow(should_pump) => {
                 self.set_should_pump(should_pump, super::AquaPathSideType::Front)
             }
+            Mutation::SetBackRevolutions(revolution) => {
+                self.set_max_revolutions(revolution, super::AquaPathSideType::Back)
+            }
+            Mutation::SetFrontRevolutions(revolutions) => {
+                self.set_max_revolutions(revolutions, super::AquaPathSideType::Front)
+            }
+            Mutation::SetBackHeatingTolerance(tolerance) => {
+                self.set_heating_tolerance(tolerance, super::AquaPathSideType::Back)
+            }
+            Mutation::SetFrontHeatingTolerance(tolerance) => {
+                self.set_heating_tolerance(tolerance, super::AquaPathSideType::Front)
+            }
+            Mutation::SetBackCoolingTolerance(tolerance) => {
+                self.set_cooling_tolerance(tolerance, super::AquaPathSideType::Back);
+            }
+            Mutation::SetFrontCoolingTolerance(tolerance) => {
+                self.set_cooling_tolerance(tolerance, super::AquaPathSideType::Front);
+            }
         }
         Ok(())
     }

machines/src/aquapath1/controller.rs

@@ -1,21 +1,22 @@
 use crate::aquapath1::VolumeRate;
 use crate::aquapath1::{Flow, Temperature};
 use control_core::controllers::pid::PidController;
-use ethercat_hal::io::encoder_input::EncoderInput;
+use ethercat_hal::io::analog_input::AnalogInput;
+use ethercat_hal::io::digital_input::DigitalInput;
 use ethercat_hal::io::{
     analog_output::AnalogOutput, digital_output::DigitalOutput, temperature_input::TemperatureInput,
 };
-use std::time::{Duration, Instant};
+use std::time::Instant;
+use units::AngularVelocity;
+use units::angular_velocity::revolution_per_minute;
 use units::f64::ThermodynamicTemperature;
-use units::thermodynamic_temperature::degree_celsius;
+use units::thermodynamic_temperature::{degree_celsius, kelvin};
 use units::volume_rate::liter_per_minute;
 #[derive(Debug)]
 
 pub struct Controller {
     pub pid: PidController,
-    temperature_pid_output: f64,
     window_start: Instant,
-    pwm_period: Duration,
 
     pub temperature: Temperature,
     pub target_temperature: ThermodynamicTemperature,
@@ -27,17 +28,27 @@ pub struct Controller {
     pub cooling_controller: AnalogOutput,
     pub cooling_relais: DigitalOutput,
 
+    pub cooling_tolerance: ThermodynamicTemperature,
+    pub heating_tolerance: ThermodynamicTemperature,
+
+    pub current_revolutions: AngularVelocity,
+    pub max_revolutions: AngularVelocity,
+
     pub heating_relais_1: DigitalOutput,
     pub temperature_sensor_in: TemperatureInput,
     pub temperature_sensor_out: TemperatureInput,
 
+    pub power: f64,
+    pub total_energy: f64,
+
     pub cooling_allowed: bool,
     pub heating_allowed: bool,
 
     pub flow: Flow,
+    pub is_flowing : bool,
     pump_relais: DigitalOutput,
     pub should_pump: bool,
-    pub flow_sensor: EncoderInput,
+    pub flow_sensor: AnalogInput,
     pub pump_allowed: bool,
     pub current_flow: VolumeRate,
     pub max_flow: VolumeRate,
@@ -48,7 +59,6 @@ impl Controller {
         kp: f64,
         ki: f64,
         kd: f64,
-        pwm_duration: Duration,
         temp: Temperature,
         target_tempetature: ThermodynamicTemperature,
         cooling_controller: AnalogOutput,
@@ -56,16 +66,15 @@ impl Controller {
         heating_relais_1: DigitalOutput,
         temp_sensor_in: TemperatureInput,
         temp_sensor_out: TemperatureInput,
+        max_revolutions: AngularVelocity,
 
         flow: Flow,
         pump_relais: DigitalOutput,
-        flow_sensor: EncoderInput,
+        flow_sensor: AnalogInput,
     ) -> Self {
         Self {
             pid: PidController::new(kp, ki, kd),
-            temperature_pid_output: 0.0,
             window_start: Instant::now(),
-            pwm_period: pwm_duration,
             target_temperature: target_tempetature,
             current_temperature: ThermodynamicTemperature::new::<degree_celsius>(25.0),
             temp_reservoir: ThermodynamicTemperature::new::<degree_celsius>(25.0),
@@ -74,13 +83,25 @@ impl Controller {
 
             temperature: temp,
             cooling_controller: cooling_controller,
+
+            cooling_tolerance: ThermodynamicTemperature::new::<degree_celsius>(2.0),
+            heating_tolerance: ThermodynamicTemperature::new::<degree_celsius>(2.0),
+
+            current_revolutions: AngularVelocity::new::<revolution_per_minute>(0.0),
+            max_revolutions: max_revolutions,
+
             cooling_relais: cooling_relais,
             heating_relais_1: heating_relais_1,
+
             cooling_allowed: false,
             heating_allowed: false,
+            is_flowing : false,
             temperature_sensor_in: temp_sensor_in,
             temperature_sensor_out: temp_sensor_out,
 
+            power: 700.0,
+            total_energy: 0.0,
+
             flow: flow,
             pump_relais: pump_relais,
             flow_sensor: flow_sensor,
@@ -174,12 +195,12 @@ impl Controller {
 
     pub fn turn_cooling_on(&mut self) {
         self.cooling_relais.set(true);
-        self.cooling_controller.set(10.0);
         self.temperature.cooling = true;
     }
 
     pub fn turn_cooling_off(&mut self) {
         self.cooling_relais.set(false);
+        self.current_revolutions = AngularVelocity::new::<revolution_per_minute>(0.0);
         self.temperature.cooling = false;
     }
 
@@ -191,6 +212,7 @@ impl Controller {
     pub fn turn_heating_off(&mut self) {
         self.heating_relais_1.set(false);
         self.temperature.heating = false;
+        self.power = 0.0;
     }
 
     pub fn set_should_pump(&mut self, should_pump: bool) {
@@ -201,33 +223,50 @@ impl Controller {
         self.should_pump
     }
 
-    pub fn get_flow(&mut self) -> VolumeRate {
-        let value = match self.flow_sensor.get_frequency_value() {
+    pub fn get_flow(&mut self) -> bool {
+    /*    let value = match self.flow_sensor.get_value() {
             Ok(val) => val,
             Err(_e) => {
-                return VolumeRate::new::<liter_per_minute>(0.0);
+                false
             }
-        };
+        };*/
 
-        match value {
-            Some(val) => {
-                if val == 0 {
-                    return VolumeRate::new::<liter_per_minute>(0.0);
-                }
-                // Formula: f = 8.1*q - 3, so q = (f + 3) / 8.1
-                let actual_flow = ((val / 100) as f32 + 3.0) / 8.1;
-                VolumeRate::new::<liter_per_minute>(actual_flow.into())
-            }
-            None => {
-                return VolumeRate::new::<liter_per_minute>(0.0);
-            }
-        }
+        false
     }
 
-    pub fn update(&mut self, now: Instant) -> () {
+    pub fn get_current_revolutions(&self) -> AngularVelocity {
+        self.current_revolutions
+    }
+
+    pub fn get_max_revolutions(&self) -> AngularVelocity {
+        self.max_revolutions
+    }
+
+    pub fn set_max_revolutions(&mut self, revolutions: AngularVelocity) {
+        self.max_revolutions = revolutions;
+    }
+
+    pub fn set_cooling_tolerance(&mut self, tolerance: ThermodynamicTemperature) {
+        self.cooling_tolerance = tolerance;
+    }
+
+    pub fn set_heating_tolerance(&mut self, tolerance: ThermodynamicTemperature) {
+        self.heating_tolerance = tolerance;
+    }
+
+    // no power/energy unit implemented
+    pub fn get_current_power(&self) -> f64 {
+        self.power
+    }
+
+    pub fn get_total_energy(&self) -> f64 {
+        self.total_energy
+    }
+
+    pub fn update(&mut self, now: Instant) -> bool {
         let current_flow = self.get_flow();
-        self.current_flow = current_flow;
-        self.flow.flow = current_flow;
+        let flow_changed = current_flow == self.is_flowing;
+        self.is_flowing = current_flow;
 
         let should_flow = self.get_should_pump();
         self.flow.should_pump = should_flow;
@@ -250,44 +289,52 @@ impl Controller {
         // Calculate PID error once
         let error = self.target_temperature.get::<degree_celsius>()
             - self.current_temperature.get::<degree_celsius>();
-        let control = self.pid.update(error, now);
-        self.temperature_pid_output = control;
 
-        let elapsed = now.duration_since(self.window_start);
-        if elapsed >= self.pwm_period {
-            self.window_start = now;
-        }
+        let elapsed = now - self.window_start;
+        self.window_start = now;
 
         // Decide whether to heat or cool based on error
-        if error > 0.0 {
+        if error > self.heating_tolerance.get::<degree_celsius>() {
             // Need heating (current < target)
             if self.temperature.cooling {
                 self.turn_cooling_off();
             }
-            if self.heating_allowed && current_flow > VolumeRate::new::<liter_per_minute>(0.0) {
-                // Only start heating if pump is on
-                let duty = control.clamp(0.0, 1.0);
-                let on_time = self.pwm_period.mul_f64(duty);
-                let on = elapsed < on_time;
-                if on && !self.temperature.heating {
-                    self.turn_heating_on();
-                } else if !on && self.temperature.heating {
-                    self.turn_heating_off();
-                }
+            if self.heating_allowed && self.is_flowing {
+                self.turn_heating_on();
+
+                self.total_energy += self.get_current_power() * elapsed.as_secs_f64() / 3600.0;
             } else {
                 // Pump is off or heating not allowed - don't heat
                 if self.temperature.heating {
                     self.turn_heating_off();
                 }
             }
-        } else {
+        } else if error < -self.cooling_tolerance.get::<degree_celsius>() {
             // Need cooling (current > target)
             if self.temperature.heating {
                 self.turn_heating_off();
             }
-            if self.cooling_allowed && !self.temperature.cooling {
-                self.turn_cooling_on();
+            if self.cooling_allowed && self.is_flowing {
+                if !self.temperature.cooling {
+                    self.turn_cooling_on();
+                }
+
+                let max_revolutions = self.get_max_revolutions();
+                let temp_offset = self.current_temperature - self.target_temperature;
+
+                let target_revolutions = (temp_offset.get::<kelvin>() * 10.0)
+                    .clamp(0.0, max_revolutions.get::<revolution_per_minute>());
+
+                self.cooling_controller
+                    .set(target_revolutions as f32 / 10.0);
+                self.current_revolutions =
+                    AngularVelocity::new::<revolution_per_minute>(target_revolutions);
+            } else {
+                if self.temperature.cooling {
+                    self.turn_cooling_off();
+                }
             }
         }
+        flow_changed
     }
 }

machines/src/aquapath1/mod.rs

@@ -1,6 +1,8 @@
+use api::{ToleranceState, ToleranceStates};
 use control_core::socketio::namespace::NamespaceCacheingLogic;
 use serde::{Deserialize, Serialize};
 use std::time::Instant;
+use units::angular_velocity::revolution_per_minute;
 use units::f64::*;
 use units::{thermodynamic_temperature::degree_celsius, volume_rate::liter_per_minute};
 
@@ -9,8 +11,8 @@ use crate::{
     MACHINE_AQUAPATH_V1, VENDOR_QITECH,
     aquapath1::{
         api::{
-            AquaPathV1Events, AquaPathV1Namespace, FlowState, FlowStates, LiveValuesEvent,
-            ModeState, StateEvent, TempState, TempStates,
+            AquaPathV1Events, AquaPathV1Namespace, FanState, FanStates, FlowState, FlowStates,
+            LiveValuesEvent, ModeState, StateEvent, TempState, TempStates,
         },
         controller::Controller,
     },
@@ -109,8 +111,8 @@ impl std::fmt::Display for AquaPathV1 {
 }
 
 impl AquaPathV1 {
-    pub fn emit_live_values(&mut self) {
-        let live_values = LiveValuesEvent {
+    pub fn get_live_values(&self) -> LiveValuesEvent {
+        LiveValuesEvent {
             front_temperature: self
                 .front_controller
                 .current_temperature
@@ -119,17 +121,30 @@ impl AquaPathV1 {
                 .back_controller
                 .current_temperature
                 .get::<degree_celsius>(),
-            front_flow: self.front_controller.current_flow.get::<liter_per_minute>(),
-            back_flow: self.back_controller.current_flow.get::<liter_per_minute>(),
             front_temp_reservoir: self.front_controller.temp_reservoir.get::<degree_celsius>(),
             back_temp_reservoir: self.back_controller.temp_reservoir.get::<degree_celsius>(),
-        };
-        let event = live_values.build();
+            front_revolutions: self
+                .front_controller
+                .current_revolutions
+                .get::<revolution_per_minute>(),
+            back_revolutions: self
+                .back_controller
+                .current_revolutions
+                .get::<revolution_per_minute>(),
+            front_power: self.front_controller.get_current_power(),
+            back_power: self.back_controller.get_current_power(),
+            front_total_energy: self.front_controller.get_total_energy(),
+            back_total_energy: self.back_controller.get_total_energy(),
+        }
+    }
+
+    pub fn emit_live_values(&mut self) {
+        let event = self.get_live_values().build();
         self.namespace.emit(AquaPathV1Events::LiveValues(event));
     }
 
-    pub fn emit_state(&mut self) {
-        let state = StateEvent {
+    pub fn get_state(&self) -> StateEvent {
+        StateEvent {
             is_default_state: false,
             mode_state: ModeState {
                 mode: self.mode.clone(),
@@ -167,9 +182,57 @@ impl AquaPathV1 {
                     should_flow: self.back_controller.should_pump,
                 },
             },
-        };
+            fan_states: FanStates {
+                front: FanState {
+                    revolutions: self
+                        .front_controller
+                        .max_revolutions
+                        .get::<revolution_per_minute>(),
+                    max_revolutions: self
+                        .front_controller
+                        .max_revolutions
+                        .get::<revolution_per_minute>(),
+                },
+                back: FanState {
+                    revolutions: self
+                        .back_controller
+                        .max_revolutions
+                        .get::<revolution_per_minute>(),
+                    max_revolutions: self
+                        .back_controller
+                        .max_revolutions
+                        .get::<revolution_per_minute>(),
+                },
+            },
+            tolerance_states: ToleranceStates {
+                front: ToleranceState {
+                    heating: self
+                        .front_controller
+                        .heating_tolerance
+                        .get::<degree_celsius>(),
+                    cooling: self
+                        .front_controller
+                        .cooling_tolerance
+                        .get::<degree_celsius>(),
+                },
+                back: ToleranceState {
+                    heating: self
+                        .back_controller
+                        .heating_tolerance
+                        .get::<degree_celsius>(),
+                    cooling: self
+                        .back_controller
+                        .cooling_tolerance
+                        .get::<degree_celsius>(),
+                },
+            },
+            front_flow: self.front_controller.is_flowing,
+            back_flow: self.back_controller.is_flowing,
+        }
+    }
 
-        let event = state.build();
+    pub fn emit_state(&mut self) {
+        let event = self.get_state().build();
         self.namespace.emit(AquaPathV1Events::State(event));
     }
 }
@@ -269,3 +332,45 @@ impl AquaPathV1 {
         self.emit_state();
     }
 }
+
+impl AquaPathV1 {
+    fn set_max_revolutions(&mut self, revolutions: f64, fan_type: AquaPathSideType) {
+        match fan_type {
+            AquaPathSideType::Back => self
+                .back_controller
+                .set_max_revolutions(AngularVelocity::new::<revolution_per_minute>(revolutions)),
+            AquaPathSideType::Front => self
+                .front_controller
+                .set_max_revolutions(AngularVelocity::new::<revolution_per_minute>(revolutions)),
+        }
+        self.emit_state();
+    }
+}
+
+impl AquaPathV1 {
+    fn set_heating_tolerance(&mut self, tolerance: f64, tolerance_type: AquaPathSideType) {
+        match tolerance_type {
+            AquaPathSideType::Back => self
+                .back_controller
+                .set_heating_tolerance(ThermodynamicTemperature::new::<degree_celsius>(tolerance)),
+            AquaPathSideType::Front => self
+                .front_controller
+                .set_heating_tolerance(ThermodynamicTemperature::new::<degree_celsius>(tolerance)),
+        }
+
+        self.emit_state();
+    }
+
+    fn set_cooling_tolerance(&mut self, tolerance: f64, tolerance_type: AquaPathSideType) {
+        match tolerance_type {
+            AquaPathSideType::Back => self
+                .back_controller
+                .set_cooling_tolerance(ThermodynamicTemperature::new::<degree_celsius>(tolerance)),
+            AquaPathSideType::Front => self
+                .front_controller
+                .set_cooling_tolerance(ThermodynamicTemperature::new::<degree_celsius>(tolerance)),
+        }
+
+        self.emit_state();
+    }
+}

machines/src/aquapath1/new.rs

@@ -11,22 +11,21 @@ use anyhow::Error;
 use ethercat_hal::{
     coe::ConfigurableDevice,
     devices::{
-        ek1100::{EK1100, EK1100_IDENTITY_A},
-        el2008::{EL2008, EL2008_IDENTITY_A, EL2008_IDENTITY_B, EL2008Port},
-        el3204::{EL3204, EL3204_IDENTITY_A, EL3204_IDENTITY_B, EL3204Port},
-        el4002::{EL4002, EL4002_IDENTITY_A, EL4002Port},
-        el5152::{
+        ek1100::{EK1100, EK1100_IDENTITY_A}, el1002::{EL1002, EL1002_IDENTITY_A}, el2008::{EL2008, EL2008_IDENTITY_A, EL2008_IDENTITY_B, EL2008Port}, el3062_0030::{EL3062_0030, EL3062_0030_IDENTITY_A, EL3062_0030Configuration}, el3204::{EL3204, EL3204_IDENTITY_A, EL3204_IDENTITY_B, EL3204Port}, el4002::{EL4002, EL4002_IDENTITY_A, EL4002Port}, el5152::{
             EL5152, EL5152_IDENTITY_A, EL5152Configuration, EL5152Port,
             EL5152PredefinedPdoAssignment,
-        },
+        }
     },
     io::{
-        analog_output::AnalogOutput, digital_output::DigitalOutput, encoder_input::EncoderInput,
-        temperature_input::TemperatureInput,
+        analog_input::AnalogInput, analog_output::AnalogOutput, digital_input::DigitalInput, digital_output::DigitalOutput, encoder_input::EncoderInput, temperature_input::TemperatureInput
     },
 };
-use std::time::{Duration, Instant};
-use units::thermodynamic_temperature::{ThermodynamicTemperature, degree_celsius};
+use std::time::Instant;
+use units::{
+    AngularVelocity,
+    angular_velocity::revolution_per_minute,
+    thermodynamic_temperature::{ThermodynamicTemperature, degree_celsius},
+};
 
 impl MachineNewTrait for AquaPathV1 {
     fn new<'maindevice>(params: &MachineNewParams) -> Result<Self, Error> {
@@ -79,49 +78,32 @@ impl MachineNewTrait for AquaPathV1 {
             .await?
             .0;
 
-            let el5152 =
-                get_ethercat_device::<EL5152>(hardware, params, 4, [EL5152_IDENTITY_A].to_vec())
+            let el3062_0030 =
+                get_ethercat_device::<EL3062_0030>(hardware, params, 4, [EL3062_0030_IDENTITY_A].to_vec())
                     .await?
                     .0;
 
-            let config = EL5152Configuration {
-                pdo_assignment: EL5152PredefinedPdoAssignment::Frequency,
-                ..Default::default()
-            };
-            let subdevice = get_subdevice_by_index(hardware.subdevices, 4)?;
-            el5152
-                .write()
-                .await
-                .write_config(&subdevice, &config)
-                .await?;
+            let el3062_0030_subdevice = get_subdevice_by_index(hardware.subdevices, 4)?;
+            let mut guard = el3062_0030.write().await;
+            let config = EL3062_0030Configuration::default();
+            guard.write_config(el3062_0030_subdevice,&config).await;
+            drop(guard);
 
-            let enc1 = EncoderInput::new(el5152.clone(), EL5152Port::ENC1);
+            let ai1 = AnalogInput::new(el3062_0030.clone(),ethercat_hal::devices::el3062_0030::EL3062_0030Port::AI1);            
+            let ai2 = AnalogInput::new(el3062_0030.clone(), ethercat_hal::devices::el3062_0030::EL3062_0030Port::AI2);            
 
-            let enc2 = EncoderInput::new(el5152.clone(), EL5152Port::ENC2);
             //after heating
-            let t1 = TemperatureInput::new(el3204.clone(), EL3204Port::T1);
-            //in reservoir
-            let t2 = TemperatureInput::new(el3204.clone(), EL3204Port::T2);
-            //after heating
-            let t3 = TemperatureInput::new(el3204.clone(), EL3204Port::T3);
-            //in reservoir
+            let t1 = TemperatureInput::new(el3204.clone(), EL3204Port::T1);            
+            let t2 = TemperatureInput::new(el3204.clone(), EL3204Port::T2);            
+            let t3 = TemperatureInput::new(el3204.clone(), EL3204Port::T3);            
             let t4 = TemperatureInput::new(el3204.clone(), EL3204Port::T4);
-            //pump flow control
-            //phys 1
-            let do1 = DigitalOutput::new(el2008.clone(), EL2008Port::DO1);
-            //phys 5
-            let do2 = DigitalOutput::new(el2008.clone(), EL2008Port::DO2);
-            //heating
-
-            //phys 6
-            let do4 = DigitalOutput::new(el2008.clone(), EL2008Port::DO4);
-            //phys 3
-            let do5 = DigitalOutput::new(el2008.clone(), EL2008Port::DO5);
-            //phys 7
-            let do6 = DigitalOutput::new(el2008.clone(), EL2008Port::DO6);
-            //cooling power cut
-
-            //phys 8
+            
+            //pump flow control            
+            let do1 = DigitalOutput::new(el2008.clone(), EL2008Port::DO1);            
+            let do2 = DigitalOutput::new(el2008.clone(), EL2008Port::DO2);                        
+            let do4 = DigitalOutput::new(el2008.clone(), EL2008Port::DO4);            
+            let do5 = DigitalOutput::new(el2008.clone(), EL2008Port::DO5);            
+            let do6 = DigitalOutput::new(el2008.clone(), EL2008Port::DO6);            
             let do8 = DigitalOutput::new(el2008.clone(), EL2008Port::DO8);
 
             let ao1 = AnalogOutput::new(el4002.clone(), EL4002Port::AO1);
@@ -131,7 +113,6 @@ impl MachineNewTrait for AquaPathV1 {
                 0.10,
                 0.0,
                 0.015,
-                Duration::from_millis(500),
                 Temperature::default(),
                 ThermodynamicTemperature::new::<degree_celsius>(25.0),
                 ao1,
@@ -139,16 +120,16 @@ impl MachineNewTrait for AquaPathV1 {
                 do2,
                 t1,
                 t2,
+                AngularVelocity::new::<revolution_per_minute>(100.0),
                 Flow::default(),
                 do1,
-                enc1,
+                ai1,
             );
 
             let back_controller = Controller::new(
                 0.10,
                 0.0,
                 0.015,
-                Duration::from_millis(500),
                 Temperature::default(),
                 ThermodynamicTemperature::new::<degree_celsius>(25.0),
                 ao2,
@@ -156,9 +137,10 @@ impl MachineNewTrait for AquaPathV1 {
                 do6,
                 t3,
                 t4,
+                AngularVelocity::new::<revolution_per_minute>(100.0),
                 Flow::default(),
                 do5,
-                enc2,
+                ai2,
             );
             let (sender, receiver) = smol::channel::unbounded();
             let mut water_cooling = Self {

machines/src/buffer1/act.rs

@@ -1,5 +1,5 @@
 use super::BufferV1;
-use crate::{MachineAct, MachineMessage};
+use crate::{MachineAct, MachineMessage, MachineValues};
 use std::time::{Duration, Instant};
 
 impl MachineAct for BufferV1 {
@@ -33,14 +33,21 @@ impl MachineAct for BufferV1 {
                 let _res = self.api_mutate(value);
             }
             MachineMessage::ConnectToMachine(_machine_connection) =>
-            /*Doesnt connect to any Machine so do nothing*/
-            {
-                ()
-            }
+                /*Doesnt connect to any Machine so do nothing*/
+                {}
             MachineMessage::DisconnectMachine(_machine_connection) =>
-            /*Doesnt connect to any Machine so do nothing*/
-            {
-                ()
+                /*Doesnt connect to any Machine so do nothing*/
+                {}
+            MachineMessage::RequestValues(sender) => {
+                sender
+                    .send_blocking(MachineValues {
+                        state: serde_json::to_value(self.get_state())
+                            .expect("Failed to serialize state"),
+                        live_values: serde_json::to_value(self.get_live_values())
+                            .expect("Failed to serialize live values"),
+                    })
+                    .expect("Failed to send values");
+                sender.close();
             }
         }
     }

machines/src/buffer1/mod.rs

@@ -48,21 +48,27 @@ impl BufferV1 {
         vendor: VENDOR_QITECH,
         machine: MACHINE_BUFFER_V1,
     };
-    pub fn emit_live_values(&mut self) {
-        let live_values = LiveValuesEvent {};
 
-        let event = live_values.build();
+    pub fn get_live_values(&mut self) -> LiveValuesEvent {
+        LiveValuesEvent {}
+    }
+
+    pub fn emit_live_values(&mut self) {
+        let event = self.get_live_values().build();
         self.namespace.emit(BufferV1Events::LiveValues(event));
     }
-    pub fn emit_state(&mut self) {
-        let state = StateEvent {
+
+    pub fn get_state(&self) -> StateEvent {
+        StateEvent {
             mode_state: ModeState {
                 mode: self.mode.clone(),
             },
             // connected_machine_state: self.connected_winder.to_state(),
-        };
+        }
+    }
 
-        let event = state.build();
+    pub fn emit_state(&mut self) {
+        let event = self.get_state().build();
         self.namespace.emit(BufferV1Events::State(event));
     }
 

machines/src/digital_input_test_machine/act.rs

@@ -0,0 +1,46 @@
+use super::DigitalInputTestMachine;
+use crate::{MachineAct, MachineMessage, MachineValues};
+use std::time::{Duration, Instant};
+
+impl MachineAct for DigitalInputTestMachine {
+    fn act(&mut self, now: Instant) {
+        if let Ok(msg) = self.api_receiver.try_recv() {
+            self.act_machine_message(msg);
+        }
+
+        if now.duration_since(self.last_state_emit) > Duration::from_secs_f64(1.0 / 30.0) {
+            self.emit_state();
+            self.last_state_emit = now;
+        }
+    }
+
+    fn act_machine_message(&mut self, msg: MachineMessage) {
+        match msg {
+            MachineMessage::SubscribeNamespace(namespace) => {
+                self.namespace.namespace = Some(namespace);
+                self.emit_state();
+            }
+            MachineMessage::UnsubscribeNamespace => self.namespace.namespace = None,
+            MachineMessage::HttpApiJsonRequest(value) => {
+                use crate::MachineApi;
+                let _res = self.api_mutate(value);
+            }
+            MachineMessage::ConnectToMachine(_machine_connection) => {
+                // Does not connect to any Machine; do nothing
+            }
+            MachineMessage::DisconnectMachine(_machine_connection) => {
+                // Does not connect to any Machine; do nothing
+            }
+            MachineMessage::RequestValues(sender) => {
+                sender
+                    .send_blocking(MachineValues {
+                        state: serde_json::to_value(self.get_state())
+                            .expect("Failed to serialize state"),
+                        live_values: serde_json::Value::Null,
+                    })
+                    .expect("Failed to send values");
+                sender.close();
+            }
+        }
+    }
+}

machines/src/digital_input_test_machine/api.rs

@@ -0,0 +1,77 @@
+use std::sync::Arc;
+
+use control_core::socketio::{
+    event::{Event, GenericEvent},
+    namespace::{
+        CacheFn, CacheableEvents, Namespace, NamespaceCacheingLogic, cache_first_and_last_event,
+    },
+};
+use serde::{Deserialize, Serialize};
+
+use crate::{MachineApi, digital_input_test_machine::DigitalInputTestMachine};
+
+#[derive(Serialize, Debug, Clone)]
+pub struct StateEvent {
+    pub led_on: [bool; 4],
+}
+
+impl StateEvent {
+    pub fn build(&self) -> Event<Self> {
+        Event::new("StateEvent", self.clone())
+    }
+}
+pub enum DigitalInputTestMachineEvents {
+    State(Event<StateEvent>),
+}
+
+#[derive(Deserialize)]
+#[serde(tag = "action", content = "value")]
+pub enum Mutation {
+    SetLed { index: usize, on: bool },
+}
+#[derive(Debug, Clone)]
+pub struct DigitalInputTestMachineNamespace {
+    pub namespace: Option<Namespace>,
+}
+
+impl NamespaceCacheingLogic<DigitalInputTestMachineEvents> for DigitalInputTestMachineNamespace {
+    fn emit(&mut self, events: DigitalInputTestMachineEvents) {
+        let event = Arc::new(events.event_value());
+        let buffer_fn = events.event_cache_fn();
+        if let Some(ns) = &mut self.namespace {
+            ns.emit(event, &buffer_fn);
+        }
+    }
+}
+
+impl CacheableEvents<DigitalInputTestMachineEvents> for DigitalInputTestMachineEvents {
+    fn event_value(&self) -> GenericEvent {
+        match self {
+            DigitalInputTestMachineEvents::State(event) => event.clone().into(),
+        }
+    }
+
+    fn event_cache_fn(&self) -> CacheFn {
+        cache_first_and_last_event()
+    }
+}
+
+impl MachineApi for DigitalInputTestMachine {
+    fn api_get_sender(&self) -> smol::channel::Sender<crate::MachineMessage> {
+        self.api_sender.clone()
+    }
+
+    fn api_mutate(&mut self, _value: serde_json::Value) -> Result<(), anyhow::Error> {
+        //Digital Input Test Machine does not Set Values
+        // let mutation: Mutation = serde_json::from_value(value)?;
+        // match mutation {
+        //     Mutation::SetLed { index, on } => self.set_led(index, on),
+        // }
+
+        Ok(())
+    }
+
+    fn api_event_namespace(&mut self) -> Option<Namespace> {
+        self.namespace.namespace.clone()
+    }
+}

machines/src/digital_input_test_machine/mod.rs

@@ -0,0 +1,73 @@
+use std::time::Instant;
+
+use control_core::socketio::namespace::NamespaceCacheingLogic;
+use ethercat_hal::io::digital_input::DigitalInput;
+use smol::channel::{Receiver, Sender};
+
+use crate::{
+    AsyncThreadMessage, DIGITAL_INPUT_TEST_MACHINE, Machine, MachineMessage, VENDOR_QITECH,
+    digital_input_test_machine::api::{
+        DigitalInputTestMachineEvents, DigitalInputTestMachineNamespace, StateEvent,
+    },
+    machine_identification::{MachineIdentification, MachineIdentificationUnique},
+};
+
+pub mod act;
+pub mod api;
+pub mod new;
+
+#[derive(Debug)]
+pub struct DigitalInputTestMachine {
+    pub api_receiver: Receiver<MachineMessage>,
+    pub api_sender: Sender<MachineMessage>,
+    pub machine_identification_unique: MachineIdentificationUnique,
+    pub main_sender: Option<Sender<AsyncThreadMessage>>,
+    pub namespace: DigitalInputTestMachineNamespace,
+    pub last_state_emit: Instant,
+    pub led_on: [bool; 4],
+    pub digital_input: [DigitalInput; 4],
+}
+
+impl Machine for DigitalInputTestMachine {
+    fn get_machine_identification_unique(&self) -> MachineIdentificationUnique {
+        self.machine_identification_unique.clone()
+    }
+
+    fn get_main_sender(&self) -> Option<Sender<AsyncThreadMessage>> {
+        self.main_sender.clone()
+    }
+}
+
+impl DigitalInputTestMachine {
+    pub const MACHINE_IDENTIFICATION: MachineIdentification = MachineIdentification {
+        vendor: VENDOR_QITECH,
+        machine: DIGITAL_INPUT_TEST_MACHINE,
+    };
+
+    pub fn get_state(&self) -> StateEvent {
+        StateEvent {
+            led_on: self.led_on,
+        }
+    }
+
+    pub fn emit_state(&mut self) {
+        //Set Led_On after DigitalInput
+        let mut i = 0;
+
+        for di in &self.digital_input {
+            let value = match di.get_value() {
+                Ok(v) => v,
+                Err(_) => false,
+            };
+            self.led_on[i] = value;
+            i += 1;
+        }
+
+        let event = StateEvent {
+            led_on: self.led_on,
+        }
+        .build();
+        self.namespace
+            .emit(DigitalInputTestMachineEvents::State(event));
+    }
+}

machines/src/digital_input_test_machine/new.rs

@@ -0,0 +1,87 @@
+use std::{sync::Arc, time::Instant};
+
+use anyhow::Error;
+use ethercat_hal::{
+    devices::{
+        EthercatDevice, downcast_device,
+        wago_750_354::{WAGO_750_354_IDENTITY_A, Wago750_354},
+        wago_modules::wago_750_402::{Wago750_402, Wago750_402InputPort},
+    },
+    io::digital_input::DigitalInput,
+};
+use smol::{block_on, lock::RwLock};
+
+use crate::{
+    MachineNewHardware, MachineNewParams, MachineNewTrait,
+    digital_input_test_machine::{DigitalInputTestMachine, api::DigitalInputTestMachineNamespace},
+    get_ethercat_device, validate_no_role_dublicates, validate_same_machine_identification_unique,
+};
+
+impl MachineNewTrait for DigitalInputTestMachine {
+    fn new<'maindevice>(params: &MachineNewParams) -> Result<Self, Error> {
+        // validate general stuff
+        let device_identification = params
+            .device_group
+            .iter()
+            .map(|device_identification| device_identification.clone())
+            .collect::<Vec<_>>();
+        validate_same_machine_identification_unique(&device_identification)?;
+        validate_no_role_dublicates(&device_identification)?;
+
+        let hardware = match &params.hardware {
+            MachineNewHardware::Ethercat(x) => x,
+            _ => {
+                return Err(anyhow::anyhow!(
+                    "[{}::EtherCATMachine/TestMachine::new] MachineNewHardware is not Ethercat",
+                    module_path!()
+                ));
+            }
+        };
+
+        block_on(async {
+            // Example usage of a Wago Coupler and a 750-402 in the first slot, where the Output Port 1,2,3,4 is used
+            let _wago_750_354 = get_ethercat_device::<Wago750_354>(
+                hardware,
+                params,
+                0,
+                [WAGO_750_354_IDENTITY_A].to_vec(),
+            )
+            .await?;
+
+            let modules = Wago750_354::initialize_modules(_wago_750_354.1).await?;
+
+            let mut coupler = _wago_750_354.0.write().await;
+
+            for module in modules {
+                coupler.set_module(module);
+            }
+
+            coupler.init_slot_modules(_wago_750_354.1);
+            let dev = coupler.slot_devices.get(0).unwrap().clone().unwrap();
+            let wago750_402: Arc<RwLock<Wago750_402>> = downcast_device::<Wago750_402>(dev).await?;
+
+            let di1 = DigitalInput::new(wago750_402.clone(), Wago750_402InputPort::DI1);
+            let di2 = DigitalInput::new(wago750_402.clone(), Wago750_402InputPort::DI2);
+            let di3 = DigitalInput::new(wago750_402.clone(), Wago750_402InputPort::DI3);
+            let di4 = DigitalInput::new(wago750_402.clone(), Wago750_402InputPort::DI4);
+
+            drop(coupler);
+
+            let (sender, receiver) = smol::channel::unbounded();
+            let mut my_test = Self {
+                api_receiver: receiver,
+                api_sender: sender,
+                machine_identification_unique: params.get_machine_identification_unique(),
+                namespace: DigitalInputTestMachineNamespace {
+                    namespace: params.namespace.clone(),
+                },
+                last_state_emit: Instant::now(),
+                led_on: [false; 4],
+                main_sender: params.main_thread_channel.clone(),
+                digital_input: [di1, di2, di3, di4],
+            };
+            my_test.emit_state();
+            Ok(my_test)
+        })
+    }
+}

machines/src/extruder1/act.rs

@@ -1,7 +1,7 @@
 #[cfg(not(feature = "mock-machine"))]
 use crate::extruder1::ExtruderV2;
 #[cfg(not(feature = "mock-machine"))]
-use crate::{MachineAct, MachineMessage};
+use crate::{MachineAct, MachineMessage, MachineValues};
 #[cfg(not(feature = "mock-machine"))]
 use std::time::{Duration, Instant};
 
@@ -41,6 +41,7 @@ impl MachineAct for ExtruderV2 {
 
         // more than 33ms have passed since last emit (30 "fps" target)
         if now.duration_since(self.last_measurement_emit) > Duration::from_secs_f64(1.0 / 30.0) {
+            self.update_total_energy(now);
             self.maybe_emit_state_event();
             // Emit live values at 30 FPS
             self.emit_live_values();
@@ -61,11 +62,20 @@ impl MachineAct for ExtruderV2 {
 
                 let _res = self.api_mutate(value);
             }
-            MachineMessage::ConnectToMachine(_machine_connection) => (),
+            MachineMessage::ConnectToMachine(_machine_connection) => {}
             MachineMessage::DisconnectMachine(_machine_connection) =>
-            /*Doesnt connect to any Machine so do nothing*/
-            {
-                ()
+                /*Doesnt connect to any Machine so do nothing*/
+                {}
+            MachineMessage::RequestValues(sender) => {
+                sender
+                    .send_blocking(MachineValues {
+                        state: serde_json::to_value(self.get_state())
+                            .expect("Failed to serialize state"),
+                        live_values: serde_json::to_value(self.get_live_values())
+                            .expect("Failed to serialize live values"),
+                    })
+                    .expect("Failed to send values");
+                sender.close();
             }
         }
     }

machines/src/extruder1/emit.rs

@@ -25,11 +25,11 @@ use units::{angular_velocity::revolution_per_minute, thermodynamic_temperature::
 
 #[cfg(not(feature = "mock-machine"))]
 impl ExtruderV2 {
-    pub fn build_state_event(&mut self) -> StateEvent {
-        use crate::extruder1::api::{TemperaturePid, TemperaturePidStates};
+    pub fn get_state(&self) -> StateEvent {
+        use crate::extruder1::api::TemperaturePidStates;
 
         StateEvent {
-            is_default_state: !std::mem::replace(&mut self.emitted_default_state, true),
+            is_default_state: !self.emitted_default_state,
             rotation_state: RotationState {
                 forward: self.screw_speed_controller.get_rotation_direction(),
             },
@@ -141,16 +141,14 @@ impl ExtruderV2 {
             },
         }
     }
-}
 
-#[cfg(not(feature = "mock-machine"))]
-impl ExtruderV2 {
     pub fn emit_state(&mut self) {
-        let state = self.build_state_event();
+        let state = self.get_state();
         let hash = hash_with_serde_model(self.screw_speed_controller.get_inverter_status());
         self.last_status_hash = Some(hash);
         let event = state.build();
         self.namespace.emit(ExtruderV2Events::State(event));
+        self.emitted_default_state = true;
     }
 
     pub fn maybe_emit_state_event(&mut self) {
@@ -168,13 +166,8 @@ impl ExtruderV2 {
         }
     }
 
-    pub fn emit_live_values(&mut self) {
-        use std::time::Instant;
-        let now = Instant::now();
-        let combined_power = self.calculate_combined_power();
-        self.update_total_energy(combined_power, now);
-
-        let live_values = LiveValuesEvent {
+    pub fn get_live_values(&self) -> LiveValuesEvent {
+        LiveValuesEvent {
             motor_status: self.screw_speed_controller.get_motor_status().into(),
             pressure: self.screw_speed_controller.get_pressure().get::<bar>(),
             nozzle_temperature: self
@@ -209,11 +202,13 @@ impl ExtruderV2 {
             middle_power: self
                 .temperature_controller_middle
                 .get_heating_element_wattage(),
-            combined_power,
+            combined_power: self.calculate_combined_power(),
             total_energy_kwh: self.total_energy_kwh,
-        };
+        }
+    }
 
-        let event = live_values.build();
+    pub fn emit_live_values(&mut self) {
+        let event = self.get_live_values().build();
         self.namespace.emit(ExtruderV2Events::LiveValues(event));
     }
 

machines/src/extruder1/mock/act.rs

@@ -1,6 +1,6 @@
 use super::ExtruderV2;
 use crate::MachineAct;
-use crate::MachineMessage;
+use crate::{MachineMessage, MachineValues};
 use std::time::{Duration, Instant};
 
 impl MachineAct for ExtruderV2 {
@@ -40,6 +40,17 @@ impl MachineAct for ExtruderV2 {
             {
                 ()
             }
+            MachineMessage::RequestValues(sender) => {
+                sender
+                    .send_blocking(MachineValues {
+                        state: serde_json::to_value(self.build_state_event())
+                            .expect("Failed to serialize state"),
+                        live_values: serde_json::to_value(self.get_live_values())
+                            .expect("Failed to serialize live values"),
+                    })
+                    .expect("Failed to send values");
+                sender.close();
+            }
         }
     }
 }