From cd8a922a67db2e88a3d95e8762dd9d43a7188e01 Mon Sep 17 00:00:00 2001 From: "Austin St. Aubin" Date: Sat, 13 Oct 2018 11:08:20 -0500 Subject: [PATCH] Minor fixes --- .gitignore | 1 + src/config.h | 4 ++-- src/esp_oled.cpp | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 60723e05..2a143187 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ Thumbs.db +.DS_Store *.orig embedded/node_modules embedded/dist diff --git a/src/config.h b/src/config.h index eb91f0c3..353ee395 100644 --- a/src/config.h +++ b/src/config.h @@ -117,8 +117,8 @@ //Pins where the screen is connected #ifdef ESP_OLED_FEATURE #define OLED_DISPLAY_SH1106 // OLED Display Type: SSD1306(OLED_DISPLAY_SSD1306) / SH1106(OLED_DISPLAY_SH1106), comment this line out to disable oled -#define OLED_PIN_A 5 //5 //SDA; // i2c SDA Pin -#define OLED_PIN_B 4 //4 //SCL; // i2c SCL Pin +#define OLED_PIN_SDA 4 //5 //SDA; // i2c SDA Pin +#define OLED_PIN_SCL 15 //4 //SCL; // i2c SCL Pin #define OLED_ADDR 0x3c #define HELTEC_EMBEDDED_PIN 16 //0 to disable #define OLED_FLIP_VERTICALY 1 //0 to disable diff --git a/src/esp_oled.cpp b/src/esp_oled.cpp index c2783c8d..a12f9d1b 100644 --- a/src/esp_oled.cpp +++ b/src/esp_oled.cpp @@ -32,9 +32,9 @@ #ifdef OLED_DISPLAY_SSD1306 - SSD1306 esp_display(0x3c, OLED_PIN_A, OLED_PIN_B); + SSD1306 esp_display(OLED_ADDR, OLED_PIN_SDA, OLED_PIN_SCL); #elif defined OLED_DISPLAY_SH1106 - SH1106 esp_display(0x3c, OLED_PIN_A, OLED_PIN_B); + SH1106 esp_display(OLED_ADDR, OLED_PIN_SDA, OLED_PIN_SCL); #endif