Project layout and architecture changes

Author: erdemsimsek

Cargo.lock

@@ -1,15 +1,17 @@
-[package]
-name = "CanOpenDataViewer"
-version = "0.1.0"
-edition = "2024"
+[workspace]
+resolver = "2"
+members = [
+    "canopen-viewer",
+    "canopen-common",
+    "mock-canopen-node",
+]
 
-[dependencies]
-configparser = "3.1.0"
-eframe = "0.31.0"
-rfd = "0.15.4"
-egui_plot = "0.31.0"
-image = "0.25.1"
-chrono = "0.4.41"
+# Shared dependencies across workspace (optional but reduces duplication)
+[workspace.dependencies]
+socketcan = "3.5.0"
 tokio = { version = "1.47.1", features = ["full"] }
 rand = "0.9.2"
-socketcan = "3.5.0"
+serde = { version = "1.0", features = ["derive"] }
+
+# This is now a workspace root, not a package
+# The actual binaries are in the member crates

Cargo.toml

@@ -1,7 +1,22 @@
 # CANopen Real-time Monitor & Plotter
 
+A high-performance, real-time CANopen diagnostics tool written in Rust, featuring dynamic plotting and configurable SDO polling.
 
-A high-performance, real-time CANopen diagnostics tool written in Rust, featuring dynamic plotting, configurable SDO polling, and selective TPDO monitoring.
+## 📁 Project Structure
+
+This is a Rust workspace containing multiple crates:
+
+```
+CanOpenDataViewer/
+├── canopen-viewer/          # Main GUI application
+├── canopen-common/          # Shared CANopen protocol library
+├── mock-canopen-node/       # Mock CANopen node for testing
+└── examples/                # Example binaries and EDS files
+```
+
+- **canopen-viewer**: The main application with GUI built using `egui`
+- **canopen-common**: Shared library for SDO protocol (used by both viewer and mock node)
+- **mock-canopen-node**: Simulated CANopen device for testing without real hardware
 
 
 ## Core Features
@@ -81,15 +96,37 @@ This ensures the user is always presented with information in its most useful fo
 
 1.  Clone the repository:
     ```bash
-    git clone [https://github.com/erdemsimsek/CanOpenDataViewer.git](https://github.com/erdemsimsek/CanOpenDataViewer.git)
+    git clone https://github.com/erdemsimsek/CanOpenDataViewer.git
     cd CanOpenDataViewer
     ```
 
-2.  Build and run the application:
+2.  Build the workspace:
     ```bash
-    cargo run --release
+    # Build everything
+    cargo build --workspace --release
+
+    # Or build just the viewer
+    cargo build -p canopen-viewer --release
     ```
 
+3.  Run the mock node (for testing without hardware):
+    ```bash
+    # Terminal 1: Start mock CANopen node
+    cargo run -p mock-canopen-node --release -- --interface vcan0 --node-id 4
+    ```
+
+4.  Run the viewer:
+    ```bash
+    # Terminal 2: Start the viewer application
+    cargo run -p canopen-viewer --release
+    ```
+
+    Then in the GUI:
+    - Select CAN interface: `vcan0`
+    - Enter Node ID: `4`
+    - Select EDS file (or skip for testing)
+    - Click "Start" and subscribe to SDOs
+
 ## Roadmap
 
 * []

README.md

@@ -0,0 +1,8 @@
+[package]
+name = "canopen-common"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+socketcan = { workspace = true }
+tokio = { workspace = true }

canopen-common/Cargo.toml

@@ -0,0 +1,18 @@
+//! # CANopen Common Library
+//!
+//! Shared CANopen protocol implementation used by both the viewer application
+//! and the mock CANopen node for testing.
+//!
+//! This library provides:
+//! - SDO (Service Data Object) protocol encoding/decoding
+//! - Common data types and error handling
+//! - Frame parsing utilities
+
+pub mod sdo;
+
+// Re-export commonly used types for convenience
+pub use sdo::{
+    SdoRequest, SdoResponse, SdoResponseData, SdoDataType, SdoError,
+    create_sdo_request_frame, parse_sdo_response, parse_payload,
+    get_abort_code_description, SdoCommand
+};

canopen-common/src/lib.rs

@@ -0,0 +1,21 @@
+[package]
+name = "canopen-viewer"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+# Use workspace dependencies
+socketcan = { workspace = true }
+tokio = { workspace = true }
+rand = { workspace = true }
+
+# UI dependencies
+configparser = "3.1.0"
+eframe = "0.31.0"
+rfd = "0.15.4"
+egui_plot = "0.31.0"
+image = "0.25.1"
+chrono = "0.4.41"
+
+# This will use the shared CANopen protocol code
+canopen-common = { path = "../canopen-common" }

src/canopen/sdo.rs canopen-common/src/sdo.rssrc/canopen/sdo.rs renamed to canopen-common/src/sdo.rs

@@ -8,7 +8,7 @@ use tokio::task::JoinHandle;
 use std::error::Error;
 use std::fmt;
 
-use crate::canopen::sdo::{SdoRequest, SdoResponse, SdoError, create_sdo_request_frame, parse_sdo_response};
+use canopen_common::{SdoRequest, SdoResponse, SdoError, create_sdo_request_frame, parse_sdo_response};
 
 #[derive(Debug)]
 pub enum CANopenError {

canopen-viewer/Cargo.toml

@@ -0,0 +1,13 @@
+// Connection management is still local to the viewer
+pub mod connect;
+
+// SDO protocol is now in the common library
+// Re-export from canopen-common for backwards compatibility
+pub use canopen_common::{
+    SdoRequest, SdoResponse, SdoResponseData, SdoDataType, SdoError,
+    create_sdo_request_frame, parse_sdo_response, parse_payload,
+    get_abort_code_description, SdoCommand
+};
+
+pub use connect::{CANopenConnection, CANopenNodeHandle, CANopenError};
+