hide profile title when printing legend

Author: hkdsun

firmware/code/Inc/parser.h

@@ -3,7 +3,7 @@
 
 #ifdef __cplusplus
  extern "C" {
-#endif 
+#endif
 
 #include "stm32f0xx_hal.h"
 #include "buttons.h"
@@ -61,9 +61,12 @@ void change_profile(uint8_t dir);
 void handle_keypress(uint8_t keynum, but_status* b_status, ds3_exe_result* exe);
 void scan_profiles(void);
 uint8_t get_last_profile(void);
+uint32_t ms_since_last_profile_change(void);
+
 void restore_profile(uint8_t profile_id);
 void keypress_wrapper(uint8_t keynum, ds3_exe_result* exe);
-void print_legend(void);
+void print_title(void);
+void print_legend(uint8_t hide_title);
 void save_settings(void);
 void load_settings(void);
 void save_last_profile(uint8_t profile_id);

firmware/code/Src/ds3_vm.c

@@ -283,7 +283,7 @@ void execute_instruction(uint16_t curr_pc, ds3_exe_result* exe, uint8_t keynum)
   uint16_t op_data = make_uint16(byte0, byte1);
   current_key = keynum;
   // printf("PC: %04d | Opcode: %02d | 0x%02x 0x%02x | 0x%04x\n", curr_pc, this_opcode, byte0, byte1, op_data);
-  
+
   exe->result = EXE_OK;
   exe->next_pc = curr_pc + INSTRUCTION_SIZE_BYTES;
   exe->data = 0;
@@ -524,7 +524,7 @@ void execute_instruction(uint16_t curr_pc, ds3_exe_result* exe, uint8_t keynum)
   }
   else if(this_opcode == OP_OLR)
   {
-    print_legend();
+    print_legend(0);
   }
   else if(this_opcode == OP_BCLR)
   {

firmware/code/Src/my_tasks.c

@@ -824,7 +824,7 @@ void keypress_task_start(void const * argument)
   if(is_pressed(0))
   {
     select_keymap();
-    print_legend();
+    print_legend(0);
   }
 
   is_busy = 0;
@@ -850,7 +850,9 @@ void keypress_task_start(void const * argument)
           goto key_task_end;
         }
         if(i == KEY_BUTTON1 || i == KEY_BUTTON2)
+        {
           handle_tactile_button_press(i);
+        }
         if(hold_cache[i].type != KEY_TYPE_UNKNOWN && hold_cache[i].code != 0)
         {
           press_key(hold_cache[i].code, hold_cache[i].type);
@@ -903,7 +905,7 @@ void keypress_task_start(void const * argument)
           }
           if (this_exe.epilogue_actions & NEED_OLED_REFRESH)
           {
-            print_legend();
+            print_legend(0);
           }
         }
       }

firmware/code/Src/parser.c

@@ -22,6 +22,8 @@ static const uint8_t col_lookup[7][3] = {
    {0, 42, 85}
 };
 
+uint32_t last_profile_change;
+
 FRESULT sd_fresult;
 FATFS sd_fs;
 FIL sd_file;
@@ -379,6 +381,11 @@ uint8_t load_persistent_state(void)
   return 0;
 }
 
+uint32_t ms_since_last_profile_change(void)
+{
+  return HAL_GetTick() - last_profile_change;
+}
+
 void load_profile(uint8_t pid)
 {
   char* profile_name = find_profile(pid);
@@ -391,6 +398,33 @@ void load_profile(uint8_t pid)
   if(load_persistent_state() != 0)
     redraw_bg();
   p_cache.current_profile = pid;
+  last_profile_change = HAL_GetTick();
+}
+
+#define TITLE_ROW 5
+#define NUM_OLED_ROWS 6
+#define TEXT_HEIGHT 12
+#define MARGIN_TOP 5
+
+void print_title()
+{
+  memset(temp_buf, 0, PATH_SIZE);
+  sprintf(temp_buf, "profile%d_", p_cache.current_profile);
+  char* pf_name = p_cache.profile_fn + strlen(temp_buf);
+
+  memset(temp_buf, 0, PATH_SIZE);
+  sprintf(temp_buf, "=== P%d: %s ===", p_cache.current_profile, pf_name);
+
+  if(strlen(temp_buf) > 21)
+    temp_buf[21] = 0;
+
+  int8_t y_start = TITLE_ROW * 10 + 2;
+  int8_t x_start = (21 - strlen(temp_buf)) * 3;
+  if(x_start < 0)
+    x_start = 0;
+
+  ssd1306_SetCursor((uint8_t)x_start, y_start);
+  ssd1306_WriteString(temp_buf, Font_6x10,White);
 }
 
 void print_keyname(char* keyname, uint8_t keynum)
@@ -401,35 +435,31 @@ void print_keyname(char* keyname, uint8_t keynum)
     temp_buf[0] = '-';
   if(strlen(temp_buf) > 7)
     temp_buf[7] = 0;
+
   uint8_t row = keynum / 3;
   uint8_t col = keynum - row * 3;
+
   int8_t x_start = col_lookup[strlen(temp_buf) - 1][col];
-  int8_t y_start = (row + 1) * 10 + 2;
+  int8_t y_start = (row) * TEXT_HEIGHT + MARGIN_TOP;
   if(x_start < 0)
     x_start = 0;
   if(y_start < 0)
     y_start = 0;
+
   ssd1306_SetCursor((uint8_t)x_start, (uint8_t)y_start);
   ssd1306_WriteString(temp_buf, Font_6x10,White);
 }
 
-void print_legend(void)
+void print_legend(uint8_t hide_title)
 {
   ssd1306_Fill(Black);
-  memset(temp_buf, 0, PATH_SIZE);
-  sprintf(temp_buf, "profile%d_", p_cache.current_profile);
-  char* pf_name = p_cache.profile_fn + strlen(temp_buf);
-  memset(temp_buf, 0, PATH_SIZE);
-  sprintf(temp_buf, "=== P%d: %s ===", p_cache.current_profile, pf_name);
-  if(strlen(temp_buf) > 21)
-    temp_buf[21] = 0;
-  int8_t x_start = (21 - strlen(temp_buf)) * 3;
-  if(x_start < 0)
-    x_start = 0;
-  ssd1306_SetCursor((uint8_t)x_start, 0);
-  ssd1306_WriteString(temp_buf, Font_6x10,White);
+
+  // if(!hide_title)
+  //   print_title();
+
   for (int i = 0; i < MAPPABLE_KEY_COUNT; ++i)
     print_keyname(p_cache.key_fn[i], i);
+
   ssd1306_UpdateScreen();
 }
 
@@ -511,7 +541,7 @@ void reset_hold_cache(void)
 void restore_profile(uint8_t profile_id)
 {
   load_profile(profile_id);
-  print_legend();
+  print_legend(0);
   save_last_profile(profile_id);
   reset_hold_cache();
 }