Subversion Repositories Projects

Rev

Rev 902 | Rev 941 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 902 Rev 932
Line 144... Line 144...
144
            write_ndigit_number_u(23, top_line + 1, naviData.HomePositionDeviation.Distance / 10 * 32 / 10, 4, 0);
144
            write_ndigit_number_u(23, top_line + 1, naviData.HomePositionDeviation.Distance / 10 * 32 / 10, 4, 0);
145
        } else {
145
        } else {
146
            write_ndigit_number_u(23, top_line + 1, naviData.HomePositionDeviation.Distance / 10, 4, 0);
146
            write_ndigit_number_u(23, top_line + 1, naviData.HomePositionDeviation.Distance / 10, 4, 0);
147
        }
147
        }
148
 
148
 
-
 
149
        // show coords only when configure AND stats are off OR stats are on and motors are off
-
 
150
        if ((COSD_FLAGS_CONFIG & COSD_FLAG_SHOW_COORDS)
-
 
151
            && ((naviData.FCFlags & FCFLAG_MOTOR_RUN)
-
 
152
            || !((COSD_FLAGS_RUNTIME & COSD_WASFLYING) && (COSD_FLAGS_MODES & COSD_FLAG_STATS)))) {
-
 
153
            write_gps_pos(15, bottom_line - 2, naviData.CurrentPosition.Longitude);
-
 
154
            write_gps_pos(15, bottom_line - 1, naviData.CurrentPosition.Latitude);
-
 
155
        }
-
 
156
 
149
        // center
157
        // center
150
        if (naviData.FCFlags & FCFLAG_MOTOR_RUN) { // should be engines running
158
        if (naviData.FCFlags & FCFLAG_MOTOR_RUN) { // should be engines running
151
            if (!(old_MKFlags & FCFLAG_MOTOR_RUN)) { // motors just started, clear middle
159
            if (!(old_MKFlags & FCFLAG_MOTOR_RUN)) { // motors just started, clear middle
152
                clear();
160
                clear();
153
                // remember current heigth for offsets
161
                // remember current heigth for offsets
Line 168... Line 176...
168
            if (COSD_FLAGS_MODES & COSD_FLAG_ARTHORIZON) { // horizon
176
            if (COSD_FLAGS_MODES & COSD_FLAG_ARTHORIZON) { // horizon
169
                uint8_t horizon_bottom = bottom_line - 1;
177
                uint8_t horizon_bottom = bottom_line - 1;
170
                if ((COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) || (COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT)) {
178
                if ((COSD_FLAGS_RUNTIME & COSD_FLAG_STROMREC) || (COSD_FLAGS_MODES & COSD_FLAG_FCCURRENT)) {
171
                    horizon_bottom--;
179
                    horizon_bottom--;
172
                }
180
                }
-
 
181
                if (COSD_FLAGS_CONFIG & COSD_FLAG_SHOW_COORDS) {
-
 
182
                    horizon_bottom--;
-
 
183
                }
-
 
184
 
173
                if (COSD_FLAGS_MODES & COSD_FLAG_AGGRHORIZON) {
185
                if (COSD_FLAGS_MODES & COSD_FLAG_AGGRHORIZON) {
174
                    draw_agressiva_artificial_horizon(top_line + 2, horizon_bottom, naviData.AngleNick, naviData.AngleRoll);
186
                    draw_agressiva_artificial_horizon(top_line + 2, horizon_bottom, naviData.AngleNick, naviData.AngleRoll);
175
                } else {
187
                } else {
176
                    draw_artificial_horizon(top_line + 2, horizon_bottom, naviData.AngleNick, naviData.AngleRoll);
188
                    draw_artificial_horizon(top_line + 2, horizon_bottom, naviData.AngleNick, naviData.AngleRoll);
177
                }
189
                }
Line 198... Line 210...
198
                    draw_artificial_horizon(top_line + 2, horizon_bottom, naviData.AngleNick, naviData.AngleRoll);
210
                    draw_artificial_horizon(top_line + 2, horizon_bottom, naviData.AngleNick, naviData.AngleRoll);
199
                }
211
                }
200
            }
212
            }
201
        }
213
        }
202
 
214
 
203
        // show coords only when configure AND stats are off OR stats are on and motors are off
-
 
204
        if ((COSD_FLAGS_CONFIG & COSD_FLAG_SHOW_COORDS)
-
 
205
            && ((naviData.FCFlags & FCFLAG_MOTOR_RUN)
-
 
206
            || !((COSD_FLAGS_RUNTIME & COSD_WASFLYING) && (COSD_FLAGS_MODES & COSD_FLAG_STATS)))) {
-
 
207
            write_gps_pos(15, bottom_line - 2, naviData.CurrentPosition.Longitude);
-
 
208
            write_gps_pos(15, bottom_line - 1, naviData.CurrentPosition.Latitude);
-
 
209
        }
215
 
210
 
216
 
211
        if (COSD_FLAGS_MODES & COSD_FLAG_BIGVARIO) {
217
        if (COSD_FLAGS_MODES & COSD_FLAG_BIGVARIO) {
212
            draw_big_variometer(27, 8, naviData.Variometer);
218
            draw_big_variometer(27, 8, naviData.Variometer);
213
        }
219
        }
214
 
220