Implement real ADC readings with VND7050AJ sensor multiplexing

- Switch from simulated to real ADC readings in adc_sensor library
- Add GPIO control for VND7050AJ sensor selection (sen, s0, s1 pins)
- Implement proper ADC device and channel setup for voltage/current measurements
- Enable ADC driver in prj.conf (CONFIG_ADC=y)
- Disable simulation mode (CONFIG_ADC_SENSOR_SIMULATED=n)
- Add devicetree bindings for custom supply voltage and motor current sensors
- Update overlay with adc_sensors nodes using PB4, PB5, PB6 pins
- Integrate real ADC readings into Modbus server registers
- Support HSE/HSI clock source toggling in overlay configuration

.gemini_commit_message.txt

@@ -0,0 +1,7 @@
+feat(modbus): Implement persistent and improved reconfiguration for Modbus server
+
+This commit enhances the Modbus server's configuration handling by:
+
+- Loading saved baudrate and unit ID settings during initialization, ensuring persistence across reboots.
+- Providing improved feedback during `modbus_reconfigure`, including logging for successful changes and informing the user when a device restart is required for changes to take effect.
+- Saving new configuration settings even if immediate reinitialization fails, allowing them to be applied on the next boot.

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "fwu.h": "c"
+    }
+}

README.de.md

@@ -1,3 +1,5 @@
+<img src="./docs/img/logo.png" alt="Logo" width="100"/>
+
 🇩🇪 Deutsch | [🇬🇧 English](README.md) | [🇫🇷 Français](README.fr.md) | [🇪🇸 Español](README.es.md)
 
 # Modulares Bewässerungssystem
@@ -11,6 +13,8 @@ Die detaillierte Dokumentation befindet sich im Verzeichnis [`docs/`](./docs/):
 *   **[Konzept](./docs/concept.de.md)**: Beschreibt die Systemarchitektur, die verwendeten Komponenten und die grundlegenden Design-Entscheidungen.
 *   **[MODBUS Register](./docs/modbus-registers.de.md)**: Definiert die Register-Map für die Kommunikation mit den Slave-Nodes.
 *   **[Projektplan](./docs/planning.de.md)**: Enthält den Entwicklungs- und Implementierungsplan.
+*   **[Firmware-Handbuch](./docs/firmware-manual.de.md)**: Beschreibt den Funktionsumfang und die Bedienung der Slave-Node-Firmware.
+*   **[Modbus Test-Tool](./software/tools/modbus_tool/README.de.md)**: Anleitung für das Python-basierte Kommandozeilen-Tool zum Testen der Slaves.
 
 ## Schnellstart
 

README.es.md

@@ -1,3 +1,5 @@
+<img src="./docs/img/logo.png" alt="Logo" width="100"/>
+
 [🇩🇪 Deutsch](README.de.md) | [🇬🇧 English](README.md) | [🇫🇷 Français](README.fr.md) | 🇪🇸 Español
 
 # Sistema de riego modular

README.fr.md

@@ -1,3 +1,5 @@
+<img src="./docs/img/logo.png" alt="Logo" width="100"/>
+
 [🇩🇪 Deutsch](README.de.md) | [🇬🇧 English](README.md) | 🇫🇷 Français | [🇪🇸 Español](README.es.md)
 
 # Système d'irrigation modulaire

README.md

@@ -1,3 +1,5 @@
+<img src="./docs/img/logo.png" alt="Logo" width="100"/>
+
 [🇩🇪 Deutsch](README.de.md) | 🇬🇧 English | [🇫🇷 Français](README.fr.md) | [🇪🇸 Español](README.es.md)
 
 # Modular Irrigation System

docs/concept.de.md

@@ -1,3 +1,5 @@
+<img src="./img/logo.png" alt="Logo" width="100"/>
+
 🇩🇪 Deutsch | [🇬🇧 English](concept.en.md) | [🇫🇷 Français](concept.fr.md) | [🇪🇸 Español](concept.es.md)
 
 # Konzept: Modulares Bewässerungssystem

docs/concept.en.md

@@ -1,3 +1,5 @@
+<img src="./img/logo.png" alt="Logo" width="100"/>
+
 [🇩🇪 Deutsch](concept.de.md) | 🇬🇧 English | [🇫🇷 Français](concept.fr.md) | [🇪🇸 Español](concept.es.md)
 
 # Concept: Modular Irrigation System

docs/concept.es.md

@@ -1,3 +1,5 @@
+<img src="./img/logo.png" alt="Logo" width="100"/>
+
 [🇩🇪 Deutsch](concept.de.md) | [🇬🇧 English](concept.en.md) | [🇫🇷 Français](concept.fr.md) | 🇪🇸 Español
 
 # Concepto: Sistema de riego modular

docs/concept.fr.md

@@ -1,3 +1,5 @@
+<img src="./img/logo.png" alt="Logo" width="100"/>
+
 [🇩🇪 Deutsch](concept.de.md) | [🇬🇧 English](concept.en.md) | 🇫🇷 Français | [🇪🇸 Español](concept.es.md)
 
 # Concept : Système d'irrigation modulaire

docs/img/logo.svg

@@ -0,0 +1,16 @@
+<svg width="100" height="120" viewBox="0 0 100 120" xmlns="http://www.w3.org/2000/svg" aria-labelledby="logoTitle">
+  <title id="logoTitle">Logo: Wassertropfen mit integriertem Chip</title>
+  
+  <path 
+    d="M50 115 C 85 85, 95 65, 95 45 A 45 45 0 1 0 5 45 C 5 65, 15 85, 50 115 Z" 
+    fill="#2563EB" 
+  />
+  
+  <g fill="#FFFFFF">
+    <rect x="25" y="35" width="50" height="8" rx="2"/>
+    <rect x="25" y="50" width="35" height="8" rx="2"/>
+    <rect x="70" y="50" width="5" height="8" rx="2"/>
+    <rect x="25" y="65" width="50" height="8" rx="2"/>
+  </g>
+  
+</svg>

docs/modbus-registers.de.md

@@ -1,3 +1,5 @@
+<img src="./img/logo.png" alt="Logo" width="100"/>
+
 🇩🇪 Deutsch | [🇬🇧 English](modbus-registers.en.md) | [🇫🇷 Français](modbus-registers.fr.md) | [🇪🇸 Español](modbus-registers.es.md)
 
 # MODBUS Register Map Definition v1.0
@@ -36,6 +38,7 @@ Alle Register sind in einer einzigen, durchgehenden Liste pro Register-Typ (`Inp
 | **0x00F2** | `DEVICE_STATUS`                | System            | `0`=OK, `1`=Allgemeiner Fehler.                                                                                                           |
 | **0x00F3** | `UPTIME_SECONDS_LOW`           | System            | Untere 16 Bit der Uptime in Sekunden.                                                                                                     |
 | **0x00F4** | `UPTIME_SECONDS_HIGH`          | System            | Obere 16 Bit der Uptime.                                                                                                                  |
+| **0x00F5** | `SUPPLY_VOLTAGE_MV`            | System            | Aktuelle Versorgungsspannung in Millivolt (mV).                                                                                           |
 | **0x0100** | `FWU_LAST_CHUNK_CRC`           | Firmware-Update   | Enthält den CRC16 des zuletzt im Puffer empfangenen Daten-Chunks.                                                                         |
 
 ## 3. Holding Registers (4xxxx, Read/Write)
@@ -47,6 +50,7 @@ Alle Register sind in einer einzigen, durchgehenden Liste pro Register-Typ (`Inp
 | **0x0002** | `MAX_SCHLIESSZEIT_S`          | Ventil            | Sicherheits-Timeout in Sekunden für den Schliessen-Vorgang.                                                                                |
 | **0x0010** | `DIGITAL_AUSGAENGE_ZUSTAND`   | Ausgänge          | Bitmaske zum Lesen und Schreiben der Ausgänge. Bit 0: Ausgang 1, Bit 1: Ausgang 2. `1`=AN, `0`=AUS.                                         |
 | **0x00F0** | `WATCHDOG_TIMEOUT_S`          | System            | Timeout des Fail-Safe-Watchdogs in Sekunden. `0`=Deaktiviert.                                                                             |
+| **0x00F1** | `DEVICE_RESET`                | System            | Schreibt `1` um das Gerät neu zu starten.                                                                                                 |
 | **0x0100** | `FWU_COMMAND`                 | Firmware-Update   | `1`: **Verify Chunk**: Der zuletzt übertragene Chunk wurde vom Client als gültig befunden. Der Slave soll ihn nun ins Flash schreiben. `2`: **Finalize Update**: Alle Chunks sind übertragen. Installation abschliessen und neu starten. |
 | **0x0101** | `FWU_CHUNK_OFFSET_LOW`        | Firmware-Update   | Untere 16 Bit des 32-Bit-Offsets, an den der nächste Chunk geschrieben werden soll.                                                         |
 | **0x0102** | `FWU_CHUNK_OFFSET_HIGH`       | Firmware-Update   | Obere 16 Bit des 32-Bit-Offsets.                                                                                                          |

docs/modbus-registers.en.md

@@ -1,3 +1,5 @@
+<img src="./img/logo.png" alt="Logo" width="100"/>
+
 [🇩🇪 Deutsch](modbus-registers.de.md) | 🇬🇧 English | [🇫🇷 Français](modbus-registers.fr.md) | [🇪🇸 Español](modbus-registers.es.md)
 
 # MODBUS Register Map Definition v1.0

docs/modbus-registers.es.md

@@ -1,3 +1,5 @@
+<img src="./img/logo.png" alt="Logo" width="100"/>
+
 [🇩🇪 Deutsch](modbus-registers.de.md) | [🇬🇧 English](modbus-registers.en.md) | [🇫🇷 Français](modbus-registers.fr.md) | 🇪🇸 Español
 
 # Definición del mapa de registros MODBUS v1.0

docs/modbus-registers.fr.md

@@ -1,3 +1,5 @@
+<img src="./img/logo.png" alt="Logo" width="100"/>
+
 [🇩🇪 Deutsch](modbus-registers.de.md) | [🇬🇧 English](modbus-registers.en.md) | 🇫🇷 Français | [🇪🇸 Español](modbus-registers.es.md)
 
 # Définition de la carte des registres MODBUS v1.0

docs/planning.de.md

@@ -1,3 +1,5 @@
+<img src="./img/logo.png" alt="Logo" width="100"/>
+
 🇩🇪 Deutsch | [🇬🇧 English](planning.en.md) | [🇫🇷 Français](planning.fr.md) | [🇪🇸 Español](planning.es.md)
 
 # Projektplan: Modulares Bewässerungssystem

docs/planning.en.md

@@ -1,3 +1,5 @@
+<img src="./img/logo.png" alt="Logo" width="100"/>
+
 [🇩🇪 Deutsch](planning.de.md) | 🇬🇧 English | [🇫🇷 Français](planning.fr.md) | [🇪🇸 Español](planning.es.md)
 
 # Project Plan: Modular Irrigation System

docs/planning.es.md

@@ -1,3 +1,5 @@
+<img src="./img/logo.png" alt="Logo" width="100"/>
+
 [🇩🇪 Deutsch](planning.de.md) | [🇬🇧 English](planning.en.md) | [🇫🇷 Français](planning.fr.md) | 🇪🇸 Español
 
 # Plan del proyecto: Sistema de riego modular

docs/planning.fr.md

@@ -1,3 +1,5 @@
+<img src="./img/logo.png" alt="Logo" width="100"/>
+
 [🇩🇪 Deutsch](planning.de.md) | [🇬🇧 English](planning.en.md) | 🇫🇷 Français | [🇪🇸 Español](planning.es.md)
 
 # Plan de projet : Système d'irrigation modulaire

setup-format-hook.sh

@@ -0,0 +1,56 @@
+#!/bin/sh
+
+# This script sets up a Git pre-commit hook to automatically format C/C++ files
+# in the 'software/' subdirectory using clang-format.
+
+# Define the path for the pre-commit hook
+HOOK_DIR=".git/hooks"
+HOOK_FILE="$HOOK_DIR/pre-commit"
+
+# Create the hooks directory if it doesn't exist
+mkdir -p "$HOOK_DIR"
+
+# Create the pre-commit hook script using a 'here document'
+cat > "$HOOK_FILE" << 'EOF'
+#!/bin/sh
+
+# --- Pre-commit hook for clang-format ---
+#
+# This hook formats staged C, C++, and Objective-C files in the 'software/'
+# subdirectory before a commit is made.
+# It automatically finds the .clang-format file in the software/ directory.
+#
+
+# Directory to be formatted
+TARGET_DIR="software/"
+
+# Use git diff to find staged files that are Added (A), Copied (C), or Modified (M).
+# We filter for files only within the TARGET_DIR.
+# The grep regex matches common C/C++ and Objective-C file extensions.
+FILES_TO_FORMAT=$(git diff --cached --name-only --diff-filter=ACM "$TARGET_DIR" | grep -E '\.(c|h|cpp|hpp|cxx|hxx|cc|hh|m|mm)$')
+
+if [ -z "$FILES_TO_FORMAT" ]; then
+    # No relevant files to format, exit successfully.
+    exit 0
+fi
+
+echo "› Running clang-format on staged files in '$TARGET_DIR'..."
+
+# Run clang-format in-place on the identified files.
+# clang-format will automatically find the .clang-format file in the software/ directory
+# or any of its parent directories.
+echo "$FILES_TO_FORMAT" | xargs clang-format -i
+
+# Since clang-format may have changed the files, we need to re-stage them.
+echo "$FILES_TO_FORMAT" | xargs git add
+
+echo "› Formatting complete."
+
+exit 0
+EOF
+
+# Make the hook executable
+chmod +x "$HOOK_FILE"
+
+echo "✅ Git pre-commit hook has been set up successfully."
+echo "   It will now automatically format files in the '$PWD/software' directory before each commit."

software/.clang-format

@@ -0,0 +1,5 @@
+# .clang-format
+BasedOnStyle: Google
+#IndentWidth: 4
+#ColumnLimit: 100
+#AllowShortFunctionsOnASingleLine: None

software/.vscode/settings.json

@@ -1,12 +1,15 @@
 {
-        // Hush CMake
-		"cmake.configureOnOpen": false,
-
-		// IntelliSense
-		"C_Cpp.default.compilerPath": "${userHome}/zephyr-sdk-0.17.1/arm-zephyr-eabi/bin/arm-zephyr-eabi-gcc.exe",
-		"C_Cpp.default.compileCommands": "${workspaceFolder}/build/compile_commands.json",
-
-		// File Associations
-		"files.associations": {
-		}
+	// Hush CMake
+	"cmake.configureOnOpen": false,
+	// IntelliSense
+	"C_Cpp.default.compilerPath": "${userHome}/zephyr-sdk-0.17.1/arm-zephyr-eabi/bin/arm-zephyr-eabi-gcc.exe",
+	"C_Cpp.default.compileCommands": "${workspaceFolder}/build/compile_commands.json",
+	// File Associations
+	"files.associations": {
+		"app_version.h": "c"
+	},
+	"C_Cpp.clang_format_style": "file",
+	"nrf-connect.applications": [
+		"${workspaceFolder}/apps/slave_node"
+	],
 }

software/.vscode/tasks.json

@@ -2,32 +2,20 @@
 	"version": "2.0.0",
 	"tasks": [
 		{
-			"label": "West Build",
-			"type": "shell",
-			"group": {
-				"kind": "build",
-				"isDefault": true
-			},
-			"linux": {
-				"command": "${userHome}/zephyrproject/.venv/bin/west"
-			},
-			"windows": {
-				"command": "${userHome}/zephyrproject/.venv/Scripts/west.exe"
-			},
-			"osx": {
-				"command": "${userHome}/zephyrproject/.venv/bin/west"
-			},
-			"args": [
-				"build",
-				"-p",
-				"auto",
-				"-b",
-				"valve_node"
-			],
-			"problemMatcher": [
-				"$gcc"
-			]
-		},
+            "label": "Format All C/C++ Files",
+            "type": "shell",
+            "command": "find . -name \"*.c\" -o -name \"*.h\" | xargs clang-format -i",
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "presentation": {
+                "reveal": "silent",
+                "clear": true,
+                "panel": "shared"
+            }
+        },
 		{
 			"label": "West Configurable Build",
 			"type": "shell",

software/CMakeLists.txt

@@ -1,14 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-
-# This line should ideally be after project() and find_package(Zephyr)
-# target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/zephyr/drivers) # <-- WRONG POSITION
-
-list(APPEND BOARD_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
-
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(valve_node)
-
-target_include_directories(app PRIVATE ${ZEPHYR_BASE}/include/zephyr/drivers)
-target_sources(app PRIVATE src/main2.c)

software/CMakeLists.txt.orig

@@ -1,25 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-cmake_minimum_required(VERSION 3.20.0)
-
-list(APPEND BOARD_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
-
-find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(valve_node)
-
-target_sources(app PRIVATE src/main.c)
-target_sources(app PRIVATE lib/canbus.c)
-
-# source files for modbus waterlevel sensor
-zephyr_library_sources_ifdef(CONFIG_HAS_MODBUS_WATERLEVEL_SENSOR
-    lib/waterlevel_sensor.c
-)
-
-#source files for valve
-zephyr_library_sources_ifdef(CONFIG_HAS_VALVE
-    lib/valve.c
-)
-
-zephyr_include_directories(
-    lib
-)

software/Kconfig

@@ -0,0 +1 @@
+rsource "lib/Kconfig"

software/apps/gateway/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 3.20)
+
+# Include the main 'software' directory as a module to find boards, libs, etc.
+list(APPEND ZEPHYR_EXTRA_MODULES ${CMAKE_CURRENT_SOURCE_DIR}/../..)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+project(gateway)
+
+target_sources(app PRIVATE src/main.c)

software/apps/gateway/prj.conf

@@ -0,0 +1,2 @@
+# Gateway Configuration
+CONFIG_NETWORKING=y

software/apps/gateway/src/main.c

@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2025 Eduard Iten
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include <zephyr/kernel.h>
+
+int main(void) {
+  printk("Hello from Gateway!\n");
+  return 0;
+}

software/apps/slave_node/.vscode/c_cpp_properties.json

@@ -0,0 +1,12 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "compileCommands": "${workspaceFolder}/build/compile_commands.json",
+            "cStandard": "c99",
+            "cppStandard": "gnu++17",
+            "intelliSenseMode": "linux-gcc-arm"
+        }
+    ],
+    "version": 4
+}

