Mercurial > public > ostc4

comparison Discovery/Src/t7.c @ 884:940f8e132638 Evo_2_23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 608d3e918146
children 0e084e5554a8
comparison
equal deleted inserted replaced
883:7755a476f164 884:940f8e132638
207 t7l1.WindowY0 = 318; 207 t7l1.WindowY0 = 318;
208 t7l1.WindowY1 = 479; 208 t7l1.WindowY1 = 479;
209 209
210 t7l2.Image = &t7screen; 210 t7l2.Image = &t7screen;
211 t7l2.WindowNumberOfTextLines = 2; 211 t7l2.WindowNumberOfTextLines = 2;
212 t7l2.WindowLineSpacing = 22; // Abstand von Y0 212 t7l2.WindowLineSpacing = 12; // Abstand von Y0
213 t7l2.WindowTab = 100; // vermtl. ohne Verwendung in diesem Fenster 213 t7l2.WindowTab = 100; // vermtl. ohne Verwendung in diesem Fenster
214 t7l2.WindowX0 = 0; 214 t7l2.WindowX0 = 0;
215 t7l2.WindowX1 = t7l1.WindowX1; 215 t7l2.WindowX1 = t7l1.WindowX1;
216 t7l2.WindowY0 = 142; 216 t7l2.WindowY0 = 142;
217 t7l2.WindowY1 = t7l1.WindowY0 - 5; 217 t7l2.WindowY1 = t7l1.WindowY0 - 5;
374 t7l1.WindowY0 = CUSTOMBOX_LINE_TOP; 374 t7l1.WindowY0 = CUSTOMBOX_LINE_TOP;
375 t7l1.WindowY1 = 150 + TOP_LINE_HIGHT; 375 t7l1.WindowY1 = 150 + TOP_LINE_HIGHT;
376 376
377 t7l2.Image = &t7screen; 377 t7l2.Image = &t7screen;
378 t7l2.WindowNumberOfTextLines = 2; 378 t7l2.WindowNumberOfTextLines = 2;
379 t7l2.WindowLineSpacing = 22; // Abstand von Y0 379 t7l2.WindowLineSpacing = 12; // Abstand von Y0
380 t7l2.WindowTab = 100; // vermtl. ohne Verwendung in diesem Fenster 380 t7l2.WindowTab = 100; // vermtl. ohne Verwendung in diesem Fenster
381 t7l2.WindowX0 = t7l1.WindowX0; 381 t7l2.WindowX0 = t7l1.WindowX0;
382 t7l2.WindowX1 = t7l1.WindowX1; 382 t7l2.WindowX1 = t7l1.WindowX1;
383 t7l2.WindowY0 = t7l1.WindowY1 + 5; 383 t7l2.WindowY0 = t7l1.WindowY1 + 5;
384 t7l2.WindowY1 = t7l2.WindowY0 + 146; 384 t7l2.WindowY1 = t7l2.WindowY0 + 146;
2718 2718
2719 char TextC1[2*TEXTSIZE]; 2719 char TextC1[2*TEXTSIZE];
2720 char TextC2[TEXTSIZE]; 2720 char TextC2[TEXTSIZE];
2721 uint8_t textPointer; 2721 uint8_t textPointer;
2722 2722
2723 point_t start, stop; 2723 uint8_t color = 0;
2724 uint8_t color;
2725 int textlength; 2724 int textlength;
2726 2725
2727 uint16_t nextstopLengthSeconds = 0; 2726 uint16_t nextstopLengthSeconds = 0;
2728 uint8_t nextstopDepthMeter = 0; 2727 uint8_t nextstopDepthMeter = 0;
2729 uint8_t oxygen_percentage = 0; 2728 uint8_t oxygen_percentage = 0;
2817 snprintf(TextL1,TEXTSIZE,"\020%01.0f",depth); 2816 snprintf(TextL1,TEXTSIZE,"\020%01.0f",depth);
2818 2817
2819 Gfx_colorsscheme_mod(TextL1, color); 2818 Gfx_colorsscheme_mod(TextL1, color);
2820 2819
2821 GFX_write_string(&FontT144,&t7l1,TextL1,0); 2820 GFX_write_string(&FontT144,&t7l1,TextL1,0);
2822
2823
2824 2821
2825 /* divetime */ 2822 /* divetime */
2826 if(stateUsed->lifeData.counterSecondsShallowDepth) 2823 if(stateUsed->lifeData.counterSecondsShallowDepth)
2827 { 2824 {
2828 snprintf(TextR1,TEXTSIZE,"\f\002\136 %u:%02u",TimeoutTime.Minutes, TimeoutTime.Seconds); 2825 snprintf(TextR1,TEXTSIZE,"\f\002\136 %u:%02u",TimeoutTime.Minutes, TimeoutTime.Seconds);