Merge pull request #267 from cyberman54/master

sync dev to master

src/hal/heltec.h

@@ -16,9 +16,9 @@
 #define HAS_BUTTON KEY_BUILTIN                        // button "PROG" on board
 
 // Pins for I2C interface of OLED Display
-#define MY_OLED_SDA OLED_SDA
-#define MY_OLED_SCL OLED_SCL
-#define MY_OLED_RST OLED_RST
+#define MY_OLED_SDA (4)
+#define MY_OLED_SCL (15)
+#define MY_OLED_RST (16)
 
 // Pins for LORA chip SPI interface come from board file, we need some
 // additional definitions for LMIC

src/hal/heltecv2.h

@@ -18,9 +18,9 @@
 #define HAS_BUTTON KEY_BUILTIN                        // button "PROG" on board
 
 // Pins for I2C interface of OLED Display
-#define MY_OLED_SDA OLED_SDA
-#define MY_OLED_SCL OLED_SCL
-#define MY_OLED_RST OLED_RST
+#define MY_OLED_SDA (21)
+#define MY_OLED_SCL (22)
+#define MY_OLED_RST (16)
 
 // Pins for LORA chip SPI interface come from board file, we need some
 // additional definitions for LMIC

src/hal/ttgov1.h

@@ -17,9 +17,9 @@
 #define HAS_BUTTON KEY_BUILTIN
 
 // Pins for I2C interface of OLED Display
-#define MY_OLED_SDA OLED_SDA
-#define MY_OLED_SCL OLED_SCL
-#define MY_OLED_RST OLED_RST
+#define MY_OLED_SDA (15)
+#define MY_OLED_SCL (4)
+#define MY_OLED_RST (16)
 
 // Pins for LORA chip SPI interface come from board file, we need some
 // additional definitions for LMIC

src/hal/ttgov2.h

@@ -18,8 +18,8 @@
 #define DISABLE_BROWNOUT 1 // comment out if you want to keep brownout feature
 
 // Pins for I2C interface of OLED Display
-#define MY_OLED_SDA OLED_SDA
-#define MY_OLED_SCL OLED_SCL
+#define MY_OLED_SDA (21)
+#define MY_OLED_SCL (22)
 #define MY_OLED_RST U8X8_PIN_NONE
 
 // Pins for LORA chip SPI interface come from board file, we need some
@@ -28,4 +28,4 @@
 #define LORA_IO1  (33)
 #define LORA_IO2  LMIC_UNUSED_PIN
 
-#endif
+#endif