From baf1bccf6193211ef373232c64513a0bd13d7078 Mon Sep 17 00:00:00 2001
From: ElicMagus <nikmaos@nikmaos.ru>
Date: Wed, 17 Apr 2024 08:51:20 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0?=
 =?UTF-8?q?=20=D0=B2=D0=B2=D0=B5=D0=B4=D1=91=D0=BD=D0=BD=D1=8B=D1=85=20?=
 =?UTF-8?q?=D0=BA=D0=BE=D1=8D=D1=84=D1=84=D0=B8=D1=86=D0=B8=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .sync-exclude.lst |  5 +++++
 HARG_1022.txt     |  3 +--
 src/main.rs       | 27 +++++++++++++++------------
 3 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 .sync-exclude.lst

diff --git a/.sync-exclude.lst b/.sync-exclude.lst
new file mode 100644
index 0000000..1e767df
--- /dev/null
+++ b/.sync-exclude.lst
@@ -0,0 +1,5 @@
+target/*
+target/
+output/*
+output/
+Cargo.lock
diff --git a/HARG_1022.txt b/HARG_1022.txt
index 47d12fa..0e3141f 100644
--- a/HARG_1022.txt
+++ b/HARG_1022.txt
@@ -2,5 +2,4 @@ H2_A = 0.0
 H2_B = 0.0
 H2_C = 1.0
 H2_D = 0.0
-HUMI_K = 1.0
-HUMI_B = 0.0
\ No newline at end of file
+HUMI_K = 1.0
\ No newline at end of file
diff --git a/src/main.rs b/src/main.rs
index 3b54644..8a0577d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -67,7 +67,8 @@ fn main() {
     } else {
         println!("Нет доступных портов. Завершение работы . . .");
     }
-
+    let mut input=String::new();
+    let _ = io::stdin().read_line(&mut input);
     // let options = eframe::NativeOptions {
     //     // Hide the OS-specific "chrome" around the window:
     //     decorated: true,
@@ -112,8 +113,8 @@ fn mb_port_loop() -> Result<ErrorKind> {
     println!("Введите имя файла с коэффициентами:");
     let mut path = String::new();
     let _ = io::stdin().read_line(&mut path);
-    println!("{:#?}", path);
-    let path = path.trim_end();
+    // println!("{:#?}", path);
+    let path = path.trim_matches(|c| c == '\"' || c == '\r' || c=='\n');
     let file = OpenOptions::new().read(true).open(&path);
     let file = match file {
         Ok(file) => file,
@@ -236,7 +237,7 @@ fn mb_port_loop() -> Result<ErrorKind> {
                     .unwrap();
                 let response = mb_trancieve(&mut port_wf, &request)?;
                 mb_req.parse_ok(&response).unwrap();
-                thread::sleep(Duration::from_millis(20));
+                thread::sleep(Duration::from_millis(200));
 
                 //Проверка ввода коэффициента
                 mb_req
@@ -267,7 +268,7 @@ fn mb_port_loop() -> Result<ErrorKind> {
                 .unwrap();
             let response = mb_trancieve(&mut port_wf, &request)?;
             mb_req.parse_ok(&response).unwrap();
-            thread::sleep(Duration::from_millis(20));
+            thread::sleep(Duration::from_millis(100));
 
             //Проверка ввода коэффициента
             mb_req
@@ -299,15 +300,17 @@ fn mb_port_loop() -> Result<ErrorKind> {
             mb_req.parse_ok(&response).unwrap();
             let mut raw_str = Vec::new();
             mb_req.parse_u16(&response, &mut raw_str).unwrap();
-
+            println!("Name\t|STAT\t|OUTPUT\t\t|INPUT");
             for i in (1..12).step_by(2) {
-                let f = (raw_str[i] as u32) + (raw_str[i + 1] as u32) << 16;
-                let f = unsafe { mem::transmute::<u32, f32>(f) };
-                print!("{:#06X?}: ", coefs_cmds.cmd[i / 2]);
-                if coefs_cmds.coef[i / 2] != f {
-                    println!("ERR");
+                let int = (raw_str[i + 1] as u32) << 16 | (raw_str[i] as u32) ;
+                let f = unsafe { mem::transmute::<u32, f32>(int) };
+                let int2 =  unsafe { mem::transmute::<f32, i32>(coefs_cmds.coef[i / 2]) };
+                // println!("{:#?}:\t",(coefs_cmds.coef[i / 2] - f).abs());
+                print!("{:#06X?}:\t", coefs_cmds.cmd[i / 2]);
+                if (coefs_cmds.coef[i / 2] - f).abs() > (1.0/131072.0) {
+                    println!("ERR:\t{:#010X?} |\t{:#010X?}",int,int2);
                 } else {
-                    println!("OK")
+                    println!("OK");
                 }
             }