ua1zbe
/
LoRa_APRS_iGate111
mirror of https://github.com/richonguzman/LoRa_APRS_iGate.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WIRE update

This commit is contained in:
richonguzman 2024-10-25 11:50:57 -03:00
parent c9577b6c21
commit a91f0f3f3c
2 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/display.cpp
View File

@ -33,9 +33,11 @@
#endif #endif
#endif #endif
extern Configuration Config; extern Configuration Config;
String oldHeader, oldFirstLine, oldSecondLine, oldThirdLine, oldFourthLine, oldFifthLine, oldSixthLine;
bool displayFound = false;
String oldHeader, oldFirstLine, oldSecondLine, oldThirdLine, oldFourthLine, oldFifthLine, oldSixthLine;
void cleanTFT() { void cleanTFT() {
#ifdef HAS_TFT #ifdef HAS_TFT
@ -68,6 +70,7 @@ void displaySetup() {
#endif #endif
if(display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) { if(display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) {
displayFound = true;
if (Config.display.turn180) { if (Config.display.turn180) {
display.setRotation(2); display.setRotation(2);
} }
@ -78,11 +81,7 @@ void displaySetup() {
display.ssd1306_command(SSD1306_SETCONTRAST); display.ssd1306_command(SSD1306_SETCONTRAST);
display.ssd1306_command(1); display.ssd1306_command(1);
display.display(); display.display();
} else {
//Serial.println(F("SSD1306 allocation failed"));
#undef HAS_DISPLAY
} }
#endif #endif
#endif #endif
delay(1000); delay(1000);
@ -98,7 +97,7 @@ void displayToggle(bool toggle) {
#if HAS_EPAPER #if HAS_EPAPER
// ... to be continued // ... to be continued
#else #else
display.ssd1306_command(SSD1306_DISPLAYON); if (displayFound) display.ssd1306_command(SSD1306_DISPLAYON);
#endif #endif
#endif #endif
} else { } else {
@ -108,7 +107,7 @@ void displayToggle(bool toggle) {
#if HAS_EPAPER #if HAS_EPAPER
// ... to be continued // ... to be continued
#else #else
display.ssd1306_command(SSD1306_DISPLAYOFF); if (displayFound) display.ssd1306_command(SSD1306_DISPLAYOFF);
#endif #endif
#endif #endif
} }
@ -162,18 +161,20 @@ void displayShow(const String& header, const String& line1, const String& line2,
#ifdef HAS_EPAPER #ifdef HAS_EPAPER
// ... to be continued // ... to be continued
#else #else
display.clearDisplay(); if (displayFound) {
display.setTextColor(WHITE); display.clearDisplay();
display.setTextSize(1); display.setTextColor(WHITE);
display.setCursor(0, 0); display.setTextSize(1);
display.println(header); display.setCursor(0, 0);
for (int i = 0; i < 3; i++) { display.println(header);
display.setCursor(0, 8 + (8 * i)); for (int i = 0; i < 3; i++) {
display.println(*lines[i]); display.setCursor(0, 8 + (8 * i));
display.println(*lines[i]);
}
display.ssd1306_command(SSD1306_SETCONTRAST);
display.ssd1306_command(1);
display.display();
} }
display.ssd1306_command(SSD1306_SETCONTRAST);
display.ssd1306_command(1);
display.display();
#endif #endif
#endif #endif
delay(wait); delay(wait);
@ -200,19 +201,21 @@ void displayShow(const String& header, const String& line1, const String& line2,
#ifdef HAS_EPAPER #ifdef HAS_EPAPER
// ... to be continued // ... to be continued
#else #else
display.clearDisplay(); if (displayFound) {
display.setTextColor(WHITE); display.clearDisplay();
display.setTextSize(2); display.setTextColor(WHITE);
display.setCursor(0, 0); display.setTextSize(2);
display.println(header); display.setCursor(0, 0);
display.setTextSize(1); display.println(header);
for (int i = 0; i < 6; i++) { display.setTextSize(1);
display.setCursor(0, 16 + (8 * i)); for (int i = 0; i < 6; i++) {
display.println(*lines[i]); display.setCursor(0, 16 + (8 * i));
display.println(*lines[i]);
}
display.ssd1306_command(SSD1306_SETCONTRAST);
display.ssd1306_command(1);
display.display();
} }
display.ssd1306_command(SSD1306_SETCONTRAST);
display.ssd1306_command(1);
display.display();
#endif #endif
#endif #endif
delay(wait); delay(wait);

2
src/power_utils.cpp
View File

@ -205,7 +205,7 @@ namespace POWER_Utils {
Wire1.begin(BOARD_I2C_SDA, BOARD_I2C_SCL); Wire1.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
#endif #endif
#if defined(HELTEC_V3) || defined(HELTEC_WS) #if defined(HELTEC_V3) || defined(HELTEC_WS) || defined(LIGHTGATEWAY_1_0)
Wire.begin(OLED_SDA, OLED_SCL); Wire.begin(OLED_SDA, OLED_SCL);
#endif #endif