GitHub-Proxy/ESP3D
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git synced 2025-08-02 23:10:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Austin St. Aubin 2018-10-13 11:08:20 -05:00
parent a43eaa6d64
commit cd8a922a67
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
Thumbs.db Thumbs.db
.DS_Store
*.orig *.orig
embedded/node_modules embedded/node_modules
embedded/dist embedded/dist

4
src/config.h
View File

@ -117,8 +117,8 @@
//Pins where the screen is connected //Pins where the screen is connected
#ifdef ESP_OLED_FEATURE #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_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_SDA 4 //5 //SDA; // i2c SDA Pin
#define OLED_PIN_B 4 //4 //SCL; // i2c SCL Pin #define OLED_PIN_SCL 15 //4 //SCL; // i2c SCL Pin
#define OLED_ADDR 0x3c #define OLED_ADDR 0x3c
#define HELTEC_EMBEDDED_PIN 16 //0 to disable #define HELTEC_EMBEDDED_PIN 16 //0 to disable
#define OLED_FLIP_VERTICALY 1 //0 to disable #define OLED_FLIP_VERTICALY 1 //0 to disable

4
src/esp_oled.cpp
View File

@ -32,9 +32,9 @@
#ifdef OLED_DISPLAY_SSD1306 #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 #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 #endif