software/apps/slave_node/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.20)
+
+find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
+
+project(slave_node LANGUAGES C)
+zephyr_include_directories(../../include)
+add_subdirectory(../../lib lib)
+target_sources(app PRIVATE src/main.c)

software/apps/slave_node/Kconfig

@@ -0,0 +1,2 @@
+rsource "../../lib/Kconfig"
+source "Kconfig.zephyr"

software/apps/slave_node/VERSION

@@ -0,0 +1,5 @@
+VERSION_MAJOR = 0
+VERSION_MINOR = 0
+PATCHLEVEL = 1
+VERSION_TWEAK = 1
+EXTRAVERSION = devel

software/apps/slave_node/boards/bluepill_f103rb.conf

@@ -0,0 +1,7 @@
+# Disable UART console
+CONFIG_UART_CONSOLE=n
+
+# Enable RTT console
+CONFIG_RTT_CONSOLE=y
+CONFIG_USE_SEGGER_RTT=y
+CONFIG_SHELL_BACKEND_RTT=y

software/apps/slave_node/boards/bluepill_f103rb.overlay

@@ -0,0 +1,43 @@
+/ {
+    chosen {
+        zephyr,console = &rtt;
+        zephyr,shell = &rtt;
+        zephyr,settings-partition = &storage_partition;
+    };
+
+    rtt: rtt {
+        compatible = "segger,rtt-uart";
+        #address-cells = <1>;
+        #size-cells = <0>;
+        label = "RTT";
+        status = "okay";
+    };
+};
+
+&flash0 {
+    partitions {
+        compatible = "fixed-partitions";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        /* Application partition starts at the beginning of flash */
+        slot0_partition: partition@0 {
+            label = "image-0";
+            reg = <0x00000000 DT_SIZE_K(120)>;
+        };
+
+        /* Use the last 8K for settings */
+        storage_partition: partition@1E000 {
+            label = "storage";
+            reg = <0x0001E000 DT_SIZE_K(8)>;
+        };
+    };
+};
+
+&usart1 {
+	modbus0 {
+		compatible = "zephyr,modbus-serial";
+		status = "okay";
+	};
+	status = "okay";
+};

software/apps/slave_node/boards/weact_stm32g431_core.overlay

@@ -0,0 +1,105 @@
+/ {
+    vnd7050aj: vnd7050aj {
+        compatible = "vnd7050aj-valve-controller";
+        status = "okay";
+        
+        // VND7050AJ GPIO pin definitions
+        in0-gpios = <&gpiob 7 GPIO_ACTIVE_HIGH>; // IN0 (PB7) - Input 0 control signal
+        in1-gpios = <&gpiob 9 GPIO_ACTIVE_HIGH>; // IN1 (PB9) - Input 1 control signal
+        rst-gpios = <&gpiob 3 GPIO_ACTIVE_HIGH>; // RST (PB3) - Reset pin for VND7050AJ
+        sen-gpios = <&gpiob 4 GPIO_ACTIVE_HIGH>; // SEN (PB4) - Sense Enable for current monitoring
+        s0-gpios = <&gpiob 6 GPIO_ACTIVE_HIGH>;  // S0 (PB6) - Status/Select 0 output from VND7050AJ
+        s1-gpios = <&gpiob 5 GPIO_ACTIVE_HIGH>;  // S1 (PB5) - Status/Select 1 output from VND7050AJ
+    };
+
+    adc_sensors {
+        compatible = "adc-sensors";
+        
+        supply_voltage: supply-voltage {
+            compatible = "custom,supply-voltage";
+            io-channels = <&adc1 1>;  /* ADC1 channel 1 (PA0) */
+            io-channel-names = "voltage";
+            reference-mv = <3300>;
+            voltage-divider-ratio = <4>;  /* Adjust based on your voltage divider */
+            
+            /* GPIO control pins using VND7050AJ pins */
+            sen-gpios = <&gpiob 4 GPIO_ACTIVE_HIGH>;  /* SEN (PB4) - enable sensor */
+            s0-gpios = <&gpiob 6 GPIO_ACTIVE_HIGH>;   /* S0 (PB6) - mux select bit 0 */
+            s1-gpios = <&gpiob 5 GPIO_ACTIVE_HIGH>;   /* S1 (PB5) - mux select bit 1 */
+            
+            measurement-delay-ms = <5>;  /* 5ms delay after GPIO setup */
+        };
+        
+        motor_current: motor-current {
+            compatible = "custom,motor-current";
+            io-channels = <&adc1 1>;  /* Same ADC channel, different mux setting */
+            io-channel-names = "current";
+            reference-mv = <3300>;
+            current-sense-resistor-mohm = <100>;  /* 100mΩ sense resistor */
+            
+            /* GPIO control pins using VND7050AJ pins */
+            sen-gpios = <&gpiob 4 GPIO_ACTIVE_HIGH>;  /* SEN (PB4) - enable sensor */
+            s0-gpios = <&gpiob 6 GPIO_ACTIVE_HIGH>;   /* S0 (PB6) - mux select bit 0 */
+            s1-gpios = <&gpiob 5 GPIO_ACTIVE_HIGH>;   /* S1 (PB5) - mux select bit 1 */
+            
+            measurement-delay-ms = <10>; /* 10ms delay for current settling */
+        };
+    };
+};
+
+// Clock configuration: Uncomment the following section to use calibrated HSI instead of HSE
+//&clk_hse {
+//    status = "disabled";  // Disable external crystal oscillator
+//};
+//
+//&clk_hsi {
+//    status = "okay";      // Enable internal high-speed oscillator (16 MHz, calibrated)
+//};
+//
+//&pll {
+//    // Change PLL source from HSE to HSI
+//    clocks = <&clk_hsi>;
+//    // Adjust multipliers to maintain 144 MHz system clock with 16 MHz HSI input
+//    // HSI = 16 MHz, div-m = 4, mul-n = 72, div-r = 2
+//    // PLL_VCO = (16 MHz / 4) * 72 = 288 MHz  
+//    // SYSCLK = 288 MHz / 2 = 144 MHz
+//    div-m = <4>;    // Divide HSI by 4 (16 MHz / 4 = 4 MHz)
+//    mul-n = <72>;   // Multiply by 72 (4 MHz * 72 = 288 MHz)
+//    div-r = <2>;    // Divide by 2 for system clock (288 MHz / 2 = 144 MHz)
+//};
+
+&usart1 {
+	modbus0 {
+		compatible = "zephyr,modbus-serial";
+		status = "okay";
+	};
+	status = "okay";
+    pinctrl-0 = <&usart1_tx_pa9 &usart1_rx_pa10>; // PA9=TX, PA10=RX for Modbus communication
+    pinctrl-names = "default";
+};
+
+&adc1 { // ADC1 wird für PA0 verwendet
+    status = "okay"; // ADC1 aktivieren
+    pinctrl-0 = <&adc1_in1_pa0>; // Pinmux für PA0 als ADC1_IN1
+    pinctrl-names = "default";
+    st,adc-clock-source = "SYNC";
+    st,adc-prescaler = <4>;
+    #address-cells = <1>;
+    #size-cells = <0>;
+
+    // Definition des ADC-Kanals für MULTISENSE (PA0)
+    channel@1 { // ADC1_IN1 ist Kanal 1
+        reg = <1>; // Kanalnummer
+        zephyr,gain = "ADC_GAIN_1";
+        zephyr,reference = "ADC_REF_INTERNAL";
+        zephyr,acquisition-time = <ADC_ACQ_TIME_DEFAULT>;
+        zephyr,resolution = <12>;
+    };
+};
+
+&pinctrl {
+    // Pinmux für PA0 als ADC1_IN1 (Analogmodus)
+    adc1_in1_pa0: adc1_in1_pa0 {
+        pinmux = <STM32_PINMUX('A', 0, ANALOG)>; // PA0 in den Analogmodus setzen
+    };
+};

software/apps/slave_node/cdc-acm.overlay

@@ -0,0 +1,14 @@
+&zephyr_udc0 {
+	cdc_acm_uart0: cdc_acm_uart0 {
+		compatible = "zephyr,cdc-acm-uart";
+
+		modbus0 {
+			compatible = "zephyr,modbus-serial";
+			status = "okay";
+		};
+	};
+};
+
+&usart1 {
+	/delete-node/ modbus0;
+};

software/apps/slave_node/dts/bindings/adc/custom,motor-current.yaml

@@ -0,0 +1,48 @@
+description: Custom motor current measurement with GPIO control
+
+compatible: "custom,motor-current"
+
+properties:
+  io-channels:
+    type: phandle-array
+    required: true
+    description: ADC channel for current measurement
+
+  io-channel-names:
+    type: string-array
+    description: Names for the ADC channels
+
+  current-sense-resistor-mohm:
+    type: int
+    required: true
+    description: Current sense resistor value in milliohms
+
+  amplifier-gain:
+    type: int
+    default: 1
+    description: Current sense amplifier gain
+
+  reference-mv:
+    type: int
+    default: 3300
+    description: ADC reference voltage in millivolts
+
+  sen-gpios:
+    type: phandle-array
+    required: true
+    description: GPIO to enable/disable the current measurement sensor
+
+  s0-gpios:
+    type: phandle-array
+    required: true
+    description: GPIO for multiplexer control bit 0
+
+  s1-gpios:
+    type: phandle-array
+    required: true
+    description: GPIO for multiplexer control bit 1
+
+  measurement-delay-ms:
+    type: int
+    default: 10
+    description: Delay in milliseconds after setting GPIOs before ADC measurement

software/apps/slave_node/dts/bindings/adc/custom,supply-voltage.yaml

@@ -0,0 +1,63 @@
+description: Custom supply voltage measurement with GPIO control
+
+compatible: "custom,supply-voltage"
+
+properties:
+  io-channels:
+    type: phandle-array
+    required: true
+    description: ADC channel for voltage measurement
+
+  io-channel-names:
+    type: string-array
+    description: Names for the ADC channels
+
+  voltage-divider-ratio:
+    type: int
+    required: true
+    description: Voltage divider ratio for scaling
+
+  reference-mv:
+    type: int
+    default: 3300
+    description: ADC reference voltage in millivolts
+
+  sen-gpios:
+    type: phandle-array
+    required: true
+    description: GPIO to enable/disable the voltage measurement sensor
+
+  s0-gpios:
+    type: phandle-array
+    required: true
+    description: GPIO for multiplexer control bit 0
+
+  s1-gpios:
+    type: phandle-array
+    required: true
+    description: GPIO for multiplexer control bit 1
+
+  measurement-delay-ms:
+    type: int
+    default: 10
+    description: Delay in milliseconds after setting GPIOs before ADC measurement
+
+  sen-gpios:
+    type: phandle-array
+    required: true
+    description: GPIO for SEN (Sense Enable) pin
+
+  s0-gpios:
+    type: phandle-array
+    required: true
+    description: GPIO for S0 (Select 0) pin
+
+  s1-gpios:
+    type: phandle-array
+    required: true
+    description: GPIO for S1 (Select 1) pin
+
+  measurement-delay-ms:
+    type: int
+    default: 10
+    description: Delay in milliseconds after setting control pins before ADC reading

software/apps/slave_node/dts/bindings/vnd7050aj-valve-controller.yaml

@@ -0,0 +1,35 @@
+# VND7050AJ Valve Controller binding
+description: VND7050AJ valve controller GPIO configuration
+
+compatible: "vnd7050aj-valve-controller"
+
+properties:
+  in0-gpios:
+    type: phandle-array
+    description: GPIO for IN0 control signal
+    required: true
+
+  in1-gpios:
+    type: phandle-array
+    description: GPIO for IN1 control signal
+    required: true
+
+  rst-gpios:
+    type: phandle-array
+    description: GPIO for reset pin
+    required: true
+
+  sen-gpios:
+    type: phandle-array
+    description: GPIO for sense enable pin
+    required: true
+
+  s0-gpios:
+    type: phandle-array
+    description: GPIO for status/select 0 pin
+    required: true
+
+  s1-gpios:
+    type: phandle-array
+    description: GPIO for status/select 1 pin
+    required: true

software/apps/slave_node/overlay-cdc-acm.conf

@@ -0,0 +1,4 @@
+CONFIG_USB_DEVICE_STACK=y
+CONFIG_USB_DEVICE_PRODUCT="Modbus slave node"
+CONFIG_UART_LINE_CTRL=y
+CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n

software/apps/slave_node/prj.conf

@@ -0,0 +1,26 @@
+# Enable Console and printk for logging
+CONFIG_CONSOLE=y
+CONFIG_LOG=y
+
+# Enable Shell
+CONFIG_SHELL=y
+CONFIG_REBOOT=y
+
+# Enable Settings Subsystem
+CONFIG_SETTINGS=y
+CONFIG_SETTINGS_NVS=y
+CONFIG_NVS=y
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_FLASH_PAGE_LAYOUT=y
+
+# Config modbus
+CONFIG_UART_INTERRUPT_DRIVEN=y
+CONFIG_MODBUS=y
+CONFIG_MODBUS_ROLE_SERVER=y
+CONFIG_MODBUS_BUFFER_SIZE=256
+
+# ADC Sensor Configuration - Use real ADC readings
+CONFIG_ADC_SENSOR_SIMULATED=n
+CONFIG_ADC=y
+

software/apps/slave_node/src/main.c

@@ -0,0 +1,31 @@
+#include <app_version.h>
+#include <lib/fwu.h>
+#include <lib/modbus_server.h>
+#include <lib/valve.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/settings/settings.h>
+
+LOG_MODULE_REGISTER(main, LOG_LEVEL_INF);
+
+int main(void) {
+  int rc;
+  LOG_INF("Starting Irrigation System Slave Node version %s (Build version %s)",
+          APP_VERSION_STRING, STRINGIFY(APP_BUILD_VERSION));
+
+  if (settings_subsys_init() || settings_load()) {
+    LOG_ERR("Settings initialization or loading failed");
+  }
+
+  valve_init();
+  fwu_init();
+
+  rc = modbus_server_init();
+  if (rc < 0) {
+    LOG_ERR("Modbus RTU server initialization failed: %d", rc);
+    return 0;
+  }
+
+  LOG_INF("Irrigation System Slave Node started successfully");
+  return 0;
+}

software/boards/iten/bluepill_f103rb/Kconfig.bluepill_f103rb

@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Eduard Iten
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_BLUEPILL_F103RB
+	select SOC_STM32F103XB

software/boards/iten/bluepill_f103rb/bluepill_f103rb.dts

@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2025 Eduard Iten
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+#include <st/f1/stm32f1.dtsi>
+#include <st/f1/stm32f103Xb.dtsi>
+#include <st/f1/stm32f103r(8-b)tx-pinctrl.dtsi>
+#include <zephyr/dt-bindings/input/input-event-codes.h>
+
+/ {
+	model = "Blue-Pill STM32F103RB";
+	compatible = "iten,bluepill-f103rb";
+
+	chosen {
+		zephyr,console = &usart1;
+		zephyr,shell-uart = &usart1;
+		zephyr,sram = &sram0;
+		zephyr,flash = &flash0;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		led_status: led_status {
+			gpios = <&gpioc 13 GPIO_ACTIVE_LOW>;
+			label = "User LED";
+		};
+	};
+
+	aliases {
+		led0 = &led_status;
+		watchdog0 = &iwdg;
+	};
+};
+
+
+&clk_lsi {
+	status = "okay";
+};
+
+&clk_hse {
+	clock-frequency = <DT_FREQ_M(8)>;
+	status = "okay";
+};
+
+&pll {
+	mul = <9>;
+	clocks = <&clk_hse>;
+	status = "okay";
+};
+
+&rcc {
+	clocks = <&pll>;
+	clock-frequency = <DT_FREQ_M(72)>;
+	ahb-prescaler = <1>;
+	apb1-prescaler = <2>;
+	apb2-prescaler = <1>;
+	adc-prescaler = <6>;
+};
+
+
+&usart1 {
+	pinctrl-0 = <&usart1_tx_pa9 &usart1_rx_pa10>;
+	pinctrl-names = "default";
+	current-speed = <115200>;
+	status = "okay";
+};
+
+&iwdg {
+	status = "okay";
+};
+
+
+&clk_lsi {
+	status = "okay";
+};
+
+&clk_hse {
+	clock-frequency = <DT_FREQ_M(8)>;
+	status = "okay";
+};
+
+&pll {
+	mul = <9>;
+	clocks = <&clk_hse>;
+	status = "okay";
+};
+
+&rcc {
+	clocks = <&pll>;
+	clock-frequency = <DT_FREQ_M(72)>;
+	ahb-prescaler = <1>;
+	apb1-prescaler = <2>;
+	apb2-prescaler = <1>;
+	adc-prescaler = <6>;
+};
+
+&exti {
+	status = "okay";
+};
+
+&dma1 {
+	status = "okay";
+};

software/boards/iten/bluepill_f103rb/bluepill_f103rb_defconfig

@@ -0,0 +1,4 @@
+# Copyright (c) 2025 Eduard Iten
+# SPDX-License-Identifier: Apache-2.0
+CONFIG_SERIAL=y
+CONFIG_GPIO=y

software/boards/iten/bluepill_f103rb/board.cmake

@@ -1,11 +1,12 @@
+# Copyright (c) 2025 Eduard Iten
 # SPDX-License-Identifier: Apache-2.0
 
 # keep first
-board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw")
 board_runner_args(jlink "--device=STM32F103RB" "--speed=4000")
