small graphical adjustments

mooltipass · Jun 8, 2020 · e374682 · e374682
1 parent fccf555
commit e374682
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/source_code/main_mcu/.vs/mini_ble/v14/.atsuo b/source_code/main_mcu/.vs/mini_ble/v14/.atsuo
diff --git a/source_code/main_mcu/src/GUI/gui_prompts.c b/source_code/main_mcu/src/GUI/gui_prompts.c
@@ -109,8 +109,9 @@ void gui_prompts_display_tutorial(void)
             sh1122_refresh_used_font(&plat_oled_descriptor, FONT_UBUNTU_MEDIUM_17_ID);
             for (uint16_t i = 0; i < 3; i++)
             {
+                uint16_t text_offset = (current_tutorial_page > 0 && current_tutorial_page < 3)? 30 : 0;
                 custom_fs_get_string_from_file(TUTORIAL_FLINE_TEXT_ID + current_tutorial_page*3 + i, &temp_string_pt, TRUE);
-                sh1122_put_string_xy(&plat_oled_descriptor, 0, gui_prompts_tutorial_3_lines_y_positions[i], OLED_ALIGN_CENTER, temp_string_pt, TRUE);
+                sh1122_put_string_xy(&plat_oled_descriptor, text_offset, gui_prompts_tutorial_3_lines_y_positions[i], OLED_ALIGN_CENTER, temp_string_pt, TRUE);
             }
 
             /* Display animation frame if needed */

diff --git a/source_code/main_mcu/src/OLED/sh1122.c b/source_code/main_mcu/src/OLED/sh1122.c
@@ -2196,7 +2196,7 @@ int16_t sh1122_put_string_xy(sh1122_descriptor_t* oled_descriptor, int16_t x, in
     {
         if ((x + oled_descriptor->min_text_x + width) < oled_descriptor->max_text_x)
         {
-            x = oled_descriptor->min_text_x + x + (oled_descriptor->max_text_x - oled_descriptor->min_text_x - width)/2;
+            x = oled_descriptor->min_text_x + x + (oled_descriptor->max_text_x - oled_descriptor->min_text_x - x - width)/2;
         }
         else
         {
-Original file line number
+Diff line change
@@ Expand Up @@
         {
             if ((x + oled_descriptor->min_text_x + width) < oled_descriptor->max_text_x)
             {
-                x = oled_descriptor->min_text_x + x + (oled_descriptor->max_text_x - oled_descriptor->min_text_x - width)/2;
+                x = oled_descriptor->min_text_x + x + (oled_descriptor->max_text_x - oled_descriptor->min_text_x - x - width)/2;
             }
             else
             {
@@ Expand Down @@