Skip to content

Commit ed1feac

Browse files
committed
Fix PR #404
Fixes #410, #411
1 parent 0fd872e commit ed1feac

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

library.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ESP8266 and ESP32 OLED driver for SSD1306 displays",
3-
"version": "4.6.0",
3+
"version": "4.6.1",
44
"keywords": "ssd1306, oled, display, i2c",
55
"description": "I2C display driver for SSD1306 OLED displays connected to ESP8266, ESP32, Mbed-OS",
66
"license": "MIT",

library.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=ESP8266 and ESP32 OLED driver for SSD1306 displays
2-
version=4.6.0
2+
version=4.6.1
33
author=ThingPulse, Fabrice Weinberg
44
maintainer=ThingPulse <[email protected]>
55
sentence=I2C display driver for SSD1306 OLED displays connected to ESP8266, ESP32, Mbed-OS

src/SH1106Wire.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ class SH1106Wire : public OLEDDisplay {
6464
* ensure -1 value are specified for all 3 parameters. This can be usefull to control TwoWire with multiple
6565
* device on the same bus.
6666
*
67-
* @param _address I2C Display address
68-
* @param _sda I2C SDA pin number, default to -1 to skip Wire begin call
69-
* @param _scl I2C SCL pin number, default to -1 (only SDA = -1 is considered to skip Wire begin call)
67+
* @param address I2C Display address
68+
* @param sda I2C SDA pin number, default to -1 to skip Wire begin call
69+
* @param scl I2C SCL pin number, default to -1 (only SDA = -1 is considered to skip Wire begin call)
7070
* @param g display geometry dafault to generic GEOMETRY_128_64, see OLEDDISPLAY_GEOMETRY definition for other options
71-
* @param _i2cBus on ESP32 with 2 I2C HW buses, I2C_ONE for 1st Bus, I2C_TWO fot 2nd bus, default I2C_ONE
72-
* @param _frequency for Frequency by default Let's use ~700khz if ESP8266 is in 160Mhz mode, this will be limited to ~400khz if the ESP8266 in 80Mhz mode
71+
* @param i2cBus on ESP32 with 2 I2C HW buses, I2C_ONE for 1st Bus, I2C_TWO fot 2nd bus, default I2C_ONE
72+
* @param frequency for Frequency by default Let's use ~700khz if ESP8266 is in 160Mhz mode, this will be limited to ~400khz if the ESP8266 in 80Mhz mode
7373
*/
7474
SH1106Wire(uint8_t address, int sda = -1, int scl = -1, OLEDDISPLAY_GEOMETRY g = GEOMETRY_128_64, HW_I2C i2cBus = I2C_ONE, long frequency = 700000) {
7575
setGeometry(g);

src/SSD1306Wire.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -65,25 +65,25 @@ class SSD1306Wire : public OLEDDisplay {
6565
* ensure -1 value are specified for all 3 parameters. This can be usefull to control TwoWire with multiple
6666
* device on the same bus.
6767
*
68-
* @param _address I2C Display address
69-
* @param _sda I2C SDA pin number, default to -1 to skip Wire begin call
70-
* @param _scl I2C SCL pin number, default to -1 (only SDA = -1 is considered to skip Wire begin call)
68+
* @param address I2C Display address
69+
* @param sda I2C SDA pin number, default to -1 to skip Wire begin call
70+
* @param scl I2C SCL pin number, default to -1 (only SDA = -1 is considered to skip Wire begin call)
7171
* @param g display geometry dafault to generic GEOMETRY_128_64, see OLEDDISPLAY_GEOMETRY definition for other options
72-
* @param _i2cBus on ESP32 with 2 I2C HW buses, I2C_ONE for 1st Bus, I2C_TWO fot 2nd bus, default I2C_ONE
73-
* @param _frequency for Frequency by default Let's use ~700khz if ESP8266 is in 160Mhz mode, this will be limited to ~400khz if the ESP8266 in 80Mhz mode
72+
* @param i2cBus on ESP32 with 2 I2C HW buses, I2C_ONE for 1st Bus, I2C_TWO fot 2nd bus, default I2C_ONE
73+
* @param frequency for Frequency by default Let's use ~700khz if ESP8266 is in 160Mhz mode, this will be limited to ~400khz if the ESP8266 in 80Mhz mode
7474
*/
7575
SSD1306Wire(uint8_t address, int sda = -1, int scl = -1, OLEDDISPLAY_GEOMETRY g = GEOMETRY_128_64, HW_I2C i2cBus = I2C_ONE, long frequency = 700000) {
7676
setGeometry(g);
7777

78-
this->_address = _address;
79-
this->_sda = _sda;
80-
this->_scl = _scl;
78+
this->_address = address;
79+
this->_sda = sda;
80+
this->_scl = scl;
8181
#if !defined(ARDUINO_ARCH_ESP32)
8282
this->_wire = &Wire;
8383
#else
8484
this->_wire = (i2cBus == I2C_ONE) ? &Wire : &Wire1;
8585
#endif
86-
this->_frequency = _frequency;
86+
this->_frequency = frequency;
8787
}
8888

8989
bool connect() {

0 commit comments

Comments
 (0)