alex/esp-idf-ssd1306
1
0
Fork 0
mirror of https://github.com/nopnop2002/esp-idf-ssd1306.git synced 2024-10-03 18:18:47 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added _i2c_dev_handle to member of SSD1306_t

Browse Source
This commit is contained in:
nopnop2002 2024-09-12 08:00:14 +09:00
parent 30b5eb31ce
commit 04a726204c
3 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/ssd1306/ssd1306.h
View File

@ -103,7 +103,10 @@ typedef struct {
PAGE_t _page[8]; PAGE_t _page[8];
bool _flip; bool _flip;
i2c_port_t _i2c_num; i2c_port_t _i2c_num;
spi_device_handle_t _SPIHandle; spi_device_handle_t _spi_device_handle;
#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0))
i2c_master_dev_handle_t _i2c_dev_handle;
#endif
} SSD1306_t; } SSD1306_t;
#ifdef __cplusplus #ifdef __cplusplus

22
components/ssd1306/ssd1306_i2c_new.c
View File

@ -21,8 +21,6 @@
#define I2C_MASTER_FREQ_HZ 400000 // I2C clock of SSD1306 can run at 400 kHz max. #define I2C_MASTER_FREQ_HZ 400000 // I2C clock of SSD1306 can run at 400 kHz max.
#define I2C_TICKS_TO_WAIT 100 // Maximum ticks to wait before issuing a timeout. #define I2C_TICKS_TO_WAIT 100 // Maximum ticks to wait before issuing a timeout.
i2c_master_dev_handle_t dev_handle;
void i2c_master_init(SSD1306_t * dev, int16_t sda, int16_t scl, int16_t reset) void i2c_master_init(SSD1306_t * dev, int16_t sda, int16_t scl, int16_t reset)
{ {
ESP_LOGI(TAG, "New i2c driver is used"); ESP_LOGI(TAG, "New i2c driver is used");
@ -42,8 +40,8 @@ void i2c_master_init(SSD1306_t * dev, int16_t sda, int16_t scl, int16_t reset)
.device_address = I2C_ADDRESS, .device_address = I2C_ADDRESS,
.scl_speed_hz = I2C_MASTER_FREQ_HZ, .scl_speed_hz = I2C_MASTER_FREQ_HZ,
}; };
//i2c_master_dev_handle_t dev_handle; i2c_master_dev_handle_t i2c_dev_handle;
ESP_ERROR_CHECK(i2c_master_bus_add_device(bus_handle, &dev_cfg, &dev_handle)); ESP_ERROR_CHECK(i2c_master_bus_add_device(bus_handle, &dev_cfg, &i2c_dev_handle));
if (reset >= 0) { if (reset >= 0) {
//gpio_pad_select_gpio(reset); //gpio_pad_select_gpio(reset);
@ -57,6 +55,7 @@ void i2c_master_init(SSD1306_t * dev, int16_t sda, int16_t scl, int16_t reset)
dev->_address = I2C_ADDRESS; dev->_address = I2C_ADDRESS;
dev->_flip = false; dev->_flip = false;
dev->_i2c_num = I2C_NUM; dev->_i2c_num = I2C_NUM;
dev->_i2c_dev_handle = i2c_dev_handle;
} }
void i2c_bus_add(SSD1306_t * dev, i2c_master_bus_handle_t bus_handle, i2c_port_t i2c_num, int16_t reset) void i2c_bus_add(SSD1306_t * dev, i2c_master_bus_handle_t bus_handle, i2c_port_t i2c_num, int16_t reset)
@ -81,8 +80,8 @@ void i2c_bus_add(SSD1306_t * dev, i2c_master_bus_handle_t bus_handle, i2c_port_t
.device_address = I2C_ADDRESS, .device_address = I2C_ADDRESS,
.scl_speed_hz = I2C_MASTER_FREQ_HZ, .scl_speed_hz = I2C_MASTER_FREQ_HZ,
}; };
//i2c_master_dev_handle_t dev_handle; i2c_master_dev_handle_t i2c_dev_handle;
ESP_ERROR_CHECK(i2c_master_bus_add_device(bus_handle, &dev_cfg, &dev_handle)); ESP_ERROR_CHECK(i2c_master_bus_add_device(bus_handle, &dev_cfg, &i2c_dev_handle));
if (reset >= 0) { if (reset >= 0) {
//gpio_pad_select_gpio(reset); //gpio_pad_select_gpio(reset);
@ -96,6 +95,7 @@ void i2c_bus_add(SSD1306_t * dev, i2c_master_bus_handle_t bus_handle, i2c_port_t
dev->_address = I2C_ADDRESS; dev->_address = I2C_ADDRESS;
dev->_flip = false; dev->_flip = false;
dev->_i2c_num = i2c_num; dev->_i2c_num = i2c_num;
dev->_i2c_dev_handle = i2c_dev_handle;
} }
void i2c_init(SSD1306_t * dev, int width, int height) { void i2c_init(SSD1306_t * dev, int width, int height) {
@ -146,7 +146,7 @@ void i2c_init(SSD1306_t * dev, int width, int height) {
out_buf[out_index++] = OLED_CMD_DISPLAY_ON; // AF out_buf[out_index++] = OLED_CMD_DISPLAY_ON; // AF
esp_err_t res; esp_err_t res;
res = i2c_master_transmit(dev_handle, out_buf, out_index, I2C_TICKS_TO_WAIT); res = i2c_master_transmit(dev->_i2c_dev_handle, out_buf, out_index, I2C_TICKS_TO_WAIT);
if (res == ESP_OK) { if (res == ESP_OK) {
ESP_LOGI(TAG, "OLED configured successfully"); ESP_LOGI(TAG, "OLED configured successfully");
} else { } else {
@ -184,14 +184,14 @@ void i2c_display_image(SSD1306_t * dev, int page, int seg, uint8_t * images, int
out_buf[out_index++] = 0xB0 | _page; out_buf[out_index++] = 0xB0 | _page;
esp_err_t res; esp_err_t res;
res = i2c_master_transmit(dev_handle, out_buf, out_index, I2C_TICKS_TO_WAIT); res = i2c_master_transmit(dev->_i2c_dev_handle, out_buf, out_index, I2C_TICKS_TO_WAIT);
if (res != ESP_OK) if (res != ESP_OK)
ESP_LOGE(TAG, "Could not write to device [0x%02x at %d]: %d (%s)", dev->_address, dev->_i2c_num, res, esp_err_to_name(res)); ESP_LOGE(TAG, "Could not write to device [0x%02x at %d]: %d (%s)", dev->_address, dev->_i2c_num, res, esp_err_to_name(res));
out_buf[0] = OLED_CONTROL_BYTE_DATA_STREAM; out_buf[0] = OLED_CONTROL_BYTE_DATA_STREAM;
memcpy(&out_buf[1], images, width); memcpy(&out_buf[1], images, width);
res = i2c_master_transmit(dev_handle, out_buf, width + 1, I2C_TICKS_TO_WAIT); res = i2c_master_transmit(dev->_i2c_dev_handle, out_buf, width + 1, I2C_TICKS_TO_WAIT);
if (res != ESP_OK) if (res != ESP_OK)
ESP_LOGE(TAG, "Could not write to device [0x%02x at %d]: %d (%s)", dev->_address, dev->_i2c_num, res, esp_err_to_name(res)); ESP_LOGE(TAG, "Could not write to device [0x%02x at %d]: %d (%s)", dev->_address, dev->_i2c_num, res, esp_err_to_name(res));
free(out_buf); free(out_buf);
@ -208,7 +208,7 @@ void i2c_contrast(SSD1306_t * dev, int contrast) {
out_buf[out_index++] = OLED_CMD_SET_CONTRAST; // 81 out_buf[out_index++] = OLED_CMD_SET_CONTRAST; // 81
out_buf[out_index++] = _contrast; out_buf[out_index++] = _contrast;
esp_err_t res = i2c_master_transmit(dev_handle, out_buf, 3, I2C_TICKS_TO_WAIT); esp_err_t res = i2c_master_transmit(dev->_i2c_dev_handle, out_buf, 3, I2C_TICKS_TO_WAIT);
if (res != ESP_OK) if (res != ESP_OK)
ESP_LOGE(TAG, "Could not write to device [0x%02x at %d]: %d (%s)", dev->_address, dev->_i2c_num, res, esp_err_to_name(res)); ESP_LOGE(TAG, "Could not write to device [0x%02x at %d]: %d (%s)", dev->_address, dev->_i2c_num, res, esp_err_to_name(res));
} }
@ -283,7 +283,7 @@ void i2c_hardware_scroll(SSD1306_t * dev, ssd1306_scroll_type_t scroll) {
out_buf[out_index++] = OLED_CMD_DEACTIVE_SCROLL; // 2E out_buf[out_index++] = OLED_CMD_DEACTIVE_SCROLL; // 2E
} }
esp_err_t res = i2c_master_transmit(dev_handle, out_buf, out_index, I2C_TICKS_TO_WAIT); esp_err_t res = i2c_master_transmit(dev->_i2c_dev_handle, out_buf, out_index, I2C_TICKS_TO_WAIT);
if (res != ESP_OK) if (res != ESP_OK)
ESP_LOGE(TAG, "Could not write to device [0x%02x at %d]: %d (%s)", dev->_address, dev->_i2c_num, res, esp_err_to_name(res)); ESP_LOGE(TAG, "Could not write to device [0x%02x at %d]: %d (%s)", dev->_address, dev->_i2c_num, res, esp_err_to_name(res));
} }

16
components/ssd1306/ssd1306_spi.c
View File

@ -71,15 +71,15 @@ void spi_master_init(SSD1306_t * dev, int16_t mosi, int16_t sclk, int16_t cs, in
devcfg.spics_io_num = cs; devcfg.spics_io_num = cs;
devcfg.queue_size = 1; devcfg.queue_size = 1;
spi_device_handle_t handle; spi_device_handle_t spi_device_handle;
ret = spi_bus_add_device( HOST_ID, &devcfg, &handle); ret = spi_bus_add_device( HOST_ID, &devcfg, &spi_device_handle);
ESP_LOGI(TAG, "spi_bus_add_device=%d",ret); ESP_LOGI(TAG, "spi_bus_add_device=%d",ret);
assert(ret==ESP_OK); assert(ret==ESP_OK);
dev->_dc = dc; dev->_dc = dc;
dev->_address = SPI_ADDRESS; dev->_address = SPI_ADDRESS;
dev->_flip = false; dev->_flip = false;
dev->_SPIHandle = handle; dev->_spi_device_handle = spi_device_handle;
} }
void spi_device_add(SSD1306_t * dev, int16_t cs, int16_t dc, int16_t reset) void spi_device_add(SSD1306_t * dev, int16_t cs, int16_t dc, int16_t reset)
@ -127,15 +127,15 @@ void spi_device_add(SSD1306_t * dev, int16_t cs, int16_t dc, int16_t reset)
devcfg.spics_io_num = cs; devcfg.spics_io_num = cs;
devcfg.queue_size = 1; devcfg.queue_size = 1;
spi_device_handle_t handle; spi_device_handle_t spi_device_handle;
ret = spi_bus_add_device( HOST_ID, &devcfg, &handle); ret = spi_bus_add_device( HOST_ID, &devcfg, &spi_device_handle);
ESP_LOGI(TAG, "spi_bus_add_device=%d",ret); ESP_LOGI(TAG, "spi_bus_add_device=%d",ret);
assert(ret==ESP_OK); assert(ret==ESP_OK);
dev->_dc = dc; dev->_dc = dc;
dev->_address = SPI_ADDRESS; dev->_address = SPI_ADDRESS;
dev->_flip = false; dev->_flip = false;
dev->_SPIHandle = handle; dev->_spi_device_handle = spi_device_handle;
} }
@ -158,13 +158,13 @@ bool spi_master_write_command(SSD1306_t * dev, uint8_t Command )
static uint8_t CommandByte = 0; static uint8_t CommandByte = 0;
CommandByte = Command; CommandByte = Command;
gpio_set_level( dev->_dc, SPI_COMMAND_MODE ); gpio_set_level( dev->_dc, SPI_COMMAND_MODE );
return spi_master_write_byte( dev->_SPIHandle, &CommandByte, 1 ); return spi_master_write_byte( dev->_spi_device_handle, &CommandByte, 1 );
} }
bool spi_master_write_data(SSD1306_t * dev, const uint8_t* Data, size_t DataLength ) bool spi_master_write_data(SSD1306_t * dev, const uint8_t* Data, size_t DataLength )
{ {
gpio_set_level( dev->_dc, SPI_DATA_MODE ); gpio_set_level( dev->_dc, SPI_DATA_MODE );
return spi_master_write_byte( dev->_SPIHandle, Data, DataLength ); return spi_master_write_byte( dev->_spi_device_handle, Data, DataLength );
} }