diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index e80666b..080e70d 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -3,5 +3,8 @@
     // for the documentation about the extensions.json format
     "recommendations": [
         "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
     ]
 }
diff --git a/lib/obp60task/OBP60Hardware.h b/lib/obp60task/OBP60Hardware.h
index 14b10e5..b0b63b3 100644
--- a/lib/obp60task/OBP60Hardware.h
+++ b/lib/obp60task/OBP60Hardware.h
@@ -34,7 +34,7 @@
     // Buzzer
     #define OBP_BUZZER 19
     #define TONE1 1500          // 1500Hz
-    #define TONE2 2000          // 200Hz
+    #define TONE2 2000          // 2000Hz
     #define TONE3 3000          // 3000Hz
     #define TONE4 4000          // 4000Hz
     // Analog Input
diff --git a/lib/obp60task/OBP60Keypad.h b/lib/obp60task/OBP60Keypad.h
new file mode 100644
index 0000000..c1cf81c
--- /dev/null
+++ b/lib/obp60task/OBP60Keypad.h
@@ -0,0 +1,158 @@
+#ifndef _OBP60FUNCTIONS_H
+#define _OBP60FUNCTIONS_H
+
+#include <Arduino.h>
+#include "OBP60Hardware.h"
+  
+// Global vars
+
+// Routine for TTP229-BSF (!!! IC use not a I2C bus !!!)
+// 
+// 8 Key Mode
+//
+// Key number        {0, 1, 2, 3, 4, 5, 6, 7, 8}
+// Scan code         {0, 8, 7, 1, 6, 2, 5, 3, 4}
+int keyposition[9] = {0, 3, 5, 7, 8, 6, 4, 2, 1};   // Position of key in raw data, 0 = nothing touched
+int keypad[9];          // Raw data array from TTP229
+int key;                // Value of key [0|1], 0 = touched, 1 = not touched
+int keycode = 0;        // Keycode of pressed key [0...8], 0 = nothing touched
+int keycode2 = 0;        // Keycode of very short pressed key [0...8], 0 = nothing touched
+String keystatus = "0"; // Status of key (0 = processed, 1s...8s, 1l...8l, left, right unprocessed)
+int keycodeold = 0;     // Old keycode
+int keycodeold2 = 0;    // Old keycode for short pressed key
+bool keyoff = false;    // Key switch off
+int swipedelay = 500;   // Delay after swipe in [ms]
+int keydelay = 250;     // Delay after key pressed in  [ms]
+bool keylock = false;   // Key lock after pressed key is valid (repeat protection by conginous pressing)
+int repeatnum;          // Actual number of key detections for a pressed key
+int shortpress = 5;     // number of key detections after that the key is valid (n * 40ms) for short pessing
+int longpress = 25;     // number of key detections after that the key is valid (n * 40ms) for long pessing
+int swipedir = 0;       // Swipe direction 0 = nothing, -1 = left, +1 = right
+
+long starttime = 0;     // Start time point for pressed key
+
+
+String readKeypad() {
+  noInterrupts();
+  pinMode(TTP_SDO, INPUT);
+  pinMode(TTP_SCL, OUTPUT);
+  keycode = 0;
+  // Read key code from raw data
+  for (int i = 0; i < 9; i++) {
+      digitalWrite(TTP_SCL, LOW);
+      delay(0);  // 0ms clock
+      keypad[i] = digitalRead(TTP_SDO);
+      if(i > 0){
+          // Invert keypad
+          if(keypad[i] == 1){
+            key = 0;
+          }
+          else{
+            key = 1;
+          }
+          keycode += key * i;
+      }
+      digitalWrite(TTP_SCL, HIGH);
+      delay(0);   // 0ms clock
+  }
+  interrupts();
+  // Remapping keycode
+  keycode = keyposition[keycode];
+
+  // Detect short keynumber
+  if (keycode > 0 ){ 
+    if(keylock == false){
+      starttime = millis();
+      keylock = true;
+    }
+    if (keycode != keycodeold){
+      keylock = false;
+    }
+    // Detect a very short keynumber (10ms)
+    if (millis() > starttime + 10 && keycode == keycodeold && keylock == true) {
+      keystatus = String(keycode) + "vs";
+      // Process only valid keys
+      if(keycode == 1 || keycode == 6){
+        keycode2 = keycode;
+      }
+      // Clear by unvalid keys
+      else{
+        keycode2 = 0;
+        keycodeold2 = 0;
+      }
+    }
+    // Timeout for very short pressed key
+    if(millis() > starttime + 200){
+      keycode2 = 0;
+    }
+    // Detect a short keynumber (200ms)
+    if (keyoff == false && millis() > starttime + 200 && keycode == keycodeold && keylock == true) {
+      keystatus = String(keycode) + "s";
+      keycode = 0;
+      keycodeold = 0;
+      keycode2 = 0;
+      keycodeold2 = 0;
+      buzzer(TONE4, buzPower, 100);
+      keylock = false;
+      delay(keydelay);
+    }
+  }
+
+  // Key lock with key 1 and 6 or 6 and 1 in fast series
+  if((keycode2 == 1 && keycodeold2 == 6) || (keycode2 == 6 && keycodeold2 == 1)) {
+    keycode = 0;
+    keycodeold = 0;
+    keycode2 = 0;
+    keycodeold2 = 0;
+    buzzer(TONE4, buzPower, 1000);
+    keylock = false;
+    delay(keydelay);
+
+    keyoff = !keyoff;
+    if(keyoff == true){
+      keystatus = "off";
+    }
+    else{
+      keystatus = "on";
+    }
+  }
+
+  // Detect swipe right
+  if (keyoff == false && keycode > 0 && keycodeold > 0 && keycode > keycodeold && !((keycode == 1 && keycodeold == 6) || (keycode == 6 && keycodeold == 1))){
+  //if (keycode > 0 && keycodeold > 0 && keycode > keycodeold){
+    keycode = 0;
+    keycodeold = 0;
+    keycode2 = 0;
+    keycodeold2 = 0;
+    swipedir = 1;
+    keystatus = "r";
+    buzzer(TONE3, buzPower, 150);
+    buzzer(TONE4, buzPower, 150);
+  }
+
+  // Detect swipe left
+  if (keyoff == false && keycode > 0 && keycodeold > 0 && keycode < keycodeold && !((keycode == 1 && keycodeold == 6) || (keycode == 6 && keycodeold == 1))){
+  //if (keycode > 0 && keycodeold > 0 && keycode < keycodeold){  
+    keycode = 0;
+    keycodeold = 0;
+    keycode2 = 0;
+    keycodeold2 = 0;
+    swipedir = -1;
+    keystatus = "l";
+    buzzer(TONE4, buzPower, 150);
+    buzzer(TONE3, buzPower, 150);
+  }
+
+  // Reset keylock after release
+  if (keycode == 0){
+    keylock = false;
+  }
+
+  // Copy keycode
+  keycodeold = keycode;
+  keycodeold2 = keycode2;
+
+  return keystatus;
+}
+
+#endif
\ No newline at end of file
diff --git a/lib/obp60task/obp60task.cpp b/lib/obp60task/obp60task.cpp
index 7051865..9b3a669 100644
--- a/lib/obp60task/obp60task.cpp
+++ b/lib/obp60task/obp60task.cpp
@@ -2,6 +2,7 @@
 #include "obp60task.h"
 #include "Pagedata.h"
 #include "OBP60Hardware.h"              // PIN definitions
+
 #include <Ticker.h>                     // Timer Lib for timer interrupts
 #include <Wire.h>                       // I2C connections
 #include <MCP23017.h>                   // MCP23017 extension Port
@@ -13,6 +14,7 @@
 #include <GxIO/GxIO_SPI/GxIO_SPI.h>     // GxEPD lip for SPI display communikation
 #include <GxIO/GxIO.h>                  // GxEPD lip for SPI
 #include "OBP60ExtensionPort.h"         // Functions lib for extension board
+#include "OBP60Keypad.h"                // Functions lib for keypad
 
 // True type character sets
 #include "Ubuntu_Bold8pt7b.h"
@@ -157,14 +159,21 @@ typedef struct {
         QueueHandle_t queue;
     } MyData;
 
+// Keyboard Task
+//#######################################
 void keyboardTask(void *param){
     MyData *data=(MyData *)param;
     int page=data->page0;
+    // Loop for keyboard task
     while (true){
         //send a key event 
         xQueueSend(data->queue, &page, 0);
+/*        
         delay(10000);
         page+=1;
+*/        
+        readKeypad();
+        delay(20);
         if (page>=MAX_PAGE_NUMBER) page=0;
     }
     vTaskDelete(NULL);