Skip to content
Snippets Groups Projects
Commit 0a11d226 authored by Arcao's avatar Arcao
Browse files

Merge remote-tracking branch 'upstream/master'

parents 873980f7 c6510a8d
No related branches found
No related tags found
No related merge requests found
...@@ -211,7 +211,7 @@ class OLEDDisplay : public Print { ...@@ -211,7 +211,7 @@ class OLEDDisplay : public Print {
void flipScreenVertically(); void flipScreenVertically();
// Write the buffer to the display memory // Write the buffer to the display memory
virtual void display(void); virtual void display(void) = 0;
// Clear the local pixel buffer // Clear the local pixel buffer
void clear(void); void clear(void);
...@@ -251,10 +251,10 @@ class OLEDDisplay : public Print { ...@@ -251,10 +251,10 @@ class OLEDDisplay : public Print {
char *logBuffer = NULL; char *logBuffer = NULL;
// Send a command to the display (low level function) // Send a command to the display (low level function)
virtual void sendCommand(uint8_t com); virtual void sendCommand(uint8_t com) {};
// Connect to the display // Connect to the display
virtual bool connect(); virtual bool connect() {};
// Send all the init commands // Send all the init commands
void sendInitCommands(); void sendInitCommands();
......
...@@ -116,6 +116,10 @@ void OLEDDisplayUi::setOverlays(OverlayCallback* overlayFunctions, uint8_t overl ...@@ -116,6 +116,10 @@ void OLEDDisplayUi::setOverlays(OverlayCallback* overlayFunctions, uint8_t overl
// -/----- Loading Process -----\- // -/----- Loading Process -----\-
void OLEDDisplayUi::setLoadingDrawFunction(LoadingDrawFunction loadingDrawFunction) {
this->loadingDrawFunction = loadingDrawFunction;
}
void OLEDDisplayUi::runLoadingProcess(LoadingStage* stages, uint8_t stagesCount) { void OLEDDisplayUi::runLoadingProcess(LoadingStage* stages, uint8_t stagesCount) {
uint8_t progress = 0; uint8_t progress = 0;
uint8_t increment = 100 / stagesCount; uint8_t increment = 100 / stagesCount;
...@@ -372,11 +376,11 @@ void OLEDDisplayUi::drawIndicator() { ...@@ -372,11 +376,11 @@ void OLEDDisplayUi::drawIndicator() {
break; break;
case RIGHT: case RIGHT:
x = 120 + (8 * indicatorFadeProgress); x = 120 + (8 * indicatorFadeProgress);
y = 32 - frameStartPos + 12 * i; y = 32 - frameStartPos + 2 + 12 * i;
break; break;
case LEFT: case LEFT:
x = 0 - (8 * indicatorFadeProgress); x = 0 - (8 * indicatorFadeProgress);
y = 32 - frameStartPos + 12 * i; y = 32 - frameStartPos + 2 + 12 * i;
break; break;
} }
......
...@@ -274,14 +274,14 @@ void enableIndicator(); ...@@ -274,14 +274,14 @@ void enableIndicator();
void disableIndicator(); void disableIndicator();
/** /**
* Enable drawing of indicators * Enable drawing of all indicators.
*/ */
void enableAllIndicator(); void enableAllIndicators();
/** /**
* Disable drawing of indicators. * Disable drawing of all indicators.
*/ */
void disableAllIndicator(); void disableAllIndicators();
/** /**
* Set the position of the indicator bar. * Set the position of the indicator bar.
...@@ -322,7 +322,7 @@ void setOverlays(OverlayCallback* overlayFunctions, uint8_t overlayCount); ...@@ -322,7 +322,7 @@ void setOverlays(OverlayCallback* overlayFunctions, uint8_t overlayCount);
* Set the function that will draw each step * Set the function that will draw each step
* in the loading animation * in the loading animation
*/ */
void setLoadingDrawFunction(LoadingDrawFunction stage); void setLoadingDrawFunction(LoadingDrawFunction loadingDrawFunction);
/** /**
* Run the loading process * Run the loading process
......
{ {
"name": "ESP8266_SSD1306", "name": "ESP8266_SSD1306",
"version": "3.2.3", "version": "3.2.4",
"keywords": "ssd1306, oled, display, i2c", "keywords": "ssd1306, oled, display, i2c",
"description": "A I2C display driver for SSD1306 oled displays connected to an ESP8266", "description": "A I2C display driver for SSD1306 oled displays connected to an ESP8266",
"repository": "repository":
......
name=ESP8266 Oled Driver for SSD1306 display name=ESP8266 Oled Driver for SSD1306 display
version=3.2.3 version=3.2.4
author=Daniel Eichhorn, Fabrice Weinberg author=Daniel Eichhorn, Fabrice Weinberg
maintainer=Daniel Eichhorn <squix78@gmail.com> maintainer=Daniel Eichhorn <squix78@gmail.com>
sentence=A I2C display driver for SSD1306 oled displays connected to an ESP8266 sentence=A I2C display driver for SSD1306 oled displays connected to an ESP8266
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment