changeset 884:940f8e132638 Evo_2_23

Minor screen cleanup: In flipped mode some visualization did not match the non flipped version. Also depth display in T7 view has been moved
author Ideenmodellierer
date Sun, 01 Sep 2024 20:31:01 +0200
parents 7755a476f164
children 8d3f3a635397
files Discovery/Src/gfx_engine.c Discovery/Src/t7.c Discovery/Src/tMenuEditHardware.c Discovery/Src/tMenuEditSystem.c
diffstat 4 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Discovery/Src/gfx_engine.c	Sat Aug 31 18:14:40 2024 +0200
+++ b/Discovery/Src/gfx_engine.c	Sun Sep 01 20:31:01 2024 +0200
@@ -2058,7 +2058,10 @@
 		minimal = 0;
 
 	if(Font == &FontT144)
+	{
 		settings.TinyFont = (uint32_t)&FontT84;
+		settings.Ydelta = 12;
+	}
 	else
 	if(Font == &FontT105)
 		settings.TinyFont = (uint32_t)&FontT54;
--- a/Discovery/Src/t7.c	Sat Aug 31 18:14:40 2024 +0200
+++ b/Discovery/Src/t7.c	Sun Sep 01 20:31:01 2024 +0200
@@ -209,7 +209,7 @@
 
 		t7l2.Image = &t7screen;
 		t7l2.WindowNumberOfTextLines = 2;
-		t7l2.WindowLineSpacing = 22; // Abstand von Y0
+		t7l2.WindowLineSpacing = 12; // Abstand von Y0
 		t7l2.WindowTab = 100; // vermtl. ohne Verwendung in diesem Fenster
 		t7l2.WindowX0 = 0;
 		t7l2.WindowX1 = t7l1.WindowX1;
@@ -376,7 +376,7 @@
 
     t7l2.Image = &t7screen;
     t7l2.WindowNumberOfTextLines = 2;
-    t7l2.WindowLineSpacing = 22; // Abstand von Y0
+    t7l2.WindowLineSpacing = 12; // Abstand von Y0
     t7l2.WindowTab = 100; // vermtl. ohne Verwendung in diesem Fenster
     t7l2.WindowX0 = t7l1.WindowX0;
     t7l2.WindowX1 = t7l1.WindowX1;
@@ -2720,8 +2720,7 @@
     char TextC2[TEXTSIZE];
     uint8_t textPointer;
 
-    point_t start, stop;
-    uint8_t color;
+    uint8_t color = 0;
     int textlength;
 
     uint16_t 	nextstopLengthSeconds = 0;
@@ -2820,8 +2819,6 @@
 
     GFX_write_string(&FontT144,&t7l1,TextL1,0);
 
-
-
 /* divetime */
     if(stateUsed->lifeData.counterSecondsShallowDepth)
     {
--- a/Discovery/Src/tMenuEditHardware.c	Sat Aug 31 18:14:40 2024 +0200
+++ b/Discovery/Src/tMenuEditHardware.c	Sun Sep 01 20:31:01 2024 +0200
@@ -906,7 +906,7 @@
     }
 
     snprintf(text,32,"%c",TXT_ButtonLock);
-    write_field_on_off(StMHARD5_ButtonLock,	 30, 95, ME_Y_LINE5,  &FontT48, text, settingsGetPointer()->buttonLockActive);
+    write_field_on_off(StMHARD5_ButtonLock,	 30, 700, ME_Y_LINE5,  &FontT48, text, settingsGetPointer()->buttonLockActive);
 
     setEvent(StMHARD5_Button1, (uint32_t)OnAction_Button);
 
@@ -945,7 +945,7 @@
         sens[i] = settingsHelperButtonSens_translate_hwOS_values_to_percentage(stateRealGetPointer()->lifeData.buttonPICdata[i]);
     }
     snprintf(text,64,"\020\016\016%c%c \017 (%03u  %03u  %03u)",TXT_2BYTE,TXT2BYTE_LowerIsLess,sens[2],sens[1],sens[0]);
-    write_label_var(  20, 340, ME_Y_LINE6, &FontT42, text);
+    write_label_var(  20, 700, ME_Y_LINE6, &FontT42, text);
 
     tMenuEdit_refresh_field(StMHARD5_Button1);
     tMenuEdit_refresh_field(StMHARD5_ButtonBalance1);
--- a/Discovery/Src/tMenuEditSystem.c	Sat Aug 31 18:14:40 2024 +0200
+++ b/Discovery/Src/tMenuEditSystem.c	Sun Sep 01 20:31:01 2024 +0200
@@ -737,7 +737,7 @@
     write_content( 30, 700, ME_Y_LINE4 + 30 + 70, &FontT48, "___________", CLUT_DIVE_FieldSeperatorLines);
     write_content(280, 700, ME_Y_LINE4 + 30 + 70 - 3, &FontT48, "|", CLUT_DIVE_pluginbox);
     write_content(290, 700, ME_Y_LINE4 + 30 + 70 - 37, &FontT48, "_______________", CLUT_DIVE_pluginbox);
-    write_content( 30, 700, ME_Y_LINE4 + 30, &FontT144, "24.7", CLUT_Font027);
+    write_content( 30, 700, ME_Y_LINE4 + 42, &FontT144, "24.7", CLUT_Font027);
 
     write_buttonTextline(TXT2BYTE_ButtonBack,TXT2BYTE_ButtonEnter,TXT2BYTE_ButtonNext);
 }