+board_runner_args(stm32cubeprogrammer "--port=swd" "--reset-mode=hw")
 
 # keep first
+include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/stm32cubeprogrammer.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/openocd-stm32.board.cmake)
-include(${ZEPHYR_BASE}/boards/common/jlink.board.cmake)
 include(${ZEPHYR_BASE}/boards/common/blackmagicprobe.board.cmake)

software/boards/iten/bluepill_f103rb/board.yml

@@ -0,0 +1,8 @@
+# Copyright (c) 2025 Eduard Iten
+# SPDX-License-Identifier: Apache-2.0
+
+board:
+  name: bluepill_f103rb
+  vendor: iten
+  socs:
+  - name: stm32f103xb

software/boards/iten/valve_node/Kconfig.valve_node

@@ -1,58 +0,0 @@
-config BOARD_VALVE_NODE
-    select SOC_STM32F103XB
-
-mainmenu "APP CAN Settings"
-config LOOPBACK_MODE
-	bool "Loopback LOOPBACK_MODE"
-	default n
-	help
-	  Set the can controller to loopback mode.
-	  This allows testing without a second board.
-
-mainmenu "APP Logging Settings"
-config LOG_CAN_LEVEL
-	int "Log level for CAN"
-	default 3
-	range 0 7
-	help
-	  Set the log level for CAN messages.
-	  0 = None, 1 = Error, 2 = Warning, 3 = Info, 4 = Debug, 5 = Trace, 6 = Debug2, 7 = Debug3
-
-config LOG_SETTINGS_LEVEL
-	int "Log level for settings"
-	default 3
-	range 0 7
-	help
-	  Set the log level for CAN messages.
-	  0 = None, 1 = Error, 2 = Warning, 3 = Info, 4 = Debug, 5 = Trace, 6 = Debug2, 7 = Debug3
-
-config LOG_WATERLEVELSENSOR_LEVEL
-	int "Log level for waterlevel sensor"
-	default 3
-	range 0 7
-	help
-	  Set the log level for CAN messages.
-	  0 = None, 1 = Error, 2 = Warning, 3 = Info, 4 = Debug, 5 = Trace, 6 = Debug2, 7 = Debug3
-
-config LOG_VALVE_LEVEL
-	int "Log level for valve control"
-	default 3
-	range 0 7
-	help
-	  Set the log level for valve control messages.
-	  0 = None, 1 = Error, 2 = Warning, 3 = Info, 4 = Debug, 5 = Trace, 6 = Debug2, 7 = Debug3
-
-mainmenu "Irrigation controller node configuration"
-config HAS_MODBUS_WATERLEVEL_SENSOR
-    bool "Has modbus water level sensor"
-    default n
-    help
-      Enable modbus water level sensor support.
-      This allows reading the water level from a modbus device.
-
-config HAS_VALVE
-	bool "Has valve control"
-	default n
-	help
-	  Enable valve control support.
-	  This allows controlling valves via CAN messages.

software/boards/iten/valve_node/board.yml

@@ -1,10 +0,0 @@
-board:
-  name: valve_node
-  full_name: Irrigation system CANbus valve node
-  socs:
-  - name: stm32f103xb
-  # revision:
-  #   format: number
-  #   default: "1"
-  #   revisions:
-  #   -name: "1"

software/boards/iten/valve_node/valve_node.dts

@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 2017 Linaro Limited
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/dts-v1/;
-#include <st/f1/stm32f1.dtsi>
-#include <st/f1/stm32f103Xb.dtsi>
-#include <st/f1/stm32f103r(8-b)tx-pinctrl.dtsi>
-#include <zephyr/dt-bindings/input/input-event-codes.h>
-
-/ {
-	model = "Iten engineering Valve Node";
-	compatible = "st,stm32f103rb";
-
-	can_loopback0: can_loopback0 {
-		status = "disabled";
-		compatible = "zephyr,can-loopback";
-	};
-
-	chosen {
-		zephyr,console = &usart1;
-		zephyr,shell-uart = &usart1;
-		zephyr,sram = &sram0;
-		zephyr,flash = &flash0;
-		zephyr,canbus = &can1;
-	};
-
-	leds: leds {
-		compatible = "gpio-leds";
-
-		green_led_2: led_2 {
-			gpios = <&gpiob 2 GPIO_ACTIVE_HIGH>;
-			label = "User LD2";
-		};
-	};
-
-	gpio_keys {
-		compatible = "gpio-keys";
-
-		user_button: button {
-			label = "User";
-			gpios = <&gpioc 13 GPIO_ACTIVE_LOW>;
-			zephyr,code = <INPUT_KEY_0>;
-		};
-
-		endstopopen: endstop_open {
-			gpios = <&gpiob 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-			label = "Endstop Open";
-		};
-
-		endstopclose: endstop_closed {
-			gpios = <&gpiob 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-			label = "Endstop Close";
-		};
-
-		statusopen: status_open {
-			gpios = <&gpiob 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-			label = "Status Open";
-		};
-
-		statusclose: status_close {
-			gpios = <&gpioa 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>;
-			label = "Status Close";
-		};
-	};
-
-	aliases {
-		led0 = &green_led_2;
-		sw0 = &user_button;
-		watchdog0 = &iwdg;
-		die-temp0 = &die_temp;
-		adc-motor-current = &motor_current_channel;
-		adc-vref = &vref_channel;
-	};
-
-};
-
-&clk_lsi {
-	status = "okay";
-};
-
-&clk_hse {
-	clock-frequency = <DT_FREQ_M(8)>;
-	status = "okay";
-};
-
-&pll {
-	mul = <9>;
-	clocks = <&clk_hse>;
-	status = "okay";
-};
-
-&rcc {
-	clocks = <&pll>;
-	clock-frequency = <DT_FREQ_M(72)>;
-	ahb-prescaler = <1>;
-	apb1-prescaler = <2>;
-	apb2-prescaler = <1>;
-	adc-prescaler = <6>;
-};
-
-&usart1 {
-	pinctrl-0 = <&usart1_tx_pa9 &usart1_rx_pa10>;
-	pinctrl-names = "default";
-	status = "okay";
-	current-speed = <115200>;
-};
-
-&usart2 {
-	pinctrl-0 = <&usart2_tx_pa2 &usart2_rx_pa3>;
-	current-speed = <9600>;
-	pinctrl-names = "default";
-	status = "okay";
-	modbus0 {
-		compatible = "zephyr,modbus-serial";
-		status = "okay";
-	};
-};
-
-&usart3 {
-	pinctrl-0 = <&usart3_tx_pb10 &usart3_rx_pb11>;
-	current-speed = <115200>;
-	pinctrl-names = "default";
-};
-
-&i2c1 {
-	pinctrl-0 = <&i2c1_scl_remap1_pb8 &i2c1_sda_remap1_pb9>;
-	pinctrl-names = "default";
-	status = "okay";
-	clock-frequency = <I2C_BITRATE_FAST>;
-};
-
-&iwdg {
-	status = "okay";
-};
-
-&rtc {
-	clocks = <&rcc STM32_CLOCK_BUS_APB1 0x10000000>,
-		   <&rcc STM32_SRC_LSI RTC_SEL(2)>;
-	status = "okay";
-};
-
-&adc1 {
-	pinctrl-0 = <&adc_pb1_pins>;
-	pinctrl-names = "default";
-	status = "okay";
-
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	motor_current_channel: channel@9 {
-		reg = <0x9>;
-		zephyr,gain = "ADC_GAIN_1";
-		zephyr,reference = "ADC_REF_VDD_1";
-		zephyr,acquisition-time = <49159>;
-		zephyr,resolution = <12>;
-	};
-
-	vref_channel: channel@11 { /* 17 dezimal = 11 hex */
-		reg = <0x11>;
-		zephyr,gain = "ADC_GAIN_1";
-		zephyr,reference = "ADC_REF_VDD_1";
-		zephyr,acquisition-time = <49159>;
-		zephyr,resolution = <12>;
-	};
-};
-
-&die_temp {
-	status = "okay";
-};
-
-&dma1 {
-	status = "okay";
-};
-
-&flash0 {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		storage_partition: partition@1f800 {
-			label = "storage";
-			reg = <0x0001f800 DT_SIZE_K(2)>;
-		};
-	};
-};
-
-&can1 {
-	pinctrl-0 = <&can_rx_pa11 &can_tx_pa12>;
-	pinctrl-names = "default";
-	status= "okay";
-	bitrate = <125000>;
-};
-
-&exti {
-	status = "okay";
-};
-
-&pinctrl {
-	adc_pb1_pins: adc_pb1_pins {
-		pinmux = <STM32F1_PINMUX('B', 1, ANALOG, NO_REMAP)>;
-	};
-};

software/boards/iten/valve_node/valve_node_defconfig

@@ -1,31 +0,0 @@
-# SPDX-License-Identifier: Apache-2.0
-
-# enable uart driver
-CONFIG_SERIAL=y
-# enable console
-CONFIG_CONSOLE=y
-
-# enable GPIO
-CONFIG_GPIO=y
-
-# modbus config
-CONFIG_UART_INTERRUPT_DRIVEN=y
-CONFIG_UART_LINE_CTRL=n
-CONFIG_MODBUS=y
-CONFIG_MODBUS_ROLE_CLIENT=y
-
-# can config
-CONFIG_CAN=y
-CONFIG_CAN_INIT_PRIORITY=80
-#CONFIG_CAN_MAX_FILTER=5
-CONFIG_CAN_ACCEPT_RTR=y
-
-# settings
-CONFIG_FLASH=y
-CONFIG_FLASH_MAP=y
-CONFIG_SETTINGS=y
-CONFIG_SETTINGS_RUNTIME=y
-CONFIG_NVS=y
-CONFIG_SETTINGS_NVS=y
-CONFIG_HEAP_MEM_POOL_SIZE=256
-CONFIG_MPU_ALLOW_FLASH_WRITE=y

software/include/lib/adc_sensor.h

@@ -0,0 +1,46 @@
+#ifndef ADC_SENSOR_H
+#define ADC_SENSOR_H
+
+#include <stdint.h>
+
+/**
+ * @file adc_sensor.h
+ * @brief API for the ADC sensor library.
+ *
+ * This library provides functions to initialize and read from the ADC sensors,
+ * specifically for measuring supply voltage and motor current.
+ * It can operate in a real or simulated mode.
+ */
+
+/**
+ * @brief Initializes the ADC sensor system.
+ *
+ * This function sets up the necessary ADC channels and configurations.
+ * It should be called once before any other function in this library.
+ * In simulated mode, it logs the simulated values.
+ *
+ * @return 0 on success, or a negative error code on failure.
+ */
+int adc_sensor_init(void);
+
+/**
+ * @brief Gets the current supply voltage reading.
+ *
+ * This function reads the value from the corresponding ADC channel and converts
+ * it to millivolts.
+ *
+ * @return The supply voltage in millivolts (mV).
+ */
+uint16_t adc_sensor_get_voltage_mv(void);
+
+/**
+ * @brief Gets the current motor current reading.
+ *
+ * This function reads the value from the motor driver's sense pin via ADC
+ * and converts it to milliamps. This is used for end-stop detection.
+ *
+ * @return The motor current in milliamps (mA).
+ */
+uint16_t adc_sensor_get_current_ma(void);
+
+#endif /* ADC_SENSOR_H */

software/include/lib/fwu.h

@@ -0,0 +1,47 @@
+#ifndef FWU_H
+#define FWU_H
+
+#include <stdint.h>
+
+/**
+ * @file fwu.h
+ * @brief API for the Firmware Update (FWU) library.
+ *
+ * This library provides the core logic for handling the over-the-air firmware
+ * update process via Modbus. It manages the data buffer, processes commands,
+ * and calculates CRC checksums for data verification.
+ */
+
+/**
+ * @brief Initializes the firmware update module.
+ *
+ * This function currently does nothing but is a placeholder for future
+ * initialization logic.
+ */
+void fwu_init(void);
+
+/**
+ * @brief Handles incoming Modbus register writes related to firmware updates.
+ *
+ * This function is the main entry point for the FWU process. It parses the
+ * address and value from a Modbus write operation and takes appropriate action,
+ * such as storing metadata (offset, size) or data chunks, and processing
+ * commands (verify, finalize).
+ *
+ * @param addr The Modbus register address being written to.
+ * @param reg The 16-bit value being written to the register.
+ */
+void fwu_handler(uint16_t addr, uint16_t reg);
+
+/**
+ * @brief Gets the CRC16-CCITT of the last received firmware chunk.
+ *
+ * After a data chunk is fully received into the buffer, this function can be
+ * called to retrieve the calculated CRC checksum. The master can then compare
+ * this with its own calculated CRC to verify data integrity.
+ *
+ * @return The 16-bit CRC of the last chunk.
+ */
+uint16_t fwu_get_last_chunk_crc(void);
+
+#endif  // FWU_H

software/include/lib/modbus_server.h

@@ -0,0 +1,164 @@
+#ifndef MODBUS_SERVER_H
+#define MODBUS_SERVER_H
+
+#include <stdint.h>
+
+/**
+ * @file modbus_server.h
+ * @brief API for the Modbus server implementation.
+ *
+ * This file defines the Modbus register map and provides functions to
+ * initialize and manage the Modbus server.
+ */
+
+/**
+ * @brief Modbus Input Register Addresses (Read-Only).
+ * @see docs/modbus-registers.de.md
+ */
+enum {
+  /**
+   * @brief Kombiniertes Status-Register für das Ventil.
+   * High-Byte: Bewegung (0=Idle, 1=Öffnet, 2=Schliesst, 3=Fehler).
+   * Low-Byte: Zustand (0=Geschlossen, 1=Geöffnet).
+   */
+  REG_INPUT_VALVE_STATE_MOVEMENT = 0x0000,
+  /**
+   * @brief Aktueller Motorstrom in Milliampere (mA).
+   */
+  REG_INPUT_MOTOR_CURRENT_MA = 0x0001,
+  /**
+   * @brief Bitmaske der digitalen Eingänge. Bit 0: Eingang 1, Bit 1: Eingang 2.
+   * 1=Aktiv.
+   */
+  REG_INPUT_DIGITAL_INPUTS_STATE = 0x0020,
+  /**
+   * @brief Event-Flags für Taster (Clear-on-Read). Bit 0: Taster 1 gedrückt.
+   * Bit 1: Taster 2 gedrückt.
+   */
+  REG_INPUT_BUTTON_EVENTS = 0x0021,
+  /**
+   * @brief Firmware-Version, z.B. 0x0102 für v1.2.
+   */
+  REG_INPUT_FIRMWARE_VERSION_MAJOR_MINOR = 0x00F0,
+  /**
+   * @brief Firmware-Version Patch-Level, z.B. 3 für v1.2.3.
+   */
+  REG_INPUT_FIRMWARE_VERSION_PATCH = 0x00F1,
+  /**
+   * @brief Gerätestatus (0=OK, 1=Allgemeiner Fehler).
+   */
+  REG_INPUT_DEVICE_STATUS = 0x00F2,
+  /**
+   * @brief Untere 16 Bit der Uptime in Sekunden.
+   */
+  REG_INPUT_UPTIME_SECONDS_LOW = 0x00F3,
+  /**
+   * @brief Obere 16 Bit der Uptime in Sekunden.
+   */
+  REG_INPUT_UPTIME_SECONDS_HIGH = 0x00F4,
+  /**
+   * @brief Aktuelle Versorgungsspannung in Millivolt (mV).
+   */
+  REG_INPUT_SUPPLY_VOLTAGE_MV = 0x00F5,
+  /**
+   * @brief CRC16 des zuletzt im Puffer empfangenen Daten-Chunks für das
+   * Firmware-Update.
+   */
+  REG_INPUT_FWU_LAST_CHUNK_CRC = 0x0100
+};
+
+/**
+ * @brief Modbus Holding Register Addresses (Read/Write).
+ * @see docs/modbus-registers.de.md
+ */
+enum {
+  /**
+   * @brief Ventilsteuerungsbefehl (1=Öffnen, 2=Schliessen, 0=Bewegung stoppen).
+   */
+  REG_HOLDING_VALVE_COMMAND = 0x0000,
+  /**
+   * @brief Sicherheits-Timeout in Sekunden für den Öffnen-Vorgang.
+   */
+  REG_HOLDING_MAX_OPENING_TIME_S = 0x0001,
+  /**
+   * @brief Sicherheits-Timeout in Sekunden für den Schliessen-Vorgang.
+   */
+  REG_HOLDING_MAX_CLOSING_TIME_S = 0x0002,
+  /**
+   * @brief Bitmaske zum Lesen und Schreiben der digitalen Ausgänge. Bit 0:
+   * Ausgang 1, Bit 1: Ausgang 2. 1=AN, 0=AUS.
+   */
+  REG_HOLDING_DIGITAL_OUTPUTS_STATE = 0x0010,
+  /**
+   * @brief Timeout des Fail-Safe-Watchdogs in Sekunden. 0=Deaktiviert.
+   */
+  REG_HOLDING_WATCHDOG_TIMEOUT_S = 0x00F0,
+  /**
+   * @brief Schreiben von 1 startet das Gerät neu.
+   */
+  REG_HOLDING_DEVICE_RESET = 0x00F1,
+  /**
+   * @brief Befehl für das Firmware-Update.
+   * 1: Verify Chunk - Slave schreibt den letzten Chunk ins Flash.
+   * 2: Finalize Update - Installation abschliessen und neu starten.
+   */
+  REG_HOLDING_FWU_COMMAND = 0x0100,
+  /**
+   * @brief Untere 16 Bit des 32-Bit-Offsets für den nächsten
+   * Firmware-Update-Chunk.
+   */
+  REG_HOLDING_FWU_CHUNK_OFFSET_LOW = 0x0101,
+  /**
+   * @brief Obere 16 Bit des 32-Bit-Offsets für den nächsten
+   * Firmware-Update-Chunk.
+   */
+  REG_HOLDING_FWU_CHUNK_OFFSET_HIGH = 0x0102,
+  /**
+   * @brief Grösse des nächsten Firmware-Update-Chunks in Bytes (max. 256).
+   */
+  REG_HOLDING_FWU_CHUNK_SIZE = 0x0103,
+  /**
+   * @brief Startadresse des 256-Byte-Puffers für Firmware-Update-Daten.
+   */
+  REG_HOLDING_FWU_DATA_BUFFER = 0x0180,
+};
+
+/**
+ * @brief Initializes the Modbus server.
+ *
+ * This function sets up the Modbus RTU server interface, loads saved settings
+ * (baudrate, unit ID), and starts listening for requests.
+ *
+ * @return 0 on success, or a negative error code on failure.
+ */
+int modbus_server_init(void);
+
+/**
+ * @brief Reconfigures the Modbus server at runtime.
+ *
+ * Updates the baudrate and unit ID of the server. If the reconfiguration
+ * fails, the settings are saved and will be applied after a device reset.
+ *
+ * @param baudrate The new baudrate to set.
+ * @param unit_id The new Modbus unit ID (slave address).
+ * @return 0 on success, or a negative error code if immediate reconfiguration
+ * fails. Returns 0 even on failure if settings could be saved for the next
+ * boot.
+ */
+int modbus_reconfigure(uint32_t baudrate, uint8_t unit_id);
+
+/**
+ * @brief Gets the current baudrate of the Modbus server.
+ *
+ * @return The current baudrate.
+ */
+uint32_t modbus_get_baudrate(void);
+
+/**
+ * @brief Gets the current unit ID of the Modbus server.
+ *
+ * @return The current unit ID.
+ */
+uint8_t modbus_get_unit_id(void);
+
+#endif  // MODBUS_SERVER_H

