fix bug of display rotation

john0312 · Jul 24, 2024 · 9d2c1e6 · 9d2c1e6
1 parent 62738f9
commit 9d2c1e6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/fw/Core/Hitcon/Logic/Display/display.cc b/fw/Core/Hitcon/Logic/Display/display.cc
@@ -108,13 +108,7 @@ void display_get_frame_packed(display_buf_t *buf, int frame) {
   }
 
   if (display_orientation) {
-    uint8_t tmp[DISPLAY_HEIGHT][DISPLAY_WIDTH];
-    for (int y = 0; y < DISPLAY_HEIGHT; y++) {
-      for (int x = 0; x < DISPLAY_WIDTH; x++) {
-        tmp[y][x] = buf[sizeof(tmp) - 1 - (y * DISPLAY_WIDTH + x)];
-      }
-    }
-    memcpy(buf, tmp, sizeof(tmp));
+    display_buf_rotate_180(buf);
   }
 
   display_current_frame = frame;

diff --git a/fw/Core/Hitcon/Logic/Display/display.h b/fw/Core/Hitcon/Logic/Display/display.h
@@ -3,6 +3,7 @@
 
 #include <Logic/Display/font.h>
 #include <stdint.h>
+#include <string.h>
 
 // clang-format off
 /**
@@ -108,6 +109,17 @@ inline void display_buf_unpack(uint8_t *dst, const display_buf_t *src,
   }
 }
 
+inline void display_buf_rotate_180(display_buf_t *buf) {
+  display_buf_t tmp[DISPLAY_WIDTH];
+  for (int y = 0; y < DISPLAY_HEIGHT; ++y) {
+    for (int x = 0; x < DISPLAY_WIDTH; ++x) {
+      display_buf_assign(tmp[DISPLAY_WIDTH - 1 - x], DISPLAY_HEIGHT - 1 - y,
+                         display_buf_get(buf[x], y));
+    }
+  }
+  memcpy(buf, tmp, sizeof(tmp));
+}
+
 void display_init();
 
 // Toggle the orientation of the display.