3 files changed, 15 insertions, 9 deletions
diff --git a/drivers/painter/comms/qp_comms_i2c.c b/drivers/painter/comms/qp_comms_i2c.c
index ec45ddfb3b..93f503f3dd 100644
--- a/drivers/painter/comms/qp_comms_i2c.c
+++ b/drivers/painter/comms/qp_comms_i2c.c
@@ -28,18 +28,14 @@ bool qp_comms_i2c_init(painter_device_t device) {
 }
 
 bool qp_comms_i2c_start(painter_device_t device) {
-    painter_driver_t *     driver       = (painter_driver_t *)device;
-    qp_comms_i2c_config_t *comms_config = (qp_comms_i2c_config_t *)driver->comms_config;
-    return i2c_start(comms_config->chip_address << 1) == I2C_STATUS_SUCCESS;
+    return true;
 }
 
 uint32_t qp_comms_i2c_send_data(painter_device_t device, const void *data, uint32_t byte_count) {
     return qp_comms_i2c_send_raw(device, data, byte_count);
 }
 
-void qp_comms_i2c_stop(painter_device_t device) {
-    i2c_stop();
-}
+void qp_comms_i2c_stop(painter_device_t device) {}
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Command+Data I2C support
diff --git a/drivers/painter/sh1106/qp_sh1106.c b/drivers/painter/sh1106/qp_sh1106.c
index 7cb6e398fa..4117115aec 100644
--- a/drivers/painter/sh1106/qp_sh1106.c
+++ b/drivers/painter/sh1106/qp_sh1106.c
@@ -44,7 +44,7 @@ __attribute__((weak)) bool qp_sh1106_init(painter_device_t device, painter_rotat
     }
 
     // clang-format off
-    const uint8_t sh1106_init_sequence[] = {
+    uint8_t sh1106_init_sequence[] = {
         // Command,                 Delay,  N, Data[N]
         SH1106_SET_MUX_RATIO,           0,  1, 0x3F,
         SH1106_DISPLAY_OFFSET,          0,  1, 0x00,
@@ -61,6 +61,16 @@ __attribute__((weak)) bool qp_sh1106_init(painter_device_t device, painter_rotat
     };
     // clang-format on
 
+    // If the display height is anything other than the default 64 pixels, change SH1106_SET_MUX_RATIO data byte to the correct value
+    if (driver->oled.base.panel_height != 64) {
+        sh1106_init_sequence[3] = driver->oled.base.panel_height - 1;
+    }
+
+    // For 128x32 or 96x16 displays, change SH1106_COM_PADS_HW_CFG data byte from alternative (0x12) to sequential (0x02) configuration
+    if (driver->oled.base.panel_height <= 32) {
+        sh1106_init_sequence[20] = 0x02;
+    }
+
     qp_comms_bulk_command_sequence(device, sh1106_init_sequence, sizeof(sh1106_init_sequence));
     return true;
 }
@@ -203,4 +213,4 @@ painter_device_t qp_sh1106_make_i2c_device(uint16_t panel_width, uint16_t panel_
     return NULL;
 }
 
-#endif // QUANTUM_PAINTER_SH1106_SPI_ENABLE
+#endif // QUANTUM_PAINTER_SH1106_I2C_ENABLE
diff --git a/drivers/painter/sh1106/qp_sh1106_opcodes.h b/drivers/painter/sh1106/qp_sh1106_opcodes.h
index a2e100d770..bf86ba4c2c 100644
--- a/drivers/painter/sh1106/qp_sh1106_opcodes.h
+++ b/drivers/painter/sh1106/qp_sh1106_opcodes.h
@@ -16,7 +16,7 @@
 #define SH1106_COM_PADS_HW_CFG 0xDA
 #define SH1106_SET_CONTRAST 0x81
 #define SH1106_SET_PRECHARGE_PERIOD 0xD9
-#define SH1106_VCOM_DETECT 0xDB
+#define SH1106_VCOM_DESELECT_LEVEL 0xDB
 #define SH1106_ALL_ON_RESUME 0xA4
 #define SH1106_NON_INVERTING_DISPLAY 0xA6
 #define SH1106_DEACTIVATE_SCROLL 0x2E