software/include/lib/valve.h

@@ -0,0 +1,123 @@
+#ifndef VALVE_H
+#define VALVE_H
+
+#include <stdint.h>
+#include <zephyr/drivers/gpio.h>
+
+/**
+ * @file valve.h
+ * @brief API for controlling the motorized valve.
+ *
+ * This library provides functions to initialize, open, close, and stop the
+ * valve. It also allows getting the valve's state and movement status, and
+ * configuring the maximum opening and closing times.
+ */
+
+/**
+ * @brief Defines the GPIO pins used for the valve controller.
+ */
+struct valve_gpios {
+  const struct gpio_dt_spec
+      in0; /**< Control input 0 for the VND7050AJ driver. */
+  const struct gpio_dt_spec
+      in1; /**< Control input 1 for the VND7050AJ driver. */
+  const struct gpio_dt_spec rst; /**< Reset pin for the VND7050AJ driver. */
+  const struct gpio_dt_spec sen; /**< Sense (current measurement) pin. */
+  const struct gpio_dt_spec s0;  /**< S0 select pin. */
+  const struct gpio_dt_spec s1;  /**< S1 select pin. */
+};
+
+/**
+ * @brief Represents the static state of the valve (open or closed).
+ */
+enum valve_state {
+  VALVE_STATE_CLOSED, /**< The valve is fully closed. */
+  VALVE_STATE_OPEN,   /**< The valve is fully open. */
+};
+
+/**
+ * @brief Represents the dynamic movement status of the valve.
+ */
+enum valve_movement {
+  VALVE_MOVEMENT_IDLE,    /**< The valve is not moving. */
+  VALVE_MOVEMENT_OPENING, /**< The valve is currently opening. */
+  VALVE_MOVEMENT_CLOSING, /**< The valve is currently closing. */
+  VALVE_MOVEMENT_ERROR    /**< An error occurred during movement. */
+};
+
+/**
+ * @brief Initializes the valve control system.
+ *
+ * Configures the GPIOs and loads saved settings for timeouts.
+ */
+void valve_init(void);
+
+/**
+ * @brief Starts opening the valve.
+ *
+ * The valve will open for the configured maximum opening time.
+ */
+void valve_open(void);
+
+/**
+ * @brief Starts closing the valve.
+ *
+ * The valve will close for the configured maximum closing time.
+ */
+void valve_close(void);
+
+/**
+ * @brief Stops any ongoing valve movement immediately.
+ */
+void valve_stop(void);
+
+/**
+ * @brief Gets the current static state of the valve.
+ *
+ * @return The current valve state (VALVE_STATE_CLOSED or VALVE_STATE_OPEN).
+ */
+enum valve_state valve_get_state(void);
+
+/**
+ * @brief Gets the current movement status of the valve.
+ *
+ * @return The current movement status.
+ */
+enum valve_movement valve_get_movement(void);
+
+/**
+ * @brief Gets the motor current.
+ *
+ * @return The motor current in milliamps (currently simulated).
+ */
+uint16_t valve_get_motor_current(void);
+
+/**
+ * @brief Sets the maximum time for the valve to open.
+ *
+ * @param seconds The timeout in seconds.
+ */
+void valve_set_max_open_time(uint16_t seconds);
+
+/**
+ * @brief Sets the maximum time for the valve to close.
+ *
+ * @param seconds The timeout in seconds.
+ */
+void valve_set_max_close_time(uint16_t seconds);
+
+/**
+ * @brief Gets the configured maximum opening time.
+ *
+ * @return The timeout in seconds.
+ */
+uint16_t valve_get_max_open_time(void);
+
+/**
+ * @brief Gets the configured maximum closing time.
+ *
+ * @return The timeout in seconds.
+ */
+uint16_t valve_get_max_close_time(void);
+
+#endif  // VALVE_H

software/lib/CMakeLists.txt

@@ -0,0 +1,6 @@
+add_subdirectory_ifdef(CONFIG_ADC_SENSOR adc_sensor)
+add_subdirectory_ifdef(CONFIG_LIB_FWU fwu)
+add_subdirectory_ifdef(CONFIG_LIB_MODBUS_SERVER modbus_server)
+add_subdirectory_ifdef(CONFIG_LIB_VALVE valve)
+add_subdirectory_ifdef(CONFIG_SHELL_SYSTEM shell_system)
+add_subdirectory_ifdef(CONFIG_SHELL_MODBUS shell_modbus)

software/lib/Kconfig

@@ -0,0 +1,9 @@
+menu "Irrigation system software libraries"
+
+rsource "adc_sensor/Kconfig"
+rsource "fwu/Kconfig"
+rsource "modbus_server/Kconfig"
+rsource "valve/Kconfig"
+rsource "shell_system/Kconfig"
+rsource "shell_modbus/Kconfig"
+endmenu

software/lib/adc_sensor/CMakeLists.txt

@@ -0,0 +1 @@
+zephyr_library_sources(adc_sensor.c)

software/lib/adc_sensor/Kconfig

@@ -0,0 +1,16 @@
+config ADC_SENSOR
+	bool "ADC sensor library"
+	default y
+	help
+	  Enable ADC sensor library for voltage and current measurements.
+
+if ADC_SENSOR
+
+config ADC_SENSOR_SIMULATED
+	bool "Use simulated ADC readings"
+	default n
+	help
+	  Use simulated values instead of real ADC readings.
+	  Voltage: 12000mV, Current: 45mA
+
+endif # ADC_SENSOR

software/lib/adc_sensor/adc_sensor.c

@@ -0,0 +1,347 @@
+/**
+ * @file adc_sensor.c
+ * @brief Implementation of the ADC sensor library.
+ *
+ * This file contains the implementation for initializing and reading from ADC
+ * sensors. It currently provides simulated values for voltage and current, with
+ * placeholders for real hardware ADC implementation including GPIO control.
+ */
+
+#include <lib/adc_sensor.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+
+LOG_MODULE_REGISTER(adc_sensor, LOG_LEVEL_INF);
+
+// Simulated values
+#define SIMULATED_VOLTAGE_MV 12000
+#define SIMULATED_CURRENT_MA 45
+
+// Devicetree node checks
+#define VOLTAGE_SENSOR_NODE DT_NODELABEL(supply_voltage)
+#define CURRENT_SENSOR_NODE DT_NODELABEL(motor_current)
+
+#ifndef CONFIG_ADC_SENSOR_SIMULATED
+// ADC device reference
+#if DT_NODE_EXISTS(VOLTAGE_SENSOR_NODE)
+#define ADC_NODE DT_PHANDLE(VOLTAGE_SENSOR_NODE, io_channels)
+#define ADC_CHANNEL DT_PHA(VOLTAGE_SENSOR_NODE, io_channels, input)
+#define ADC_RESOLUTION 12
+#define ADC_REFERENCE_MV DT_PROP(VOLTAGE_SENSOR_NODE, reference_mv)
+#define VOLTAGE_DIVIDER_RATIO \
+  DT_PROP(VOLTAGE_SENSOR_NODE, voltage_divider_ratio)
+
+static const struct device *adc_dev;
+static struct adc_channel_cfg adc_channel_cfg = {
+    .gain = ADC_GAIN_1,
+    .reference = ADC_REF_INTERNAL,
+    .acquisition_time = ADC_ACQ_TIME_DEFAULT,
+    .channel_id = ADC_CHANNEL,
+    .differential = 0};
+
+static struct adc_sequence adc_sequence = {
+    .channels = BIT(ADC_CHANNEL),
+    .buffer_size = sizeof(uint16_t),
+    .resolution = ADC_RESOLUTION,
+};
+
+static uint16_t adc_buffer;
+#endif
+#endif
+
+static bool initialized = false;
+
+#ifndef CONFIG_ADC_SENSOR_SIMULATED
+// GPIO specs for voltage sensor (if devicetree nodes exist)
+#if DT_NODE_EXISTS(VOLTAGE_SENSOR_NODE)
+static const struct gpio_dt_spec voltage_sen_gpio =
+    GPIO_DT_SPEC_GET(VOLTAGE_SENSOR_NODE, sen_gpios);
+static const struct gpio_dt_spec voltage_s0_gpio =
+    GPIO_DT_SPEC_GET(VOLTAGE_SENSOR_NODE, s0_gpios);
+static const struct gpio_dt_spec voltage_s1_gpio =
+    GPIO_DT_SPEC_GET(VOLTAGE_SENSOR_NODE, s1_gpios);
+#endif
+
+// GPIO specs for current sensor (if devicetree nodes exist)
+#if DT_NODE_EXISTS(CURRENT_SENSOR_NODE)
+static const struct gpio_dt_spec current_sen_gpio =
+    GPIO_DT_SPEC_GET(CURRENT_SENSOR_NODE, sen_gpios);
+static const struct gpio_dt_spec current_s0_gpio =
+    GPIO_DT_SPEC_GET(CURRENT_SENSOR_NODE, s0_gpios);
+static const struct gpio_dt_spec current_s1_gpio =
+    GPIO_DT_SPEC_GET(CURRENT_SENSOR_NODE, s1_gpios);
+#endif
+
+/**
+ * @brief Configure GPIO pins for ADC sensor control
+ */
+static int configure_sensor_gpios(void) {
+  int ret = 0;
+
+#if DT_NODE_EXISTS(VOLTAGE_SENSOR_NODE)
+  // Configure voltage sensor GPIOs
+  if (gpio_is_ready_dt(&voltage_sen_gpio)) {
+    ret = gpio_pin_configure_dt(&voltage_sen_gpio, GPIO_OUTPUT_INACTIVE);
+    if (ret < 0) {
+      LOG_ERR("Failed to configure voltage sen GPIO: %d", ret);
+      return ret;
+    }
+  }
+
+  if (gpio_is_ready_dt(&voltage_s0_gpio)) {
+    ret = gpio_pin_configure_dt(&voltage_s0_gpio, GPIO_OUTPUT_INACTIVE);
+    if (ret < 0) {
+      LOG_ERR("Failed to configure voltage s0 GPIO: %d", ret);
+      return ret;
+    }
+  }
+
+  if (gpio_is_ready_dt(&voltage_s1_gpio)) {
+    ret = gpio_pin_configure_dt(&voltage_s1_gpio, GPIO_OUTPUT_INACTIVE);
+    if (ret < 0) {
+      LOG_ERR("Failed to configure voltage s1 GPIO: %d", ret);
+      return ret;
+    }
+  }
+#endif
+
+#if DT_NODE_EXISTS(CURRENT_SENSOR_NODE)
+  // Configure current sensor GPIOs
+  if (gpio_is_ready_dt(&current_sen_gpio)) {
+    ret = gpio_pin_configure_dt(&current_sen_gpio, GPIO_OUTPUT_INACTIVE);
+    if (ret < 0) {
+      LOG_ERR("Failed to configure current sen GPIO: %d", ret);
+      return ret;
+    }
+  }
+
+  if (gpio_is_ready_dt(&current_s0_gpio)) {
+    ret = gpio_pin_configure_dt(&current_s0_gpio, GPIO_OUTPUT_INACTIVE);
+    if (ret < 0) {
+      LOG_ERR("Failed to configure current s0 GPIO: %d", ret);
+      return ret;
+    }
+  }
+
+  if (gpio_is_ready_dt(&current_s1_gpio)) {
+    ret = gpio_pin_configure_dt(&current_s1_gpio, GPIO_OUTPUT_INACTIVE);
+    if (ret < 0) {
+      LOG_ERR("Failed to configure current s1 GPIO: %d", ret);
+      return ret;
+    }
+  }
+#endif
+
+  return 0;
+}
+
+/**
+ * @brief Set GPIO pins for voltage measurement
+ * @param s0_state State for S0 pin (multiplexer bit 0)
+ * @param s1_state State for S1 pin (multiplexer bit 1)
+ */
+static int set_voltage_sensor_gpios(bool enable, bool s0_state, bool s1_state) {
+#if DT_NODE_EXISTS(VOLTAGE_SENSOR_NODE)
+  if (gpio_is_ready_dt(&voltage_sen_gpio)) {
+    gpio_pin_set_dt(&voltage_sen_gpio, enable ? 1 : 0);
+  }
+  if (gpio_is_ready_dt(&voltage_s0_gpio)) {
+    gpio_pin_set_dt(&voltage_s0_gpio, s0_state ? 1 : 0);
+  }
+  if (gpio_is_ready_dt(&voltage_s1_gpio)) {
+    gpio_pin_set_dt(&voltage_s1_gpio, s1_state ? 1 : 0);
+  }
+
+  // Delay for GPIO settling (from devicetree or default)
+#if DT_NODE_HAS_PROP(VOLTAGE_SENSOR_NODE, measurement_delay_ms)
+  k_msleep(DT_PROP(VOLTAGE_SENSOR_NODE, measurement_delay_ms));
+#else
+  k_msleep(5);  // Default 5ms delay
+#endif
+#endif
+  return 0;
+}
+
+/**
+ * @brief Set GPIO pins for current measurement
+ * @param s0_state State for S0 pin (multiplexer bit 0)
+ * @param s1_state State for S1 pin (multiplexer bit 1)
+ */
+static int set_current_sensor_gpios(bool enable, bool s0_state, bool s1_state) {
+#if DT_NODE_EXISTS(CURRENT_SENSOR_NODE)
+  if (gpio_is_ready_dt(&current_sen_gpio)) {
+    gpio_pin_set_dt(&current_sen_gpio, enable ? 1 : 0);
+  }
+  if (gpio_is_ready_dt(&current_s0_gpio)) {
+    gpio_pin_set_dt(&current_s0_gpio, s0_state ? 1 : 0);
+  }
+  if (gpio_is_ready_dt(&current_s1_gpio)) {
+    gpio_pin_set_dt(&current_s1_gpio, s1_state ? 1 : 0);
+  }
+
+  // Delay for GPIO settling (from devicetree or default)
+#if DT_NODE_HAS_PROP(CURRENT_SENSOR_NODE, measurement_delay_ms)
+  k_msleep(DT_PROP(CURRENT_SENSOR_NODE, measurement_delay_ms));
+#else
+  k_msleep(10);  // Default 10ms delay
+#endif
+#endif
+  return 0;
+}
+#endif /* !CONFIG_ADC_SENSOR_SIMULATED */
+
+#ifndef CONFIG_ADC_SENSOR_SIMULATED
+/**
+ * @brief Read ADC value and convert to millivolts
+ * @return ADC reading in millivolts, or 0 on error
+ */
+static uint16_t read_adc_voltage_mv(void) {
+#if DT_NODE_EXISTS(VOLTAGE_SENSOR_NODE)
+  int ret = adc_read(adc_dev, &adc_sequence);
+  if (ret < 0) {
+    LOG_ERR("ADC read failed: %d", ret);
+    return 0;
+  }
+
+  // Convert ADC reading to millivolts
+  // ADC reading is 12-bit (0-4095) representing 0 to ADC_REFERENCE_MV
+  uint32_t adc_value = adc_buffer;
+  uint32_t voltage_mv = (adc_value * ADC_REFERENCE_MV) / 4095;
+
+  // Apply voltage divider scaling
+  voltage_mv *= VOLTAGE_DIVIDER_RATIO;
+
+  LOG_DBG("ADC raw: %u, voltage: %u mV", adc_value, (uint16_t)voltage_mv);
+
+  return (uint16_t)voltage_mv;
+#else
+  return 0;
+#endif
+}
+
+/**
+ * @brief Read ADC value and convert to milliamps (for current sensor)
+ * @return ADC reading in milliamps, or 0 on error
+ */
+static uint16_t read_adc_current_ma(void) {
+#if DT_NODE_EXISTS(CURRENT_SENSOR_NODE)
+  int ret = adc_read(adc_dev, &adc_sequence);
+  if (ret < 0) {
+    LOG_ERR("ADC read failed: %d", ret);
+    return 0;
+  }
+
+  // Convert ADC reading to millivolts first
+  uint32_t adc_value = adc_buffer;
+  uint32_t voltage_mv = (adc_value * ADC_REFERENCE_MV) / 4095;
+
+  // Convert voltage to current based on current sensor characteristics
+  // Assuming a linear current sensor with specific mV/mA ratio
+  // This will need to be calibrated for your specific current sensor
+  uint32_t current_ma = voltage_mv / 10;  // Example: 10mV per mA
+
+  LOG_DBG("ADC raw: %u, current: %u mA", adc_value, (uint16_t)current_ma);
+
+  return (uint16_t)current_ma;
+#else
+  return 0;
+#endif
+}
+#endif
+
+int adc_sensor_init(void) {
+  if (initialized) {
+    return 0;
+  }
+
+#ifdef CONFIG_ADC_SENSOR_SIMULATED
+  LOG_INF("ADC sensor initialized (simulated mode)");
+  LOG_INF("Simulated values: %dmV, %dmA", SIMULATED_VOLTAGE_MV,
+          SIMULATED_CURRENT_MA);
+#else
+  // Initialize GPIO pins for sensor control
+  int ret = configure_sensor_gpios();
+  if (ret < 0) {
+    LOG_ERR("Failed to configure sensor GPIOs: %d", ret);
+    return ret;
+  }
+
+  // Initialize ADC hardware
+#if DT_NODE_EXISTS(VOLTAGE_SENSOR_NODE)
+  adc_dev = DEVICE_DT_GET(ADC_NODE);
+  if (!device_is_ready(adc_dev)) {
+    LOG_ERR("ADC device not ready");
+    return -ENODEV;
+  }
+
+  adc_sequence.buffer = &adc_buffer;
+
+  ret = adc_channel_setup(adc_dev, &adc_channel_cfg);
+  if (ret < 0) {
+    LOG_ERR("Failed to setup ADC channel: %d", ret);
+    return ret;
+  }
+
+  LOG_INF("ADC device ready: %s", adc_dev->name);
+#endif
+
+  LOG_INF("ADC sensor initialized (real ADC mode with GPIO control)");
+
+#if DT_NODE_EXISTS(VOLTAGE_SENSOR_NODE)
+  LOG_INF("Voltage sensor found in devicetree");
+#endif
+#if DT_NODE_EXISTS(CURRENT_SENSOR_NODE)
+  LOG_INF("Current sensor found in devicetree");
+#endif
+#endif
+
+  initialized = true;
+  return 0;
+}
+
+uint16_t adc_sensor_get_voltage_mv(void) {
+  if (!initialized) {
+    LOG_WRN("ADC sensor not initialized, calling adc_sensor_init()");
+    adc_sensor_init();
+  }
+
+#ifdef CONFIG_ADC_SENSOR_SIMULATED
+  return SIMULATED_VOLTAGE_MV;
+#else
+  // Set GPIOs for voltage measurement (example: s0=0, s1=0 for channel 0)
+  set_voltage_sensor_gpios(true, false, false);
+
+  // Read real ADC value for voltage
+  uint16_t voltage = read_adc_voltage_mv();
+
+  // Disable sensor after measurement to save power
+  set_voltage_sensor_gpios(false, false, false);
+
+  return voltage;
+#endif
+}
+
+uint16_t adc_sensor_get_current_ma(void) {
+  if (!initialized) {
+    LOG_WRN("ADC sensor not initialized, calling adc_sensor_init()");
+    adc_sensor_init();
+  }
+
+#ifdef CONFIG_ADC_SENSOR_SIMULATED
+  return SIMULATED_CURRENT_MA;
+#else
+  // Set GPIOs for current measurement (example: s0=1, s1=0 for channel 1)
+  set_current_sensor_gpios(true, true, false);
+
+  // Read real ADC value for current
+  uint16_t current = read_adc_current_ma();
+
+  // Disable sensor after measurement to save power
+  set_current_sensor_gpios(false, false, false);
+
+  return current;
+#endif
+}

