-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request '[app, complex, meln_logic] Применение структуры M…
…eln в программе. Closed #8' (#16) from meln_logic into master Reviewed-on: https://git.oberon-alfa.ru/prishchepa.aleksej/SimpleUI_Rust/pulls/16 Реактивный подход для автоматизации внедрён
- Loading branch information
Showing
21 changed files
with
713 additions
and
432 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| use modbus::{ValueArc, ModbusValues}; | ||
|
|
||
| pub struct Klapans { | ||
| pub давление_воздуха: ValueArc, | ||
| двигатель_компрессора_воздуха: ValueArc, | ||
|
|
||
| // // Материал | ||
| // клапан_подачи_материала: ValueArc, // ШК2 | ||
| // клапан_верхнего_контейнера: ValueArc, // ШК5 | ||
| // клапан_помольной_камеры: ValueArc, // ШК3 | ||
| // клапан_нижнего_контейнера: ValueArc, // ШК1 | ||
| // | ||
| // // Вакуум | ||
| // клапан_напуска: ValueArc, | ||
| // клапан_насоса: ValueArc, | ||
|
|
||
| klapans: ModbusValues, | ||
| klapans_шк: ModbusValues, | ||
| } | ||
|
|
||
| impl From<&ModbusValues> for Klapans { | ||
| fn from(values: &ModbusValues) -> Self { | ||
| let klapans_шк = (0..12).map(|i| | ||
| format!("Клапан ШК{} {}", i/2+1, | ||
| if i%2==0 {"открыт"} else {"закрыт"}) | ||
| ).collect::<Vec<_>>(); | ||
| Klapans { | ||
| давление_воздуха: values.get_value_arc("Давление воздуха компрессора").unwrap(), | ||
| двигатель_компрессора_воздуха: values.get_value_arc("Двигатель компрессора воздуха").unwrap(), | ||
| klapans: values.get_values_by_name_contains( | ||
| &["Клапан нижнего контейнера", "Клапан верхнего контейнера", | ||
| "Клапан подачи материала", "Клапан помольной камеры", | ||
| "Клапан напуска", "Клапан насоса М5"] | ||
| ), | ||
| klapans_шк: values.get_values_by_name_contains( | ||
| klapans_шк.iter().map(|name| name.as_str()) | ||
| .collect::<Vec<_>>().as_slice() | ||
| ), | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl Klapans { | ||
|
|
||
| pub fn klapan_turn(&self, name: &str, enb: bool) { | ||
| // if self.давление_воздуха.is_error() { | ||
| // return; | ||
| // } | ||
|
|
||
| if let Err(e) = self.klapans.set_bit(name, enb) { | ||
| dbg!(e); | ||
| } | ||
| } | ||
| fn двигатель_компрессора_воздуха_turn(&self, enb: bool) { | ||
| self.двигатель_компрессора_воздуха.set_bit(enb); | ||
| } | ||
| } | ||
|
|
||
| pub mod watcher { | ||
| use crate::structs::Property; | ||
| use std::collections::HashMap; | ||
| use tokio::sync::broadcast; | ||
|
|
||
| pub struct Klapans { | ||
| pub давление_воздуха: Property<f32>, | ||
|
|
||
| pub klapans: HashMap<String, Property<bool>>, | ||
| pub klapans_send: broadcast::Sender<(String, bool)>, | ||
|
|
||
| pub klapans_шк: HashMap<(String, String), Property<bool>>, | ||
| pub klapans_шк_send: broadcast::Sender<(String, bool)>, | ||
| } | ||
| impl Klapans { | ||
| pub(crate) fn update_property(&self, values: &super::Klapans) { | ||
| for (n, p) in &self.klapans { | ||
| p.set(values.klapans.get_bit(n).unwrap()); | ||
| } | ||
| for ((шк, _n), p) in &self.klapans_шк { | ||
| p.set(values.klapans_шк.get_bit(&format!("Клапан {} открыт", шк)).unwrap()); | ||
| } | ||
| } | ||
|
|
||
| pub(crate) async fn automation(&self) { | ||
| let futs1 = self.klapans.iter() | ||
| .map(|(name, prop)| { | ||
| let mut sub = prop.subscribe(); | ||
| async move { | ||
| loop { | ||
| sub.changed().await; | ||
| let klapan = sub.borrow(); | ||
| let _ = self.klapans_send.send((name.to_owned(), *klapan)); | ||
| } | ||
| } | ||
| }); | ||
| let futs2 = self.klapans_шк.iter() | ||
| .map(|((_шк, name), prop)| { | ||
| let mut sub = prop.subscribe(); | ||
| async move { | ||
| loop { | ||
| sub.changed().await; | ||
| let klapan = sub.borrow(); | ||
| let _ = self.klapans_send.send((name.to_owned(), *klapan)); | ||
| } | ||
| } | ||
| }); | ||
| tokio::join!( | ||
| futures_util::future::join_all(futs1), | ||
| futures_util::future::join_all(futs2), | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| impl Default for Klapans { | ||
| fn default() -> Self { | ||
| let klapan_names = [ | ||
| ("ШК1", "Клапан нижнего контейнера"), // ШК1 | ||
| ("ШК3", "Клапан верхнего контейнера"), // ШК5 | ||
| ("ШК2", "Клапан подачи материала"), // ШК2 | ||
| ("ШК5", "Клапан помольной камеры"), // ШК3 | ||
| ("ШК4", "Клапан напуска"), // ШК4 | ||
| ("ШК6", "Клапан насоса М5"), // ШК6 | ||
| ]; | ||
| Klapans { | ||
| давление_воздуха: Property::default(), | ||
| klapans: klapan_names.iter().map(|&(_, n)| (n.to_owned(), Property::<bool>::default())).collect(), | ||
| klapans_send: broadcast::channel(16).0, | ||
| klapans_шк: klapan_names.iter().map(|&(шк, n)| ((шк.to_owned(), n.to_owned()), Property::<bool>::default())).collect(), | ||
| klapans_шк_send: broadcast::channel(16).0, | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.