Compare commits
3 Commits
project-re
...
69cf7e9511
| Author | SHA1 | Date | |
|---|---|---|---|
| 69cf7e9511 | |||
| 8df7aef51b | |||
| f6ee0a5122 |
@@ -1,6 +0,0 @@
|
|||||||
cmake_minimum_required(VERSION 3.20)
|
|
||||||
|
|
||||||
project(fwu)
|
|
||||||
|
|
||||||
target_sources(fwu PRIVATE src/fwu.c)
|
|
||||||
target_include_directories(fwu PUBLIC include)
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
cmake_minimum_required(VERSION 3.20)
|
|
||||||
|
|
||||||
project(modbus_server)
|
|
||||||
|
|
||||||
target_sources(modbus_server PRIVATE src/modbus_server.c)
|
|
||||||
target_include_directories(modbus_server PUBLIC include)
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
cmake_minimum_required(VERSION 3.20)
|
|
||||||
|
|
||||||
project(valve)
|
|
||||||
|
|
||||||
target_sources(valve PRIVATE src/valve.c)
|
|
||||||
target_include_directories(valve PUBLIC include)
|
|
||||||
@@ -1,9 +1,50 @@
|
|||||||
|
/ {
|
||||||
|
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
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
&usart1 {
|
&usart1 {
|
||||||
modbus0 {
|
modbus0 {
|
||||||
compatible = "zephyr,modbus-serial";
|
compatible = "zephyr,modbus-serial";
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
status = "okay";
|
status = "okay";
|
||||||
pinctrl-0 = <&usart1_tx_pa9 &usart1_rx_pa10>;
|
pinctrl-0 = <&usart1_tx_pa9 &usart1_rx_pa10>; // PA9=TX, PA10=RX for Modbus communication
|
||||||
pinctrl-names = "default";
|
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
|
||||||
|
};
|
||||||
|
};
|
||||||
@@ -2,8 +2,21 @@
|
|||||||
#define VALVE_H
|
#define VALVE_H
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
#include <zephyr/drivers/gpio.h>
|
||||||
|
|
||||||
enum valve_state { VALVE_STATE_CLOSED, VALVE_STATE_OPEN };
|
struct valve_gpios {
|
||||||
|
const struct gpio_dt_spec in0;
|
||||||
|
const struct gpio_dt_spec in1;
|
||||||
|
const struct gpio_dt_spec rst;
|
||||||
|
const struct gpio_dt_spec sen;
|
||||||
|
const struct gpio_dt_spec s0;
|
||||||
|
const struct gpio_dt_spec s1;
|
||||||
|
};
|
||||||
|
|
||||||
|
enum valve_state {
|
||||||
|
VALVE_STATE_CLOSED,
|
||||||
|
VALVE_STATE_OPEN,
|
||||||
|
};
|
||||||
enum valve_movement { VALVE_MOVEMENT_IDLE, VALVE_MOVEMENT_OPENING, VALVE_MOVEMENT_CLOSING, VALVE_MOVEMENT_ERROR };
|
enum valve_movement { VALVE_MOVEMENT_IDLE, VALVE_MOVEMENT_OPENING, VALVE_MOVEMENT_CLOSING, VALVE_MOVEMENT_ERROR };
|
||||||
|
|
||||||
void valve_init(void);
|
void valve_init(void);
|
||||||
|
|||||||
@@ -1,10 +1,21 @@
|
|||||||
#include <zephyr/kernel.h>
|
#include <zephyr/kernel.h>
|
||||||
#include <zephyr/settings/settings.h>
|
#include <zephyr/settings/settings.h>
|
||||||
#include <zephyr/logging/log.h>
|
#include <zephyr/logging/log.h>
|
||||||
|
#include <zephyr/device.h>
|
||||||
|
#include <zephyr/drivers/gpio.h>
|
||||||
#include <lib/valve.h>
|
#include <lib/valve.h>
|
||||||
|
|
||||||
LOG_MODULE_REGISTER(valve, LOG_LEVEL_INF);
|
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_state current_state = VALVE_STATE_CLOSED;
|
||||||
static enum valve_movement current_movement = VALVE_MOVEMENT_IDLE;
|
static enum valve_movement current_movement = VALVE_MOVEMENT_IDLE;
|
||||||
static uint16_t max_opening_time_s = 60;
|
static uint16_t max_opening_time_s = 60;
|
||||||
@@ -13,11 +24,15 @@ static struct k_work_delayable valve_work;
|
|||||||
|
|
||||||
static void valve_work_handler(struct k_work *work)
|
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) {
|
if (current_movement == VALVE_MOVEMENT_OPENING) {
|
||||||
LOG_INF("Virtual valve finished opening");
|
LOG_INF("Valve finished opening");
|
||||||
} else if (current_movement == VALVE_MOVEMENT_CLOSING) {
|
} else if (current_movement == VALVE_MOVEMENT_CLOSING) {
|
||||||
current_state = VALVE_STATE_CLOSED;
|
current_state = VALVE_STATE_CLOSED;
|
||||||
LOG_INF("Virtual valve finished closing");
|
LOG_INF("Valve finished closing");
|
||||||
}
|
}
|
||||||
current_movement = VALVE_MOVEMENT_IDLE;
|
current_movement = VALVE_MOVEMENT_IDLE;
|
||||||
}
|
}
|
||||||
@@ -27,22 +42,35 @@ void valve_init(void)
|
|||||||
k_work_init_delayable(&valve_work, valve_work_handler);
|
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_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));
|
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_INACTIVE);
|
||||||
|
gpio_pin_configure_dt(&valve_gpios.sen, GPIO_OUTPUT_INACTIVE);
|
||||||
|
gpio_pin_configure_dt(&valve_gpios.s0, GPIO_OUTPUT_INACTIVE);
|
||||||
|
gpio_pin_configure_dt(&valve_gpios.s1, GPIO_OUTPUT_INACTIVE);
|
||||||
}
|
}
|
||||||
|
|
||||||
void valve_open(void)
|
void valve_open(void)
|
||||||
{
|
{
|
||||||
if (current_state == VALVE_STATE_CLOSED) {
|
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_state = VALVE_STATE_OPEN;
|
||||||
current_movement = VALVE_MOVEMENT_OPENING;
|
current_movement = VALVE_MOVEMENT_OPENING;
|
||||||
k_work_schedule(&valve_work, K_SECONDS(max_opening_time_s));
|
k_work_schedule(&valve_work, K_MSEC(max_opening_time_s * 1000 * 0.9));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void valve_close(void)
|
void valve_close(void)
|
||||||
{
|
{
|
||||||
if (current_state == VALVE_STATE_OPEN) {
|
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;
|
current_movement = VALVE_MOVEMENT_CLOSING;
|
||||||
k_work_schedule(&valve_work, K_SECONDS(max_closing_time_s));
|
k_work_schedule(&valve_work, K_MSEC(max_closing_time_s * 1000 * 0.9));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user