[Painter] Begin initial add of layer map rendering

drashna · Aug 6, 2024 · a3a10f4 · a3a10f4
1 parent 2502657
commit a3a10f4
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 1 deletion.
diff --git a/users/drashna/display/display.c b/users/drashna/display/display.c
@@ -20,6 +20,9 @@ char qp_keylog_str[QP_KEYLOGGER_LENGTH] = {0};
 #ifdef KEYLOGGER_ENABLE
 bool keylogger_has_changed = true;
 #endif
+#ifdef LAYER_MAP_ENABLE
+__attribute__((unused)) bool layer_map_has_updated = true;
+#endif
 
 // clang-format off
 const char PROGMEM code_to_name[256] = {

diff --git a/users/drashna/display/display.h b/users/drashna/display/display.h
@@ -8,6 +8,7 @@
 #include "progmem.h"
 
 extern bool               keylogger_has_changed;
+extern bool               layer_map_has_updated;
 extern const char PROGMEM code_to_name[256];
 
 bool process_record_display_driver(uint16_t keycode, keyrecord_t* record);

diff --git a/users/drashna/display/painter/ili9341_display.c b/users/drashna/display/painter/ili9341_display.c
@@ -14,6 +14,9 @@
 #ifdef RTC_ENABLE
 #    include "features/rtc/rtc.h"
 #endif
+#ifdef LAYER_MAP_ENABLE
+#    include "features/layer_map.h"
+#endif
 
 #include <math.h>
 #include <stdio.h>
@@ -698,6 +701,36 @@ __attribute__((weak)) void ili9341_draw_user(void) {
             qp_rect(ili9341_display, xpos, ypos, max_rtc_xpos, ypos + font_oled->line_height, 0, 0, 0, true);
         }
 #endif // RTC_ENABLE
+
+        //  Layer Map render
+        ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef LAYER_MAP_ENABLE
+        ypos -= (font_oled->line_height + 4) * LAYER_MAP_ROWS;
+        if (hue_redraw || layer_map_has_updated) {
+            uint16_t temp_ypos = ypos;
+            for (uint8_t y = 0; y < LAYER_MAP_ROWS; y++) {
+                xpos = 25;
+                for (uint8_t x = 0; x < LAYER_MAP_COLS; x++) {
+                    uint16_t keycode = extract_basic_keycode(layer_map[y][x], NULL, false);
+                    char     code    = 0;
+                    if (keycode > 0xFF) {
+                        keycode = KC_SPC;
+                    }
+                    if (keycode < ARRAY_SIZE(code_to_name)) {
+                        code = pgm_read_byte(&code_to_name[keycode]);
+                    }
+                    snprintf(buf, sizeof(buf), "%c", code);
+                    xpos += qp_drawtext_recolor(ili9341_display, xpos, temp_ypos, font_oled, buf, curr_hue, 255, 255, 0,
+                                                0, peek_matrix_layer_map(y, x) ? 255 : 0) +
+                            5;
+                }
+                temp_ypos += font_oled->line_height + 4;
+            }
+            layer_map_has_updated = false;
+        }
+
+#endif
     }
     qp_flush(ili9341_display);
 }
diff --git a/users/drashna/features/layer_map.c b/users/drashna/features/layer_map.c
@@ -10,6 +10,9 @@
 volatile uint16_t layer_map[LAYER_MAP_ROWS][LAYER_MAP_COLS] = {0};
 static bool       layer_map_set                             = false;
 extern bool       peek_matrix(uint8_t row_index, uint8_t col_index, bool read_raw);
+#ifdef CUSTOM_QUANTUM_PAINTER_ENABLE
+extern bool layer_map_has_updated;
+#endif
 
 void set_layer_map(void) {
     layer_map_set = true;
@@ -41,6 +44,9 @@ void populate_layer_map(void) {
         }
         // xprintf("\n");
     }
+#ifdef CUSTOM_QUANTUM_PAINTER_ENABLE
+    layer_map_has_updated = true;
+#endif
 }
 
 bool peek_matrix_layer_map(uint8_t row, uint8_t col) {
@@ -50,7 +56,7 @@ bool peek_matrix_layer_map(uint8_t row, uint8_t col) {
     }
     return peek_matrix(layer_remap[row][col].row, layer_remap[row][col].col, false);
 #else
-    if (row = > KEYLOC_DIP_SWITCH_OFF) {
+    if (row >= KEYLOC_DIP_SWITCH_OFF) {
         return false;
     }
     return peek_matrix(row, col, false);