From a9e102c7239df184df5e77eed792b25035419631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=28=D0=A0?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=29?= <alex76sh1@gmail.com>
Date: Sat, 12 Dec 2020 11:54:36 +0300
Subject: [PATCH] =?UTF-8?q?[app,=20test,=20invertor]=20=D0=A3=D0=B1=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BB=20=D0=B2=D1=8B=D0=BB=D0=B5=D1=82=D1=8B.=20=D0=A1?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20=D1=83=D1=81=D1=82=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BA=D1=83=20=D1=81=D0=BA=D0=BE=D1=80=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D0=B8=20=D0=B2=D0=BE=20=D0=B2=D1=80=D0=B5=D0=BC=D1=8F=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app_test_device/test_invertor.rs | 23 +++++++++++++----------
 src/main.rs                          | 22 +++++++++++-----------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/app_test_device/test_invertor.rs b/src/app_test_device/test_invertor.rs
index 02acd63..74e9bb7 100644
--- a/src/app_test_device/test_invertor.rs
+++ b/src/app_test_device/test_invertor.rs
@@ -73,13 +73,16 @@ impl TestInvertor {
     pub fn update(&mut self, message: Message) {
 //                 println!("update");
         match message {
-            Message::Start => self.invertor.start().unwrap(),
-            Message::Stop => self.invertor.stop().unwrap(),
+            Message::Start => if self.invertor.device().is_connect() {
+                self.invertor.set_speed(self.speed).unwrap();
+                self.invertor.start().unwrap();
+            },
+            Message::Stop => {self.invertor.stop();},
             Message::SpeedChanged(speed) => {
                 self.speed = speed;
-                if let Err(error) = self.invertor.set_speed(speed) {
-                    self.ui.error = Some(format!("Error: {}", error));
-                } else { self.ui.error = None; }
+//                 if let Err(error) = self.invertor.set_speed(speed) {
+//                     self.ui.error = Some(format!("Error: {}", error));
+//                 } else { self.ui.error = None; }
             },
             Message::DirectChanged(direct) => {
                 self.invertor.set_direct(direct);
@@ -122,14 +125,14 @@ impl TestInvertor {
             .push(Text::new(self.invertor.device().name()))
             .push(Text::new(format!("Values: {}", self.invertor.device().values_map().len())))
             ;
-        res = if self.invertor.device().is_connect() {
+        res = if !self.invertor.device().is_connect() {
             let slider = {
                 let slider = Slider::new(
                     &mut self.ui.speed_slider,
-                    0..=5000/10,
-                    self.speed/10,
-                    |speed| Message::SpeedChanged(speed*10),
-                );
+                    0..=10_000,
+                    self.speed,
+                    Message::SpeedChanged,
+                ).step(1_000);
                 let speed_out = self.invertor.get_hz_out_value().value();
                 Row::new()
                     .spacing(20)
diff --git a/src/main.rs b/src/main.rs
index 6bb1b5b..76f9a12 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,16 +15,16 @@ mod app_stand_graphic;
 fn main() {
     println!("Hello World");
 //     app_graphic::GraphicsApp::run(Settings::default());
-    app_stand_graphic::App::run(Settings::default());
-//     app_test_device::TestDeviceApp::run(Settings { 
-//         window: window::Settings {
-//             //size: (600, 500), //
-//             size: (1200, 800),
-//             resizable: true,
-//             .. Default::default()
-//         },
-//         flags: (),
-//         .. Settings::default()
-//     });
+//     app_stand_graphic::App::run(Settings::default());
+    app_test_device::TestDeviceApp::run(Settings { 
+        window: window::Settings {
+            //size: (600, 500), //
+            size: (1200, 800),
+            resizable: true,
+            .. Default::default()
+        },
+        flags: (),
+        .. Settings::default()
+    });
 }