software/lib/canbus.c

@@ -1,286 +0,0 @@
-#include "canbus.h"
-#include <zephyr/logging/log.h>
-#include <zephyr/kernel.h>
-#include <zephyr/sys/byteorder.h>
-#include <zephyr/drivers/can.h>
-#include <stdlib.h>
-
-#ifdef CONFIG_HAS_MODBUS_WATERLEVEL_SENSOR
-#include "waterlevel_sensor.h"
-#endif // CONFIG_HAS_MODBUS_WATERLEVEL_SENSOR
-
-#ifdef CONFIG_HAS_VALVE
-#include "valve.h"
-#endif // CONFIG_HAS_VALVE
-
-const struct device *const can_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_canbus));
-
-LOG_MODULE_REGISTER(canbus, CONFIG_LOG_CAN_LEVEL);
-
-K_MSGQ_DEFINE(canbus_msgq, sizeof(struct can_frame), CANBUS_RX_MSGQ_SIZE, 4);
-K_THREAD_STACK_DEFINE(canbus_rx_stack, CANBUS_RX_THREAD_STACK_SIZE);
-
-uint8_t node_id = 0; // Default node ID, can be set later
-uint8_t can_msg_id = 0;
-
-k_tid_t canbus_rx_thread_id;
-struct k_thread canbus_rx_thread_data;
-
-int canbus_rx_filter_id = -1;
-
-void canbus_rx_callback(const struct device *dev, struct can_frame *frame, void *user_data)
-{
-    int rc;
-    ARG_UNUSED(dev);
-    ARG_UNUSED(user_data);
-
-    if (frame->id >> 8 != node_id) // Check if the frame ID matches the node ID
-    {
-        LOG_DBG("Received CAN frame with ID %d, but it does not match node ID %d", frame->id >> 8, node_id);
-        return; // Ignore frames that do not match the node ID
-    }
-
-    // Process the received CAN frame
-    rc = k_msgq_put(&canbus_msgq, frame, K_NO_WAIT);
-    if (rc != 0)
-    {
-        LOG_ERR("Failed to put CAN frame into message queue: %d", rc);
-    }
-}
-
-void canbus_thread(void *arg1, void *arg2, void *arg3)
-{
-    ARG_UNUSED(arg1);
-    ARG_UNUSED(arg2);
-    ARG_UNUSED(arg3);
-
-    LOG_INF("CAN bus thread started");
-
-    // Main loop for CAN bus operations
-    while (1)
-    {
-        int rc;
-        struct can_frame frame;
-        k_msgq_get(&canbus_msgq, &frame, K_FOREVER); // Wait for a message from the queue
-        LOG_DBG("Received CAN frame with ID: 0x%02x, DLC: %d, RTR: %d",
-                frame.id, frame.dlc, (uint8_t)(frame.flags & CAN_FRAME_RTR));
-        LOG_HEXDUMP_DBG(frame.data, frame.dlc, "CAN frame data");
-        uint8_t reg = frame.id & 0xFF;               // Extract register from the frame ID
-        bool is_rtr = (frame.flags & CAN_FRAME_RTR) != 0; // Check if it's a remote transmission request
-        switch (reg)
-        {
-#ifdef CONFIG_HAS_MODBUS_WATERLEVEL_SENSOR
-        case CANBUS_REG_WATERLEVEL_LEVEL:
-        case CANBUS_REG_WATERLEVEL_ZERO_POINT:
-        case CANBUS_REG_WATERLEVEL_MAX_POINT:
-            waterlevel_command_t command;
-            command.cmd = is_rtr ? WATERLEVEL_CMD_GET : WATERLEVEL_CMD_SET; // Determine command type based on RTR
-            command.reg = reg;                                              // Set the register ID
-            int16_t value = 0; // Initialize value to 0
-            if (!is_rtr) // If it's not a remote request, extract the value from the frame data
-            {
-                if (frame.dlc < sizeof(command.data))
-                {                    LOG_ERR("Received frame with insufficient data length: %d", frame.dlc);
-                    continue; // Skip processing if data length is insufficient
-                }
-                value = sys_be16_to_cpu(*(uint16_t *)frame.data); // Convert data from big-endian to host byte order
-                command.data = value; // Set the data field
-                LOG_DBG("Setting command data to: %d", value);
-            }
-            extern struct k_msgq waterlevel_sensor_msgq;                    // Declare the water level sensor message queue
-            k_msgq_put(&waterlevel_sensor_msgq, &command, K_NO_WAIT);
-            break;
-#endif // CONFIG_HAS_MODBUS_WATERLEVEL_SENSOR
-#ifdef CONFIG_HAS_VALVE
-        case CANBUS_REG_VALVE_STATUS:
-        case CANBUS_REG_VALVE_OPERATION:
-        if (is_rtr)
-            {
-                LOG_DBG("Received remote request for valve status or operation");
-                if (reg == CANBUS_REG_VALVE_STATUS)
-                {
-                    valve_send_status(); // Send the current valve status
-                }
-                else if (reg == CANBUS_REG_VALVE_OPERATION)
-                {
-                    valve_send_operation(); // Send the current valve operation state
-                } else {
-                    LOG_ERR("Unknown valve register: 0x%02x", reg);
-                    continue; // Skip processing if the register is unknown
-                }
-            }
-            else
-            {
-                LOG_ERR("Received CAN frame with data for valve status or operation, but RTR is not set");
-                continue; // Skip processing if RTR is not set for valve status or operation
-            }
-            break;
-        case CANBUS_REG_VALVE_COMMAND:
-        {
-            if (is_rtr) {
-                LOG_ERR("Received remote request for valve command, but this is not supported");
-                continue; // Skip processing if RTR is set for valve command
-            } else {
-                // Extract the command from the frame data
-                if (frame.dlc < sizeof(uint8_t)) {
-                    LOG_ERR("Received frame with insufficient data length for valve command: %d", frame.dlc);
-                    continue; // Skip processing if data length is insufficient
-                }
-                uint8_t command = frame.data[0]; // Get the command from the first byte of data
-                LOG_DBG("Received valve command: 0x%02x", command);
-                rc = valve_cmd(command); // Send the command to the valve
-                if (rc < 0) {
-                    LOG_ERR("Failed to send valve command: %d", rc);
-                    continue; // Skip processing if sending the command failed
-                }
-            }
-            break;
-        }
-        default:
-            LOG_DBG("Received CAN frame with unknown register: 0x%02x", reg);
-            break;
-        }
-        #endif // CONFIG_HAS_VALVE
-    }
-}
-
-int canbus_init(void)
-{
-    int rc = 0;
-
-    if (!device_is_ready(can_dev))
-    {
-        LOG_ERR("CAN device %s is not ready", can_dev->name);
-        return -ENODEV;
-    }
-
-#ifdef CONFIG_LOOPBACK_MODE
-    rc = can_set_mode(can_dev, CAN_MODE_LOOPBACK);
-    if (rc != 0)
-    {
-        LOG_ERR("Failed to set CAN loopback mode: %d", rc);
-        return rc;
-    }
-#endif
-
-    rc = can_start(can_dev);
-    if (rc != 0)
-    {
-        printf("Error starting CAN controller [%d]", rc);
-        return 0;
-    }
-    LOG_DBG("CAN device %s is ready", can_dev->name);
-    // Initialize the CAN RX thread
-    canbus_rx_thread_id = k_thread_create(&canbus_rx_thread_data, canbus_rx_stack,
-                                          K_THREAD_STACK_SIZEOF(canbus_rx_stack), canbus_thread,
-                                          NULL, NULL, NULL,
-                                          CANBUS_RX_THREAD_PRIORITY, 0, K_NO_WAIT);
-    k_thread_name_set(canbus_rx_thread_id, "canbus_rx");
-
-    const struct can_filter filter = {
-        .id = node_id << 8, // Standard ID with node ID in the first byte
-        .mask = 0x700,      // Mask to match the first byte of the ID
-        .flags = 0,         // No special flags
-    };
-    canbus_rx_filter_id = can_add_rx_filter(can_dev, canbus_rx_callback, NULL, &filter);
-    LOG_DBG("CAN RX filter added for node ID %d", canbus_rx_filter_id);
-    return 0;
-}
-
-void canbus_tx8_callback(const struct device *dev, int error, void *user_data)
-{
-    ARG_UNUSED(dev);
-    uint8_t frame_id = *(uint8_t *)user_data; // Retrieve the frame ID from user data
-
-    if (error != 0)
-    {
-        LOG_ERR("CAN transmission error. Error code: %d, Frame ID: %d", error, frame_id);
-    }
-    else
-    {
-        LOG_DBG("CAN message with Frame ID %d sent successfully", frame_id);
-    }
-    free(user_data); // Free the allocated memory for frame ID
-}
-
-int canbus_send8(uint16_t reg, uint8_t value)
-{
-    int rc = 0;
-    struct can_frame frame = {
-        .id = (node_id << 8) | reg, // Standard ID with node ID in the first byte
-        .dlc = sizeof(value),        // Data Length Code (DLC)
-    };
-    frame.data[0] = value; // Set the value in the first byte of the data
-    uint8_t *frame_id = malloc(sizeof(uint8_t)); // Allocate memory for frame ID
-    LOG_DBG("Preparing to send 8-bit value 0x%02x to register 0x%02x on node %d", value, reg, node_id);
-    if (frame_id == NULL)
-    {
-        LOG_ERR("Failed to allocate memory for frame ID");
-        return -ENOMEM; // Not enough memory
-    }
-    *frame_id = can_msg_id++; // Increment message ID for uniqueness
-    LOG_DBG("Using frame ID: %d", *frame_id);
-    rc = can_send(can_dev, &frame, CANBUS_TX_TIMEOUT, canbus_tx8_callback, frame_id);
-    // Send the CAN frame with a timeout and callback
-    if (rc != 0)
-    {
-        LOG_ERR("Failed to queue CAN frame: %d", rc);
-        free(frame_id); // Free the allocated memory for frame ID
-        return rc;
-    }
-    return 0;
-}
-
-void canbus_tx16_callback(const struct device *dev, int error, void *user_data)
-{
-    ARG_UNUSED(dev);
-    uint8_t frame_id = *(uint8_t *)user_data; // Retrieve the frame ID from user data
-
-    if (error != 0)
-    {
-        LOG_ERR("CAN transmission error. Error code: %d, Frame ID: %d", error, frame_id);
-    }
-    else
-    {
-        LOG_DBG("CAN message with Frame ID %d sent successfully", frame_id);
-    }
-    free(user_data); // Free the allocated memory for frame ID
-}
-
-int canbus_send16(uint16_t reg, uint16_t value)
-{
-    int rc = 0;
-    union data_type
-    {
-        int16_t value;
-        uint8_t bytes[2];
-    } data;
-    data.value = sys_cpu_to_be16(value); // Convert value to big-endian format
-
-    struct can_frame frame = {
-        .id = (node_id << 8) | reg, // Standard ID with node ID in the first byte
-        .dlc = sizeof(data),        // Data Length Code (DLC)
-    };
-    memcpy(frame.data, data.bytes, sizeof(data)); // Copy data into the frame
-    uint8_t *frame_id = malloc(sizeof(uint8_t));  // Allocate memory for frame ID
-    LOG_DBG("Preparing to send 16-bit value 0x%04x to register 0x%02x on node %d", value, reg, node_id);
-    if (frame_id == NULL)
-    {
-        LOG_ERR("Failed to allocate memory for frame ID");
-        return -ENOMEM; // Not enough memory
-    }
-    *frame_id = can_msg_id++; // Increment message ID for uniqueness
-    LOG_DBG("Using frame ID: %d", *frame_id);
-    rc = can_send(can_dev, &frame, CANBUS_TX_TIMEOUT, canbus_tx16_callback, frame_id);
-    // Send the CAN frame with a timeout and callback
-    if (rc != 0)
-    {
-        LOG_ERR("Failed to queue CAN frame: %d", rc);
-        free(frame_id); // Free the allocated memory for frame ID
-        return rc;
-    }
-
-    LOG_DBG("Queued 16-bit value 0x%04x to register 0x%02x on node %d, frame ID: %d",
-            value, reg, node_id, *frame_id);
-    return 0;
-}

software/lib/canbus.h

@@ -1,16 +0,0 @@
-#ifndef __CANBUS_H__
-#define __CANBUS_H__
-
-#include <stdint.h>
-#include "canbus_registers.h"
-
-#define CANBUS_RX_THREAD_STACK_SIZE (512) // Stack size for the CAN RX thread
-#define CANBUS_RX_THREAD_PRIORITY (5) // Priority for the CAN RX thread
-#define CANBUS_RX_MSGQ_SIZE (5) // Size of the message queue for CAN RX thread
-#define CANBUS_TX_TIMEOUT K_MSEC(100) // Timeout for sending CAN messages in milliseconds
-
-int canbus_init(void);
-int canbus_send8(uint16_t reg, uint8_t value);
-int canbus_send16(uint16_t reg, uint16_t value);
-
-#endif // __CANBUS_H__

software/lib/canbus_registers.h

@@ -1,42 +0,0 @@
-#ifndef __CANBUS_REGISTERS_H__
-#define __CANBUS_REGISTERS_H__
-
-enum canbus_registers {
-    CANBUS_REG_REBOOT = 0x00,
-    CANBUS_REG_STATE = 0x01,
-    CANBUS_REG_ERROR = 0x02,
-
-    CANBUS_REG_VALVE_STATUS = 0x10,
-    CANBUS_REG_VALVE_OPERATION = 0x11,
-    CANBUS_REG_VALVE_COMMAND = 0x12,
-
-    CANBUS_REG_WATERLEVEL_STATE = 0x20,
-    CANBUS_REG_WATERLEVEL_LEVEL = 0x21,
-    CANBUS_REG_WATERLEVEL_ZERO_POINT = 0x22,
-    CANBUS_REG_WATERLEVEL_MAX_POINT = 0x23,
-};
-
-enum valve_status {
-    VALVE_STATE_CLOSED = 0x00,
-    VALVE_STATE_OPEN = 0x01,
-    VALVE_STATE_ERROR = 0x02,
-    VALVE_STATE_UNKNOWN = 0x03,
-};
-
-enum valve_operation_state {
-    VALVE_OPERATION_IDLE = 0x00,
-    VALVE_OPERATION_OPENING = 0x01,
-    VALVE_OPERATION_CLOSING = 0x02,
-};
-
-enum valve_command {
-    VALVE_COMMAND_STOP = 0x00,
-    VALVE_COMMAND_OPEN = 0x01,
-    VALVE_COMMAND_CLOSE = 0x02,
-};
-
-enum waterlevel_state {
-    WATERLEVEL_STATE_OK = 0x00,
-    WATERLEVEL_STATE_MODBUS_ERROR = 0x02,
-};
-#endif // __CANBUS_REGISTERS_H__

