drivers: display: st7567: Obey the column offset property

Shift the output to the display by the configured column offset

Signed-off-by: Jeremy Dick <[email protected]>

Author: jeremydick

drivers/display/display_st7567.c

@@ -112,7 +112,7 @@ static bool st7567_bus_ready_dbi(const struct device *dev)
 static int st7567_write_cmd_bus_dbi(const struct device *dev, const uint8_t *buf, size_t len)
 {
 	const struct st7567_config *config = dev->config;
-	int ret;
+	int ret = 0;
 
 	for (size_t i = 0; i < len; i++) {
 		ret = mipi_dbi_command_write(config->bus.dbi.mipi_dev, &config->bus.dbi.dbi_config,
@@ -285,22 +285,34 @@ static int st7567_suspend(const struct device *dev)
 }
 
 static int st7567_write_default(const struct device *dev, const uint16_t x, const uint16_t y,
-				const struct display_buffer_descriptor *desc, const void *buf,
-				const size_t buf_len)
+				const uint8_t *buf, const size_t buf_len)
 {
+	const struct st7567_config *config = dev->config;
 	int ret;
 	uint8_t cmd_buf[3];
+	uint16_t column = x + config->column_offset;
+
+	cmd_buf[0] = ST7567_COLUMN_LSB | (column & 0xF);
+	cmd_buf[1] = ST7567_COLUMN_MSB | ((column >> 4) & 0xF);
+	cmd_buf[2] = ST7567_PAGE | (y >> 3);
+
+	ret = st7567_write_cmd_bus(dev, cmd_buf, sizeof(cmd_buf));
+	if (ret < 0) {
+		return ret;
+	}
+
+	return st7567_write_pixels_bus(dev, buf, buf_len);
+}
+
+static int st7567_write_desc(const struct device *dev, const uint16_t x, const uint16_t y,
+			     const struct display_buffer_descriptor *desc, const void *buf,
+			     const size_t buf_len)
+{
+	int ret = 0;
 
 	for (int i = 0; i < desc->height / 8; i++) {
-		cmd_buf[0] = ST7567_COLUMN_LSB | (x & 0xF);
-		cmd_buf[1] = ST7567_COLUMN_MSB | ((x >> 4) & 0xF);
-		cmd_buf[2] = ST7567_PAGE | ((y >> 3) + i);
-		ret = st7567_write_cmd_bus(dev, cmd_buf, sizeof(cmd_buf));
-		if (ret < 0) {
-			return ret;
-		}
-		ret = st7567_write_pixels_bus(dev, ((const uint8_t *)buf + i * desc->pitch),
-					      desc->pitch);
+		ret = st7567_write_default(dev, x, y + (i << 3),
+					   ((const uint8_t *)buf + i * desc->pitch), desc->pitch);
 		if (ret < 0) {
 			return ret;
 		}
@@ -340,7 +352,7 @@ static int st7567_write(const struct device *dev, const uint16_t x, const uint16
 	LOG_DBG("x %u, y %u, pitch %u, width %u, height %u, buf_len %u", x, y, desc->pitch,
 		desc->width, desc->height, buf_len);
 
-	return st7567_write_default(dev, x, y, desc, buf, buf_len);
+	return st7567_write_desc(dev, x, y, desc, buf, buf_len);
 }
 
 static int st7567_set_contrast(const struct device *dev, const uint8_t contrast)
@@ -420,23 +432,9 @@ static int st7567_clear(const struct device *dev)
 	int ret = 0;
 	uint8_t buf = 0;
 
-	uint8_t cmd_buf[] = {
-		ST7567_COLUMN_LSB,
-		ST7567_COLUMN_MSB,
-		ST7567_PAGE,
-	};
-
 	for (int y = 0; y < config->height; y += 8) {
 		for (int x = 0; x < config->width; x++) {
-			cmd_buf[0] = ST7567_COLUMN_LSB | (x & 0xF);
-			cmd_buf[1] = ST7567_COLUMN_MSB | ((x >> 4) & 0xF);
-			cmd_buf[2] = ST7567_PAGE | (y >> 3);
-			ret = st7567_write_cmd_bus(dev, cmd_buf, sizeof(cmd_buf));
-			if (ret < 0) {
-				LOG_ERR("Error clearing display");
-				return ret;
-			}
-			ret = st7567_write_pixels_bus(dev, (uint8_t *)&buf, 1);
+			ret = st7567_write_default(dev, x, y, &buf, 1);
 			if (ret < 0) {
 				LOG_ERR("Error clearing display");
 				return ret;