diff --git a/pdf/HELTEC-WIFI_LoRa_32_V2.pdf b/pdf/HELTEC-WIFI_LoRa_32_V2.pdf
new file mode 100644
index 0000000..46c9840
Binary files /dev/null and b/pdf/HELTEC-WIFI_LoRa_32_V2.pdf differ
diff --git a/pdf/HELTEC-WiFi_LoRa_32_V2(433,470-510).PDF b/pdf/HELTEC-WiFi_LoRa_32_V2(433,470-510).PDF
new file mode 100644
index 0000000..3c12f58
Binary files /dev/null and b/pdf/HELTEC-WiFi_LoRa_32_V2(433,470-510).PDF differ
diff --git a/platformio.ini b/platformio.ini
index 1d66e4a..bbee73c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -53,4 +53,14 @@ build_flags = ${env.build_flags} -D LORA32_2
 [env:ttgo-lora32-v1]
 platform = espressif32
 board = ttgo-lora32-v1
-build_flags = ${env.build_flags} -D LORA32_1
\ No newline at end of file
+build_flags = ${env.build_flags} -D LORA32_1
+
+[env:ttgo-Heltec-WiFi-KIT32]
+platform = espressif32
+board = heltec_wifi_kit_32
+build_flags = ${env.build_flags} -D HELTEC_WIFI_KIT32
+
+[env:ttgo-Heltec-WiFi-KIT32_V2]
+platform = espressif32
+board = heltec_wifi_kit_32_v2
+build_flags = ${env.build_flags} -D HELTEC_WIFI_KIT32_V2
\ No newline at end of file
diff --git a/src/TTGO_T-Beam_LoRa_APRS.ino b/src/TTGO_T-Beam_LoRa_APRS.ino
index e3fd23e..b89f657 100644
--- a/src/TTGO_T-Beam_LoRa_APRS.ino
+++ b/src/TTGO_T-Beam_LoRa_APRS.ino
@@ -31,8 +31,31 @@
 #include "version.h"
 
 // I2C LINES
-#define I2C_SDA 21
-#define I2C_SCL 22
+
+#ifdef T_BEAM_V1_0
+  #define I2C_SDA 21
+  #define I2C_SCL 22
+#elif T_BEAM_V0_7
+  #define I2C_SDA 21
+  #define I2C_SCL 22
+#elif LORA32_1
+  #define I2C_SDA 21
+  #define I2C_SCL 22
+#elif LORA32_2
+  #define I2C_SDA 21
+  #define I2C_SCL 22
+#elif LORA32_21
+  #define I2C_SDA 21
+  #define I2C_SCL 22 
+#elif HELTEC_WIFI_KIT32
+  #define I2C_SDA 4
+  #define I2C_SCL 15 
+#elif HELTEC_WIFI_KIT32_V2
+  #define I2C_SDA 4
+  #define I2C_SCL 15        
+#endif
+
+
 
 // DISPLAY address
 #define SSD1306_ADDRESS 0x3C