software/lib/fwu/CMakeLists.txt

@@ -0,0 +1 @@
+zephyr_library_sources(fwu.c)

software/lib/fwu/Kconfig

@@ -0,0 +1,5 @@
+config LIB_FWU
+    bool "Enable Firmware Update Library"
+    default y
+    help
+      Enable the Firmware Update Library.

software/lib/fwu/fwu.c

@@ -0,0 +1,58 @@
+/**
+ * @file fwu.c
+ * @brief Implementation of the Firmware Update (FWU) library.
+ *
+ * This file implements the logic for receiving a new firmware image in chunks
+ * over Modbus. It maintains a buffer for the incoming data, calculates the CRC
+ * of the received chunk, and handles commands to verify the chunk and finalize
+ * the update process. The actual writing to flash is simulated.
+ */
+
+#include <lib/fwu.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/byteorder.h>
+#include <zephyr/sys/crc.h>
+
+LOG_MODULE_REGISTER(fwu, LOG_LEVEL_INF);
+
+#define FWU_BUFFER_SIZE 256
+static uint8_t fwu_buffer[FWU_BUFFER_SIZE];  // Buffer to store incoming
+                                             // firmware data chunks
+static uint32_t fwu_chunk_offset =
+    0;  // Offset for the current firmware chunk in the overall image
+static uint16_t fwu_chunk_size = 0;  // Size of the current firmware chunk
+static uint16_t fwu_last_chunk_crc =
+    0;  // CRC16 of the last received firmware chunk
+
+void fwu_init(void) {}
+
+void fwu_handler(uint16_t addr, uint16_t reg) {
+  // This is a simplified handler. In a real scenario, you would have a proper
+  // mapping between register addresses and actions.
+  if (addr == 0x0100) {  // FWU_COMMAND
+    if (reg == 1) {
+      LOG_INF("FWU: Chunk at offset %u (size %u) verified.", fwu_chunk_offset,
+              fwu_chunk_size);
+    } else if (reg == 2) {
+      LOG_INF("FWU: Finalize command received. Rebooting (simulated).");
+    }
+  } else if (addr == 0x0101) {  // FWU_CHUNK_OFFSET_LOW
+    fwu_chunk_offset = (fwu_chunk_offset & 0xFFFF0000) | reg;
+  } else if (addr == 0x0102) {  // FWU_CHUNK_OFFSET_HIGH
+    fwu_chunk_offset = (fwu_chunk_offset & 0x0000FFFF) | ((uint32_t)reg << 16);
+  } else if (addr == 0x0103) {  // FWU_CHUNK_SIZE
+    fwu_chunk_size = (reg > FWU_BUFFER_SIZE) ? FWU_BUFFER_SIZE : reg;
+  } else if (addr >= 0x0180 && addr < (0x0180 + (FWU_BUFFER_SIZE / 2))) {
+    uint16_t index = (addr - 0x0180) * 2;
+    if (index < sizeof(fwu_buffer)) {
+      sys_put_be16(reg, &fwu_buffer[index]);
+      if (index + 2 >= fwu_chunk_size) {
+        fwu_last_chunk_crc = crc16_ccitt(0xffff, fwu_buffer, fwu_chunk_size);
+        LOG_INF("FWU: Chunk received, CRC is 0x%04X", fwu_last_chunk_crc);
+      }
+    }
+  }
+}
+
+uint16_t fwu_get_last_chunk_crc(void) { return fwu_last_chunk_crc; }

software/lib/modbus_server/CMakeLists.txt

@@ -0,0 +1 @@
+zephyr_library_sources(modbus_server.c)

software/lib/modbus_server/Kconfig

@@ -0,0 +1,5 @@
+config LIB_MODBUS_SERVER
+    bool "Enable Modbus Server Library"
+    default y
+    help
+      Enable the Modbus Server Library.

software/lib/modbus_server/modbus_server.c

@@ -0,0 +1,264 @@
+/**
+ * @file modbus_server.c
+ * @brief Modbus RTU server implementation for the irrigation system slave node.
+ *
+ * This file implements the Modbus server logic, including register callbacks,
+ * watchdog handling, and dynamic reconfiguration. It interfaces with other
+ * libraries like valve control, ADC sensors, and firmware updates.
+ */
+
+#include <app_version.h>
+#include <lib/adc_sensor.h>
+#include <lib/fwu.h>
+#include <lib/modbus_server.h>
+#include <lib/valve.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/modbus/modbus.h>
+#include <zephyr/settings/settings.h>
+#include <zephyr/sys/reboot.h>
+#include <zephyr/usb/usb_device.h>
+
+LOG_MODULE_REGISTER(modbus_server, LOG_LEVEL_INF);
+
+static int modbus_iface;
+static struct modbus_iface_param server_param = {
+    .mode = MODBUS_MODE_RTU,
+    .server = {.user_cb = NULL, .unit_id = 1},
+    .serial = {.baud = 19200, .parity = UART_CFG_PARITY_NONE},
+};
+
+static uint16_t watchdog_timeout_s = 0;
+static struct k_timer watchdog_timer;
+
+/**
+ * @brief Timer handler for the Modbus watchdog.
+ *
+ * This function is called when the watchdog timer expires, indicating a loss
+ * of communication with the Modbus master. It triggers a fail-safe action,
+ * which is to close the valve.
+ *
+ * @param timer_id Pointer to the timer instance.
+ */
+static void watchdog_timer_handler(struct k_timer *timer_id) {
+  LOG_WRN("Modbus watchdog expired! Closing valve as a fail-safe.");
+  valve_close();
+}
+
+/**
+ * @brief Resets the Modbus watchdog timer.
+ *
+ * This function should be called upon receiving any valid Modbus request
+ * to prevent the watchdog from expiring.
+ */
+static inline void reset_watchdog(void) {
+  if (watchdog_timeout_s > 0) {
+    k_timer_start(&watchdog_timer, K_SECONDS(watchdog_timeout_s), K_NO_WAIT);
+  }
+}
+
+/**
+ * @brief Callback for reading Modbus holding registers.
+ *
+ * @param addr Register address.
+ * @param reg Pointer to store the read value.
+ * @return 0 on success.
+ */
+static int holding_reg_rd(uint16_t addr, uint16_t *reg) {
+  reset_watchdog();
+  switch (addr) {
+    case REG_HOLDING_MAX_OPENING_TIME_S:
+      *reg = valve_get_max_open_time();
+      break;
+    case REG_HOLDING_MAX_CLOSING_TIME_S:
+      *reg = valve_get_max_close_time();
+      break;
+    case REG_HOLDING_WATCHDOG_TIMEOUT_S:
+      *reg = watchdog_timeout_s;
+      break;
+    default:
+      *reg = 0;
+      break;
+  }
+  return 0;
+}
+
+/**
+ * @brief Callback for writing Modbus holding registers.
+ *
+ * @param addr Register address.
+ * @param reg Value to write.
+ * @return 0 on success.
+ */
+static int holding_reg_wr(uint16_t addr, uint16_t reg) {
+  reset_watchdog();
+  switch (addr) {
+    case REG_HOLDING_VALVE_COMMAND:
+      if (reg == 1) {
+        valve_open();
+      } else if (reg == 2) {
+        valve_close();
+      } else if (reg == 0) {
+        valve_stop();
+      }
+      break;
+    case REG_HOLDING_MAX_OPENING_TIME_S:
+      valve_set_max_open_time(reg);
+      break;
+    case REG_HOLDING_MAX_CLOSING_TIME_S:
+      valve_set_max_close_time(reg);
+      break;
+    case REG_HOLDING_WATCHDOG_TIMEOUT_S:
+      watchdog_timeout_s = reg;
+      if (watchdog_timeout_s > 0) {
+        LOG_INF("Watchdog enabled with %u s timeout.", watchdog_timeout_s);
+        reset_watchdog();
+      } else {
+        LOG_INF("Watchdog disabled.");
+        k_timer_stop(&watchdog_timer);
+      }
+      break;
+    case REG_HOLDING_DEVICE_RESET:
+      if (reg == 1) {
+        LOG_WRN("Modbus reset command received. Rebooting...");
+        sys_reboot(SYS_REBOOT_WARM);
+      }
+      break;
+    default:
+      fwu_handler(addr, reg);
+      break;
+  }
+  return 0;
+}
+
+/**
+ * @brief Callback for reading Modbus input registers.
+ *
+ * @param addr Register address.
+ * @param reg Pointer to store the read value.
+ * @return 0 on success.
+ */
+static int input_reg_rd(uint16_t addr, uint16_t *reg) {
+  reset_watchdog();
+  uint32_t uptime_s = k_uptime_get_32() / 1000;
+  switch (addr) {
+    case REG_INPUT_VALVE_STATE_MOVEMENT:
+      *reg = (valve_get_movement() << 8) | (valve_get_state() & 0xFF);
+      break;
+    case REG_INPUT_MOTOR_CURRENT_MA:
+      *reg = adc_sensor_get_current_ma();
+      break;
+    case REG_INPUT_UPTIME_SECONDS_LOW:
+      *reg = (uint16_t)(uptime_s & 0xFFFF);
+      break;
+    case REG_INPUT_UPTIME_SECONDS_HIGH:
+      *reg = (uint16_t)(uptime_s >> 16);
+      break;
+    case REG_INPUT_SUPPLY_VOLTAGE_MV:
+      *reg = adc_sensor_get_voltage_mv();
+      break;
+    case REG_INPUT_FWU_LAST_CHUNK_CRC:
+      *reg = fwu_get_last_chunk_crc();
+      break;
+    case REG_INPUT_FIRMWARE_VERSION_MAJOR_MINOR:
+      *reg = (APP_VERSION_MAJOR << 8) | APP_VERSION_MINOR;
+      break;
+    case REG_INPUT_FIRMWARE_VERSION_PATCH:
+      *reg = APP_PATCHLEVEL;
+      break;
+    default:
+      *reg = 0;
+      break;
+  }
+  return 0;
+}
+
+static struct modbus_user_callbacks mbs_cbs = {
+    // Modbus server callback functions
+    .holding_reg_rd = holding_reg_rd,
+    .holding_reg_wr = holding_reg_wr,
+    .input_reg_rd = input_reg_rd,
+};
+
+#define MODBUS_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(zephyr_modbus_serial)
+
+int modbus_server_init(void) {
+  k_timer_init(&watchdog_timer, watchdog_timer_handler, NULL);
+
+  // Initialize ADC sensor
+  int ret = adc_sensor_init();
+  if (ret < 0) {
+    LOG_ERR("Failed to initialize ADC sensor: %d", ret);
+    return ret;
+  }
+
+  // Load saved settings
+  uint32_t saved_baudrate = 19200;
+  uint8_t saved_unit_id = 1;
+  settings_load_one("modbus/baudrate", &saved_baudrate, sizeof(saved_baudrate));
+  settings_load_one("modbus/unit_id", &saved_unit_id, sizeof(saved_unit_id));
+
+  // Apply loaded settings
+  server_param.serial.baud = saved_baudrate;
+  server_param.server.unit_id = saved_unit_id;
+
+  const char iface_name[] = {DEVICE_DT_NAME(MODBUS_NODE)};
+#if DT_NODE_HAS_COMPAT(DT_PARENT(MODBUS_NODE), zephyr_cdc_acm_uart)
+  const struct device *const dev = DEVICE_DT_GET(DT_PARENT(MODBUS_NODE));
+  uint32_t dtr = 0;
+
+  if (!device_is_ready(dev) || usb_enable(NULL)) {
+    return 0;
+  }
+
+  while (!dtr) {
+    uart_line_ctrl_get(dev, UART_LINE_CTRL_DTR, &dtr);
+    k_sleep(K_MSEC(100));
+  }
+
+  LOG_INF("Client connected to server on %s", dev->name);
+#endif
+  modbus_iface = modbus_iface_get_by_name(iface_name);
+  if (modbus_iface < 0) {
+    return modbus_iface;
+  }
+  server_param.server.user_cb = &mbs_cbs;
+
+  LOG_INF("Starting Modbus server: baudrate=%u, unit_id=%u", saved_baudrate,
+          saved_unit_id);
+  return modbus_init_server(modbus_iface, server_param);
+}
+
+int modbus_reconfigure(uint32_t baudrate, uint8_t unit_id) {
+  // Update parameters
+  server_param.serial.baud = baudrate;
+  server_param.server.unit_id = unit_id;
+
+  // Try to reinitialize - this should work for most cases
+  int ret = modbus_init_server(modbus_iface, server_param);
+
+  if (ret == 0) {
+    settings_save_one("modbus/baudrate", &baudrate, sizeof(baudrate));
+    settings_save_one("modbus/unit_id", &unit_id, sizeof(unit_id));
+    LOG_INF("Modbus reconfigured: baudrate=%u, unit_id=%u", baudrate, unit_id);
+  } else {
+    LOG_ERR("Failed to reconfigure Modbus: %d", ret);
+    LOG_INF("Modbus reconfiguration requires restart to take effect");
+
+    // Save settings for next boot
+    settings_save_one("modbus/baudrate", &baudrate, sizeof(baudrate));
+    settings_save_one("modbus/unit_id", &unit_id, sizeof(unit_id));
+
+    LOG_INF(
+        "Settings saved. Type 'reset' to restart the device and apply the "
+        "change.");
+    return 0;  // Return success since settings are saved
+  }
+
+  return ret;
+}
+
+uint32_t modbus_get_baudrate(void) { return server_param.serial.baud; }
+uint8_t modbus_get_unit_id(void) { return server_param.server.unit_id; }

software/lib/shell_modbus/CMakeLists.txt

@@ -0,0 +1 @@
+zephyr_library_sources(shell_modbus.c)

software/lib/shell_modbus/Kconfig

@@ -0,0 +1,5 @@
+config SHELL_MODBUS
+    bool "Enable Shell Modbus"
+    default y
+    help
+      Enable the modnbus shell commands.

software/lib/shell_modbus/shell_modbus.c

@@ -0,0 +1,176 @@
+/**
+ * @file shell_modbus.c
+ * @brief Provides shell commands for Modbus and valve configuration.
+ *
+ * This file implements a set of commands for the Zephyr shell to allow
+ * runtime configuration of the Modbus server (baudrate, slave ID) and the
+ * valve (max opening/closing times). The settings are persisted to non-volatile
+ * storage.
+ */
+
+#include <lib/modbus_server.h>
+#include <lib/valve.h>
+#include <stdlib.h>
+#include <zephyr/shell/shell.h>
+
+/**
+ * @brief Shell command to set the Modbus baudrate.
+ *
+ * @param sh The shell instance.
+ * @param argc Argument count.
+ * @param argv Argument values.
+ * @return 0 on success, -EINVAL on error.
+ */
+static int cmd_modbus_set_baud(const struct shell *sh, size_t argc,
+                               char **argv) {
+  if (argc != 2) {
+    shell_error(sh, "Usage: set_baud <baudrate>");
+    return -EINVAL;
+  }
+
+  uint32_t new_baud = (uint32_t)strtoul(argv[1], NULL, 10);
+  const uint32_t valid_baud_rates[] = {1200,  2400,  4800,  9600,
+                                       19200, 38400, 57600, 115200};
+  bool is_valid = false;
+
+  for (int i = 0; i < ARRAY_SIZE(valid_baud_rates); i++) {
+    if (new_baud == valid_baud_rates[i]) {
+      is_valid = true;
+      break;
+    }
+  }
+
+  if (!is_valid) {
+    char error_msg[128];
+    int offset = snprintf(error_msg, sizeof(error_msg),
+                          "Invalid baudrate. Valid rates are: ");
+    for (int i = 0; i < ARRAY_SIZE(valid_baud_rates); i++) {
+      offset += snprintf(error_msg + offset, sizeof(error_msg) - offset, "%u ",
+                         valid_baud_rates[i]);
+    }
+    shell_error(sh, "%s", error_msg);
+    return -EINVAL;
+  }
+
+  if (modbus_reconfigure(new_baud, modbus_get_unit_id()) != 0) {
+    shell_error(sh, "Failed to apply new baudrate");
+  } else {
+    shell_print(sh, "Modbus baudrate set to: %u (and saved)", new_baud);
+  }
+
+  return 0;
+}
+
+/**
+ * @brief Shell command to set the Modbus slave ID.
+ *
+ * @param sh The shell instance.
+ * @param argc Argument count.
+ * @param argv Argument values.
+ * @return 0 on success, -EINVAL on error.
+ */
+static int cmd_modbus_set_id(const struct shell *sh, size_t argc, char **argv) {
+  if (argc != 2) {
+    shell_error(sh, "Usage: set_id <slave_id>");
+    return -EINVAL;
+  }
+
+  uint32_t new_id_u32 = (uint32_t)strtoul(argv[1], NULL, 10);
+  if (new_id_u32 == 0 || new_id_u32 > 247) {
+    shell_error(sh, "Invalid slave ID: %s. Must be between 1 and 247.",
+                argv[1]);
+    return -EINVAL;
+  }
+  uint8_t new_id = (uint8_t)new_id_u32;
+
+  if (modbus_reconfigure(modbus_get_baudrate(), new_id) != 0) {
+    shell_error(sh, "Failed to apply new slave ID");
+  } else {
+    shell_print(sh, "Modbus slave ID set to: %u (and saved)", new_id);
+  }
+
+  return 0;
+}
+
+/**
+ * @brief Shell command to set the valve's maximum opening time.
+ *
+ * @param sh The shell instance.
+ * @param argc Argument count.
+ * @param argv Argument values.
+ * @return 0 on success, -EINVAL on error.
+ */
+static int cmd_valve_set_open_time(const struct shell *sh, size_t argc,
+                                   char **argv) {
+  if (argc != 2) {
+    shell_error(sh, "Usage: set_open_time <seconds>");
+    return -EINVAL;
+  }
+
+  uint16_t seconds = (uint16_t)strtoul(argv[1], NULL, 10);
+  valve_set_max_open_time(seconds);
+  shell_print(sh, "Max opening time set to: %u seconds (and saved)", seconds);
+
+  return 0;
+}
+
+/**
+ * @brief Shell command to set the valve's maximum closing time.
+ *
+ * @param sh The shell instance.
+ * @param argc Argument count.
+ * @param argv Argument values.
+ * @return 0 on success, -EINVAL on error.
+ */
+static int cmd_valve_set_close_time(const struct shell *sh, size_t argc,
+                                    char **argv) {
+  if (argc != 2) {
+    shell_error(sh, "Usage: set_close_time <seconds>");
+    return -EINVAL;
+  }
+
+  uint16_t seconds = (uint16_t)strtoul(argv[1], NULL, 10);
+  valve_set_max_close_time(seconds);
+  shell_print(sh, "Max closing time set to: %u seconds (and saved)", seconds);
+
+  return 0;
+}
+
+/**
+ * @brief Shell command to show the current configuration.
+ *
+ * @param sh The shell instance.
+ * @param argc Argument count.
+ * @param argv Argument values.
+ * @return 0 on success.
+ */
+static int cmd_config_show(const struct shell *sh, size_t argc, char **argv) {
+  shell_print(sh, "Current Modbus Configuration:");
+  shell_print(sh, "  Baudrate: %u", modbus_get_baudrate());
+  shell_print(sh, "  Slave ID: %u", modbus_get_unit_id());
+  shell_print(sh, "Current Valve Configuration:");
+  shell_print(sh, "  Max Opening Time: %u s", valve_get_max_open_time());
+  shell_print(sh, "  Max Closing Time: %u s", valve_get_max_close_time());
+  return 0;
+}
+
+SHELL_STATIC_SUBCMD_SET_CREATE(sub_modbus_cmds,
+                               SHELL_CMD(set_baud, NULL, "Set Modbus baudrate",
+                                         cmd_modbus_set_baud),
+                               SHELL_CMD(set_id, NULL, "Set Modbus slave ID",
+                                         cmd_modbus_set_id),
+                               SHELL_SUBCMD_SET_END);
+
+SHELL_STATIC_SUBCMD_SET_CREATE(sub_valve_cmds,
+                               SHELL_CMD(set_open_time, NULL,
+                                         "Set max valve opening time",
+                                         cmd_valve_set_open_time),
+                               SHELL_CMD(set_close_time, NULL,
+                                         "Set max valve closing time",
+                                         cmd_valve_set_close_time),
+                               SHELL_SUBCMD_SET_END);
+
+SHELL_CMD_REGISTER(modbus, &sub_modbus_cmds, "Modbus configuration", NULL);
+SHELL_CMD_REGISTER(valve, &sub_valve_cmds, "Valve configuration", NULL);
+SHELL_CMD_REGISTER(show_config, NULL, "Show all configurations",
+                   cmd_config_show);

