Skip to content

Commit c588f96

Browse files
committed
Merge branch 'contrib/github_pr_477' into 'master'
Fixed axs15231b use i2c_master SCL frequency error (GitHub PR) Closes AEGHB-1000 See merge request ae_group/esp-iot-solution!1261
2 parents c576811 + bb85a1c commit c588f96

File tree

3 files changed

+22
-3
lines changed

3 files changed

+22
-3
lines changed
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
# ChangeLog
22

3+
## v1.0.1 - 2025-03-09
4+
5+
### bugfix:
6+
7+
- Fixed an issue where using i2c_master could not set scl_speed_hz resulting in an invalid scl frequency error
8+
39
## v1.0.0 - 2024-02-29
410

511
### Enhancements:
612

7-
* Implement the driver for the AXS15231B LCD controller
8-
13+
- Implement the driver for the AXS15231B LCD controller

components/display/lcd/esp_lcd_axs15231b/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "1.0.0"
1+
version: "1.0.1"
22
description: ESP LCD & Touch AXS15231B
33
url: https://github.com/espressif/esp-bsp/tree/master/components/lcd/esp_lcd_axs15231b
44
issues: https://github.com/espressif/esp-iot-solution/issues

components/display/lcd/esp_lcd_axs15231b/include/esp_lcd_axs15231b.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ esp_err_t esp_lcd_touch_new_i2c_axs15231b(const esp_lcd_panel_io_handle_t io, co
176176
* @brief Touch IO configuration structure
177177
*
178178
*/
179+
179180
#define ESP_LCD_TOUCH_IO_I2C_AXS15231B_CONFIG() \
180181
{ \
181182
.dev_addr = ESP_LCD_TOUCH_IO_I2C_AXS15231B_ADDRESS, \
@@ -188,6 +189,19 @@ esp_err_t esp_lcd_touch_new_i2c_axs15231b(const esp_lcd_panel_io_handle_t io, co
188189
} \
189190
}
190191

192+
#define ESP_LCD_TOUCH_IO_I2C_AXS15231B_CONFIG_EX(scl_speed_hz) \
193+
{ \
194+
.dev_addr = ESP_LCD_TOUCH_IO_I2C_AXS15231B_ADDRESS, \
195+
.control_phase_bytes = 1, \
196+
.dc_bit_offset = 0, \
197+
.lcd_cmd_bits = 8, \
198+
.flags = \
199+
{ \
200+
.disable_control_phase = 1, \
201+
}, \
202+
.scl_speed_hz = scl_speed_hz, \
203+
}
204+
191205
#ifdef __cplusplus
192206
}
193207
#endif

0 commit comments

Comments
 (0)