Mercurial > public > ostc4

comparison Discovery/Src/t6_apnea.c @ 413:65c7b009136f Improment_NVM

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bugfix Flipdisplay Gauge and Apnoe mode: Changes needed to provide the same look and feel like in standard mode were not applied. Added missinng functions.
author ideenmodellierer
date Tue, 14 Jan 2020 21:10:37 +0100
parents 39c147e47c1c
children 18946846b95b
comparison
equal deleted inserted replaced
412:b3ab85121e4d 413:65c7b009136f
86 return t6_selection_customview; 86 return t6_selection_customview;
87 } 87 }
88 88
89 void t6_init(void) 89 void t6_init(void)
90 { 90 {
91 SSettings* pSettings;
92 pSettings = settingsGetPointer();
91 t6_selection_customview = t6_customviewsStandard[0]; 93 t6_selection_customview = t6_customviewsStandard[0];
92 94
93 t6screen.FBStartAdress = 0; 95 t6screen.FBStartAdress = 0;
94 t6screen.ImageHeight = 480; 96 t6screen.ImageHeight = 480;
95 t6screen.ImageWidth = 800; 97 t6screen.ImageWidth = 800;
97 99
98 t6l1.Image = &t6screen; 100 t6l1.Image = &t6screen;
99 t6l1.WindowNumberOfTextLines = 2; 101 t6l1.WindowNumberOfTextLines = 2;
100 t6l1.WindowLineSpacing = 19; // Abstand von Y0 102 t6l1.WindowLineSpacing = 19; // Abstand von Y0
101 t6l1.WindowTab = 100; 103 t6l1.WindowTab = 100;
102 t6l1.WindowX0 = 0; 104 if(!pSettings->FlipDisplay)
103 t6l1.WindowX1 = BigFontSeperationLeftRight - 5; 105 {
104 t6l1.WindowY0 = BigFontSeperationTopBottom + 5; 106 t6l1.WindowX0 = 0;
105 t6l1.WindowY1 = 479; 107 t6l1.WindowX1 = BigFontSeperationLeftRight - 5;
108 t6l1.WindowY0 = BigFontSeperationTopBottom + 5;
109 t6l1.WindowY1 = 479;
110 }
111 else
112 {
113 t6l1.WindowX0 = 800 - BigFontSeperationLeftRight + 5;
114 t6l1.WindowX1 = 799;
115 t6l1.WindowY0 = 0;
116 t6l1.WindowY1 = 479 - BigFontSeperationTopBottom + 5 ;
117 }
106 118
107 t6r1.Image = &t6screen; 119 t6r1.Image = &t6screen;
108 t6r1.WindowNumberOfTextLines = t6l1.WindowNumberOfTextLines; 120 t6r1.WindowNumberOfTextLines = t6l1.WindowNumberOfTextLines;
109 t6r1.WindowLineSpacing = t6l1.WindowLineSpacing; 121 t6r1.WindowLineSpacing = t6l1.WindowLineSpacing;
110 t6r1.WindowTab = t6l1.WindowTab; 122 t6r1.WindowTab = t6l1.WindowTab;
111 t6r1.WindowX0 = BigFontSeperationLeftRight + 5; 123 if(!pSettings->FlipDisplay)
112 t6r1.WindowX1 = 799; 124 {
125 t6r1.WindowX0 = BigFontSeperationLeftRight + 5;
126 t6r1.WindowX1 = 799;
127 }
128 else
129 {
130 t6r1.WindowX0 = 0;
131 t6r1.WindowX1 = BigFontSeperationLeftRight - 5;
132 }
113 t6r1.WindowY0 = t6l1.WindowY0; 133 t6r1.WindowY0 = t6l1.WindowY0;
114 t6r1.WindowY1 = t6l1.WindowY1; 134 t6r1.WindowY1 = t6l1.WindowY1;
115 135
116 t6c1.Image = &t6screen; 136 t6c1.Image = &t6screen;
117 t6c1.WindowNumberOfTextLines = 2; 137 t6c1.WindowNumberOfTextLines = 2;
118 t6c1.WindowLineSpacing = t6l1.WindowLineSpacing; 138 t6c1.WindowLineSpacing = t6l1.WindowLineSpacing;
119 t6c1.WindowX0 = 0; 139 t6c1.WindowX0 = 0;
120 t6c1.WindowX1 = 799; 140 t6c1.WindowX1 = 799;
121 t6c1.WindowY0 = 0; 141 if(!pSettings->FlipDisplay)
122 t6c1.WindowY1 = BigFontSeperationTopBottom - 5; 142 {
143 t6c1.WindowY0 = 0;
144 t6c1.WindowY1 = BigFontSeperationTopBottom - 5;
145 }
146 else
147 {
148 t6c1.WindowY0 = 480 - BigFontSeperationTopBottom + 5;
149 t6c1.WindowY1 = 479;
150 t6c1.WindowX0 = 0;
151 t6c1.WindowX1 = BigFontSeperationLeftRight - 5;
152 }
123 153
124 t6c2.Image = &t6screen; 154 t6c2.Image = &t6screen;
125 t6c2.WindowNumberOfTextLines = 3; 155 t6c2.WindowNumberOfTextLines = 3;
126 t6c2.WindowLineSpacing = 58; 156 t6c2.WindowLineSpacing = 58;
127 t6c2.WindowX0 = 370; 157 t6c2.WindowX0 = 370;
128 t6c2.WindowX1 = 799; 158 t6c2.WindowX1 = 799;
129 t6c2.WindowY0 = 0; 159
130 t6c2.WindowY1 = BigFontSeperationTopBottom - 5; 160 if(!pSettings->FlipDisplay)
161 {
162 t6c2.WindowY0 = 0;
163 t6c2.WindowY1 = BigFontSeperationTopBottom - 5;
164 }
165 else
166 {
167 t6c2.WindowY0 = 480 - BigFontSeperationTopBottom + 5;
168 t6c2.WindowY1 = 479;
169 }
170
131 t6c2.WindowTab = 600; 171 t6c2.WindowTab = 600;
132 172
133 t6c3.Image = &t6screen; 173 t6c3.Image = &t6screen;
134 t6c3.WindowNumberOfTextLines = 1; 174 t6c3.WindowNumberOfTextLines = 1;
135 t6c3.WindowLineSpacing = 0; // Abstand von Y0 175 t6c3.WindowLineSpacing = 0; // Abstand von Y0
136 t6c3.WindowTab = 100; 176 t6c3.WindowTab = 100;
137 t6c3.WindowX0 = CUSTOMBOX_LINE_LEFT + CUSTOMBOX_INSIDE_OFFSET; 177 t6c3.WindowX0 = CUSTOMBOX_LINE_LEFT + CUSTOMBOX_INSIDE_OFFSET;
138 t6c3.WindowX1 = CUSTOMBOX_LINE_RIGHT - CUSTOMBOX_INSIDE_OFFSET; 178 t6c3.WindowX1 = CUSTOMBOX_LINE_RIGHT - CUSTOMBOX_INSIDE_OFFSET;
139 t6c3.WindowY0 = 0; 179 if(!pSettings->FlipDisplay)
140 t6c3.WindowY1 = 69; 180 {
181 t6c3.WindowY0 = 0;
182 t6c3.WindowY1 = 69;
183 }
184 else
185 {
186 t6c3.WindowY0 = 480 - 69;
187 t6c3.WindowY1 = 479;
188 }
141 } 189 }
142 190
143 191
144 void t6_refresh(void) 192 void t6_refresh(void)
145 { 193 {