software/lib/shell_system/CMakeLists.txt

@@ -0,0 +1 @@
+zephyr_library_sources(shell_system.c)

software/lib/shell_system/Kconfig

@@ -0,0 +1,5 @@
+config SHELL_SYSTEM
+    bool "Enable Shell System"
+    default y
+    help
+      Enable the system commands.

software/lib/shell_system/shell_system.c

@@ -0,0 +1,30 @@
+/**
+ * @file shell_system.c
+ * @brief Provides basic system-level shell commands.
+ *
+ * This file implements essential system commands for the Zephyr shell,
+ * such as rebooting the device.
+ */
+
+#include <zephyr/shell/shell.h>
+#include <zephyr/sys/reboot.h>
+
+/**
+ * @brief Shell command to reset the system.
+ *
+ * This command performs a warm reboot of the device after a short delay
+ * to ensure the shell message is printed.
+ *
+ * @param sh The shell instance.
+ * @param argc Argument count.
+ * @param argv Argument values.
+ * @return 0 on success.
+ */
+static int cmd_reset(const struct shell *sh, size_t argc, char **argv) {
+  shell_print(sh, "Rebooting system...");
+  k_sleep(K_MSEC(100));  // Allow the shell to print the message
+  sys_reboot(SYS_REBOOT_WARM);
+  return 0;
+}
+
+SHELL_CMD_REGISTER(reset, NULL, "Reboot the system", cmd_reset);

software/lib/valve.c

@@ -1,163 +0,0 @@
-#include <zephyr/kernel.h>
-#include <zephyr/logging/log.h>
-
-#include "canbus.h"
-#include "canbus_registers.h"
-#include "valve.h"
-
-LOG_MODULE_REGISTER(valve, CONFIG_LOG_VALVE_LEVEL);
-
-K_THREAD_STACK_DEFINE(valve_thread_stack, VALVE_THREAD_STACK_SIZE);
-K_MSGQ_DEFINE(valve_msgq, sizeof(int), VALVE_MSGQ_SIZE, 4);
-
-k_tid_t valve_thread_id;
-struct k_thread valve_thread_data;
-
-valve_status_t valve_status_data = {
-    .valve_state = VALVE_STATE_UNKNOWN,
-    .valve_operation = VALVE_OPERATION_IDLE,
-};
-
-int valve_start_thread(void)
-{
-    int rc;
-
-    // Initialize the valve
-    rc = valve_init();
-    if (rc < 0)
-    {
-        LOG_ERR("Failed to initialize valve: %d", rc);
-        return rc;
-    }
-
-    // Create the valve thread
-    valve_thread_id = k_thread_create(&valve_thread_data, valve_thread_stack,
-                                      K_THREAD_STACK_SIZEOF(valve_thread_stack),
-                                      (k_thread_entry_t)valve_cmd, NULL, NULL, NULL,
-                                      VALVE_THREAD_PRIORITY, 0, K_NO_WAIT);
-    k_thread_name_set(valve_thread_id, "valve");
-
-    LOG_INF("Valve thread started successfully");
-while (1)
-    {
-        // Wait for commands from the message queue
-        int cmd;
-        rc = k_msgq_get(&valve_msgq, &cmd, VALVE_STATE_INTERVAL);
-        if (rc == 0)
-        {
-            // Process the command
-            rc = valve_cmd(cmd);
-            if (rc < 0)
-            {
-                LOG_ERR("Failed to process valve command: %d", rc);
-            }
-        }
-        else
-        {
-            valve_send_status();    // Send current valve status periodically
-        }
-    }  
-    return 0;
-}
-int valve_init(void)
-{
-    return 0;
-}
-
-int valve_cmd(int cmd)
-{
-    switch (cmd)
-    {
-    case VALVE_COMMAND_OPEN:
-        if (valve_status_data.valve_state != VALVE_STATE_OPEN)
-        {
-            valve_status_data.valve_state = VALVE_STATE_OPEN;
-            valve_status_data.valve_operation = VALVE_OPERATION_OPENING;
-            valve_send_status();    // Send updated status before opening
-            valve_send_operation(); // Send updated operation state before opening
-            k_sleep(VALVE_OPENING_TIME);                              // Simulate opening time
-            valve_status_data.valve_operation = VALVE_OPERATION_IDLE; // Set operation to idle after opening
-            valve_send_status();                                      // Send updated status after opening
-            valve_send_operation();                                   // Send updated operation state after opening
-        }
-        break;
-    case VALVE_COMMAND_CLOSE:
-        if (valve_status_data.valve_state != VALVE_STATE_CLOSED)
-        {
-            valve_status_data.valve_operation = VALVE_OPERATION_CLOSING;
-            valve_send_operation();                                   // Send updated operation state before closing
-            k_sleep(VALVE_CLOSING_TIME);                              // Simulate closing time
-            valve_status_data.valve_state = VALVE_STATE_CLOSED;       // Set valve state to closed after closing
-            valve_status_data.valve_operation = VALVE_OPERATION_IDLE; // Set operation to idle after closing
-            valve_send_status();                                      // Send updated status after closing
-            valve_send_operation();                                   // Send updated operation state after closing
-        }
-        break;
-    case VALVE_COMMAND_STOP:
-        valve_status_data.valve_operation = VALVE_OPERATION_IDLE;
-        break;
-    default:
-        LOG_ERR("Unknown valve command: %d", cmd);
-        return -EINVAL; // Invalid command
-    }
-    return 0;
-}
-
-int valve_send_status(void)
-{
-    int rc = canbus_send8(CANBUS_REG_VALVE_STATUS, valve_status_data.valve_state);
-    if (rc != 0)
-    {
-        LOG_ERR("Failed to send valve status: %d", rc);
-        return rc;
-    }
-    char *state_str;
-    switch (valve_status_data.valve_state)
-    {
-    case VALVE_STATE_CLOSED:
-        state_str = "CLOSED";
-        break;
-    case VALVE_STATE_OPEN:
-        state_str = "OPEN";
-        break;
-    case VALVE_STATE_ERROR:
-        state_str = "ERROR";
-        break;
-    case VALVE_STATE_UNKNOWN:
-        state_str = "UNKNOWN";
-        break;
-    default:
-        state_str = "INVALID";
-        break;
-    }
-    LOG_INF("Valve status sent: %s", state_str);
-    return 0;
-}
-
-int valve_send_operation(void)
-{
-    int rc = canbus_send8(CANBUS_REG_VALVE_OPERATION, valve_status_data.valve_operation);
-    if (rc != 0)
-    {
-        LOG_ERR("Failed to send valve operation: %d", rc);
-        return rc;
-    }
-    char *operation_str;
-    switch (valve_status_data.valve_operation)
-    {
-    case VALVE_OPERATION_IDLE:
-        operation_str = "IDLE";
-        break;
-    case VALVE_OPERATION_OPENING:
-        operation_str = "OPENING";
-        break;
-    case VALVE_OPERATION_CLOSING:
-        operation_str = "CLOSING";
-        break;
-    default:
-        operation_str = "UNKNOWN";
-        break;
-    }
-    LOG_INF("Valve operation sent: %s", operation_str);
-    return 0;
-}

software/lib/valve.h

@@ -1,27 +0,0 @@
-#ifndef __VALVE_H__
-#define __VALVE_H__
-
-#define VALVE_OPENING_TIME K_MSEC(4500)        // Time to open the valve
-#define VALVE_CLOSING_TIME K_MSEC(4500)        // Time to close the valve
-#define VALVE_MAX_OPENING_TIME K_MSEC(5000)    // Maximum time to open the valve
-#define VALVE_MAX_CLOSING_TIME K_MSEC(5000)    // Maximum time to close the valve
-#define VALVE_STATE_INTERVAL K_SECONDS(5 * 60) // Interval to check the valve state
-#define VALVE_THREAD_STACK_SIZE (512)          // Stack size for the valve thread
-#define VALVE_THREAD_PRIORITY (2)              // Priority for the valve thread
-#define VALVE_MSGQ_SIZE (5)                    // Size of the message queue for valve operations
-
-#include <stdint.h>
-#include "canbus_registers.h"
-
-typedef struct {
-    uint8_t valve_state;
-    uint8_t valve_operation;
-} valve_status_t;
-
-int valve_init(void);
-int valve_cmd(int cmd);
-int valve_send_status(void);
-int valve_send_operation(void);
-
-
-#endif // __VALVE_H__

software/lib/valve/CMakeLists.txt

@@ -0,0 +1 @@
+zephyr_library_sources(valve.c)

software/lib/valve/Kconfig

@@ -0,0 +1,5 @@
+config LIB_VALVE
+    bool "Enable Valve Library"
+    default y
+    help
+      Enable the Valve Library.

software/lib/valve/valve.c

@@ -0,0 +1,121 @@
+/**
+ * @file valve.c
+ * @brief Implementation of the motorized valve control library.
+ *
+ * This file contains the logic for controlling a motorized valve using a
+ * VND7050AJ high-side driver. It uses a delayed work item to handle the
+ * safety timeouts for opening and closing operations.
+ */
+
+#include <lib/valve.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/settings/settings.h>
+
+LOG_MODULE_REGISTER(valve, LOG_LEVEL_INF);
+
+static const struct valve_gpios valve_gpios = {
+    .in0 = GPIO_DT_SPEC_GET(DT_NODELABEL(vnd7050aj), in0_gpios),
+    .in1 = GPIO_DT_SPEC_GET(DT_NODELABEL(vnd7050aj), in1_gpios),
+    .rst = GPIO_DT_SPEC_GET(DT_NODELABEL(vnd7050aj), rst_gpios),
+    .sen = GPIO_DT_SPEC_GET(DT_NODELABEL(vnd7050aj), sen_gpios),
+    .s0 = GPIO_DT_SPEC_GET(DT_NODELABEL(vnd7050aj), s0_gpios),
+    .s1 = GPIO_DT_SPEC_GET(DT_NODELABEL(vnd7050aj), s1_gpios),
+};
+
+static enum valve_state current_state = VALVE_STATE_CLOSED;
+static enum valve_movement current_movement = VALVE_MOVEMENT_IDLE;
+static uint16_t max_opening_time_s = 60;
+static uint16_t max_closing_time_s = 60;
+static struct k_work_delayable
+    valve_work;  // Work item for scheduling valve movement timeouts
+
+/**
+ * @brief Work handler for valve movement timeouts.
+ *
+ * This function is executed when the valve's movement timer expires.
+ * It stops the motor to prevent damage and updates the valve's state.
+ *
+ * @param work Pointer to the k_work item.
+ */
+static void valve_work_handler(struct k_work *work) {
+  gpio_pin_set_dt(&valve_gpios.in0, 0);
+  gpio_pin_set_dt(&valve_gpios.in1, 0);
+  gpio_pin_set_dt(&valve_gpios.rst, 0);
+
+  if (current_movement == VALVE_MOVEMENT_OPENING) {
+    LOG_INF("Valve finished opening");
+  } else if (current_movement == VALVE_MOVEMENT_CLOSING) {
+    current_state = VALVE_STATE_CLOSED;
+    LOG_INF("Valve finished closing");
+  }
+  current_movement = VALVE_MOVEMENT_IDLE;
+}
+
+void valve_init(void) {
+  k_work_init_delayable(&valve_work, valve_work_handler);
+  settings_load_one("valve/max_open_time", &max_opening_time_s,
+                    sizeof(max_opening_time_s));
+  settings_load_one("valve/max_close_time", &max_closing_time_s,
+                    sizeof(max_closing_time_s));
+
+  gpio_pin_configure_dt(&valve_gpios.in0, GPIO_OUTPUT_INACTIVE);
+  gpio_pin_configure_dt(&valve_gpios.in1, GPIO_OUTPUT_INACTIVE);
+  gpio_pin_configure_dt(&valve_gpios.rst,
+                        GPIO_OUTPUT_ACTIVE);  // Keep VND7050AJ out of reset
+  gpio_pin_configure_dt(&valve_gpios.sen, GPIO_OUTPUT_INACTIVE);
+  gpio_pin_configure_dt(&valve_gpios.s0,
+                        GPIO_OUTPUT_INACTIVE);  // S0 select pin - output
+  gpio_pin_configure_dt(&valve_gpios.s1,
+                        GPIO_OUTPUT_INACTIVE);  // S1 select pin - output
+
+  LOG_INF("Valve initialized: max_open=%us, max_close=%us", max_opening_time_s,
+          max_closing_time_s);
+}
+
+void valve_open(void) {
+  if (current_state == VALVE_STATE_CLOSED) {
+    gpio_pin_set_dt(&valve_gpios.rst, 1);
+    gpio_pin_set_dt(&valve_gpios.in1, 0);
+    gpio_pin_set_dt(&valve_gpios.in0, 1);
+    current_state = VALVE_STATE_OPEN;
+    current_movement = VALVE_MOVEMENT_OPENING;
+    k_work_schedule(&valve_work, K_MSEC(max_opening_time_s * 1000 * 0.9));
+  }
+}
+
+void valve_close(void) {
+  if (current_state == VALVE_STATE_OPEN) {
+    gpio_pin_set_dt(&valve_gpios.rst, 1);
+    gpio_pin_set_dt(&valve_gpios.in0, 0);
+    gpio_pin_set_dt(&valve_gpios.in1, 1);
+    current_movement = VALVE_MOVEMENT_CLOSING;
+    k_work_schedule(&valve_work, K_MSEC(max_closing_time_s * 1000 * 0.9));
+  }
+}
+
+void valve_stop(void) {
+  k_work_cancel_delayable(&valve_work);
+  current_movement = VALVE_MOVEMENT_IDLE;
+}
+
+enum valve_state valve_get_state(void) { return current_state; }
+enum valve_movement valve_get_movement(void) { return current_movement; }
+uint16_t valve_get_motor_current(void) {
+  return (current_movement != VALVE_MOVEMENT_IDLE) ? 150 : 10;
+}
+
+void valve_set_max_open_time(uint16_t seconds) {
+  max_opening_time_s = seconds;
+  settings_save_one("valve/max_open_time", &max_opening_time_s,
+                    sizeof(max_opening_time_s));
+}
+void valve_set_max_close_time(uint16_t seconds) {
+  max_closing_time_s = seconds;
+  settings_save_one("valve/max_close_time", &max_closing_time_s,
+                    sizeof(max_closing_time_s));
+}
+uint16_t valve_get_max_open_time(void) { return max_opening_time_s; }
+uint16_t valve_get_max_close_time(void) { return max_closing_time_s; }

software/lib/waterlevel_sensor.c

