diff --git a/lib/lilka/src/lilka/board.cpp b/lib/lilka/src/lilka/board.cpp
index e96652c..e0ca3f3 100644
--- a/lib/lilka/src/lilka/board.cpp
+++ b/lib/lilka/src/lilka/board.cpp
@@ -3,6 +3,10 @@
 #include "board.h"
 #include "display.h"
 #include "config.h"
+#include "esp32-hal-adc.h"
+#include <esp32-hal-gpio.h>
+#include <esp32-hal.h>
+#include <lilka/serial.h>
 
 namespace lilka {
 
@@ -10,7 +14,62 @@ Board::Board() {
 }
 
 void Board::begin() {
-    // Iterate over the pins, set them as inputs
+#define PIN_AWAIT_TIME 60
+#if LILKA_VERSION == 2
+    //////////////////////////////////////////////////////////////////////////
+    // Perform soldering test
+    //////////////////////////////////////////////////////////////////////////
+    // For V2:
+    // GPIO19-20                     USB
+    // GPIO0, GPIO3, GPIO45, GPIO 46 Strap pins
+    // GPIO22-25                     Just do not exist[lol:D]
+    // GPIO26-32                     Reserved for PSRAM
+    // GPIO33-37                     Reserved for Octal PSRAM
+    //////////////////////////////////////////////////////////////////////////
+    const int testPins[] = {1,  2,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15,
+                            16, 17, 18, 21, 38, 39, 40, 41, 42, 43, 44, 47, 48};
+
+    const int testPattern[] = {
+        HIGH, LOW, HIGH, HIGH, LOW, HIGH, LOW, LOW, HIGH, LOW, HIGH, HIGH, HIGH, LOW, HIGH, LOW, HIGH, LOW
+    };
+    // Configure pin mode for all pins
+    for (auto pin : testPins) {
+        pinMode(pin, INPUT_PULLDOWN);
+    }
+    // Await pin to stabilize it's state(voltage, etc.)
+    delayMicroseconds(PIN_AWAIT_TIME);
+
+    auto testPinsCount = sizeof(testPins) / sizeof(testPins[0]);
+    auto testCount = sizeof(testPattern) / sizeof(testPattern[0]);
+
+    for (int i = 0; i < testPinsCount; i++) {
+        // setup pin mode for a testPinA
+        pinMode(testPins[i], OUTPUT);
+
+        // iterate over all tested pins
+        for (int j = i + 1; j < testPinsCount; j++) {
+            // default i <> j pins tate
+            bool shorted = true;
+            // iterate over tested pattern
+            for (int k = 0; k < testCount; k++) {
+                digitalWrite(testPins[i], testPattern[k]);
+                delayMicroseconds(PIN_AWAIT_TIME);
+                if (digitalRead(testPins[j]) != testPattern[k]) {
+                    shorted = false;
+                    break;
+                }
+            }
+            if (shorted) lilka::serial.err("Found short between GPIOs %d and %d\n", testPins[i], testPins[j]);
+        }
+        // Restore testPin state
+        digitalWrite(testPins[i], LOW);
+        pinMode(testPins[i], INPUT_PULLDOWN);
+    }
+
+#    undef PIN_AWAIT_TIME
+#endif
+
+// Iterate over the pins, set them as inputs
 #if LILKA_VERSION >= 2
     for (int pin : LILKA_EXT_PINS) {
         pinMode(pin, INPUT);