proper pixel order

src/image.c

@@ -34,13 +34,13 @@
 #define BATT_INTERVAL_MS 777
 
 void image_draw(const char *data, uint width, uint height) {
-    for (uint x = 0; x < width; x++) {
-        for (uint y = 0; y < height; y++) {
+    for (uint y = 0; y < height; y++) {
+        for (uint x = 0; x < width; x++) {
             uint32_t pixel[3];
             HEADER_PIXEL(data, pixel);
 
             uint32_t color = RGB_565(pixel[0], pixel[1], pixel[2]);
-            lcd_write_point(240 - x - 1, y, color);
+            lcd_write_point(x, y, color);
         }
     }
 }

src/lcd.c

@@ -35,7 +35,7 @@
 #define LCD_PIN_BL 13
 
 #define ST7789_PICO_COLUMN                             240
-#define ST7789_PICO_ROW                                240
+#define ST7789_PICO_ROW                                ST7789_PICO_COLUMN
 
 #define ST7789_PICO_ACCESS                            (ST7789_ORDER_PAGE_TOP_TO_BOTTOM | \
                                                        ST7789_ORDER_COLUMN_LEFT_TO_RIGHT | \
@@ -269,11 +269,11 @@ void lcd_clear(void) {
 }
 
 void lcd_write_point(uint16_t x, uint16_t y, uint32_t color) {
-    st7789_draw_point(&gs_handle, x, y, color);
+    st7789_draw_point(&gs_handle, ST7789_PICO_COLUMN - y - 1, x, color);
 }
 
 void lcd_write_rect(uint16_t left, uint16_t top, uint16_t right, uint16_t bottom, uint32_t color) {
-    st7789_fill_rect(&gs_handle, left, top, right, bottom, color);
+    st7789_fill_rect(&gs_handle, 240 - bottom - 1, left, 240 - top - 1, right, color);
 }
 
 uint32_t from_hsv(float h, float s, float v) {

src/text.c

@@ -54,7 +54,7 @@ static void pixel_callback(int16_t x, int16_t y, uint8_t count, uint8_t alpha,
     if (x < 0 || x + count >= s->options->width) return;
 
     while (count--) {
-        lcd_write_point(240 - y - 1, x,
+        lcd_write_point(x, y,
                         blend(s->options->fg, s->options->bg, alpha));
         x++;
     }
@@ -75,22 +75,22 @@ static bool line_callback(const char *line, uint16_t count, void *state) {
         int16_t line_height = s->options->font->font->line_height;
 
         if (s->options->alignment == MF_ALIGN_LEFT) {
-            lcd_write_rect(240 - s->options->y - 1 - line_height,
-                           s->options->x,
-                           240 - s->options->y - 1,
+            lcd_write_rect(s->options->x,
+                           s->options->y,
                            s->options->x + width,
+                           s->options->y + line_height,
                            s->options->bg);
         } else if (s->options->alignment == MF_ALIGN_CENTER) {
-            lcd_write_rect(240 - s->options->y - 1 - line_height,
-                           s->options->x + s->options->width / 2 - width / 2,
-                           240 - s->options->y - 1,
+            lcd_write_rect(s->options->x + s->options->width / 2 - width / 2,
+                           s->options->y,
                            s->options->x + s->options->width / 2 + width / 2,
+                           s->options->y + line_height,
                            s->options->bg);
         } else if (s->options->alignment == MF_ALIGN_RIGHT) {
-            lcd_write_rect(240 - s->options->y - 1 - line_height,
-                           s->options->x + s->options->width - width,
-                           240 - s->options->y - 1,
+            lcd_write_rect(s->options->x + s->options->width - width,
+                           s->options->y,
                            s->options->x + s->options->width,
+                           s->options->y + line_height,
                            s->options->bg);
         }
     }
@@ -181,10 +181,10 @@ void text_box(const char *s) {
         .font = &font,
     };
 
-    lcd_write_rect(240 - y - 1 - height,
-                   x,
-                   240 - y - 1,
+    lcd_write_rect(x,
+                   y,
                    x + width - 1,
+                   y + height - 1,
                    text.bg);
 
     text.text = s;