@@ -1,383 +0,0 @@
-#include "waterlevel_sensor.h"
-#include <zephyr/kernel.h>
-#include <zephyr/logging/log.h>
-#include <zephyr/modbus/modbus.h>
-#include <stdlib.h>
-#include "canbus.h"
-
-LOG_MODULE_REGISTER(wls, CONFIG_LOG_WATERLEVELSENSOR_LEVEL);
-
-#define MODBUS_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(zephyr_modbus_serial)
-
-struct k_thread waterlevel_sensor_thread_data;
-K_THREAD_STACK_DEFINE(waterlevel_sensor_stack, WATERLEVEL_SENSOR_STACK_SIZE);
-K_MSGQ_DEFINE(waterlevel_sensor_msgq, sizeof(waterlevel_command_t), WATERLEVEL_MESSAGE_QUEUE_SIZE, 4);
-
-static int modbus_client_iface;
-
-volatile static struct
-{
-    int level;   // Water level value
-    int zeropoint; // Minimum value
-    int maxpoint; // Maximum value
-    int factor;  // Factor for unit conversion
-    bool factor_set; // Flag to indicate if factor is set
-} waterlevel_measurement = {
-    .factor_set = false,
-};
-
-struct modbus_iface_param client_param = {
-    .mode = MODBUS_MODE_RTU,
-    .rx_timeout = 50000, // Timeout for receiving data in milliseconds
-    .serial = {
-        .baud = 9600,
-        .parity = UART_CFG_PARITY_NONE,
-    },
-};
-
-static int waterlevel_modbus_init() {
-    const char iface_name[] = {DEVICE_DT_NAME(MODBUS_NODE)};
-    modbus_client_iface = modbus_iface_get_by_name(iface_name);
-    if (modbus_client_iface < 0)
-    {
-        LOG_ERR("Failed to get Modbus interface by name: %s", iface_name);
-        return modbus_client_iface;
-    }
-    LOG_DBG("Initializing modbus client interface: %s", iface_name);
-    return modbus_init_client(modbus_client_iface, client_param);
-}
-
-static int waterlevel_modbus_read(void) {
-    int rc;
-    union 
-    {
-        struct
-        {
-            int16_t unit;      // Unit of measurement (e.g., cm, mm)
-            int16_t decimals;  // Number of decimal places for the measurement
-            int16_t level;     // Water level value
-            int16_t zeropoint; // Zero point for the measurement
-            int16_t maxpoint;  // Maximum point for the measurement
-        };
-        int16_t data[5]; // Data array for holding registers
-    } waterlevel_modbus_data;
-    rc = modbus_read_holding_regs(modbus_client_iface, WATERLEVEL_SENSOR_MODBUS_NODE_ID, 0x0002, waterlevel_modbus_data.data, sizeof(waterlevel_modbus_data.data) / sizeof(waterlevel_modbus_data.data[0]));
-    if (rc < 0)
-    {
-        LOG_ERR("Failed to read holding registers, node <%d>, returncode: %d", WATERLEVEL_SENSOR_MODBUS_NODE_ID, rc);
-        return rc;
-    }
-
-    LOG_DBG("Got values. Unit: %d, Decimals: %d, Level: %d, Zero Point: %d, Max Point: %d", 
-            waterlevel_modbus_data.unit, 
-            waterlevel_modbus_data.decimals, 
-            waterlevel_modbus_data.level, 
-            waterlevel_modbus_data.zeropoint, 
-            waterlevel_modbus_data.maxpoint);
-
-    LOG_HEXDUMP_DBG(waterlevel_modbus_data.data, sizeof(waterlevel_modbus_data.data), "Waterlevel Sensor Holding Registers Data");
-           
-    switch (waterlevel_modbus_data.unit)
-    {
-    case 1: // cm
-        waterlevel_measurement.factor = 10;
-        break;
-    case 2: // mm
-        waterlevel_measurement.factor = 1;
-        break;
-    default:
-        LOG_ERR("Unknown unit: %d", waterlevel_modbus_data.unit);
-        waterlevel_measurement.factor_set = false;
-        return -EINVAL;
-    }
-    switch (waterlevel_modbus_data.decimals)
-    {
-    case 0: // no decimals
-        waterlevel_measurement.factor /= 1;
-        break;
-    case 1: // one decimal
-        waterlevel_measurement.factor /= 10;
-        break;
-    case 2: // two decimals
-        waterlevel_measurement.factor /= 100;
-        break;
-    default:
-        LOG_ERR("Unknown decimals: %d", waterlevel_modbus_data.decimals);
-        waterlevel_measurement.factor_set = false;
-        return -EINVAL;
-    }
-    waterlevel_measurement.factor_set = true;
-    waterlevel_measurement.level = waterlevel_modbus_data.level * waterlevel_measurement.factor;
-    waterlevel_measurement.zeropoint = waterlevel_modbus_data.zeropoint * waterlevel_measurement.factor;
-    waterlevel_measurement.maxpoint = waterlevel_modbus_data.maxpoint * waterlevel_measurement.factor;
-    
-    LOG_DBG("Water level: %dmm, zero point: %dmm, maximum point: %dmm", 
-            waterlevel_measurement.level, 
-            waterlevel_measurement.zeropoint, 
-            waterlevel_measurement.maxpoint);
-    LOG_HEXDUMP_DBG(waterlevel_modbus_data.data, sizeof(waterlevel_modbus_data.data), "Waterlevel Sensor Holding Registers Data");
-    return 0;
-}
-
-static int waterlevel_send_level(void) {
-    if (!waterlevel_measurement.factor_set) {
-        LOG_ERR("Factor not set, cannot send water level");
-        return -EINVAL;
-    }
-
-    LOG_INF("Sending water level: %dmm", waterlevel_measurement.level);
-    canbus_send16(CANBUS_REG_WATERLEVEL_LEVEL, waterlevel_measurement.level);
-    return 0;
-}
-
-static int waterlevel_send_zero_point(void) {
-    if (!waterlevel_measurement.factor_set) {
-        LOG_ERR("Factor not set, cannot send zero point");
-        return -EINVAL;
-    }
-
-    LOG_INF("Sending water zero point: %dmm", waterlevel_measurement.zeropoint);
-    canbus_send16(CANBUS_REG_WATERLEVEL_ZERO_POINT, waterlevel_measurement.zeropoint);
-    return 0;
-}
-
-static int waterlevel_send_max_point(void) {
-    if (!waterlevel_measurement.factor_set) {
-        LOG_ERR("Factor not set, cannot send maximum point");
-        return -EINVAL;
-    }
-
-    LOG_INF("Sending water maximum point: %dmm", waterlevel_measurement.maxpoint);
-    canbus_send16(CANBUS_REG_WATERLEVEL_MAX_POINT, waterlevel_measurement.maxpoint);
-    return 0;
-}
-
-static int waterlevel_set_zero_point(int zeropoint) {
-    if (!waterlevel_measurement.factor_set) {
-        LOG_ERR("Factor not set, cannot set zero point");
-        return -EINVAL;
-    }
-
-    int16_t zeropoint_modbus = zeropoint / waterlevel_measurement.factor;
-    int rc = modbus_write_holding_regs(modbus_client_iface, WATERLEVEL_SENSOR_MODBUS_NODE_ID, 0x0005, &zeropoint_modbus, 1);
-    if (rc < 0) {
-        LOG_ERR("Failed to write zero point: %d", rc);
-        return rc;
-    }
-
-    waterlevel_measurement.zeropoint = zeropoint; // Update the local measurement structure    
-    LOG_INF("Zero point set to: %dmm", waterlevel_measurement.zeropoint);
-    rc = waterlevel_send_zero_point();
-    if (rc < 0) {
-        LOG_ERR("Failed to send zero point: %d", rc);
-        return rc;
-    }
-    return 0;
-}
-
-static int waterlevel_set_max_point(int maxpoint) {
-    if (!waterlevel_measurement.factor_set) {
-        LOG_ERR("Factor not set, cannot set maximum point");
-        return -EINVAL;
-    }
-
-    int16_t maxpoint_modbus = maxpoint / waterlevel_measurement.factor;
-    int rc = modbus_write_holding_regs(modbus_client_iface, WATERLEVEL_SENSOR_MODBUS_NODE_ID, 0x0006, &maxpoint_modbus, 1);
-    if (rc < 0) {
-        LOG_ERR("Failed to write maximum point: %d", rc);
-        return rc;
-    }
-
-    waterlevel_measurement.maxpoint = maxpoint; // Update the local measurement structure
-    LOG_INF("Maximum point set to: %dmm", waterlevel_measurement.maxpoint);
-    rc = waterlevel_send_max_point();
-    if (rc < 0) {
-        LOG_ERR("Failed to send maximum point: %d", rc);
-        return rc;
-    }
-    return 0;
-}
-
-void waterlevel_sensor_thread(void *arg1, void *arg2, void *arg3)
-{
-    ARG_UNUSED(arg1);
-    ARG_UNUSED(arg2);
-    ARG_UNUSED(arg3);
-
-    // Initialize the Modbus client
-    int rc = waterlevel_modbus_init();
-    if (rc < 0)
-    {
-        LOG_ERR("Failed to initialize Modbus client: %d", rc);
-        return;
-    }
-
-    rc = waterlevel_modbus_read();
-    if (rc < 0) {
-        LOG_ERR("Failed to read initial water level: %d", rc);  
-        return;
-    }
-    waterlevel_send_level();
-    waterlevel_send_zero_point();
-    waterlevel_send_max_point();
-
-    // Initialize the last transmission time and level
-    // Use k_uptime_get_32() to get the current uptime in milliseconds
-    // and store the initial water level measurement.
-    // This will be used to determine when to send updates.
-
-    uint32_t last_transmission_time_ms = k_uptime_get_32();
-    int32_t last_transmission_level = waterlevel_measurement.level;
-
-    while (1)
-    {     
-        uint32_t current_time_ms = k_uptime_get_32();
-        uint32_t delta_time = current_time_ms-last_transmission_time_ms;
-        waterlevel_command_t command;
-
-        rc = waterlevel_modbus_read();
-        if (rc < 0)
-        {
-            LOG_ERR("Failed to read water level: %d", rc);
-            continue;
-        }
-
-        if (delta_time >= WATERLEVEL_SENSOR_MAX_UPDATE_INTERVAL_MS ||
-            abs(waterlevel_measurement.level - last_transmission_level) >= WATERLEVEL_SENSOR_MIN_DELTA) {
-            rc = waterlevel_send_level();
-            if (rc < 0) {
-                LOG_ERR("Failed to send water level: %d", rc);
-            } else {
-                last_transmission_time_ms = current_time_ms;
-                last_transmission_level = waterlevel_measurement.level;
-            }
-        }
-
-        while (k_msgq_get(&waterlevel_sensor_msgq, &command, K_NO_WAIT) == 0)
-        {
-            switch(command.cmd)
-            {
-                case WATERLEVEL_CMD_SET:
-                    switch (command.reg)
-                    {
-                        case CANBUS_REG_WATERLEVEL_ZERO_POINT: // Set zero point
-                            rc = waterlevel_set_zero_point(command.data);
-                            if (rc < 0) {
-                                LOG_ERR("Failed to set zero point: %d", rc);
-                            }
-                            break;
-                        case CANBUS_REG_WATERLEVEL_MAX_POINT: // Set maximum point
-                            rc = waterlevel_set_max_point(command.data);
-                            if (rc < 0) {
-                                LOG_ERR("Failed to set maximum point: %d", rc);
-                            }
-                            break;
-                        default:
-                            LOG_ERR("Unknown register for SET command: 0x%02X", command.reg);
-                            break;
-                    }
-                    break;
-                case WATERLEVEL_CMD_GET:
-                    switch (command.reg)
-                    {
-                        case CANBUS_REG_WATERLEVEL_LEVEL: // Get water level
-                            waterlevel_send_level();
-                            break;
-                        case CANBUS_REG_WATERLEVEL_ZERO_POINT: // Get zero point
-                            waterlevel_send_zero_point();
-                            break;
-                        case CANBUS_REG_WATERLEVEL_MAX_POINT: // Get maximum point
-                            waterlevel_send_max_point();
-                            break;
-                        default:
-                            LOG_ERR("Unknown register for GET command: 0x%02X", command.reg);
-                            break;
-                    }
-                    break;
-                default:
-                    LOG_ERR("Unknown command type: %d", command.cmd);
-                    break;
-            }
-        }   
-    }
-}
-
-int waterlevel_sensor_start_thread(void)
-{
-    k_tid_t waterlevel_sensor_thread_id;
-
-    // Start the thread
-    waterlevel_sensor_thread_id = k_thread_create(&waterlevel_sensor_thread_data, waterlevel_sensor_stack,
-                    K_THREAD_STACK_SIZEOF(waterlevel_sensor_stack), waterlevel_sensor_thread,
-                    NULL, NULL, NULL,
-                    WATERLEVEL_SENSOR_THREAD_PRIORITY, 0, K_NO_WAIT);
-
-    if (waterlevel_sensor_thread_id == NULL)
-    {
-        LOG_ERR("Failed to create water level sensor thread");
-        return -ENOMEM;
-    }
-    k_thread_name_set(waterlevel_sensor_thread_id, "waterlevel_sensor");
-
-    LOG_INF("Water level sensor thread started successfully");
-    return 0;
-}
-
-#ifdef CONFIG_SHELL
-#include <zephyr/shell/shell.h>
-
-void waterlevel_set_zero_point_shell(const struct shell *shell, size_t argc, char **argv) {
-    if (argc != 2) {
-        shell_error(shell, "Usage: waterlevel_sensor set_zero_point <zeropoint>");
-        return;
-    }
-
-    int zeropoint = atoi(argv[1]);
-    int rc = waterlevel_set_zero_point(zeropoint);
-    if (rc < 0) {
-        shell_error(shell, "Failed to set zero point: %d", rc);
-    } else {
-        shell_print(shell, "Zero point set to: %dmm", zeropoint);
-    }
-}
-
-void waterlevel_set_max_point_shell(const struct shell *shell, size_t argc, char **argv) {
-    if (argc != 2) {
-        shell_error(shell, "Usage: waterlevel_sensor set_max_point <maxpoint>");
-        return;
-    }
-
-    int maxpoint = atoi(argv[1]);
-    int rc = waterlevel_set_max_point(maxpoint);
-    if (rc < 0) {
-        shell_error(shell, "Failed to set maximum point: %d", rc);
-    } else {
-        shell_print(shell, "Maximum point set to: %dmm", maxpoint);
-    }
-}
-
-void waterlevel_sensor_print_shell(const struct shell *shell, size_t argc, char **argv) {
-    ARG_UNUSED(argc);
-    ARG_UNUSED(argv);
-
-    waterlevel_modbus_read();
-    if (!waterlevel_measurement.factor_set) {
-        shell_error(shell, "Factor not set, cannot print water level");
-        return;
-    }
-
-    shell_print(shell, "Current water level: %4dmm", waterlevel_measurement.level);
-    shell_print(shell, "Zero point:          %4dmm", waterlevel_measurement.zeropoint);
-    shell_print(shell, "Maximum point:       %4dmm", waterlevel_measurement.maxpoint);
-}
-
-// Define the shell commands for the water level sensor
-SHELL_STATIC_SUBCMD_SET_CREATE(
-    waterlevel_sensor_cmds,
-    SHELL_CMD(print, NULL, "Print the current water level, zero point, and maximum point", waterlevel_sensor_print_shell),
-    SHELL_CMD(setzero, NULL, "Set the zero point for the water level sensor", waterlevel_set_zero_point_shell),
-    SHELL_CMD(setmax, NULL, "Set the maximum point for the water level sensor", waterlevel_set_max_point_shell),
-    SHELL_SUBCMD_SET_END);
-
-SHELL_CMD_REGISTER(wls, &waterlevel_sensor_cmds, "Water level sensor commands", NULL);
-#endif // CONFIG_SHELL

software/lib/waterlevel_sensor.h

@@ -1,27 +0,0 @@
-#ifndef __WATERLEVEL_SENSOR_H__
-#define __WATERLEVEL_SENSOR_H__
-
-#define WATERLEVEL_SENSOR_STACK_SIZE (512)
-#define WATERLEVEL_SENSOR_THREAD_PRIORITY (2)
-#define WATERLEVEL_MESSAGE_QUEUE_SIZE (5) // Size of the message queue for water level sensor thread
-#define WATERLEVEL_SENSOR_READ_INTERVAL_MS (5000) // Interval for reading the water level sensor in milliseconds
-#define WATERLEVEL_SENSOR_MIN_DELTA (2) // Minimum change in water level to trigger an update
-#define WATERLEVEL_SENSOR_MAX_UPDATE_INTERVAL_MS (600000) // Maximum interval for updating the water level in milliseconds
-
-#define WATERLEVEL_SENSOR_MODBUS_NODE_ID (0x01) // Modbus node ID for the water level sensor
-#define WATERLEVEL_SENSOR_MODBUS_BAUD_RATE (9600) // Baud rate for Modbus communication
-
-#include <inttypes.h>
-
-int waterlevel_sensor_start_thread(void);
-
-typedef struct {
-    uint8_t reg;
-    enum {
-        WATERLEVEL_CMD_SET,
-        WATERLEVEL_CMD_GET,
-    } cmd;
-    int16_t data; // Data to be set
-} waterlevel_command_t;
-
-#endif // __WATERLEVEL_SENSOR_H__

software/prj.conf

@@ -1,20 +0,0 @@
-CONFIG_HAS_MODBUS_WATERLEVEL_SENSOR=y
-CONFIG_HAS_VALVE=y
-
-CONFIG_LOG=y
-CONFIG_LOG_DEFAULT_LEVEL=3
-# CONFIG_LOG_CAN_LEVEL=4
-# CONFIG_LOG_WATERLEVELSENSOR_LEVEL=4
-# CONFIG_LOG_VALVE_LEVEL=4
-CONFIG_CBPRINTF_FP_SUPPORT=y
-CONFIG_UART_CONSOLE=y # Console on USART1
-
-# CAN loopback mode for testing
-#CONFIG_LOOPBACK_MODE=y
-CONFIG_SHELL=y
-CONFIG_CAN_SHELL=y
-CONFIG_GPIO_SHELL=y
-CONFIG_REBOOT=y
-
-CONFIG_ADC=y
-CONFIG_ADC_STM32=y