From 6c969a24557e3cbd2432db404f2c73e1e3824a04 Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Sun, 2 Aug 2020 15:58:10 +0200
Subject: [PATCH] input completed

---
 include/Class/Input.h       |  3 ++-
 include/Class/LineParsing.h | 35 ++++++++++++++++++++---------------
 src/Cmd.cpp                 |  9 +++++----
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/include/Class/Input.h b/include/Class/Input.h
index 23d41388..9232d194 100644
--- a/include/Class/Input.h
+++ b/include/Class/Input.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Arduino.h>
+
 #include "Class/LineParsing.h"
 #include "Global.h"
 
@@ -14,7 +15,7 @@ class Input : public LineParsing {
 
     void inputSet(String key, String state) {
         eventGen(key, "");
-        jsonWriteInt(configLiveJson, key, state.toInt());
+        jsonWriteFloat(configLiveJson, key, state.toFloat());
         MqttClient::publishStatus(key, state);
     }
 };
diff --git a/include/Class/LineParsing.h b/include/Class/LineParsing.h
index 21168d4c..884510b9 100644
--- a/include/Class/LineParsing.h
+++ b/include/Class/LineParsing.h
@@ -1,9 +1,10 @@
 #pragma once
 
 #include <Arduino.h>
+
 #include "Global.h"
 
-class LineParsing   {
+class LineParsing {
    protected:
     String _key;
     String _file;
@@ -20,22 +21,22 @@ class LineParsing   {
     String _db;
 
    public:
-    LineParsing() : 
+    LineParsing() :
 
-             _key{""},
-             _file{""},
-             _page{""},
-             _descr{""},
-             _order{""},
-             _addr{""},
-             _pin{""},
-             _map{""},
-             _c{""},
-             _inv{""},
-             _state{""},
-             _db{""}
+                    _key{""},
+                    _file{""},
+                    _page{""},
+                    _descr{""},
+                    _order{""},
+                    _addr{""},
+                    _pin{""},
+                    _map{""},
+                    _c{""},
+                    _inv{""},
+                    _state{""},
+                    _db{""}
 
-             {};
+                    {};
 
     void update() {
         //String order = sCmd.order();
@@ -65,6 +66,10 @@ class LineParsing   {
                 }
             }
         }
+        _page.replace("#", " ");
+        _descr.replace("#", " ");
+        _page.replace(".", " ");
+        _descr.replace(".", " ");
         createWidgetClass(_descr, _page, _order, _file, _key);
     }
 
diff --git a/src/Cmd.cpp b/src/Cmd.cpp
index 750d4c55..366df8f5 100644
--- a/src/Cmd.cpp
+++ b/src/Cmd.cpp
@@ -177,7 +177,7 @@ void buttonInSet() {
 }
 
 //==========================================Модуль ввода цифровых значений==================================
-//digit-input digit1 inputNum Ввод Введите 1 st[60]
+//input-digit digit1 inputNum Ввод Введите 4 st[60]
 //==========================================================================================================
 void inputDigit() {
     myInput = new Input();
@@ -185,12 +185,13 @@ void inputDigit() {
     String key = myInput->gkey();
     sCmd.addCommand(key.c_str(), inputDigitSet);
     myInput->inputSetDefault();
+    myInput->clear();
 }
 
 void inputDigitSet() {
-
-  
-    
+    String key = sCmd.order();
+    String state = sCmd.next();
+    myInput->inputSet(key, state);
 }
 
 //=====================================================================================================================================