diff --git a/lighthub/inputs.cpp b/lighthub/inputs.cpp
index d756eb7..901b195 100644
--- a/lighthub/inputs.cpp
+++ b/lighthub/inputs.cpp
@@ -367,7 +367,10 @@ void Input::contactPoll() {
 
 
 void Input::analogPoll() {
-    uint8_t currentInputState;
+    int16_t  mappedInputVal;
+    aJsonObject *inputMap = aJson.getObjectItem(inputObj, "map");
+    short Noize = ANALOG_NOIZE;
+    short simple = 0;
 
 #if defined(ARDUINO_ARCH_STM32F1)
      WiringPinMode inputPinMode;
@@ -376,28 +379,48 @@ void Input::analogPoll() {
      uint32_t inputPinMode;
 #endif
 
-     uint8_t inputOnLevel;
     if (inType & IN_ACTIVE_HIGH) {
-        inputOnLevel = HIGH;
         inputPinMode = INPUT;
     } else {
-        inputOnLevel = LOW;
         inputPinMode = INPUT_PULLUP;
     }
     pinMode(pin, inputPinMode);
-    currentInputState = map (analogRead(pin),0,900,0,100);
+    mappedInputVal = analogRead(pin);
+    // Mapping
+    if (inputMap && inputMap->type == aJson_Array)
+     {
+     if (aJson.getArraySize(inputMap)>=4)
+        mappedInputVal  = map (mappedInputVal,
+              aJson.getArrayItem(inputMap, 0)->valueint,
+              aJson.getArrayItem(inputMap, 1)->valueint,
+              aJson.getArrayItem(inputMap, 2)->valueint,
+              aJson.getArrayItem(inputMap, 3)->valueint);
+      if (aJson.getArraySize(inputMap)==5) Noize = aJson.getArrayItem(inputMap, 4)->valueint;
 
-    if (abs(currentInputState - store->currentValue)>1) // value changed >1
-    {
-        if (store->bounce) store->bounce = 0;
-    } else // no change
+      if (aJson.getArraySize(inputMap)==2)
+        {
+          simple = 1;
+          if (mappedInputVal < aJson.getArrayItem(inputMap, 0)->valueint) mappedInputVal = 0;
+            else if (mappedInputVal > aJson.getArrayItem(inputMap, 1)->valueint) mappedInputVal = 1;
+                 else mappedInputVal = -1;
+        }
+      }
+    if (simple) {
+       if (mappedInputVal!=-1 && mappedInputVal != store->currentValue)
+       {
+           onContactChanged(mappedInputVal);
+           store->currentValue = mappedInputVal;
+       }}
+    else
+    if (abs(mappedInputVal - store->currentValue)>Noize) // value changed >ANALOG_NOIZE
+        store->bounce = 0;
+     else // no change
         if (store->bounce<ANALOG_STATE_ATTEMPTS) store->bounce ++;
 
-        if (store->bounce<ANALOG_STATE_ATTEMPTS-1 && (currentInputState != store->currentValue))  //confirmed change
+        if (store->bounce<ANALOG_STATE_ATTEMPTS-1 && (mappedInputVal != store->currentValue))  //confirmed change
         {
-            store->logicState = currentInputState;
-            onAnalogChanged(currentInputState);
-            store->currentValue = currentInputState;
+            onAnalogChanged(mappedInputVal);
+            store->currentValue = mappedInputVal;
         }
 
 }
@@ -449,6 +472,8 @@ void Input::onAnalogChanged(int newValue) {
     debugSerial << F("IN:") << (pin) << F("=") << newValue << endl;
     aJsonObject *item = aJson.getObjectItem(inputObj, "item");
     aJsonObject *emit = aJson.getObjectItem(inputObj, "emit");
+
+
     if (emit) {
 
 //#ifdef WITH_DOMOTICZ
diff --git a/lighthub/inputs.h b/lighthub/inputs.h
index cee173e..ca53537 100644
--- a/lighthub/inputs.h
+++ b/lighthub/inputs.h
@@ -32,6 +32,7 @@ e-mail    anklimov@gmail.com
 
 #define SAME_STATE_ATTEMPTS 3
 #define ANALOG_STATE_ATTEMPTS 6
+#define ANALOG_NOIZE 1
 
 // in syntaxis
 // "pin": { "T":"N", "emit":"out_emit", item:"out_item", "scmd": "ON,OFF,TOGGLE,INCREASE,DECREASE", "rcmd": "ON,OFF,TOGGLE,INCREASE,DECREASE", "rcmd":"repeat_command" }
@@ -69,10 +70,9 @@ extern aJsonObject *inputs;
 typedef union {
     long int aslong;
     struct {
-        int8_t reserve;
         int8_t logicState;
         int8_t bounce;
-        int8_t currentValue;
+        int16_t currentValue;
     };
 
 } inStore;
diff --git a/platformio.ini b/platformio.ini
index a788a55..1eda6a1 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -11,12 +11,12 @@
 src_dir = lighthub
 env_default =
 ;    megaatmega2560
-    megaatmega2560-net
+;    megaatmega2560-net
 ;    due
 ;    esp8266
 ;    esp32
 ;    megaatmega2560-5500
-;     due-5500
+     due-5500
 ;    controllino
 ;    stm32