[ssd1306] Fix offset_x being ignored on SH1106/SH1107 displays (#17700)

This commit is contained in:
Jesse Hills
2026-07-21 08:18:15 +12:00
parent 2223b14794
commit 231a2897c0
2 changed files with 19 additions and 16 deletions
+10 -10
View File
@@ -41,17 +41,17 @@ void I2CSSD1306::command(uint8_t value) { this->write_byte(0x00, value); }
void HOT I2CSSD1306::write_display_data() {
if (this->is_sh1106_() || this->is_sh1107_()) {
uint32_t i = 0;
// Some panels wire their visible columns to a window of the controller RAM
// that does not start at column 0 (e.g. SH1107 M5Stack Unit OLED needs offset_x: 32).
// SH1106 keeps its historical 0x02 base column on top of any offset.
uint8_t start_column = this->offset_x_;
if (this->is_sh1106_()) {
start_column += 0x02;
}
for (uint8_t page = 0; page < (uint8_t) this->get_height_internal() / 8; page++) {
this->command(0xB0 + page); // row
if (this->is_sh1106_()) {
this->command(0x02); // lower column - 0x02 is historical SH1106 value
} else {
// Other SH1107 drivers use 0x00
// Column values dont change and it seems they can be set only once,
// but we follow SH1106 implementation and resend them
this->command(0x00);
}
this->command(0x10); // higher column
this->command(0xB0 + page); // row
this->command(start_column & 0x0F); // lower column
this->command(0x10 | (start_column >> 4)); // higher column
for (uint8_t x = 0; x < (uint8_t) this->get_width_internal() / 16; x++) {
uint8_t data[16];
for (uint8_t &j : data)
@@ -38,14 +38,17 @@ void SPISSD1306::command(uint8_t value) {
}
void HOT SPISSD1306::write_display_data() {
if (this->is_sh1106_() || this->is_sh1107_()) {
// Some panels wire their visible columns to a window of the controller RAM
// that does not start at column 0 (e.g. SH1107 M5Stack Unit OLED needs offset_x: 32).
// SH1106 keeps its historical 0x02 base column on top of any offset.
uint8_t start_column = this->offset_x_;
if (this->is_sh1106_()) {
start_column += 0x02;
}
for (uint8_t y = 0; y < (uint8_t) this->get_height_internal() / 8; y++) {
this->command(0xB0 + y);
if (this->is_sh1106_()) {
this->command(0x02);
} else {
this->command(0x00);
}
this->command(0x10);
this->command(start_column & 0x0F); // lower column
this->command(0x10 | (start_column >> 4)); // higher column
this->dc_pin_->digital_write(true);
for (uint8_t x = 0; x < (uint8_t) this->get_width_internal(); x++) {
this->enable();